@fern-api/fern-api-dev 5.23.3-782-g365a89d6ce6 → 5.23.3-784-g6b49fa5f22a

package/cli.cjs

@@ -628980,7 +628980,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "5.23.3-782-g365a89d6ce6",
+          version: "5.23.3-784-g6b49fa5f22a",
           usingAccessToken: true,
           ...getRunIdProperties()
         }
@@ -629044,7 +629044,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "5.23.3-782-g365a89d6ce6",
+        version: "5.23.3-784-g6b49fa5f22a",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -821059,7 +821059,7 @@ var LOCAL_STORAGE_FOLDER4 = ".fern-dev";
 var LOGS_FOLDER_NAME = "logs";
 var MAX_LOGS_DIR_SIZE_BYTES = 100 * 1024 * 1024;
 function getCliSource() {
-  const version7 = "5.23.3-782-g365a89d6ce6";
+  const version7 = "5.23.3-784-g6b49fa5f22a";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -852392,7 +852392,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "5.23.3-782-g365a89d6ce6",
+        cliVersion: "5.23.3-784-g6b49fa5f22a",
         loginCommand: "fern auth login"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
@@ -897464,7 +897464,6 @@ var NameRegistry2 = class _NameRegistry {
   registerUndiscriminatedUnionVariants({ parentSymbol, variants }) {
     const parentSymbolId = typeof parentSymbol === "string" ? parentSymbol : parentSymbol.id;
     const distinctVariants = uniqWith_default(variants, (a3, b5) => a3.caseName === b5.caseName);
-    distinctVariants.sort((a3, b5) => a3.caseName.localeCompare(b5.caseName));
     this.undiscriminatedUnionVariantsByParentSymbolId.set(parentSymbolId, distinctVariants);
     return distinctVariants;
   }
@@ -897718,8 +897717,9 @@ var Class6 = class extends AstNode8 {
   properties;
   initializers;
   methods;
+  nestedTypes;
   docs;
-  constructor({ accessLevel, name: name2, final, conformances, properties: properties7, initializers, methods, docs: docs2 }) {
+  constructor({ accessLevel, name: name2, final, conformances, properties: properties7, initializers, methods, nestedTypes: nestedTypes2, docs: docs2 }) {
     super();
     this.name = name2;
     this.final = final;
@@ -897728,6 +897728,7 @@ var Class6 = class extends AstNode8 {
     this.properties = properties7;
     this.initializers = initializers ?? [];
     this.methods = methods ?? [];
+    this.nestedTypes = nestedTypes2 ?? [];
     this.docs = docs2;
   }
   write(writer2) {
@@ -897777,6 +897778,16 @@ var Class6 = class extends AstNode8 {
         writer2.newLine();
       });
     }
+    if (this.nestedTypes.length > 0) {
+      writer2.newLine();
+      this.nestedTypes.forEach((nestedType, nestedTypeIdx) => {
+        if (nestedTypeIdx > 0) {
+          writer2.newLine();
+        }
+        nestedType.write(writer2);
+        writer2.newLine();
+      });
+    }
     writer2.dedent();
     writer2.write("}");
   }
@@ -900141,10 +900152,12 @@ var DynamicTypeLiteralMapper6 = class {
           if (record23 == null) {
             return swift_exports.Expression.nop();
           }
+          const basePropertyKeys = new Set((unionVariant.properties ?? []).map((property24) => property24.name.wireValue));
+          const propertyKey = Object.keys(record23).find((key2) => !basePropertyKeys.has(key2)) ?? "value";
           const converted = this.convert({
             fromSymbol,
             typeReference: unionVariant.typeReference,
-            value: record23[unionVariant.discriminantValue.wireValue]
+            value: record23[propertyKey]
           });
           return swift_exports.Expression.methodCall({
             target: swift_exports.Expression.reference(unionSymbol.name),
@@ -900192,12 +900205,24 @@ var DynamicTypeLiteralMapper6 = class {
   }
   convertObject({ fromSymbol, typeId, object_, value: value2 }) {
     const symbol3 = this.context.nameRegistry.getSchemaTypeSymbolOrThrow(typeId);
+    const exampleProperties = this.context.getExampleObjectProperties({
+      parameters: object_.properties,
+      snippetObject: value2
+    });
+    const examplePropertiesByWireValue = new Map(exampleProperties.map((typeInstance) => [typeInstance.name.wireValue, typeInstance]));
+    const orderedProperties = object_.properties.map((property24) => {
+      const exampleProperty = examplePropertiesByWireValue.get(property24.name.wireValue);
+      if (exampleProperty != null) {
+        return exampleProperty;
+      }
+      if (property24.typeReference.type === "literal") {
+        return { name: property24.name, typeReference: property24.typeReference, value: void 0 };
+      }
+      return null;
+    }).filter((typeInstance) => typeInstance != null);
     return swift_exports.Expression.structInitialization({
       unsafeName: symbol3.name,
-      arguments_: this.context.getExampleObjectProperties({
-        parameters: object_.properties,
-        snippetObject: value2
-      }).map((typeInstance) => {
+      arguments_: orderedProperties.map((typeInstance) => {
         const expression = this.convert({
           fromSymbol,
           typeReference: typeInstance.typeReference,
@@ -900436,7 +900461,8 @@ var FilePropertyMapper7 = class {
   getFilePropertyInfo({ fromSymbol, body, value: value2 }) {
     const result = {
       fileFields: [],
-      bodyPropertyFields: []
+      bodyPropertyFields: [],
+      orderedFields: []
     };
     const record23 = this.context.getRecord(value2) ?? {};
     for (const property24 of body.properties) {
@@ -900447,6 +900473,7 @@ var FilePropertyMapper7 = class {
             value: this.getSingleFileProperty({ property: property24, record: record23 })
           });
           result.fileFields.push(arg);
+          result.orderedFields.push(arg);
           break;
         }
         case "fileArray": {
@@ -900455,6 +900482,7 @@ var FilePropertyMapper7 = class {
             value: this.getArrayFileProperty({ property: property24, record: record23 })
           });
           result.fileFields.push(arg);
+          result.orderedFields.push(arg);
           break;
         }
         case "bodyProperty": {
@@ -900463,6 +900491,7 @@ var FilePropertyMapper7 = class {
             value: this.getBodyProperty({ fromSymbol, property: property24, record: record23 })
           });
           result.bodyPropertyFields.push(arg);
+          result.orderedFields.push(arg);
           break;
         }
         default:
@@ -900733,6 +900762,13 @@ var DynamicSnippetsGeneratorContext8 = class _DynamicSnippetsGeneratorContext ex
             requestNamePascalCase: endpoint3.request.declaration.name.pascalCase.unsafeName
           });
         }
+        endpoint3.request.queryParameters?.forEach((queryParameter) => {
+          registerLiteralEnumsForTypeReference({
+            parentSymbol: registeredSourceModuleSymbol,
+            registry: nameRegistry,
+            typeReference: queryParameter.typeReference
+          });
+        });
       }
     });
     return nameRegistry;
@@ -900759,9 +900795,12 @@ var DynamicSnippetsGeneratorContext8 = class _DynamicSnippetsGeneratorContext ex
       list: (ref2) => swift_exports.TypeReference.array(this.getSwiftTypeReferenceFromScope(ref2.value, fromSymbol)),
       literal: (ref2) => {
         return visitDiscriminatedUnion(ref2.value, "type")._visit({
-          boolean: () => referencer.referenceAsIsType("JSONValue"),
+          boolean: () => referencer.referenceSwiftType("Bool"),
           string: (literalType2) => {
-            const symbol3 = this.nameRegistry.getNestedLiteralEnumSymbolOrThrow(fromSymbol, literalType2.value);
+            const symbol3 = this.nameRegistry.getNestedLiteralEnumSymbol(fromSymbol, literalType2.value);
+            if (symbol3 == null) {
+              return referencer.referenceAsIsType("JSONValue");
+            }
             return referencer.referenceType(symbol3);
           },
           _other: () => referencer.referenceAsIsType("JSONValue")
@@ -901063,6 +901102,13 @@ var EndpointSnippetGenerator8 = class {
     }
     this.context.errors.unscope();
     args.push(...pathParameterFields);
+    this.context.errors.scope(Scope4.Headers);
+    const headerParameterFields = [];
+    if (request7.headers != null) {
+      headerParameterFields.push(...this.getEndpointMethodHeaderParameters({ namedParameters: request7.headers, snippet }));
+    }
+    this.context.errors.unscope();
+    args.push(...headerParameterFields);
     this.context.errors.scope(Scope4.QueryParameters);
     const queryParameterFields = [];
     if (request7.queryParameters != null) {
@@ -901139,12 +901185,43 @@ var EndpointSnippetGenerator8 = class {
       });
     });
   }
+  getEndpointMethodHeaderParameters({ namedParameters, snippet }) {
+    const moduleSymbol = this.context.nameRegistry.getRegisteredSourceModuleSymbolOrThrow();
+    const referencer = this.context.createReferencer(moduleSymbol);
+    return this.context.getExampleObjectProperties({
+      parameters: namedParameters,
+      snippetObject: snippet.headers ?? {}
+    }).filter((parameter6) => {
+      const resolvedTypeReference = this.resolveAliasTypeReference(parameter6.typeReference);
+      const swiftType = this.context.getSwiftTypeReferenceFromScope(resolvedTypeReference, moduleSymbol);
+      return referencer.resolvesToTheSwiftType(swiftType.nonOptional(), "String");
+    }).map((parameter6) => {
+      return swift_exports.functionArgument({
+        label: parameter6.name.name.camelCase.unsafeName,
+        value: this.context.dynamicTypeLiteralMapper.convert({
+          fromSymbol: moduleSymbol,
+          typeReference: parameter6.typeReference,
+          value: parameter6.value
+        })
+      });
+    });
+  }
+  resolveAliasTypeReference(typeReference2) {
+    if (typeReference2.type === "named") {
+      const namedType = this.context.ir.types[typeReference2.value];
+      if (namedType != null && namedType.type === "alias") {
+        return this.resolveAliasTypeReference(namedType.typeReference);
+      }
+    }
+    return typeReference2;
+  }
   getFilePropertyInfo({ request: request7, snippet }) {
     const moduleSymbol = this.context.nameRegistry.getRegisteredSourceModuleSymbolOrThrow();
     if (request7.body == null || !this.context.isFileUploadRequestBody(request7.body)) {
       return {
         fileFields: [],
-        bodyPropertyFields: []
+        bodyPropertyFields: [],
+        orderedFields: []
       };
     }
     return this.context.filePropertyMapper.getFilePropertyInfo({
@@ -901171,7 +901248,7 @@ var EndpointSnippetGenerator8 = class {
   getInlinedRequestBodyObjectFields({ body, value: value2, filePropertyInfo }) {
     switch (body.type) {
       case "fileUpload":
-        return [...filePropertyInfo.fileFields, ...filePropertyInfo.bodyPropertyFields];
+        return filePropertyInfo.orderedFields;
       case "properties":
         return this.getInlinedRequestBodyPropertyObjectFields({ parameters: body.value, value: value2 });
       case "referenced":
@@ -917778,7 +917855,7 @@ function getAutomationContextFromEnv() {
     config_branch: process.env.FERN_CONFIG_BRANCH,
     config_pr_number: process.env.FERN_CONFIG_PR_NUMBER,
     trigger: process.env.GITHUB_EVENT_NAME,
-    cli_version: "5.23.3-782-g365a89d6ce6"
+    cli_version: "5.23.3-784-g6b49fa5f22a"
   };
 }
 function isAutomationMode() {
@@ -918604,7 +918681,7 @@ var CliContext = class _CliContext {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "5.23.3-782-g365a89d6ce6";
+    return "5.23.3-784-g6b49fa5f22a";
   }
   getCliName() {
     if (false) {

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "5.23.3-782-g365a89d6ce6",
+  "version": "5.23.3-784-g6b49fa5f22a",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/fern-api/fern.git",