@fern-api/fern-api-dev 5.2.0 → 5.2.1-5-geb7105beec4

package/cli.cjs

@@ -544029,11 +544029,14 @@ async function loadTranslationNavigationOverlays({ translations, defaultLocale,
     if (lang === defaultLocale) {
       return;
     }
-    const langFernDir = import_path22.default.join(translationsRootDir, lang, "fern");
-    const overlayDocsYmlPath = import_path22.default.join(langFernDir, "docs.yml");
-    if (!await doesPathExist(overlayDocsYmlPath)) {
+    const overlayLookup = await resolveTranslationOverlayDocsYml({
+      translationsRootDir,
+      lang
+    });
+    if (overlayLookup == null) {
       return;
     }
+    const { overlayDocsYmlPath, overlayDir } = overlayLookup;
     try {
       const overlayContent = jsYaml.load(await (0, import_promises14.readFile)(overlayDocsYmlPath, "utf-8"));
       if (!isPlainObject4(overlayContent)) {
@@ -544042,7 +544045,7 @@ async function loadTranslationNavigationOverlays({ translations, defaultLocale,
       }
       const overlay = await parseNavigationOverlayFromDocsYml({
         docsYmlContent: overlayContent,
-        langFernDir,
+        langFernDir: overlayDir,
         context: context3
       });
       result[lang] = overlay;
@@ -544055,6 +544058,19 @@ async function loadTranslationNavigationOverlays({ translations, defaultLocale,
   }
   return result;
 }
+async function resolveTranslationOverlayDocsYml({ translationsRootDir, lang }) {
+  const langDir = import_path22.default.join(translationsRootDir, lang);
+  const directDocsYmlPath = import_path22.default.join(langDir, "docs.yml");
+  if (await doesPathExist(directDocsYmlPath)) {
+    return { overlayDocsYmlPath: directDocsYmlPath, overlayDir: langDir };
+  }
+  const legacyFernDir = import_path22.default.join(langDir, "fern");
+  const legacyDocsYmlPath = import_path22.default.join(legacyFernDir, "docs.yml");
+  if (await doesPathExist(legacyDocsYmlPath)) {
+    return { overlayDocsYmlPath: legacyDocsYmlPath, overlayDir: legacyFernDir };
+  }
+  return void 0;
+}
 function extractString(obj, key2) {
   if (isPlainObject4(obj)) {
     const value2 = obj[key2];
@@ -544064,7 +544080,7 @@ function extractString(obj, key2) {
   }
   return void 0;
 }
-async function parseNavigationOverlayFromDocsYml({ docsYmlContent, langFernDir, context: context3 }) {
+async function parseNavigationOverlayFromDocsYml({ docsYmlContent, langFernDir: overlayDir, context: context3 }) {
   const overlay = {
     tabs: void 0,
     products: void 0,
@@ -544103,8 +544119,8 @@ async function parseNavigationOverlayFromDocsYml({ docsYmlContent, langFernDir,
         }
       }
       if (typeof productObj.path === "string") {
-        const resolvedNavFilePath = import_path22.default.resolve(langFernDir, productObj.path);
-        if (!resolvedNavFilePath.startsWith(langFernDir)) {
+        const resolvedNavFilePath = import_path22.default.resolve(overlayDir, productObj.path);
+        if (!resolvedNavFilePath.startsWith(overlayDir)) {
           context3.logger.warn(`Invalid path in product overlay: "${productObj.path}" escapes the translations directory. Skipping.`);
           overlay.products.push(productOverlay);
           continue;
@@ -552506,10 +552522,11 @@ function convertSchemeReference({ reference: reference4, authSchemeDeclarations,
     if (declaration == null) {
       throw new Error("Unknown auth scheme: " + reference5);
     }
+    const effectiveDocs = docs2 ?? (typeof declaration === "object" ? declaration.docs : void 0);
     return visitRawAuthSchemeDeclaration(declaration, {
       header: (rawHeader) => AuthScheme.header({
         key: reference5,
-        docs: docs2,
+        docs: effectiveDocs,
         name: casingsGenerator.generateNameAndWireValue({
           name: rawHeader.name ?? reference5,
           wireValue: rawHeader.header
@@ -552525,27 +552542,27 @@ function convertSchemeReference({ reference: reference4, authSchemeDeclarations,
       basic: (rawScheme) => generateBasicAuth({
         key: reference5,
         casingsGenerator,
-        docs: docs2,
+        docs: effectiveDocs,
         rawScheme
       }),
       tokenBearer: (rawScheme) => generateBearerAuth({
         key: reference5,
         casingsGenerator,
-        docs: docs2,
+        docs: effectiveDocs,
         rawScheme
       }),
       inferredBearer(authScheme) {
         return generateBearerAuth({
           key: reference5,
           casingsGenerator,
-          docs: docs2,
+          docs: effectiveDocs,
           rawScheme: void 0
         });
       },
       oauth: (rawScheme) => generateBearerAuth({
         key: reference5,
         casingsGenerator,
-        docs: docs2,
+        docs: effectiveDocs,
         rawScheme: void 0
       })
     });
@@ -611131,19 +611148,12 @@ var OpenAPIConverter = class extends AbstractSpecConverter {
     }
   }
   convertSecuritySchemes() {
+    const openApiSchemes = this.convertOpenApiSecuritySchemes();
     if (this.context.authOverrides) {
-      const overrideAuth = convertApiAuth({
-        rawApiFileSchema: this.context.authOverrides,
-        casingsGenerator: this.context.casingsGenerator
-      });
-      this.addAuthToIR({
-        requirement: overrideAuth.requirement,
-        schemes: overrideAuth.schemes,
-        docs: overrideAuth.docs
-      });
+      const descriptions = new Map(openApiSchemes.map((scheme) => [scheme.key, scheme.docs]));
+      this.convertAuthOverrides(descriptions, this.context.authOverrides);
       return;
     }
-    const openApiSchemes = this.convertOpenApiSecuritySchemes();
     if (openApiSchemes.length > 0) {
       this.addAuthToIR({
         requirement: openApiSchemes.length === 1 ? "ALL" : "ANY",
@@ -611152,6 +611162,26 @@ var OpenAPIConverter = class extends AbstractSpecConverter {
       });
     }
   }
+  convertAuthOverrides(descriptions, authOverrides) {
+    const enriched = {
+      ...authOverrides,
+      "auth-schemes": Object.fromEntries(Object.entries(authOverrides["auth-schemes"] ?? {}).map(([id2, scheme]) => [id2, { ...scheme }]))
+    };
+    for (const [schemeId, scheme] of Object.entries(enriched["auth-schemes"])) {
+      if (!scheme.docs && descriptions.has(schemeId)) {
+        scheme.docs = descriptions.get(schemeId);
+      }
+    }
+    const auth8 = convertApiAuth({
+      rawApiFileSchema: enriched,
+      casingsGenerator: this.context.casingsGenerator
+    });
+    this.addAuthToIR({
+      requirement: auth8.requirement,
+      schemes: auth8.schemes,
+      docs: auth8.docs
+    });
+  }
   convertOpenApiSecuritySchemes() {
     const securitySchemes = [];
     for (const [id2, securityScheme] of Object.entries(this.context.spec.components?.securitySchemes ?? {})) {
@@ -611322,13 +611352,8 @@ var OpenAPIConverter = class extends AbstractSpecConverter {
     if (!this.context.authOverrides?.["auth-schemes"]) {
       return;
     }
-    if (!this.context.spec.components) {
-      this.context.spec.components = {};
-    }
-    this.context.spec.components.securitySchemes = {};
     const securityRequirement = {};
     for (const schemeId of Object.keys(this.context.authOverrides["auth-schemes"])) {
-      this.context.spec.components.securitySchemes[schemeId] = { type: "http", scheme: "bearer" };
       securityRequirement[schemeId] = [];
     }
     this.context.spec.security = [securityRequirement];
@@ -621992,7 +622017,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "5.2.0",
+          version: "5.2.1-5-geb7105beec4",
           usingAccessToken: true
         }
       });
@@ -622046,7 +622071,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "5.2.0",
+        version: "5.2.1-5-geb7105beec4",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -800063,7 +800088,8 @@ var DocsDefinitionResolver = class {
   }
   /**
    * Returns per-locale translated navigation overlays loaded from
-   * `translations/<lang>/fern/docs.yml` and referenced nav YAML files.
+   * `translations/<lang>/docs.yml` (or `translations/<lang>/fern/docs.yml` for
+   * backwards compatibility) and referenced nav YAML files.
    * Must be called after `resolve()`.
    */
   getTranslationNavigationOverlays() {
@@ -833921,7 +833947,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.2.0";
+  const version7 = "5.2.1-5-geb7105beec4";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -846373,7 +846399,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "5.2.0",
+        cliVersion: "5.2.1-5-geb7105beec4",
         loginCommand: "fern auth login"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
@@ -920702,7 +920728,7 @@ var CliContext = class _CliContext {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "5.2.0";
+    return "5.2.1-5-geb7105beec4";
   }
   getCliName() {
     if (false) {

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "5.2.0",
+  "version": "5.2.1-5-geb7105beec4",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/fern-api/fern.git",