@fern-api/fern-api-dev 3.65.0 → 3.66.0

package/cli.cjs

@@ -1427240,7 +1427240,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "3.65.0",
+          version: "3.66.0",
           usingAccessToken: true
         }
       });
@@ -1427339,7 +1427339,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "3.65.0",
+        version: "3.66.0",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -1455823,11 +1455823,6 @@ __export(environments_exports3, {
   WithEnvironmentsSchema: () => WithEnvironmentsSchema
 });
 
-// ../fern-definition/schema/lib/schemas/serialization/resources/environments/types/MultipleBaseUrlsEnvironmentSchema.js
-var MultipleBaseUrlsEnvironmentSchema2 = schemas_exports5.object({
-  urls: schemas_exports5.record(schemas_exports5.string(), schemas_exports5.string())
-}).extend(WithAudiences).extend(WithDocsSchema);
-
 // ../fern-definition/schema/lib/schemas/serialization/resources/environments/types/ServerVariableSchema.js
 var ServerVariableSchema = schemas_exports5.object({
   id: schemas_exports5.string(),
@@ -1455835,6 +1455830,14 @@ var ServerVariableSchema = schemas_exports5.object({
   values: schemas_exports5.list(schemas_exports5.string()).optional()
 });
 
+// ../fern-definition/schema/lib/schemas/serialization/resources/environments/types/MultipleBaseUrlsEnvironmentSchema.js
+var MultipleBaseUrlsEnvironmentSchema2 = schemas_exports5.object({
+  urls: schemas_exports5.record(schemas_exports5.string(), schemas_exports5.string()),
+  "url-templates": schemas_exports5.record(schemas_exports5.string(), schemas_exports5.string()).optional(),
+  "default-urls": schemas_exports5.record(schemas_exports5.string(), schemas_exports5.string()).optional(),
+  variables: schemas_exports5.record(schemas_exports5.string(), schemas_exports5.list(ServerVariableSchema)).optional()
+}).extend(WithAudiences).extend(WithDocsSchema);
+
 // ../fern-definition/schema/lib/schemas/serialization/resources/environments/types/SingleBaseUrlEnvironmentSchema.js
 var SingleBaseUrlEnvironmentSchema2 = schemas_exports5.object({
   url: schemas_exports5.string(),
@@ -1486123,11 +1486126,6 @@ __export(environments_exports5, {
   WithEnvironmentsSchema: () => WithEnvironmentsSchema2
 });
 
-// ../configuration/lib/generators-yml/schemas/serialization/resources/fernDefinition/resources/environments/types/MultipleBaseUrlsEnvironmentSchema.js
-var MultipleBaseUrlsEnvironmentSchema3 = schemas_exports10.object({
-  urls: schemas_exports10.record(schemas_exports10.string(), schemas_exports10.string())
-}).extend(WithAudiences2).extend(WithDocsSchema2);
-
 // ../configuration/lib/generators-yml/schemas/serialization/resources/fernDefinition/resources/environments/types/ServerVariableSchema.js
 var ServerVariableSchema2 = schemas_exports10.object({
   id: schemas_exports10.string(),
@@ -1486135,6 +1486133,14 @@ var ServerVariableSchema2 = schemas_exports10.object({
   values: schemas_exports10.list(schemas_exports10.string()).optional()
 });
 
+// ../configuration/lib/generators-yml/schemas/serialization/resources/fernDefinition/resources/environments/types/MultipleBaseUrlsEnvironmentSchema.js
+var MultipleBaseUrlsEnvironmentSchema3 = schemas_exports10.object({
+  urls: schemas_exports10.record(schemas_exports10.string(), schemas_exports10.string()),
+  "url-templates": schemas_exports10.record(schemas_exports10.string(), schemas_exports10.string()).optional(),
+  "default-urls": schemas_exports10.record(schemas_exports10.string(), schemas_exports10.string()).optional(),
+  variables: schemas_exports10.record(schemas_exports10.string(), schemas_exports10.list(ServerVariableSchema2)).optional()
+}).extend(WithAudiences2).extend(WithDocsSchema2);
+
 // ../configuration/lib/generators-yml/schemas/serialization/resources/fernDefinition/resources/environments/types/SingleBaseUrlEnvironmentSchema.js
 var SingleBaseUrlEnvironmentSchema3 = schemas_exports10.object({
   url: schemas_exports10.string(),
@@ -1494731,6 +1494737,9 @@ function buildEnvironments(context2) {
   const endpointLevelServersByName = {};
   const endpointLevelServersWithName = {};
   const endpointLevelSkippedServers = [];
+  const endpointLevelUrlTemplates = {};
+  const endpointLevelDefaultUrls = {};
+  const endpointLevelVariables = {};
   for (const endpoint3 of context2.ir.endpoints) {
     for (const server of endpoint3.servers) {
       if (server.url == null && server.name != null) {
@@ -1494742,10 +1494751,15 @@ function buildEnvironments(context2) {
       if (server.url == null) {
         continue;
       }
+      const serverRecord = server;
+      const serverDefaultUrl = "defaultUrl" in server && typeof serverRecord["defaultUrl"] === "string" ? serverRecord["defaultUrl"] : void 0;
+      const serverUrlTemplate = "urlTemplate" in server && typeof serverRecord["urlTemplate"] === "string" ? serverRecord["urlTemplate"] : void 0;
+      const serverVariables = "variables" in server && Array.isArray(serverRecord["variables"]) ? serverRecord["variables"] : void 0;
+      const serverUrl = serverDefaultUrl ?? server.url;
       const environmentSchema2 = server.audiences ? {
-        url: server.url,
+        url: serverUrl,
         audiences: server.audiences
-      } : server.url;
+      } : serverUrl;
       if (server.name == null) {
         endpointLevelSkippedServers.push(environmentSchema2);
         continue;
@@ -1494754,10 +1494768,19 @@ function buildEnvironments(context2) {
         endpointLevelServersByName[server.name] = [];
       }
       endpointLevelServersByName[server.name]?.push({
-        url: server.url,
+        url: serverUrl,
         audiences: server.audiences
       });
       endpointLevelServersWithName[server.name] = environmentSchema2;
+      if (serverUrlTemplate && server.name) {
+        endpointLevelUrlTemplates[server.name] = serverUrlTemplate;
+      }
+      if (serverDefaultUrl && server.name) {
+        endpointLevelDefaultUrls[server.name] = serverDefaultUrl;
+      }
+      if (serverVariables && serverVariables.length > 0 && server.name) {
+        endpointLevelVariables[server.name] = serverVariables;
+      }
     }
   }
   const websocketServersWithName = {};
@@ -1494934,7 +1494957,7 @@ function buildEnvironments(context2) {
     for (const [name3, schema2] of Object.entries(topLevelServersWithName)) {
       if (firstEnvironment) {
         if (hasWebsocketServersWithName) {
-          const baseUrl = typeof schema2 === "string" ? schema2 : isRawMultipleBaseUrlsEnvironment(schema2) ? Object.values(schema2.urls)[0] : schema2.url;
+          const baseUrl = typeof schema2 === "string" ? schema2 : isRawMultipleBaseUrlsEnvironment(schema2) ? Object.values(schema2.urls)[0] : schema2["default-url"] ?? schema2.url;
           context2.builder.addEnvironment({
             name: name3,
             schema: {
@@ -1494954,7 +1494977,7 @@ function buildEnvironments(context2) {
         firstEnvironment = false;
       } else {
         if (hasWebsocketServersWithName) {
-          const baseUrl = typeof schema2 === "string" ? schema2 : isRawMultipleBaseUrlsEnvironment(schema2) ? Object.values(schema2.urls)[0] : schema2.url;
+          const baseUrl = typeof schema2 === "string" ? schema2 : isRawMultipleBaseUrlsEnvironment(schema2) ? Object.values(schema2.urls)[0] : schema2["default-url"] ?? schema2.url;
           context2.builder.addEnvironment({
             name: name3,
             schema: {
@@ -1494979,16 +1495002,40 @@ function buildEnvironments(context2) {
     if (numTopLevelServersWithName === 1) {
       const environmentName = Object.keys(topLevelServersWithName)[0];
       const topLevelServerSchema = Object.values(topLevelServersWithName)[0];
-      const topLevelServerUrl = typeof topLevelServerSchema === "string" ? topLevelServerSchema : isRawMultipleBaseUrlsEnvironment(topLevelServerSchema) ? Object.values(topLevelServerSchema.urls)[0] : topLevelServerSchema.url;
+      const topLevelServerUrl = typeof topLevelServerSchema === "string" ? topLevelServerSchema : isRawMultipleBaseUrlsEnvironment(topLevelServerSchema) ? Object.values(topLevelServerSchema.urls)[0] : topLevelServerSchema["default-url"] ?? topLevelServerSchema.url;
+      const multiUrlTemplates = {};
+      const multiDefaultUrls = {};
+      const multiVariables = {};
+      if (typeof topLevelServerSchema !== "string" && !isRawMultipleBaseUrlsEnvironment(topLevelServerSchema)) {
+        if (topLevelServerSchema["url-template"]) {
+          multiUrlTemplates[DEFAULT_URL_NAME] = topLevelServerSchema["url-template"];
+        }
+        if (topLevelServerSchema["default-url"]) {
+          multiDefaultUrls[DEFAULT_URL_NAME] = topLevelServerSchema["default-url"];
+        }
+        if (topLevelServerSchema.variables && topLevelServerSchema.variables.length > 0) {
+          multiVariables[DEFAULT_URL_NAME] = topLevelServerSchema.variables;
+        }
+      }
+      Object.assign(multiUrlTemplates, endpointLevelUrlTemplates);
+      Object.assign(multiDefaultUrls, endpointLevelDefaultUrls);
+      Object.assign(multiVariables, endpointLevelVariables);
+      const hasTemplateData = Object.keys(multiUrlTemplates).length > 0 || Object.keys(multiVariables).length > 0;
+      const multiUrlSchema = {
+        urls: {
+          ...{ [DEFAULT_URL_NAME]: topLevelServerUrl ?? "" },
+          ...extractUrlsFromEnvironmentSchema(endpointLevelServersWithName),
+          ...extractUrlsFromEnvironmentSchema(websocketServersWithName)
+        },
+        ...hasTemplateData ? {
+          "url-templates": multiUrlTemplates,
+          "default-urls": multiDefaultUrls,
+          variables: multiVariables
+        } : {}
+      };
       context2.builder.addEnvironment({
         name: environmentName,
-        schema: {
-          urls: {
-            ...{ [DEFAULT_URL_NAME]: topLevelServerUrl ?? "" },
-            ...extractUrlsFromEnvironmentSchema(endpointLevelServersWithName),
-            ...extractUrlsFromEnvironmentSchema(websocketServersWithName)
-          }
-        }
+        schema: multiUrlSchema
       });
       context2.builder.setDefaultEnvironment(environmentName);
       context2.builder.setDefaultUrl(DEFAULT_URL_NAME);
@@ -1495011,7 +1495058,7 @@ function buildEnvironments(context2) {
       if (apiToUrls.size > 0) {
         let firstEnvironment = true;
         for (const [envName, envSchema] of Object.entries(topLevelServersWithName)) {
-          const baseUrl = typeof envSchema === "string" ? envSchema : isRawMultipleBaseUrlsEnvironment(envSchema) ? Object.values(envSchema.urls)[0] : envSchema.url;
+          const baseUrl = typeof envSchema === "string" ? envSchema : isRawMultipleBaseUrlsEnvironment(envSchema) ? Object.values(envSchema.urls)[0] : envSchema["default-url"] ?? envSchema.url;
           if (!baseUrl) {
             continue;
           }
@@ -1495051,7 +1495098,7 @@ function buildEnvironments(context2) {
         let firstEnvironment = true;
         for (const [name3, schema2] of Object.entries(topLevelServersWithName)) {
           if (hasWebsocketServersWithName || Object.keys(endpointLevelServersWithName).length > 0) {
-            const baseUrl = typeof schema2 === "string" ? schema2 : isRawMultipleBaseUrlsEnvironment(schema2) ? Object.values(schema2.urls)[0] : schema2.url;
+            const baseUrl = typeof schema2 === "string" ? schema2 : isRawMultipleBaseUrlsEnvironment(schema2) ? Object.values(schema2.urls)[0] : schema2["default-url"] ?? schema2.url;
             context2.builder.addEnvironment({
               name: name3,
               schema: {
@@ -1516549,15 +1516596,31 @@ function convertMultipleBaseUrlEnvironments({ baseUrls, environments: environmen
       name: casingsGenerator.generateName(baseUrl)
     })),
     environments: Object.entries(environments2).map(([environmentName, rawEnvironment]) => visitRawEnvironmentDeclaration(rawEnvironment, {
-      multipleBaseUrls: (multipleBaseUrlsEnvironment) => ({
-        docs: multipleBaseUrlsEnvironment.docs,
-        id: environmentName,
-        name: casingsGenerator.generateName(environmentName),
-        urls: mapValues_default(multipleBaseUrlsEnvironment.urls, (url3) => removeTrailingSlash2(url3)),
-        defaultUrls: void 0,
-        urlTemplates: void 0,
-        urlVariables: void 0
-      }),
+      multipleBaseUrls: (multipleBaseUrlsEnvironment) => {
+        const rawUrlTemplates = multipleBaseUrlsEnvironment["url-templates"];
+        const rawDefaultUrls = multipleBaseUrlsEnvironment["default-urls"];
+        const rawVariables = multipleBaseUrlsEnvironment.variables;
+        const urlTemplates = rawUrlTemplates && Object.keys(rawUrlTemplates).length > 0 ? rawUrlTemplates : void 0;
+        const defaultUrls = rawDefaultUrls && Object.keys(rawDefaultUrls).length > 0 ? mapValues_default(rawDefaultUrls, (url3) => removeTrailingSlash2(url3)) : void 0;
+        const urlVariables = rawVariables && Object.keys(rawVariables).length > 0 ? Object.fromEntries(Object.entries(rawVariables).map(([urlId, vars]) => [
+          urlId,
+          vars.map((v21) => ({
+            id: v21.id,
+            name: casingsGenerator.generateName(v21.id),
+            default: v21.default,
+            values: v21.values
+          }))
+        ])) : void 0;
+        return {
+          docs: multipleBaseUrlsEnvironment.docs,
+          id: environmentName,
+          name: casingsGenerator.generateName(environmentName),
+          urls: mapValues_default(multipleBaseUrlsEnvironment.urls, (url3) => removeTrailingSlash2(url3)),
+          defaultUrls,
+          urlTemplates,
+          urlVariables
+        };
+      },
       singleBaseUrl: () => {
         throw new Error(`Environment ${environmentName} does not have multiple base URLs`);
       }
@@ -1541711,6 +1541774,48 @@ var definitions = {
         additionalProperties: {
           type: "string"
         }
+      },
+      "url-templates": {
+        oneOf: [
+          {
+            type: "object",
+            additionalProperties: {
+              type: "string"
+            }
+          },
+          {
+            type: "null"
+          }
+        ]
+      },
+      "default-urls": {
+        oneOf: [
+          {
+            type: "object",
+            additionalProperties: {
+              type: "string"
+            }
+          },
+          {
+            type: "null"
+          }
+        ]
+      },
+      variables: {
+        oneOf: [
+          {
+            type: "object",
+            additionalProperties: {
+              type: "array",
+              items: {
+                $ref: "#/definitions/environments.ServerVariableSchema"
+              }
+            }
+          },
+          {
+            type: "null"
+          }
+        ]
       }
     },
     required: [
@@ -1714019,7 +1714124,7 @@ var CliContext = class {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "3.65.0";
+    return "3.66.0";
   }
   getCliName() {
     if (false) {
@@ -1717139,7 +1717244,7 @@ var import_path56 = __toESM(require("path"), 1);
 var LOCAL_STORAGE_FOLDER4 = ".fern-dev";
 var LOGS_FOLDER_NAME = "logs";
 function getCliSource() {
-  const version7 = "3.65.0";
+  const version7 = "3.66.0";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -1723887,25 +1723992,27 @@ async function visitNavigationItem2({ absolutePathToFernFolder, navigationItem,
     orphaned: noop7,
     availability: noop7
   });
-  if (navigationItemIsPage(navigationItem)) {
-    const absoluteFilepath = resolve5(dirname4(absoluteFilepathToConfiguration), navigationItem.path);
+  const markdownPath = getNavigationItemMarkdownPath(navigationItem);
+  if (markdownPath != null) {
+    const absoluteFilepath = resolve5(dirname4(absoluteFilepathToConfiguration), markdownPath);
     if (await doesPathExist(absoluteFilepath)) {
       const fileStats = await (0, import_promises103.stat)(absoluteFilepath);
       const fileSizeMB = fileStats.size / (1024 * 1024);
       if (fileSizeMB > 1) {
-        context2.logger.trace(`Processing large markdown file: ${navigationItem.path} (${fileSizeMB.toFixed(2)} MB)`);
+        context2.logger.trace(`Processing large markdown file: ${markdownPath} (${fileSizeMB.toFixed(2)} MB)`);
       }
       const startTime = performance.now();
       const content5 = (await (0, import_promises103.readFile)(absoluteFilepath, "utf8")).toString();
       const readTime = performance.now() - startTime;
       if (readTime > 2e3) {
-        context2.logger.debug(`Slow file read: ${navigationItem.path} took ${readTime.toFixed(0)}ms`);
+        context2.logger.debug(`Slow file read: ${markdownPath} took ${readTime.toFixed(0)}ms`);
       }
+      const title4 = getNavigationItemTitle(navigationItem);
       await visitor.markdownPage?.({
-        title: navigationItem.page,
+        title: title4,
         content: content5,
         absoluteFilepath
-      }, [...nodePath, navigationItem.path]);
+      }, [...nodePath, markdownPath]);
       try {
         const parseStart = performance.now();
         const { filepaths } = parseImagePaths(content5, {
@@ -1723914,17 +1724021,17 @@ async function visitNavigationItem2({ absolutePathToFernFolder, navigationItem,
         });
         const parseTime = performance.now() - parseStart;
         if (parseTime > 2e3) {
-          context2.logger.debug(`Slow image path parsing: ${navigationItem.path} took ${parseTime.toFixed(0)}ms`);
+          context2.logger.debug(`Slow image path parsing: ${markdownPath} took ${parseTime.toFixed(0)}ms`);
         }
         for (const filepath of filepaths) {
           await visitor.filepath?.({
             absoluteFilepath: filepath,
             value: relative3(absolutePathToFernFolder, filepath),
             willBeUploaded: true
-          }, [...nodePath, navigationItem.path]);
+          }, [...nodePath, markdownPath]);
         }
       } catch (err) {
-        context2.logger.trace(`Failed to parse image paths in ${navigationItem.path}: ${err}`);
+        context2.logger.trace(`Failed to parse image paths in ${markdownPath}: ${err}`);
       }
     }
   }
@@ -1723969,6 +1724076,27 @@ function navigationItemIsChangelog(item) {
 function navigationItemIsPage(item) {
   return item?.page != null;
 }
+function navigationItemIsSection(item) {
+  return item?.section != null;
+}
+function getNavigationItemMarkdownPath(item) {
+  if (navigationItemIsPage(item)) {
+    return item.path;
+  }
+  if (navigationItemIsSection(item) && item.path != null) {
+    return item.path;
+  }
+  return void 0;
+}
+function getNavigationItemTitle(item) {
+  if (navigationItemIsPage(item)) {
+    return item.page;
+  }
+  if (navigationItemIsSection(item)) {
+    return item.section;
+  }
+  return "Unknown";
+}
 function navigationItemIsApi2(item) {
   return item?.api != null;
 }

package/package.json

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