fern-api 0.39.17 → 0.39.19

package/bundle.cjs

@@ -1192625,7 +1192625,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "0.39.17",
+          version: "0.39.19",
           usingAccessToken: true
         }
       });
@@ -1192687,7 +1192687,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "0.39.17",
+        version: "0.39.19",
         ...event,
         ...event.properties
       }
@@ -1197750,10 +1197750,10 @@ var CliContext = class {
     return "fern-api";
   }
   getPackageVersion() {
-    if ("0.39.17" == null) {
+    if ("0.39.19" == null) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "0.39.17";
+    return "0.39.19";
   }
   getCliName() {
     if ("fern" == null) {
@@ -1202422,7 +1202422,7 @@ var ExamplePrimitive = {
   },
   datetime: (value) => {
     return {
-      datetime: value,
+      ...value,
       type: "datetime",
       _visit: function(visitor) {
         return ExamplePrimitive._visit(this, visitor);
@@ -1202477,7 +1202477,7 @@ var ExamplePrimitive = {
       case "date":
         return visitor.date(value.date);
       case "datetime":
-        return visitor.datetime(value.datetime);
+        return visitor.datetime(value);
       case "uuid":
         return visitor.uuid(value.uuid);
       case "base64":
@@ -1202692,6 +1202692,7 @@ __export(serialization_exports2, {
   ExampleCodeSampleLanguage: () => ExampleCodeSampleLanguage,
   ExampleCodeSampleSdk: () => ExampleCodeSampleSdk,
   ExampleContainer: () => ExampleContainer2,
+  ExampleDatetime: () => ExampleDatetime,
   ExampleEndpointCall: () => ExampleEndpointCall,
   ExampleEndpointErrorResponse: () => ExampleEndpointErrorResponse,
   ExampleEndpointSuccessResponse: () => ExampleEndpointSuccessResponse2,
@@ -1206055,6 +1206056,7 @@ __export(types_exports2, {
   EnumValue: () => EnumValue,
   ExampleAliasType: () => ExampleAliasType,
   ExampleContainer: () => ExampleContainer2,
+  ExampleDatetime: () => ExampleDatetime,
   ExampleEnumType: () => ExampleEnumType,
   ExampleKeyValuePair: () => ExampleKeyValuePair,
   ExampleListContainer: () => ExampleListContainer,
@@ -1206324,6 +1206326,12 @@ var ExampleTypeReference = schemas_exports4.objectWithoutOptionalProperties({
   shape: schemas_exports4.lazy(() => ExampleTypeReferenceShape2)
 }).extend(WithJsonExample);
 
+// ../../ir-sdk/lib/sdk/serialization/resources/types/types/ExampleDatetime.js
+var ExampleDatetime = schemas_exports4.objectWithoutOptionalProperties({
+  datetime: schemas_exports4.date(),
+  raw: schemas_exports4.string().optional()
+});
+
 // ../../ir-sdk/lib/sdk/serialization/resources/types/types/ExamplePrimitive.js
 var ExamplePrimitive2 = schemas_exports4.union("type", {
   integer: schemas_exports4.object({
@@ -1206353,9 +1206361,7 @@ var ExamplePrimitive2 = schemas_exports4.union("type", {
   date: schemas_exports4.object({
     date: schemas_exports4.string()
   }),
-  datetime: schemas_exports4.object({
-    datetime: schemas_exports4.date()
-  }),
+  datetime: ExampleDatetime,
   uuid: schemas_exports4.object({
     uuid: schemas_exports4.string()
   }),
@@ -1206387,7 +1206393,7 @@ var ExamplePrimitive2 = schemas_exports4.union("type", {
       case "date":
         return ExamplePrimitive.date(value.date);
       case "datetime":
-        return ExamplePrimitive.datetime(value.datetime);
+        return ExamplePrimitive.datetime(value);
       case "uuid":
         return ExamplePrimitive.uuid(value.uuid);
       case "base64":
@@ -1210371,7 +1210377,8 @@ var StatusCode = schemas_exports5.number();
 // ../openapi-ir-sdk/lib/sdk/serialization/resources/commons/types/Server.js
 var Server = schemas_exports5.objectWithoutOptionalProperties({
   name: schemas_exports5.string().optional(),
-  url: schemas_exports5.string()
+  url: schemas_exports5.string(),
+  audiences: schemas_exports5.list(schemas_exports5.string()).optional()
 }).extend(WithDescription);
 
 // ../openapi-ir-sdk/lib/sdk/serialization/resources/example/index.js
@@ -1215926,17 +1215933,27 @@ var ExampleTypeFactory = class {
             const fullExample = getFullExampleAsObject(example);
             const exampleDiscriminant = fullExample == null ? void 0 : fullExample[schema2.value.discriminantProperty];
             const exampleUnionVariantSchema = schema2.value.schemas[exampleDiscriminant];
-            const unionVariant = this.getDiscriminatedUnionVariantSchema(schema2.value, fullExample) ?? Object.entries(schema2.value.schemas)[0];
-            if (exampleDiscriminant != null && exampleUnionVariantSchema != null && exampleUnionVariantSchema.type === "object") {
-              allProperties = this.getAllProperties(exampleUnionVariantSchema);
-              requiredProperties = this.getAllRequiredProperties(exampleUnionVariantSchema);
-              result[schema2.value.discriminantProperty] = FullExample.primitive(PrimitiveExample.string(exampleDiscriminant));
-            } else if (unionVariant != null && unionVariant[1].type === "object") {
-              allProperties = this.getAllProperties(unionVariant[1]);
-              requiredProperties = this.getAllRequiredProperties(unionVariant[1]);
-              result[schema2.value.discriminantProperty] = FullExample.primitive(PrimitiveExample.string(unionVariant[0]));
-            } else {
-              return void 0;
+            const unionVariants = [];
+            const schemaFromExample = this.getDiscriminatedUnionVariantSchema(schema2.value, fullExample);
+            if (schemaFromExample != null) {
+              unionVariants.push(schemaFromExample);
+            }
+            unionVariants.push(...Object.entries(schema2.value.schemas));
+            for (const unionVariant of unionVariants) {
+              if (exampleDiscriminant != null && exampleUnionVariantSchema != null && exampleUnionVariantSchema.type === "object") {
+                allProperties = this.getAllProperties(exampleUnionVariantSchema);
+                requiredProperties = this.getAllRequiredProperties(exampleUnionVariantSchema);
+                result[schema2.value.discriminantProperty] = FullExample.primitive(PrimitiveExample.string(exampleDiscriminant));
+                break;
+              } else {
+                const objectSchema = this.getObjectSchema(unionVariant[1]);
+                if (objectSchema == null) {
+                  continue;
+                }
+                allProperties = this.getAllProperties(objectSchema);
+                requiredProperties = this.getAllRequiredProperties(objectSchema);
+                result[schema2.value.discriminantProperty] = FullExample.primitive(PrimitiveExample.string(unionVariant[0]));
+              }
             }
             for (const commonProperty of schema2.value.commonProperties) {
               allProperties[commonProperty.key] = commonProperty.schema;
@@ -1216162,6 +1216179,18 @@ var ExampleTypeFactory = class {
         assertNever(schema2);
     }
   }
+  getObjectSchema(schema2) {
+    if (schema2.type === "object") {
+      return schema2;
+    }
+    if (schema2.type === "reference") {
+      const referenceDeclaration = this.schemas[schema2.schema];
+      if (referenceDeclaration != null) {
+        return this.getObjectSchema(referenceDeclaration);
+      }
+    }
+    return void 0;
+  }
   getDiscriminatedUnionVariantSchema(schema2, fullExample) {
     const discriminantValue = fullExample == null ? void 0 : fullExample[schema2.discriminantProperty];
     if (discriminantValue == null || typeof discriminantValue !== "string") {
@@ -1218159,7 +1218188,8 @@ function convertServer(server) {
   return {
     url: getServerUrl({ url: server.url, variables: server.variables ?? {} }),
     description: server.description,
-    name: getServerName(server)
+    name: getServerName(server),
+    audiences: getExtension(server, FernOpenAPIExtension.AUDIENCES)
   };
 }
 function getServerUrl({ url, variables }) {
@@ -1220683,69 +1220713,93 @@ function buildChannel({ channel, context, declarationFile }) {
 // ../openapi-ir-to-fern/lib/buildEnvironments.js
 var PRODUCTION_ENVNIRONMENT_NAME = "Production";
 var DEFAULT_ENVIRONMENT_NAME = "Default";
+function extractUrlsFromEnvironmentSchema(record4) {
+  return Object.entries(record4).reduce((acc, [name2, schemaOrUrl]) => {
+    if (isRawMultipleBaseUrlsEnvironment(schemaOrUrl)) {
+      Object.entries(schemaOrUrl.urls).forEach(([urlsName, urlsValue]) => {
+        acc[urlsName] = urlsValue;
+      });
+    } else {
+      acc[name2] = typeof schemaOrUrl === "string" ? schemaOrUrl : schemaOrUrl.url;
+    }
+    return acc;
+  }, {});
+}
 function buildEnvironments(context) {
-  var _a6;
-  const topLevelServerURLsWithName = {};
-  const topLevelSkippedServerURLs = [];
+  var _a6, _b4;
+  const topLevelServersWithName = {};
+  const topLevelSkippedServers = [];
   for (const server of context.ir.servers) {
+    const environmentSchema = server.audiences ? {
+      url: server.url,
+      audiences: server.audiences
+    } : server.url;
     if (server.name == null) {
-      topLevelSkippedServerURLs.push(server.url);
+      topLevelSkippedServers.push(environmentSchema);
       continue;
     }
-    topLevelServerURLsWithName[server.name] = server.url;
+    topLevelServersWithName[server.name] = environmentSchema;
   }
-  const endpointLevelServerURLsWithName = {};
-  const endpointLevelSkippedServerURLs = [];
+  const endpointLevelServersWithName = {};
+  const endpointLevelSkippedServers = [];
   for (const endpoint of context.ir.endpoints) {
     for (const server of endpoint.server) {
+      const environmentSchema = server.audiences ? {
+        url: server.url,
+        audiences: server.audiences
+      } : server.url;
       if (server.name == null) {
-        endpointLevelSkippedServerURLs.push(server.url);
+        endpointLevelSkippedServers.push(environmentSchema);
         continue;
       }
-      endpointLevelServerURLsWithName[server.name] = server.url;
+      endpointLevelServersWithName[server.name] = environmentSchema;
     }
   }
-  const numTopLevelURLs = Object.keys(topLevelServerURLsWithName).length;
-  const numEndpointLevelURLs = Object.keys(endpointLevelServerURLsWithName).length;
-  if (numTopLevelURLs === 0 && numEndpointLevelURLs === 0) {
+  const numTopLevelServers = Object.keys(topLevelServersWithName).length;
+  const numEndpointLevelServers = Object.keys(endpointLevelServersWithName).length;
+  if (numTopLevelServers === 0 && numEndpointLevelServers === 0) {
     const singleURL = (_a6 = context.ir.servers[0]) == null ? void 0 : _a6.url;
+    const singleURLAudiences = (_b4 = context.ir.servers[0]) == null ? void 0 : _b4.audiences;
     if (singleURL != null) {
       context.builder.addEnvironment({
         name: DEFAULT_ENVIRONMENT_NAME,
-        schema: singleURL
+        schema: singleURLAudiences ? {
+          url: singleURL,
+          audiences: singleURLAudiences
+        } : singleURL
       });
       context.builder.setDefaultEnvironment(DEFAULT_ENVIRONMENT_NAME);
     }
-  } else if (numTopLevelURLs > 0 && numEndpointLevelURLs === 0) {
+  } else if (numTopLevelServers > 0 && numEndpointLevelServers === 0) {
     let count = 0;
-    if (topLevelSkippedServerURLs.length > 0) {
-      context.logger.error(`Skipping servers ${topLevelSkippedServerURLs.join(", ")} because x-fern-server-name was not provided.`);
+    if (topLevelSkippedServers.length > 0) {
+      context.logger.error(`Skipping servers ${topLevelSkippedServers.map((server) => typeof server === "string" ? server : server.url).join(", ")} because x-fern-server-name was not provided.`);
     }
-    for (const [name2, url] of Object.entries(topLevelServerURLsWithName)) {
+    for (const [name2, schema2] of Object.entries(topLevelServersWithName)) {
       if (count === 0) {
         context.builder.setDefaultEnvironment(name2);
       }
       context.builder.addEnvironment({
         name: name2,
-        schema: url
+        schema: schema2
       });
       count += 1;
     }
-  } else if (numEndpointLevelURLs > 0) {
-    if (topLevelSkippedServerURLs.length > 0 || endpointLevelSkippedServerURLs.length > 0) {
-      context.logger.error(`Skipping servers ${[...topLevelSkippedServerURLs, ...endpointLevelSkippedServerURLs].join(", ")} because x-fern-server-name was not provided.`);
+  } else if (numEndpointLevelServers > 0) {
+    if (topLevelSkippedServers.length > 0 || endpointLevelSkippedServers.length > 0) {
+      context.logger.error(`Skipping servers ${[...topLevelSkippedServers, ...endpointLevelSkippedServers].map((server) => typeof server === "string" ? server : server.url).join(", ")} because x-fern-server-name was not provided.`);
     }
-    const toplevelServerURLEntries = Object.entries(topLevelServerURLsWithName)[0];
-    if (toplevelServerURLEntries != null) {
-      const [name2, _4] = toplevelServerURLEntries;
+    const toplevelServerEntries = Object.entries(topLevelServersWithName)[0];
+    if (toplevelServerEntries != null) {
+      const [name2, _4] = toplevelServerEntries;
       context.setDefaultServerName(name2);
     }
     context.builder.addEnvironment({
       name: PRODUCTION_ENVNIRONMENT_NAME,
       schema: {
         urls: {
-          ...topLevelServerURLsWithName,
-          ...endpointLevelServerURLsWithName
+          ...extractUrlsFromEnvironmentSchema(topLevelServersWithName),
+          ...extractUrlsFromEnvironmentSchema(endpointLevelServersWithName)
         }
       }
     });
@@ -1239752,7 +1239806,10 @@ function convertPrimitiveExample({ example, typeBeingExemplified }) {
       if (typeof example !== "string") {
         throw new Error("Example is not a string");
       }
-      return ExampleTypeReferenceShape.primitive(ExamplePrimitive.datetime(new Date(example)));
+      return ExampleTypeReferenceShape.primitive(ExamplePrimitive.datetime({
+        datetime: new Date(example),
+        raw: example
+      }));
     },
     date: () => {
       if (typeof example !== "string") {
@@ -1242833,7 +1242890,10 @@ var ExampleGenerator = class {
         const exDateTime = example != null && typeof example === "string" ? example : examples_exports.DATE_TIME;
         return {
           jsonExample: exDateTime,
-          shape: ExampleTypeReferenceShape.primitive(ExamplePrimitive.datetime(new Date(exDateTime)))
+          shape: ExampleTypeReferenceShape.primitive(ExamplePrimitive.datetime({
+            datetime: new Date(exDateTime),
+            raw: exDateTime
+          }))
         };
       }
       case "UUID": {
@@ -1249634,7 +1249694,7 @@ async function getPreviewDocsDefinition({ domain: domain2, project, context }) {
     throw new Error("No docs workspace found in project");
   }
   const fernWorkspaces = await Promise.all(apiWorkspaces.map(async (workspace) => await workspace.toFernWorkspace({ context }, { enableUniqueErrorsPerEndpoint: true, detectGlobalHeaders: false })));
-  const apiCollector = new ReferencedAPICollector();
+  const apiCollector = new ReferencedAPICollector(context);
   const filesV2 = {};
   const resolver2 = new DocsDefinitionResolver(domain2, docsWorkspace, fernWorkspaces, context, void 0, async (files) => files.map((file) => {
     const fileId = v4();
@@ -1249666,20 +1249726,33 @@ async function getPreviewDocsDefinition({ domain: domain2, project, context }) {
   };
 }
 var ReferencedAPICollector = class {
+  context;
   apis = {};
+  constructor(context) {
+    this.context = context;
+  }
   addReferencedAPI({ ir, snippetsConfig }) {
-    const id = v4();
-    const apiDefinition = convertIrToFdrApi({ ir, snippetsConfig });
-    const dbApiDefinition = convertAPIDefinitionToDb(apiDefinition, id, new SDKSnippetHolder({
-      snippetsConfigWithSdkId: {},
-      snippetsBySdkId: {},
-      snippetTemplatesByEndpoint: {},
-      snippetTemplatesByEndpointId: {},
-      snippetsBySdkIdAndEndpointId: {}
-    }));
-    const readApiDefinition = convertDbAPIDefinitionToRead(dbApiDefinition);
-    this.apis[id] = readApiDefinition;
-    return id;
+    try {
+      const id = v4();
+      const apiDefinition = convertIrToFdrApi({ ir, snippetsConfig });
+      const dbApiDefinition = convertAPIDefinitionToDb(apiDefinition, id, new SDKSnippetHolder({
+        snippetsConfigWithSdkId: {},
+        snippetsBySdkId: {},
+        snippetTemplatesByEndpoint: {},
+        snippetTemplatesByEndpointId: {},
+        snippetsBySdkIdAndEndpointId: {}
+      }));
+      const readApiDefinition = convertDbAPIDefinitionToRead(dbApiDefinition);
+      this.apis[id] = readApiDefinition;
+      return id;
+    } catch (e) {
+      const err = e;
+      this.context.logger.error(`Failed to read referenced API: ${err == null ? void 0 : err.message}`);
+      if (err.stack != null) {
+        this.context.logger.error(err == null ? void 0 : err.stack);
+      }
+      throw e;
+    }
   }
   getAPIsForDefinition() {
     return this.apis;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fern-api",
-  "version": "0.39.17",
+  "version": "0.39.19",
   "repository": {
     "type": "git",
     "url": "https://github.com/fern-api/fern.git",