fern-api 0.41.1 → 0.41.2

package/bundle.cjs

@@ -1205586,6 +1205586,7 @@ __export(schemas_exports3, {
   WebhookPayloadSchema: () => WebhookPayloadSchema,
   WebhookReferencedPayloadSchema: () => WebhookReferencedPayloadSchema,
   WebhookSchema: () => WebhookSchema,
+  WithAuthSchema: () => WithAuthSchema,
   WithDocsSchema: () => WithDocsSchema,
   WithEnvironmentsSchema: () => WithEnvironmentsSchema,
   WithNameAndDocsSchema: () => WithNameAndDocsSchema,
@@ -1206306,12 +1206307,14 @@ var WithEnvironmentsSchema = z.strictObject({
   "default-environment": z.optional(z.string().or(z.null())),
   environments: z.optional(z.record(z.string(), EnvironmentSchema))
 });
-var RootApiFileSchema = WithEnvironmentsSchema.extend({
+var WithAuthSchema = z.strictObject({
+  auth: z.optional(ApiAuthSchema),
+  "auth-schemes": z.optional(z.record(AuthSchemeDeclarationSchema))
+});
+var RootApiFileSchema = z.strictObject({
   name: z.string(),
   "display-name": z.optional(z.string()),
   imports: z.optional(z.record(z.string())),
-  auth: z.optional(ApiAuthSchema),
-  "auth-schemes": z.optional(z.record(AuthSchemeDeclarationSchema)),
   headers: z.optional(z.record(z.string(), HttpHeaderSchema)),
   "error-discrimination": z.optional(ErrorDiscriminationSchema),
   audiences: z.optional(z.array(z.string())),
@@ -1206323,7 +1206326,7 @@ var RootApiFileSchema = WithEnvironmentsSchema.extend({
   variables: z.optional(z.record(VariableDeclarationSchema)),
   pagination: z.optional(PaginationSchema),
   version: z.optional(VersionDeclarationSchema)
-});
+}).extend(WithEnvironmentsSchema.shape).extend(WithAuthSchema.shape);
 
 // ../fern-definition/schema/lib/utils/RawContainerType.js
 var RawContainerType = {
@@ -1213485,6 +1213488,7 @@ var AsyncAPISchema = z.strictObject({
 });
 var SpecSchema = z.union([OpenAPISpecSchema, AsyncAPISchema]);
 var APIConfigurationV2Schema = schemas_exports3.WithEnvironmentsSchema.extend({
+  auth: z.optional(schemas_exports3.ApiAuthSchema),
   specs: z.array(SpecSchema)
 });
 
@@ -1213759,6 +1213763,7 @@ var API_ORIGIN_LOCATION_KEY = "spec-origin";
 var ASYNC_API_LOCATION_KEY = "async-api";
 var API_SETTINGS_KEY = "api-settings";
 var GeneratorsConfigurationSchema = z.strictObject({
+  "auth-schemes": z.optional(z.record(schemas_exports3.AuthSchemeDeclarationSchema)),
   api: z.optional(APIConfigurationSchema),
   whitelabel: z.optional(WhitelabelConfigurationSchema),
   metadata: z.optional(OutputMetadataSchema),
@@ -1213961,6 +1213966,19 @@ async function parseAPIConfiguration(rawGeneratorsConfiguration) {
   if (apiConfiguration != null && isApiConfigurationV2Schema(apiConfiguration)) {
     return {
       type: "singleNamespace",
+      "auth-schemes": apiConfiguration.auth != null ? Object.fromEntries(Object.entries(rawGeneratorsConfiguration["auth-schemes"] ?? {}).filter(([name2, _4]) => {
+        if (apiConfiguration.auth == null) {
+          return false;
+        }
+        return visitRawApiAuth(apiConfiguration.auth, {
+          any: (any4) => {
+            return any4.any.includes(name2);
+          },
+          single: (single) => {
+            return single === name2;
+          }
+        });
+      })) : void 0,
       ...apiConfiguration,
       definitions: apiConfiguration.specs.map((spec) => {
         if (isOpenAPISchema(spec)) {
@@ -1216775,7 +1216793,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "0.41.1",
+          version: "0.41.2",
           usingAccessToken: true
         }
       });
@@ -1216837,7 +1216855,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "0.41.1",
+        version: "0.41.2",
         ...event,
         ...event.properties
       }
@@ -1221927,10 +1221945,10 @@ var CliContext = class {
     return "fern-api";
   }
   getPackageVersion() {
-    if ("0.41.1" == null) {
+    if ("0.41.2" == null) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "0.41.1";
+    return "0.41.2";
   }
   getCliName() {
     if ("fern" == null) {
@@ -1228059,6 +1228077,18 @@ function getHeaderName(headerWireKey) {
 var BASIC_AUTH_SCHEME = "BasicAuthScheme";
 var BEARER_AUTH_SCHEME = "BearerAuthScheme";
 function buildAuthSchemes(context) {
+  if (context.authOverrides != null) {
+    for (const [name2, declaration] of Object.entries(context.authOverrides["auth-schemes"] ?? {})) {
+      context.builder.addAuthScheme({
+        name: name2,
+        schema: declaration
+      });
+    }
+    if (context.authOverrides.auth != null) {
+      context.builder.setAuth(context.authOverrides.auth);
+    }
+    return;
+  }
   let setAuth = false;
   for (const [id, securityScheme] of Object.entries(context.ir.securitySchemes)) {
     if (securityScheme.type === "basic") {
@@ -1237325,8 +1237355,8 @@ var FernDefinitionBuilderImpl = class {
     }
     this.rootApiFile.audiences.push(name2);
   }
-  setAuth(name2) {
-    this.rootApiFile.auth = name2;
+  setAuth(auth) {
+    this.rootApiFile.auth = auth;
   }
   addAuthScheme({ name: name2, schema: schema2 }) {
     if (this.rootApiFile["auth-schemes"] == null) {
@@ -1237698,15 +1237728,17 @@ var OpenApiIrConverterContext = class {
   ir;
   builder;
   environmentOverrides;
+  authOverrides;
   detectGlobalHeaders;
   defaultServerName = void 0;
-  constructor({ taskContext, ir, enableUniqueErrorsPerEndpoint, detectGlobalHeaders, environmentOverrides }) {
+  constructor({ taskContext, ir, enableUniqueErrorsPerEndpoint, detectGlobalHeaders, environmentOverrides, authOverrides }) {
     this.logger = taskContext.logger;
     this.taskContext = taskContext;
     this.ir = ir;
     this.builder = new FernDefinitionBuilderImpl(ir, false, enableUniqueErrorsPerEndpoint);
     this.detectGlobalHeaders = detectGlobalHeaders;
     this.environmentOverrides = environmentOverrides;
+    this.authOverrides = authOverrides;
   }
   getSchema(id) {
     const schema2 = this.ir.schemas[id];
@@ -1237874,7 +1237906,7 @@ var OSSWorkspace = class extends AbstractAPIWorkspace {
     this.sources = this.convertSpecsToIdentifiableSources(specs);
   }
   async getDefinition({ context, relativePathToDependency }, settings) {
-    var _a6;
+    var _a6, _b4, _c4, _d2, _e, _f;
     const openApiSpecs = await getAllOpenAPISpecs({ context, specs: this.specs, relativePathToDependency });
     const openApiIr = await parse3({
       absoluteFilePathToWorkspace: this.absoluteFilepath,
@@ -1237883,9 +1237915,8 @@ var OSSWorkspace = class extends AbstractAPIWorkspace {
       optionOverrides: getOptionsOverridesFromSettings(settings)
     });
     const definition3 = convert({
-      environmentOverrides: {
-        ...(_a6 = this.generatorsConfiguration) == null ? void 0 : _a6.api
-      },
+      authOverrides: ((_b4 = (_a6 = this.generatorsConfiguration) == null ? void 0 : _a6.api) == null ? void 0 : _b4.auth) != null ? { ...(_c4 = this.generatorsConfiguration) == null ? void 0 : _c4.api } : void 0,
+      environmentOverrides: ((_e = (_d2 = this.generatorsConfiguration) == null ? void 0 : _d2.api) == null ? void 0 : _e.environments) != null ? { ...(_f = this.generatorsConfiguration) == null ? void 0 : _f.api } : void 0,
       taskContext: context,
       ir: openApiIr,
       enableUniqueErrorsPerEndpoint: (settings == null ? void 0 : settings.enableUniqueErrorsPerEndpoint) ?? false,

package/package.json

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