additional ruby fixes to the 0.5.0 overhaul (#3359)

fern-api · Apr 11, 2024 · 7382808 · 7382808
1 parent 7b2a0bf
commit 7382808
Show file tree

Hide file tree

Showing 7 changed files with 84 additions and 44 deletions.
diff --git a/generators/ruby/codegen/src/ast/abstractions/SerializableObject.ts b/generators/ruby/codegen/src/ast/abstractions/SerializableObject.ts
@@ -1,5 +1,6 @@
 import { Argument } from "../Argument";
 import {
+    AliasReference,
     ArrayReference,
     ClassReference,
     DateReference,
@@ -102,7 +103,12 @@ export class SerializableObject extends Class_ {
                               block: {
                                   arguments: "_k, v",
                                   expressions: [
-                                      new Expression({ leftSide: "v", rightSide: OmittedValue, operation: "==" })
+                                      new Expression({
+                                          leftSide: "v",
+                                          rightSide: OmittedValue,
+                                          operation: "==",
+                                          isAssignment: false
+                                      })
                                   ]
                               },
                               onObject: propertyHash
@@ -165,11 +171,18 @@ export class SerializableObject extends Class_ {
                 });
 
                 usesParsedJson = parsedJsonVariable.fromJson() !== undefined;
+                const classReferenceForCast = prop.type[0];
                 const hasFromJson =
                     usesParsedJson &&
-                    !(prop.type[0] instanceof ArrayReference) &&
-                    !(prop.type[0] instanceof HashReference) &&
-                    !(prop.type[0] instanceof DateReference);
+                    !(classReferenceForCast instanceof ArrayReference) &&
+                    !(classReferenceForCast instanceof HashReference) &&
+                    !(classReferenceForCast instanceof DateReference) &&
+                    !(
+                        classReferenceForCast instanceof AliasReference &&
+                        (classReferenceForCast.aliasOf instanceof ArrayReference ||
+                            classReferenceForCast.aliasOf instanceof HashReference ||
+                            classReferenceForCast.aliasOf instanceof DateReference)
+                    );
                 if (hasFromJson) {
                     // If there's a special fromJson, then cast the object back to JSON before proceeding
                     const variable = new Variable({

diff --git a/generators/ruby/codegen/src/ast/classes/ClassReference.ts b/generators/ruby/codegen/src/ast/classes/ClassReference.ts
@@ -227,7 +227,7 @@ export declare namespace AliasReference {
     }
 }
 export class AliasReference extends ClassReference {
-    private aliasOf: ClassReference;
+    public aliasOf: ClassReference;
     constructor({ aliasOf, ...rest }: AliasReference.Init) {
         super(rest);
         this.aliasOf = aliasOf;

diff --git a/generators/ruby/codegen/src/ast/expressions/Expression.ts b/generators/ruby/codegen/src/ast/expressions/Expression.ts
@@ -6,7 +6,7 @@ export declare namespace Expression {
     export interface Init extends AstNode.Init {
         leftSide?: AstNode | string;
         rightSide?: AstNode | string;
-        isAssignment?: boolean;
+        isAssignment: boolean;
         operation?: string;
         yardoc?: Yardoc;
     }
@@ -18,7 +18,7 @@ export class Expression extends AstNode {
     public yardoc: Yardoc | undefined;
     public operation?: string;
 
-    constructor({ leftSide, rightSide, yardoc, operation, isAssignment = false, ...rest }: Expression.Init) {
+    constructor({ leftSide, rightSide, yardoc, operation, isAssignment, ...rest }: Expression.Init) {
         super(rest);
         this.leftSide = leftSide;
         this.rightSide = rightSide;

diff --git a/generators/ruby/sdk/VERSION b/generators/ruby/sdk/VERSION
@@ -1 +1 @@
-0.5.0-rc0
+0.5.0-rc1
diff --git a/generators/ruby/sdk/src/AbstractionUtilities.ts b/generators/ruby/sdk/src/AbstractionUtilities.ts
@@ -624,7 +624,8 @@ function generateRequestClientInitializer(
                     rightSide: new ClassReference({
                         name: ":multipart",
                         import_: new Import({ from: "faraday/multipart", isExternal: true })
-                    })
+                    }),
+                    isAssignment: false
                 }),
                 isAssignment: false
             })
@@ -674,7 +675,8 @@ function generateRequestClientInitializer(
                                 import_: new Import({ from: "faraday/retry", isExternal: true })
                             }),
                             rightSide: retryOptions,
-                            operation: ", "
+                            operation: ", ",
+                            isAssignment: false
                         }),
                         isAssignment: false
                     })

diff --git a/generators/ruby/sdk/src/utils/EndpointGenerator.ts b/generators/ruby/sdk/src/utils/EndpointGenerator.ts
@@ -1,20 +1,24 @@
 import {
     AdditionalPropertiesProperty,
+    AliasReference,
     Argument,
+    ArrayReference,
     AstNode,
     B64StringClassReference,
     BlockConfiguration,
     ClassReference,
     ClassReferenceFactory,
     Class_,
     ConditionalStatement,
+    DateReference,
     Expression,
     FieldsetProperty,
     FileClassReference,
     FunctionInvocation,
     Function_,
     GenericClassReference,
     HashInstance,
+    HashReference,
     JsonClassReference,
     Parameter,
     Property,
@@ -512,7 +516,7 @@ export class EndpointGenerator {
                                 type: GenericClassReference,
                                 variableType: VariableType.LOCAL
                             });
-                            return [
+                            const parsingExpressions = [
                                 new Expression({
                                     leftSide: "parsed_json",
                                     rightSide: new FunctionInvocation({
@@ -525,12 +529,33 @@ export class EndpointGenerator {
                                                 isNamed: false
                                             })
                                         ]
+                                    }),
+                                    isAssignment: true
+                                })
+                            ];
+                            const hasFromJson =
+                                responseCr.fromJson(nestedResponseValueVariable) !== undefined &&
+                                !(responseCr instanceof ArrayReference) &&
+                                !(responseCr instanceof HashReference) &&
+                                !(responseCr instanceof DateReference) &&
+                                !(
+                                    responseCr instanceof AliasReference &&
+                                    (responseCr.aliasOf instanceof ArrayReference ||
+                                        responseCr.aliasOf instanceof HashReference ||
+                                        responseCr.aliasOf instanceof DateReference)
+                                );
+
+                            if (hasFromJson) {
+                                parsingExpressions.push(
+                                    new Expression({
+                                        leftSide: nestedResponseValueVariable,
+                                        rightSide: `parsed_json["${jrbwp.responseProperty.name.wireValue}"].to_json`,
+                                        isAssignment: true
                                     })
-                                }),
-                                new Expression({
-                                    leftSide: nestedResponseValueVariable,
-                                    rightSide: `parsed_json["${jrbwp.responseProperty.name.wireValue}"].to_json`
-                                }),
+                                );
+                            }
+                            return [
+                                ...parsingExpressions,
                                 responseCr.fromJson(nestedResponseValueVariable) ?? nestedResponseValueVariable
                             ];
                         } else {

diff --git a/seed/ruby-sdk/response-property/lib/fern_response_property/service/client.rb b/seed/ruby-sdk/response-property/lib/fern_response_property/service/client.rb