@fern-api/fern-api-dev 4.109.0 → 5.0.0-6-gb0a2ec4ace2

package/cli.cjs

@@ -510619,7 +510619,7 @@ var MetadataConfig = external_exports.object({
   "twitter:url": external_exports.string().optional(),
   "twitter:card": TwitterCardSetting.optional(),
   "og:dynamic": external_exports.boolean().optional(),
-  "og:background-image": external_exports.string().optional(),
+  "og:dynamic:background-image": external_exports.string().optional(),
   "og:dynamic:text-color": external_exports.string().optional(),
   "og:dynamic:background-color": external_exports.string().optional(),
   "og:dynamic:logo-color": external_exports.enum(["dark", "light"]).optional(),
@@ -513961,7 +513961,7 @@ var MetadataConfig2 = schemas_exports6.object({
   twitterUrl: schemas_exports6.property("twitter:url", schemas_exports6.string().optional()),
   twitterCard: schemas_exports6.property("twitter:card", TwitterCardSetting3.optional()),
   ogDynamic: schemas_exports6.property("og:dynamic", schemas_exports6.boolean().optional()),
-  ogBackgroundImage: schemas_exports6.property("og:background-image", schemas_exports6.string().optional()),
+  ogDynamicBackgroundImage: schemas_exports6.property("og:dynamic:background-image", schemas_exports6.string().optional()),
   ogDynamicTextColor: schemas_exports6.property("og:dynamic:text-color", schemas_exports6.string().optional()),
   ogDynamicBackgroundColor: schemas_exports6.property("og:dynamic:background-color", schemas_exports6.string().optional()),
   ogDynamicLogoColor: schemas_exports6.property("og:dynamic:logo-color", OgDynamicLogoColor2.optional()),
@@ -543279,7 +543279,7 @@ async function convertMetadata(metadata, absoluteFilepathToDocsConfig, context3)
     "twitter:url": metadata.twitterUrl,
     "twitter:card": metadata.twitterCard,
     "og:dynamic": metadata.ogDynamic,
-    "og:background-image": await convertFilepathOrUrl(metadata.ogBackgroundImage, absoluteFilepathToDocsConfig),
+    "og:dynamic:background-image": await convertFilepathOrUrl(metadata.ogDynamicBackgroundImage, absoluteFilepathToDocsConfig),
     "og:dynamic:text-color": metadata.ogDynamicTextColor,
     "og:dynamic:background-color": metadata.ogDynamicBackgroundColor,
     "og:dynamic:logo-color": metadata.ogDynamicLogoColor,
@@ -543296,7 +543296,7 @@ async function convertMetadata(metadata, absoluteFilepathToDocsConfig, context3)
 function warnOnMetadataConflicts(metadata, context3) {
   const dynamicEnabled = metadata.ogDynamic === true;
   const dynamicSettings = [
-    ["og:background-image", metadata.ogBackgroundImage],
+    ["og:dynamic:background-image", metadata.ogDynamicBackgroundImage],
     ["og:dynamic:text-color", metadata.ogDynamicTextColor],
     ["og:dynamic:background-color", metadata.ogDynamicBackgroundColor],
     ["og:dynamic:logo-color", metadata.ogDynamicLogoColor],
@@ -621386,7 +621386,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "4.109.0",
+          version: "5.0.0-6-gb0a2ec4ace2",
           usingAccessToken: true
         }
       });
@@ -621440,7 +621440,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "4.109.0",
+        version: "5.0.0-6-gb0a2ec4ace2",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -798819,8 +798819,8 @@ async function collectFilesFromDocsConfig({ parsedDocsConfig }) {
   if (parsedDocsConfig.metadata?.["twitter:image"] != null && parsedDocsConfig.metadata["twitter:image"].type === "filepath") {
     filepaths.add(parsedDocsConfig.metadata["twitter:image"].value);
   }
-  if (parsedDocsConfig.metadata?.["og:background-image"] != null && parsedDocsConfig.metadata["og:background-image"].type === "filepath") {
-    filepaths.add(parsedDocsConfig.metadata["og:background-image"].value);
+  if (parsedDocsConfig.metadata?.["og:dynamic:background-image"] != null && parsedDocsConfig.metadata["og:dynamic:background-image"].type === "filepath") {
+    filepaths.add(parsedDocsConfig.metadata["og:dynamic:background-image"].value);
   }
   if (parsedDocsConfig.typography?.bodyFont != null) {
     parsedDocsConfig.typography.bodyFont.variants.forEach((variant) => {
@@ -800802,13 +800802,13 @@ https://buildwithfern.com/learn/docs/getting-started/project-structure#api-defin
     if (this.parsedDocsConfig.metadata == null) {
       return;
     }
-    const { "og:image": ogImage, "og:logo": ogLogo, "twitter:image": twitterImage, "og:background-image": ogBackgroundImage, ...rest } = this.parsedDocsConfig.metadata;
+    const { "og:image": ogImage, "og:logo": ogLogo, "twitter:image": twitterImage, "og:dynamic:background-image": ogDynamicBackgroundImage, ...rest } = this.parsedDocsConfig.metadata;
     return {
       ...rest,
       "og:image": this.convertFileIdOrUrl(ogImage),
       "og:logo": this.convertFileIdOrUrl(ogLogo),
       "twitter:image": this.convertFileIdOrUrl(twitterImage),
-      "og:background-image": this.convertFileIdOrUrl(ogBackgroundImage)
+      "og:dynamic:background-image": this.convertFileIdOrUrl(ogDynamicBackgroundImage)
     };
   }
   convertFileIdOrUrl(filepathOrUrl) {
@@ -800991,7 +800991,7 @@ async function resolveThemeFileUrls(themeConfig, tmpDir) {
   cfg.footer = await maybeDownload(cfg.footer);
   if (cfg.metadata != null && typeof cfg.metadata === "object") {
     const meta5 = cfg.metadata;
-    for (const imgKey of ["og:image", "twitter:image", "og:background-image", "og:logo"]) {
+    for (const imgKey of ["og:image", "twitter:image", "og:dynamic:background-image", "og:logo"]) {
       meta5[imgKey] = await maybeDownload(meta5[imgKey]);
     }
   }
@@ -833175,7 +833175,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 = "4.109.0";
+  const version7 = "5.0.0-6-gb0a2ec4ace2";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -841615,7 +841615,7 @@ var definitions6 = {
           }
         ]
       },
-      "og:background-image": {
+      "og:dynamic:background-image": {
         oneOf: [
           {
             type: "string"
@@ -845593,7 +845593,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "4.109.0",
+        cliVersion: "5.0.0-6-gb0a2ec4ace2",
         loginCommand: "fern auth login"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
@@ -866286,6 +866286,15 @@ var DynamicLiteralMapper = class extends WithGeneration {
     }));
   }
   convertObject({ object_, value: value2, fallbackToDefault }) {
+    const classReference4 = this.csharp.classReference({
+      origin: object_.declaration,
+      namespace: this.context.getNamespace(object_.declaration.fernFilepath)
+    });
+    const propertyNameByWireValue = /* @__PURE__ */ new Map();
+    for (const property23 of object_.properties) {
+      const actualName = this.context.resolvePropertyName(classReference4, property23.name.name);
+      propertyNameByWireValue.set(property23.name.wireValue, actualName);
+    }
     const record22 = this.context.getRecord(value2) ?? {};
     const properties7 = this.context.associateByWireValue({
       parameters: object_.properties,
@@ -866295,7 +866304,7 @@ var DynamicLiteralMapper = class extends WithGeneration {
       this.context.errors.scope(property23.name.wireValue);
       try {
         return {
-          name: this.context.getClassName(property23.name.name),
+          name: propertyNameByWireValue.get(property23.name.wireValue) ?? this.context.getClassName(property23.name.name),
           value: this.convert(property23)
         };
       } finally {
@@ -866304,7 +866313,7 @@ var DynamicLiteralMapper = class extends WithGeneration {
     });
     const providedWireValues = new Set(Object.keys(record22));
     for (const property23 of object_.properties) {
-      const fieldName = this.context.getClassName(property23.name.name);
+      const fieldName = propertyNameByWireValue.get(property23.name.wireValue) ?? this.context.getClassName(property23.name.name);
       if (providedWireValues.has(property23.name.wireValue)) {
         if (this.isRequiredProperty(property23.typeReference)) {
           const existing = fields.find((f5) => f5.name === fieldName);
@@ -866328,10 +866337,7 @@ var DynamicLiteralMapper = class extends WithGeneration {
       }
     }
     return this.csharp.Literal.class_({
-      reference: this.csharp.classReference({
-        origin: object_.declaration,
-        namespace: this.context.getNamespace(object_.declaration.fernFilepath)
-      }),
+      reference: classReference4,
       fields
     });
   }
@@ -866382,13 +866388,17 @@ var DynamicLiteralMapper = class extends WithGeneration {
       return void 0;
     }
     visited.add(typeId);
+    const classReference4 = this.csharp.classReference({
+      origin: object_.declaration,
+      namespace: this.context.getNamespace(object_.declaration.fernFilepath)
+    });
     const fields = [];
     for (const property23 of object_.properties) {
       if (this.isRequiredProperty(property23.typeReference)) {
         const defaultValue = this.getDefaultLiteralForType(property23.typeReference, visited);
         if (defaultValue != null) {
           fields.push({
-            name: this.context.getClassName(property23.name.name),
+            name: this.context.resolvePropertyName(classReference4, property23.name.name),
             value: defaultValue
           });
         }
@@ -866396,10 +866406,7 @@ var DynamicLiteralMapper = class extends WithGeneration {
     }
     visited.delete(typeId);
     return this.csharp.Literal.class_({
-      reference: this.csharp.classReference({
-        origin: object_.declaration,
-        namespace: this.context.getNamespace(object_.declaration.fernFilepath)
-      }),
+      reference: classReference4,
       fields
     });
   }
@@ -866953,6 +866960,22 @@ var DynamicSnippetsGeneratorContext = class _DynamicSnippetsGeneratorContext ext
   getPropertyName(name2) {
     return name2.pascalCase.safeName;
   }
+  /**
+   * Returns a property name that is safe within the given class reference's scope.
+   * Detects collisions where PascalCase(property) == ClassName and returns the
+   * renamed identifier (e.g., "CatalogV1Id_") to avoid CS0542 / CS0117.
+   */
+  resolvePropertyName(classReference4, name2) {
+    const expectedName = name2.pascalCase.safeName;
+    const redirected = classReference4.scope.getRedirectedFieldName(expectedName);
+    if (redirected) {
+      return redirected;
+    }
+    if (classReference4.scope.isField(expectedName)) {
+      return expectedName;
+    }
+    return classReference4.registerField(expectedName);
+  }
   getMethodName(name2) {
     return `${name2.pascalCase.safeName}Async`;
   }
@@ -867439,13 +867462,17 @@ var EndpointSnippetGenerator2 = class extends WithGeneration {
     });
   }
   getInlinedRequestArg({ request: request7, snippet: snippet2, pathParameterFields, filePropertyInfo }) {
+    const classReference4 = this.csharp.classReference({
+      origin: request7.declaration,
+      namespace: this.context.getNamespace(request7.declaration.fernFilepath)
+    });
     this.context.errors.scope(Scope4.QueryParameters);
     const queryParameters = this.context.associateQueryParametersByWireValue({
       parameters: request7.queryParameters ?? [],
       values: snippet2.queryParameters ?? {}
     });
     const queryParameterFields = queryParameters.map((queryParameter) => ({
-      name: this.context.getPropertyName(queryParameter.name.name),
+      name: this.context.resolvePropertyName(classReference4, queryParameter.name.name),
       value: this.context.dynamicLiteralMapper.convert(queryParameter)
     }));
     this.context.errors.unscope();
@@ -867455,7 +867482,7 @@ var EndpointSnippetGenerator2 = class extends WithGeneration {
       values: snippet2.headers ?? {}
     });
     const headerFields = headers2.map((header) => ({
-      name: this.context.getPropertyName(header.name.name),
+      name: this.context.resolvePropertyName(classReference4, header.name.name),
       value: this.context.dynamicLiteralMapper.convert({
         ...header,
         fallbackToDefault: header.name.wireValue
@@ -867466,30 +867493,32 @@ var EndpointSnippetGenerator2 = class extends WithGeneration {
     const requestBodyFields = request7.body != null ? this.getInlinedRequestBodyConstructorFields({
       body: request7.body,
       value: snippet2.requestBody,
-      filePropertyInfo
+      filePropertyInfo,
+      classReference: classReference4
     }) : [];
     this.context.errors.unscope();
     return this.csharp.Literal.class_({
-      reference: this.csharp.classReference({
-        origin: request7.declaration,
-        namespace: this.context.getNamespace(request7.declaration.fernFilepath)
-      }),
+      reference: classReference4,
       fields: [...pathParameterFields, ...queryParameterFields, ...headerFields, ...requestBodyFields]
     });
   }
-  getInlinedRequestBodyConstructorFields({ body, value: value2, filePropertyInfo }) {
+  getInlinedRequestBodyConstructorFields({ body, value: value2, filePropertyInfo, classReference: classReference4 }) {
     switch (body.type) {
       case "properties":
-        return this.getInlinedRequestBodyPropertyConstructorFields({ parameters: body.value, value: value2 });
+        return this.getInlinedRequestBodyPropertyConstructorFields({
+          parameters: body.value,
+          value: value2,
+          classReference: classReference4
+        });
       case "referenced":
-        return [this.getReferencedRequestBodyPropertyConstructorField({ body, value: value2 })];
+        return [this.getReferencedRequestBodyPropertyConstructorField({ body, value: value2, classReference: classReference4 })];
       case "fileUpload":
         return this.getFileUploadRequestBodyConstructorFields({ filePropertyInfo });
       default:
         assertNever(body);
     }
   }
-  getInlinedRequestBodyPropertyConstructorFields({ parameters: parameters2, value: value2 }) {
+  getInlinedRequestBodyPropertyConstructorFields({ parameters: parameters2, value: value2, classReference: classReference4 }) {
     const fields = [];
     const bodyProperties = this.context.associateByWireValue({
       parameters: parameters2,
@@ -867497,7 +867526,7 @@ var EndpointSnippetGenerator2 = class extends WithGeneration {
     });
     for (const parameter6 of bodyProperties) {
       fields.push({
-        name: this.context.getPropertyName(parameter6.name.name),
+        name: this.context.resolvePropertyName(classReference4, parameter6.name.name),
         value: this.context.dynamicLiteralMapper.convert({
           ...parameter6,
           fallbackToDefault: parameter6.name.wireValue
@@ -867509,9 +867538,9 @@ var EndpointSnippetGenerator2 = class extends WithGeneration {
   getFileUploadRequestBodyConstructorFields({ filePropertyInfo }) {
     return [...filePropertyInfo.fileFields, ...filePropertyInfo.bodyPropertyFields];
   }
-  getReferencedRequestBodyPropertyConstructorField({ body, value: value2 }) {
+  getReferencedRequestBodyPropertyConstructorField({ body, value: value2, classReference: classReference4 }) {
     return {
-      name: this.context.getPropertyName(body.bodyKey),
+      name: this.context.resolvePropertyName(classReference4, body.bodyKey),
       value: this.getReferencedRequestBodyPropertyLiteral({ body: body.bodyType, value: value2 })
     };
   }
@@ -874445,7 +874474,7 @@ var EndpointSnippetGenerator4 = class {
       args.push(...pathParameterFields.map((field5) => field5.value));
     }
     if (!inlineFileProperties) {
-      args.push(...filePropertyInfo.fileFields.map((field5) => field5.value));
+      args.push(...filePropertyInfo.fileFields.map((field5) => java_exports.TypeLiteral.isNop(field5.value) ? java_exports.TypeLiteral.raw("null") : field5.value));
     }
     args.push(this.getInlinedRequestArg({
       request: request7,
@@ -890569,6 +890598,40 @@ init_lib4();
 function escapeSwiftStringLiteral(rawValue) {
   return rawValue.replace(/\\u([0-9a-fA-F]{4})/g, "\\u{$1}").replace(/(?<!\\)\\f/g, "\\u{000C}").replace(/(?<!\\)\\v/g, "\\u{000B}").replace(/(?<!\\)\\0/g, "\\u{0000}").replace(/(?<!\\)"/g, '\\"');
 }
+function escapeSwiftStringLiteralContent(value2) {
+  let result = "";
+  for (const ch of value2) {
+    switch (ch) {
+      case "\\":
+        result += "\\\\";
+        break;
+      case '"':
+        result += '\\"';
+        break;
+      case "\n":
+        result += "\\n";
+        break;
+      case "\r":
+        result += "\\r";
+        break;
+      case "	":
+        result += "\\t";
+        break;
+      case "\0":
+        result += "\\0";
+        break;
+      default: {
+        const code5 = ch.charCodeAt(0);
+        if (code5 < 32 || code5 === 127) {
+          result += `\\u{${code5.toString(16).toUpperCase()}}`;
+        } else {
+          result += ch;
+        }
+      }
+    }
+  }
+  return result;
+}
 
 // ../../../generators/swift/codegen/lib/syntax/reserved-keywords.js
 var reservedKeywords = [
@@ -890761,7 +890824,7 @@ var Expression2 = class extends AstNode8 {
         this.internalExpression.expression.write(writer2);
         break;
       case "string-literal":
-        writer2.write(`"${this.internalExpression.value}"`);
+        writer2.write(this.internalExpression.escape ? `"${escapeSwiftStringLiteralContent(this.internalExpression.value)}"` : `"${this.internalExpression.value}"`);
         break;
       case "number-literal":
         writer2.write(this.internalExpression.value.toString());
@@ -890900,6 +890963,17 @@ var Expression2 = class extends AstNode8 {
   static stringLiteral(value2) {
     return new this({ type: "string-literal", value: value2 });
   }
+  /**
+   * Like {@link Expression.stringLiteral}, but escapes characters in `value`
+   * that cannot appear unescaped inside a Swift `"..."` string literal
+   * (control characters, real newlines, real backslashes, real double quotes).
+   * Use this when `value` is raw user data (e.g. from JSON.parse), not a
+   * pre-formed Swift string literal containing intentional backslash
+   * sequences such as `\(...)` interpolation.
+   */
+  static escapedStringLiteral(value2) {
+    return new this({ type: "string-literal", value: value2, escape: true });
+  }
   static numberLiteral(value2) {
     return new this({ type: "number-literal", value: value2 });
   }
@@ -893071,7 +893145,7 @@ var DynamicTypeLiteralMapper6 = class {
           methodName: "string",
           arguments_: [
             swift_exports.functionArgument({
-              value: swift_exports.Expression.stringLiteral(value2)
+              value: swift_exports.Expression.escapedStringLiteral(value2)
             })
           ]
         });
@@ -893109,7 +893183,7 @@ var DynamicTypeLiteralMapper6 = class {
             swift_exports.functionArgument({
               value: swift_exports.Expression.dictionaryLiteral({
                 entries: Object.entries(value2).map(([key2, value3]) => [
-                  swift_exports.Expression.stringLiteral(key2),
+                  swift_exports.Expression.escapedStringLiteral(key2),
                   this.convertUnknown(value3)
                 ]),
                 multiline: true
@@ -893148,7 +893222,7 @@ var DynamicTypeLiteralMapper6 = class {
         if (str3 == null) {
           return swift_exports.Expression.nop();
         }
-        return swift_exports.Expression.stringLiteral(str3);
+        return swift_exports.Expression.escapedStringLiteral(str3);
       }
       case "DATE": {
         const date25 = this.context.getValueAsString({ value: value2 });
@@ -893181,7 +893255,7 @@ var DynamicTypeLiteralMapper6 = class {
         if (base643 == null) {
           return swift_exports.Expression.nop();
         }
-        return swift_exports.Expression.stringLiteral(base643);
+        return swift_exports.Expression.escapedStringLiteral(base643);
       }
       case "BIG_INTEGER": {
         const bigInt = this.context.getValueAsString({ value: value2 });
@@ -893724,7 +893798,7 @@ var EndpointSnippetGenerator9 = class {
       } else {
         return swift_exports.functionArgument({
           label: "baseURL",
-          value: swift_exports.Expression.stringLiteral(snippet2.baseURL)
+          value: swift_exports.Expression.escapedStringLiteral(snippet2.baseURL)
         });
       }
     }
@@ -893748,10 +893822,10 @@ var EndpointSnippetGenerator9 = class {
         }
         args.push(swift_exports.functionArgument({
           label: auth8.username.camelCase.unsafeName,
-          value: swift_exports.Expression.stringLiteral(values2.username)
+          value: swift_exports.Expression.escapedStringLiteral(values2.username)
         }), swift_exports.functionArgument({
           label: auth8.password.camelCase.unsafeName,
-          value: swift_exports.Expression.stringLiteral(values2.password)
+          value: swift_exports.Expression.escapedStringLiteral(values2.password)
         }));
         break;
       case "bearer":
@@ -893764,7 +893838,7 @@ var EndpointSnippetGenerator9 = class {
         }
         args.push(swift_exports.functionArgument({
           label: auth8.token.camelCase.unsafeName,
-          value: swift_exports.Expression.stringLiteral(values2.token)
+          value: swift_exports.Expression.escapedStringLiteral(values2.token)
         }));
         break;
       case "header":
@@ -919841,7 +919915,7 @@ var CliContext = class _CliContext {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "4.109.0";
+    return "5.0.0-6-gb0a2ec4ace2";
   }
   getCliName() {
     if (false) {
@@ -928829,7 +928903,7 @@ ${errors4.map((e8) => `  - ${e8}`).join("\n")}`,
     collect2(raw.footer);
     if (raw.metadata != null && typeof raw.metadata === "object") {
       const meta5 = raw.metadata;
-      for (const imgKey of ["og:image", "twitter:image", "og:background-image", "og:logo"]) {
+      for (const imgKey of ["og:image", "twitter:image", "og:dynamic:background-image", "og:logo"]) {
         if (typeof meta5[imgKey] === "string") {
           collect2(meta5[imgKey]);
         }
@@ -928917,7 +928991,7 @@ ${errors4.map((e8) => `  - ${e8}`).join("\n")}`,
     cfg.footer = await field5(cfg.footer);
     if (cfg.metadata != null && typeof cfg.metadata === "object") {
       const meta5 = { ...cfg.metadata };
-      for (const imgKey of ["og:image", "twitter:image", "og:background-image", "og:logo"]) {
+      for (const imgKey of ["og:image", "twitter:image", "og:dynamic:background-image", "og:logo"]) {
         if (typeof meta5[imgKey] === "string") {
           meta5[imgKey] = await field5(meta5[imgKey]);
         }

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "4.109.0",
+  "version": "5.0.0-6-gb0a2ec4ace2",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/fern-api/fern.git",