fern-api 0.23.1-rc0 → 0.23.1-rc3

package/bundle.cjs

@@ -25921,7 +25921,7 @@ var init_DocsInstances = __esm({
     init_core();
     DocsInstances = schemas_exports.object({
       url: schemas_exports.string(),
-      customDomain: schemas_exports.property("custom-domain", schemas_exports.string().optional()),
+      customDomain: schemas_exports.property("custom-domain", schemas_exports.lazy(async () => (await Promise.resolve().then(() => (init_serialization(), serialization_exports))).CustomDomain).optional()),
       audiences: schemas_exports.lazy(async () => (await Promise.resolve().then(() => (init_serialization(), serialization_exports))).AudiencesConfig).optional(),
       private: schemas_exports.boolean().optional(),
       editThisPage: schemas_exports.property("edit-this-page", schemas_exports.lazyObject(async () => (await Promise.resolve().then(() => (init_serialization(), serialization_exports))).EditThisPageConfig).optional())
@@ -25929,6 +25929,18 @@ var init_DocsInstances = __esm({
   }
 });
 
+// pnp:/home/circleci/project/packages/cli/configuration/lib/docs-yml/schemas/sdk/serialization/resources/docs/types/CustomDomain.js
+var CustomDomain;
+var init_CustomDomain = __esm({
+  "pnp:/home/circleci/project/packages/cli/configuration/lib/docs-yml/schemas/sdk/serialization/resources/docs/types/CustomDomain.js"() {
+    init_core();
+    CustomDomain = schemas_exports.undiscriminatedUnion([
+      schemas_exports.string(),
+      schemas_exports.list(schemas_exports.string())
+    ]);
+  }
+});
+
 // pnp:/home/circleci/project/packages/cli/configuration/lib/docs-yml/schemas/sdk/serialization/resources/docs/types/EditThisPageConfig.js
 var EditThisPageConfig;
 var init_EditThisPageConfig = __esm({
@@ -26499,6 +26511,7 @@ var init_types = __esm({
     init_TabId();
     init_TabConfig();
     init_DocsInstances();
+    init_CustomDomain();
     init_EditThisPageConfig();
     init_GithubEditThisPageConfig();
     init_AudiencesConfig();
@@ -26561,6 +26574,7 @@ __export(docs_exports3, {
   ColorsConfiguration: () => ColorsConfiguration,
   ContentAlignment: () => ContentAlignment4,
   CssConfig: () => CssConfig,
+  CustomDomain: () => CustomDomain,
   DocsConfiguration: () => DocsConfiguration,
   DocsInstances: () => DocsInstances,
   DocsTypographyConfig: () => DocsTypographyConfig,
@@ -26628,6 +26642,7 @@ __export(serialization_exports, {
   ColorsConfiguration: () => ColorsConfiguration,
   ContentAlignment: () => ContentAlignment4,
   CssConfig: () => CssConfig,
+  CustomDomain: () => CustomDomain,
   DocsConfiguration: () => DocsConfiguration,
   DocsInstances: () => DocsInstances,
   DocsTypographyConfig: () => DocsTypographyConfig,
@@ -886384,7 +886399,8 @@ var APIDefinitionPathSchema = z.string().describe("Path to the OpenAPI, AsyncAPI
 var APIDefintionWithOverridesSchema = z.object({
   path: APIDefinitionPathSchema,
   origin: z.optional(z.string()).describe("The URL of the API definition origin, from which the file should be polled."),
-  overrides: z.optional(z.string()).describe("Path to the OpenAPI or AsyncAPI overrides")
+  overrides: z.optional(z.string()).describe("Path to the OpenAPI or AsyncAPI overrides"),
+  audiences: z.optional(z.array(z.string())).describe("Audiences that you would like to filter to")
 });
 var APIDefinitionList = z.array(z.union([APIDefinitionPathSchema, APIDefintionWithOverridesSchema]));
 var APIConfigurationSchema = z.union([
@@ -886605,7 +886621,8 @@ async function parseAPIConfiguration(rawGeneratorsConfiguration) {
       apiDefinitions.push({
         path: apiConfiguration,
         origin: void 0,
-        overrides: void 0
+        overrides: void 0,
+        audiences: []
       });
     } else if (Array.isArray(apiConfiguration)) {
       for (const definition2 of apiConfiguration) {
@@ -886613,13 +886630,15 @@ async function parseAPIConfiguration(rawGeneratorsConfiguration) {
           apiDefinitions.push({
             path: definition2,
             origin: void 0,
-            overrides: void 0
+            overrides: void 0,
+            audiences: []
           });
         } else {
           apiDefinitions.push({
             path: definition2.path,
             origin: definition2.origin,
-            overrides: definition2.overrides
+            overrides: definition2.overrides,
+            audiences: definition2.audiences
           });
         }
       }
@@ -886627,7 +886646,8 @@ async function parseAPIConfiguration(rawGeneratorsConfiguration) {
       apiDefinitions.push({
         path: apiConfiguration.path,
         origin: apiConfiguration.origin,
-        overrides: apiConfiguration.overrides
+        overrides: apiConfiguration.overrides,
+        audiences: apiConfiguration.audiences
       });
     }
   } else {
@@ -886639,20 +886659,23 @@ async function parseAPIConfiguration(rawGeneratorsConfiguration) {
       apiDefinitions.push({
         path: openapi,
         origin: apiOrigin,
-        overrides: openapiOverrides
+        overrides: openapiOverrides,
+        audiences: []
       });
     } else if (openapi != null) {
       apiDefinitions.push({
         path: openapi.path,
         origin: openapi.origin,
-        overrides: openapi.overrides
+        overrides: openapi.overrides,
+        audiences: []
       });
     }
     if (asyncapi != null) {
       apiDefinitions.push({
         path: asyncapi,
         origin: apiOrigin,
-        overrides: void 0
+        overrides: void 0,
+        audiences: []
       });
     }
   }
@@ -890227,7 +890250,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "0.23.1-rc0",
+          version: "0.23.1-rc3",
           usingAccessToken: true
         }
       });
@@ -890289,7 +890312,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "0.23.1-rc0",
+        version: "0.23.1-rc3",
         ...event,
         ...event.properties
       }
@@ -902332,6 +902355,9 @@ function buildPrimitiveTypeReference(primitiveSchema) {
 }
 function buildReferenceTypeReference({ schema: schema2, fileContainingReference, context }) {
   const resolvedSchema = context.getSchema(schema2.schema);
+  if (resolvedSchema == null) {
+    return "unknown";
+  }
   const schemaName = getSchemaName(resolvedSchema) ?? schema2.schema;
   const groupName = getGroupNameForSchema(resolvedSchema);
   const typeWithPrefix = getPrefixedType({
@@ -902563,6 +902589,9 @@ function buildObjectTypeDeclaration({ schema: schema2, context, declarationFile
   const extendedSchemas = [];
   for (const allOf of schema2.allOf) {
     const resolvedSchemaId = getSchemaIdOfResolvedType({ schema: allOf.schema, context });
+    if (resolvedSchemaId == null) {
+      continue;
+    }
     if (schemasToInline.has(allOf.schema) || schemasToInline.has(resolvedSchemaId)) {
       continue;
     }
@@ -902627,6 +902656,9 @@ function buildObjectTypeDeclaration({ schema: schema2, context, declarationFile
 }
 function getAllParentSchemasToInline({ property: property5, schemaId, context }) {
   const schema2 = context.getSchema(schemaId);
+  if (schema2 == null) {
+    return [];
+  }
   if (schema2.type === "reference") {
     return getAllParentSchemasToInline({ property: property5, schemaId: schema2.schema, context });
   }
@@ -902648,6 +902680,9 @@ function getAllParentSchemasToInline({ property: property5, schemaId, context })
 }
 function getProperties(context, schemaId) {
   const schema2 = context.getSchema(schemaId);
+  if (schema2 == null) {
+    return { properties: [], allOf: [] };
+  }
   if (schema2.type === "object") {
     return { properties: schema2.properties, allOf: schema2.allOf };
   } else if (schema2.type === "reference") {
@@ -902819,6 +902854,9 @@ function startsWithNumber(str3) {
 }
 function getSchemaIdOfResolvedType({ schema: schema2, context }) {
   const resolvedSchema = context.getSchema(schema2);
+  if (resolvedSchema == null) {
+    return void 0;
+  }
   if (resolvedSchema.type === "reference") {
     return getSchemaIdOfResolvedType({ context, schema: resolvedSchema.schema });
   }
@@ -908505,7 +908543,7 @@ function replaceWithSchemaReference({ openapi, replaceReference, schemaReference
 }
 
 // pnp:/home/circleci/project/packages/cli/openapi-parser/lib/openapi/v3/generateIr.js
-function generateIr({ openApi, taskContext, disableExamples }) {
+function generateIr({ openApi, taskContext, disableExamples, audiences }) {
   var _a5, _b4, _c4;
   openApi = runResolutions({ openapi: openApi });
   const securitySchemes = Object.fromEntries(Object.entries(((_a5 = openApi.components) == null ? void 0 : _a5.securitySchemes) ?? {}).map(([key2, securityScheme]) => {
@@ -908535,6 +908573,10 @@ function generateIr({ openApi, taskContext, disableExamples }) {
     taskContext.logger.debug(`Converting path ${path34}`);
     const convertedOperations = convertPathItem(path34, pathItem, openApi, context);
     for (const operation of convertedOperations) {
+      const operationAudiences = getAudiences({ operation });
+      if (audiences.length > 0 && !audiences.some((audience) => operationAudiences.includes(audience))) {
+        continue;
+      }
       switch (operation.type) {
         case "async":
           endpointsWithExample.push(operation.sync);
@@ -908743,19 +908785,40 @@ function getAllParentSchemaIds({ schema: schema2, schemas }) {
   }
   return result2;
 }
+function getAudiences({ operation }) {
+  let endpointAudiences = [];
+  switch (operation.type) {
+    case "async":
+      endpointAudiences = operation.async.audiences;
+      break;
+    case "http":
+      endpointAudiences = operation.value.audiences;
+      break;
+    case "streaming":
+      endpointAudiences = operation.streaming.audiences;
+      break;
+    case "webhook":
+      break;
+    default:
+      assertNever(operation);
+  }
+  return endpointAudiences;
+}
 
 // pnp:/home/circleci/project/packages/cli/openapi-parser/lib/openapi/v2/generateIr.js
-async function generateIr2({ openApi, taskContext, disableExamples }) {
+async function generateIr2({ openApi, taskContext, disableExamples, audiences }) {
   const conversionResult = await (0, import_swagger2openapi.convertObj)(openApi, {});
   return generateIr({
     openApi: conversionResult.openapi,
     taskContext,
-    disableExamples
+    disableExamples,
+    audiences
   });
 }
 
 // pnp:/home/circleci/project/packages/cli/openapi-parser/lib/openapi/parse.js
 async function parse3({ workspace, taskContext }) {
+  var _a5, _b4;
   let ir = {
     title: void 0,
     description: void 0,
@@ -908775,6 +908838,7 @@ async function parse3({ workspace, taskContext }) {
     globalHeaders: [],
     groups: {}
   };
+  console.log("workspace.specs", JSON.stringify(workspace.specs));
   for (const spec of workspace.specs) {
     const contents = (await (0, import_promises25.readFile)(spec.absoluteFilepath)).toString();
     if (contents.includes("openapi") || contents.includes("swagger")) {
@@ -908787,14 +908851,16 @@ async function parse3({ workspace, taskContext }) {
         const openapiIr = generateIr({
           openApi: openApiDocument,
           taskContext,
-          disableExamples: false
+          disableExamples: false,
+          audiences: ((_a5 = spec.settings) == null ? void 0 : _a5.audiences) ?? []
         });
         ir = merge3(ir, openapiIr);
       } else if (isOpenApiV2(openApiDocument)) {
         const openapiIr = await generateIr2({
           openApi: openApiDocument,
           taskContext,
-          disableExamples: false
+          disableExamples: false,
+          audiences: ((_b4 = spec.settings) == null ? void 0 : _b4.audiences) ?? []
         });
         ir = merge3(ir, openapiIr);
       }
@@ -908911,7 +908977,9 @@ function buildQueryParameter({ queryParameter, context, fileContainingReference
 function getQueryParameterTypeReference({ schema: schema2, context, fileContainingReference }) {
   if (schema2.type === "reference") {
     const resolvedSchema = context.getSchema(schema2.schema);
-    if (resolvedSchema.type === "array") {
+    if (resolvedSchema == null) {
+      return void 0;
+    } else if (resolvedSchema.type === "array") {
       return {
         value: buildTypeReference({
           schema: Schema2.optional({
@@ -908965,7 +909033,9 @@ function getQueryParameterTypeReference({ schema: schema2, context, fileContaini
   if (schema2.type === "optional" || schema2.type === "nullable") {
     if (schema2.value.type === "reference") {
       const resolvedSchema = context.getSchema(schema2.value.schema);
-      if (resolvedSchema.type === "array") {
+      if (resolvedSchema == null) {
+        return void 0;
+      } else if (resolvedSchema.type === "array") {
         return {
           value: buildTypeReference({
             schema: Schema2.optional({
@@ -909894,7 +909964,7 @@ function getRequest({ declarationFile, context, request, requestNameOverride, ge
   if (request.type === "json") {
     const maybeSchemaId = request.schema.type === "reference" ? request.schema.schema : void 0;
     const resolvedSchema = request.schema.type === "reference" ? context.getSchema(request.schema.schema) : request.schema;
-    if (resolvedSchema.type !== "object" || maybeSchemaId != null && nonRequestReferencedSchemas.includes(maybeSchemaId)) {
+    if ((resolvedSchema == null ? void 0 : resolvedSchema.type) !== "object" || maybeSchemaId != null && nonRequestReferencedSchemas.includes(maybeSchemaId)) {
       const requestTypeReference = buildTypeReference({
         schema: request.schema,
         fileContainingReference: declarationFile,
@@ -910678,13 +910748,6 @@ var OpenApiIrConverterContext = class {
   }
   getSchema(id) {
     const schema2 = this.ir.schemas[id];
-    if (schema2 == null) {
-      this.logger.warn(`Schema with id ${id} not found. Treating as unknown.`);
-      return Schema2.unknown({
-        generatedName: "",
-        nameOverride: void 0
-      });
-    }
     return schema2;
   }
   getOrThrowDefaultServerName() {
@@ -911043,7 +911106,10 @@ async function loadAPIWorkspace({ absolutePathToWorkspace, context, cliVersion,
     for (const definition2 of generatorsConfiguration.api.definitions) {
       specs.push({
         absoluteFilepath: join(absolutePathToWorkspace, RelativeFilePath.of(definition2.path)),
-        absoluteFilepathToOverrides: definition2.overrides != null ? join(absolutePathToWorkspace, RelativeFilePath.of(definition2.overrides)) : void 0
+        absoluteFilepathToOverrides: definition2.overrides != null ? join(absolutePathToWorkspace, RelativeFilePath.of(definition2.overrides)) : void 0,
+        settings: {
+          audiences: definition2.audiences ?? []
+        }
       });
     }
     return {
@@ -914714,10 +914780,10 @@ var CliContext = class {
     return "fern-api";
   }
   getPackageVersion() {
-    if ("0.23.1-rc0" == null) {
+    if ("0.23.1-rc3" == null) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "0.23.1-rc0";
+    return "0.23.1-rc3";
   }
   getCliName() {
     if ("fern" == null) {
@@ -916516,7 +916582,7 @@ function convertAvailability(availability) {
     message: typeof availability !== "string" ? availability.message : void 0
   };
 }
-function getAudiences(schema2) {
+function getAudiences2(schema2) {
   if (typeof schema2 === "string") {
     return [];
   }
@@ -922013,7 +922079,7 @@ async function generateIntermediateRepresentation({ workspace, generationLanguag
             propertiesByAudience: convertedTypeDeclarationWithFilepaths.propertiesByAudience,
             descendantFilepaths: subpackageFilepaths
           });
-          irGraph.markTypeForAudiences(convertedTypeDeclaration.name, getAudiences(typeDeclaration));
+          irGraph.markTypeForAudiences(convertedTypeDeclaration.name, getAudiences2(typeDeclaration));
         }
       },
       errors: (errors) => {
@@ -960138,39 +960204,27 @@ async function runRemoteGenerationForDocsWorkspace({ organization, fernWorkspace
     context.failAndThrow("No instances specified in docs.yml! Cannot register docs.");
     return;
   }
-  if (instances.length === 1 && instances[0] != null) {
-    const instance = instances[0];
-    await context.runInteractiveTask({ name: instance.url }, async () => {
-      await publishDocs({
-        docsWorkspace,
-        customDomains: instance.customDomain != null ? [instance.customDomain] : [],
-        domain: instance.url,
-        token,
-        organization,
-        context,
-        fernWorkspaces,
-        version: "",
-        preview,
-        audiences: instance.audiences,
-        editThisPage: instance.editThisPage,
-        isPrivate: instance.private
-      });
-    });
-    return;
-  }
   if (instances.length > 1 && instanceUrl == null) {
     context.failAndThrow(`More than one docs instances. Please specify one (e.g. --instance ${(_a5 = instances[0]) == null ? void 0 : _a5.url})`);
     return;
   }
-  const maybeInstance = instances.find((instance) => instance.url === instanceUrl);
+  const maybeInstance = instances.find((instance) => instance.url === instanceUrl) ?? instances[0];
   if (maybeInstance == null) {
     context.failAndThrow(`No docs instance with url ${instanceUrl}. Failed to register.`);
     return;
   }
+  const customDomains = [];
+  if (maybeInstance.customDomain != null) {
+    if (typeof maybeInstance.customDomain === "string") {
+      customDomains.push(maybeInstance.customDomain);
+    } else if (Array.isArray(maybeInstance.customDomain)) {
+      customDomains.push(...maybeInstance.customDomain);
+    }
+  }
   await context.runInteractiveTask({ name: maybeInstance.url }, async () => {
     await publishDocs({
       docsWorkspace,
-      customDomains: maybeInstance.customDomain != null ? [maybeInstance.customDomain] : [],
+      customDomains,
       domain: maybeInstance.url,
       token,
       organization,
@@ -962558,6 +962612,19 @@ var GeneratorsConfigurationSchema5 = z.strictObject({
   groups: z.optional(z.record(GeneratorGroupSchema3))
 });
 
+// pnp:/home/circleci/project/packages/cli/yaml/yaml-migrations/lib/migrations/0.15.0-rc0/update-directory-structure/migrateDocsInstances.js
+function migrateDocsInstances(docsURLs) {
+  return docsURLs.map((docsURL) => {
+    if (Array.isArray(docsURL.customDomain)) {
+      throw new Error("Expected custom-domain to be a string, but it was an array.");
+    }
+    return {
+      ...docsURL,
+      customDomain: docsURL.customDomain
+    };
+  });
+}
+
 // pnp:/home/circleci/project/packages/cli/yaml/yaml-migrations/lib/migrations/0.15.0-rc0/update-directory-structure/migrateDocsAndMultipleAPIs.js
 var APIS_DIRECTORY2 = "apis";
 async function migrateDocsAndMultipleAPIs({ absolutePathToFernDirectory, workspaces, workspaceContainingDocs }) {
@@ -962597,7 +962664,7 @@ async function migrateAndWriteDocsYml({ absolutePathToWorkspace, docsURLs, apiNa
   }
   const convertedDocsConfig = convertLegacyDocsConfig({
     docsConfiguration,
-    docsURLs,
+    docsURLs: migrateDocsInstances(docsURLs),
     apiName
   });
   const absolutePathToDocsConfig = getAbsolutePathToDocsYaml({ absolutePathToWorkspace });
@@ -962622,7 +962689,7 @@ async function migrateAndWriteDocsYml2({ absolutePathToWorkspace, docsURLs }) {
   }
   const convertedDocsConfig = convertLegacyDocsConfig({
     docsConfiguration,
-    docsURLs,
+    docsURLs: migrateDocsInstances(docsURLs),
     apiName: void 0
   });
   const absolutePathToDocsConfig = getAbsolutePathToDocsYaml({ absolutePathToWorkspace });

package/package.json

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