@fern-api/fern-api-dev 5.1.0 → 5.2.0-3-gd80171d98cd

package/cli.cjs

@@ -511106,7 +511106,8 @@ var DocsInstance = external_exports.object({
   url: external_exports.string(),
   "custom-domain": CustomDomain.optional(),
   "edit-this-page": EditThisPageConfig.optional(),
-  audiences: Audience.optional()
+  audiences: Audience.optional(),
+  "multi-source": external_exports.boolean().optional()
 });
 var LogoConfiguration = external_exports.object({
   dark: external_exports.string().optional(),
@@ -514301,7 +514302,8 @@ var DocsInstance2 = schemas_exports6.object({
   url: schemas_exports6.string(),
   customDomain: schemas_exports6.property("custom-domain", CustomDomain2.optional()),
   editThisPage: schemas_exports6.property("edit-this-page", EditThisPageConfig2.optional()),
-  audiences: Audience2.optional()
+  audiences: Audience2.optional(),
+  multiSource: schemas_exports6.property("multi-source", schemas_exports6.boolean().optional())
 });
 
 // ../configuration/lib/docs-yml/schemas/sdk/serialization/resources/docs/types/HttpSnippetLanguage.js
@@ -552504,10 +552506,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
@@ -552523,27 +552526,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
       })
     });
@@ -611129,19 +611132,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",
@@ -611150,6 +611146,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 ?? {})) {
@@ -611320,13 +611336,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];
@@ -621990,7 +622001,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "5.1.0",
+          version: "5.2.0-3-gd80171d98cd",
           usingAccessToken: true
         }
       });
@@ -622044,7 +622055,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "5.1.0",
+        version: "5.2.0-3-gd80171d98cd",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -833919,7 +833930,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.1.0";
+  const version7 = "5.2.0-3-gd80171d98cd";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -838237,6 +838248,16 @@ var definitions6 = {
             type: "null"
           }
         ]
+      },
+      "multi-source": {
+        oneOf: [
+          {
+            type: "boolean"
+          },
+          {
+            type: "null"
+          }
+        ]
       }
     },
     required: [
@@ -845248,7 +845269,7 @@ async function calculateFileHash(absoluteFilePath) {
 function sanitizeRelativePathForS3(relativeFilePath) {
   return relativeFilePath.replace(/\.\.\//g, "_dot_dot_/");
 }
-async function publishDocs({ token, organization, docsWorkspace, domain: domain3, customDomains, apiWorkspaces, ossWorkspaces, context: context3, preview, previewId, editThisPage, disableTemplates = false, skipUpload = false, withAiExamples = true, excludeApis = false, targetAudiences, docsUrl, cliVersion, ciSource, deployerAuthor, loginCommand = "fern login" }) {
+async function publishDocs({ token, organization, docsWorkspace, domain: domain3, customDomains, apiWorkspaces, ossWorkspaces, context: context3, preview, previewId, editThisPage, disableTemplates = false, skipUpload = false, withAiExamples = true, excludeApis = false, targetAudiences, docsUrl, cliVersion, ciSource, deployerAuthor, loginCommand = "fern login", multiSource = false }) {
   const fdrOrigin = "https://registry-dev2.buildwithfern.com";
   const isAirGapped = await detectAirGappedMode(`${fdrOrigin}/health`, context3.logger);
   if (isAirGapped) {
@@ -845280,9 +845301,12 @@ async function publishDocs({ token, organization, docsWorkspace, domain: domain3
   let urlToOutput = customDomains[0] ?? domain3;
   const basePath = parseBasePath(domain3);
   const disableDynamicSnippets = docsWorkspace.config.experimental && docsWorkspace.config.experimental.dynamicSnippets === false;
-  const isBasepathAware = docsWorkspace.config.experimental?.basepathAware === true;
+  if (docsWorkspace.config.experimental?.basepathAware === true) {
+    context3.logger.warn("experimental.basepath-aware is deprecated. Use 'multi-source: true' on the instance instead.");
+  }
+  const isBasepathAware = multiSource || docsWorkspace.config.experimental?.basepathAware === true;
   if (isBasepathAware) {
-    context3.logger.debug("Experimental flag 'basepath-aware' is enabled - using basepath-aware S3 key format");
+    context3.logger.debug("Basepath-aware mode is enabled - using basepath-aware S3 key format");
   }
   let deployLocked = false;
   const doUnlock = () => {
@@ -846252,6 +846276,9 @@ async function runRemoteGenerationForDocsWorkspace({ organization, apiWorkspaces
       customDomains.push(...maybeInstance.customDomain);
     }
   }
+  if (maybeInstance.multiSource === true) {
+    validateMultiSourceBasepaths(maybeInstance.url, customDomains, context3);
+  }
   context3.logger.info(`Starting docs publishing for ${preview ? "preview" : "production"}: ${maybeInstance.url}`);
   context3.logger.debug(`Organization: ${organization}, Preview: ${preview}, APIs: ${apiWorkspaces.length}, OSS: ${ossWorkspaces.length}`);
   let publishedUrl;
@@ -846278,7 +846305,8 @@ async function runRemoteGenerationForDocsWorkspace({ organization, apiWorkspaces
       cliVersion,
       ciSource,
       deployerAuthor,
-      loginCommand
+      loginCommand,
+      multiSource: maybeInstance.multiSource ?? false
     });
     for (let attempt = 0; ; attempt++) {
       try {
@@ -846302,6 +846330,23 @@ async function runRemoteGenerationForDocsWorkspace({ organization, apiWorkspaces
   });
   return publishedUrl;
 }
+function getBasepath(domain3) {
+  try {
+    const url3 = domain3.startsWith("https://") || domain3.startsWith("http://") ? domain3 : `https://${domain3}`;
+    return new URL(url3).pathname;
+  } catch {
+    return "/";
+  }
+}
+function validateMultiSourceBasepaths(instanceUrl, customDomains, context3) {
+  const urlBasepath = getBasepath(instanceUrl);
+  for (const customDomain of customDomains) {
+    const customDomainBasepath = getBasepath(customDomain);
+    if (customDomainBasepath !== "/" && urlBasepath !== customDomainBasepath) {
+      context3.failAndThrow(`When multi-source is enabled, the url and custom-domain must share the same basepath. Instance url '${instanceUrl}' has basepath '${urlBasepath}' but custom-domain '${customDomain}' has basepath '${customDomainBasepath}'.`, void 0, { code: CliError.Code.ConfigError });
+    }
+  }
+}
 
 // ../cli-v2/lib/docs/publisher/LegacyDocsPublisher.js
 var LegacyDocsPublisher = class {
@@ -846337,7 +846382,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "5.1.0",
+        cliVersion: "5.2.0-3-gd80171d98cd",
         loginCommand: "fern auth login"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
@@ -865752,6 +865797,8 @@ var Generation = class {
     explicitNamespaces: () => this.customConfig["explicit-namespaces"] === true,
     /** Override the default max retries for the SDK client. Default: 2. */
     maxRetries: () => this.customConfig.maxRetries,
+    /** Controls which HTTP status codes trigger automatic retries. Default: "legacy". */
+    retryStatusCodes: () => this.customConfig.retryStatusCodes ?? "legacy",
     /**
      * Output path configuration for generated files.
      * Returns normalized paths for library, test, solution, and other files.
@@ -920664,7 +920711,7 @@ var CliContext = class _CliContext {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "5.1.0";
+    return "5.2.0-3-gd80171d98cd";
   }
   getCliName() {
     if (false) {

package/package.json

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