@fern-api/fern-api-dev 5.113.3 → 5.114.0

package/cli.cjs

@@ -131246,7 +131246,8 @@ var init_OpenApiSettingsSchema2 = __esm({
       "disambiguate-request-names": schemas_exports8.boolean().optional(),
       "ignore-tags": schemas_exports8.boolean().optional(),
       "respect-parameter-content": schemas_exports8.boolean().optional(),
-      "respect-per-spec-base-path": schemas_exports8.boolean().optional()
+      "respect-per-spec-base-path": schemas_exports8.boolean().optional(),
+      "namespaced-errors": schemas_exports8.boolean().optional()
     }).extend(BaseApiSettingsSchema);
   }
 });
@@ -132773,7 +132774,8 @@ var init_ConvertOpenAPIOptions = __esm({
       groupEnvironmentsByHost: false,
       multiServerStrategy: generators_yml_exports.MultiServerStrategy.EnvironmentPerServer,
       removeDiscriminantsFromSchemas: generators_yml_exports.RemoveDiscriminantsFromSchemas.Always,
-      inferDefaultEnvironment: true
+      inferDefaultEnvironment: true,
+      namespacedErrors: false
     };
   }
 });
@@ -139927,7 +139929,8 @@ var init_HttpError2 = __esm({
     init_ErrorExample2();
     HttpError = schemas_exports9.objectWithoutOptionalProperties({
       schema: schemas_exports9.lazy(() => Schema2).optional(),
-      examples: schemas_exports9.list(ErrorExample).optional()
+      examples: schemas_exports9.list(ErrorExample).optional(),
+      namespace: schemas_exports9.string().optional()
     }).extend(WithDescription).extend(WithName3).extend(WithSource);
   }
 });
@@ -141767,7 +141770,8 @@ var init_HttpErrorWithExample2 = __esm({
     HttpErrorWithExample = schemas_exports9.objectWithoutOptionalProperties({
       statusCode: StatusCode,
       schema: schemas_exports9.lazy(() => SchemaWithExample2),
-      fullExamples: schemas_exports9.list(NamedFullExample).optional()
+      fullExamples: schemas_exports9.list(NamedFullExample).optional(),
+      namespace: schemas_exports9.string().optional()
     }).extend(WithDescription).extend(WithName3).extend(WithSource);
   }
 });
@@ -143067,18 +143071,16 @@ function isOneOfEqual(a3, b5) {
   return false;
 }
 function isObjectEqual(a3, b5) {
-  if (Object.keys(a3.properties).length !== Object.keys(b5.properties).length) {
+  if (a3.properties.length !== b5.properties.length) {
     return false;
   }
-  const aPropertyMap = Object.fromEntries(a3.properties.map((property24) => {
-    return [property24.key, property24.schema];
-  }));
-  return Object.entries(b5.properties).every(([bPropertyName, bPropertySchema]) => {
-    const aProperty = aPropertyMap[bPropertyName];
-    if (aProperty == null) {
+  const aPropertyMap = new Map(a3.properties.map((property24) => [property24.key, property24.schema]));
+  return b5.properties.every((bProperty) => {
+    const aPropertySchema = aPropertyMap.get(bProperty.key);
+    if (aPropertySchema == null) {
       return false;
     }
-    return isSchemaEqual(aProperty, bPropertySchema.schema);
+    return isSchemaEqual(aPropertySchema, bProperty.schema);
   });
 }
 var init_isSchemaEqual = __esm({
@@ -145655,6 +145657,38 @@ function getNamespaceFromGroup(groupName) {
 function getEndpointNamespace(sdkName, namespaceOverride) {
   return namespaceOverride != null ? namespaceOverride : sdkName?.groupName != null ? getNamespaceFromGroup(sdkName.groupName) : void 0;
 }
+function getErrorNamespace({ endpointNamespace, error: error50, namespacedErrors }) {
+  if (namespacedErrors) {
+    if (error50.namespace != null) {
+      return error50.namespace;
+    }
+    const referenced = unwrapReferencedSchema(error50.schema);
+    if (referenced?.namespace != null) {
+      return referenced.namespace;
+    }
+  }
+  return endpointNamespace;
+}
+function getErrorConflictNamespace({ endpointNamespace, error: error50, namespacedErrors }) {
+  if (!namespacedErrors) {
+    return void 0;
+  }
+  return getErrorNamespace({ endpointNamespace, error: error50, namespacedErrors });
+}
+function unwrapReferencedSchema(schema) {
+  if (schema == null) {
+    return void 0;
+  }
+  switch (schema.type) {
+    case "reference":
+      return schema;
+    case "nullable":
+    case "optional":
+      return unwrapReferencedSchema(schema.value);
+    default:
+      return void 0;
+  }
+}
 var init_getNamespaceFromGroup = __esm({
   "../api-importers/openapi/openapi-ir-to-fern/lib/utils/getNamespaceFromGroup.js"() {
     "use strict";
@@ -147362,9 +147396,14 @@ function buildEndpoint({ endpoint: endpoint3, declarationFile, context: context3
     const errorDeclaration = {
       "status-code": parseInt(statusCode)
     };
+    const errorNamespace = getErrorNamespace({
+      endpointNamespace: maybeEndpointNamespace,
+      error: httpError,
+      namespacedErrors: context3.options.namespacedErrors
+    });
     const errorDeclarationFile = resolveLocationWithNamespace({
       location: ERROR_DECLARATIONS_FILENAME,
-      namespaceOverride: maybeEndpointNamespace
+      namespaceOverride: errorNamespace
     });
     if (httpError.schema != null) {
       const typeReference2 = buildTypeReference({
@@ -147372,7 +147411,7 @@ function buildEndpoint({ endpoint: endpoint3, declarationFile, context: context3
         context: context3,
         fileContainingReference: errorDeclarationFile,
         declarationFile: errorDeclarationFile,
-        namespace: maybeEndpointNamespace,
+        namespace: errorNamespace,
         declarationDepth: 0
       });
       errorDeclaration.type = getTypeFromTypeReference(typeReference2);
@@ -147380,7 +147419,14 @@ function buildEndpoint({ endpoint: endpoint3, declarationFile, context: context3
     }
     context3.builder.addError(errorDeclarationFile, {
       name: errorName,
-      schema: context3.isErrorUnknownSchema(parseInt(statusCode)) ? { ...errorDeclaration, type: "unknown" } : errorDeclaration
+      schema: context3.isErrorUnknownSchema({
+        statusCode: parseInt(statusCode),
+        namespace: getErrorConflictNamespace({
+          endpointNamespace: maybeEndpointNamespace,
+          error: httpError,
+          namespacedErrors: context3.options.namespacedErrors
+        })
+      }) ? { ...errorDeclaration, type: "unknown" } : errorDeclaration
     });
     if (convertedEndpoint.errors == null) {
       convertedEndpoint.errors = [];
@@ -149305,6 +149351,9 @@ var init_lib14 = __esm({
 });
 
 // ../api-importers/openapi/openapi-ir-to-fern/lib/OpenApiIrConverterContext.js
+function getErrorKey({ statusCode, namespace }) {
+  return namespace != null ? `${namespace}:${statusCode}` : `${statusCode}`;
+}
 var OpenApiIrConverterContext;
 var init_OpenApiIrConverterContext = __esm({
   "../api-importers/openapi/openapi-ir-to-fern/lib/OpenApiIrConverterContext.js"() {
@@ -149314,6 +149363,7 @@ var init_OpenApiIrConverterContext = __esm({
     init_lib13();
     init_ConvertOpenAPIOptions();
     init_State();
+    init_getNamespaceFromGroup();
     OpenApiIrConverterContext = class {
       logger;
       taskContext;
@@ -149379,17 +149429,24 @@ var init_OpenApiIrConverterContext = __esm({
         if (ir3.title != null) {
           this.builder.setDisplayName({ displayName: ir3.title });
         }
-        const schemaByStatusCode = {};
+        const schemaByErrorKey = {};
         if (!this.enableUniqueErrorsPerEndpoint) {
           for (const endpoint3 of ir3.endpoints) {
+            const endpointNamespace = getEndpointNamespace(endpoint3.sdkName, endpoint3.namespace);
             for (const [statusCodeString, error50] of Object.entries(endpoint3.errors)) {
               const statusCode = parseInt(statusCodeString);
-              const existingSchema = schemaByStatusCode[statusCode];
+              const namespace = getErrorConflictNamespace({
+                endpointNamespace,
+                error: error50,
+                namespacedErrors: this.options.namespacedErrors
+              });
+              const key2 = getErrorKey({ statusCode, namespace });
+              const existingSchema = schemaByErrorKey[key2];
               if (existingSchema == null && error50.schema != null) {
-                schemaByStatusCode[statusCode] = error50.schema;
+                schemaByErrorKey[key2] = error50.schema;
               } else if (existingSchema != null && error50.schema != null && isSchemaEqual(existingSchema, error50.schema)) {
               } else {
-                this.unknownSchema.add(statusCode);
+                this.unknownSchema.add(key2);
               }
             }
           }
@@ -149434,8 +149491,8 @@ var init_OpenApiIrConverterContext = __esm({
       /**
        * Is error an unknown schema
        */
-      isErrorUnknownSchema(statusCode) {
-        return this.unknownSchema.has(statusCode);
+      isErrorUnknownSchema({ statusCode, namespace }) {
+        return this.unknownSchema.has(getErrorKey({ statusCode, namespace }));
       }
       /**
        * Returns the current endpoint method being processed
@@ -152169,6 +152226,7 @@ var init_BaseOpenAPIWorkspace = __esm({
       defaultIntegerFormat;
       pathParameterOrder;
       coerceConstsTo;
+      namespacedErrors;
       converter;
       constructor(args) {
         super(args);
@@ -152194,6 +152252,7 @@ var init_BaseOpenAPIWorkspace = __esm({
         this.defaultIntegerFormat = args.defaultIntegerFormat;
         this.pathParameterOrder = args.pathParameterOrder;
         this.coerceConstsTo = args.coerceConstsTo;
+        this.namespacedErrors = args.namespacedErrors;
         this.converter = new FernDefinitionConverter(args);
       }
       async getDefinition({ context: context3, absoluteFilePath, relativePathToDependency }, settings) {
@@ -167060,13 +167119,15 @@ function markErrorSchemas({ responses, context: context3, source: source2, names
       context3.logger.warn(`No error name found for status code ${statusCode}`);
       continue;
     }
+    const responseNamespace = getExtension(resolvedResponse, FernOpenAPIExtension.SDK_NAMESPACE);
     errors4[parsedStatusCode] = {
       statusCode: parsedStatusCode,
       nameOverride: void 0,
       generatedName: errorName,
       description: resolvedResponse.description,
-      schema: convertSchema2(mediaObject?.schema ?? {}, false, false, context3, [errorName, "Body"], source2, namespace),
+      schema: convertSchema2(mediaObject?.schema ?? {}, false, false, context3, [errorName, "Body"], source2, responseNamespace ?? namespace),
       fullExamples: mediaObject?.examples,
+      namespace: responseNamespace,
       source: source2
     };
   }
@@ -169148,7 +169209,8 @@ function generateIr({ openApi, taskContext, options: options2, source: source2,
           schema: convertSchemaWithExampleToSchema(error50.schema),
           description: error50.description,
           source: error50.source,
-          examples: examples2
+          examples: examples2,
+          namespace: error50.namespace
         };
       }),
       retries: endpointWithExample.retries,
@@ -200343,7 +200405,8 @@ var init_getAPIDefinitionSettings = __esm({
       disambiguateRequestNames: "disambiguateRequestNames",
       ignoreTags: "ignoreTags",
       respectParameterContent: "respectParameterContent",
-      respectPerSpecBasePath: "respectPerSpecBasePath"
+      respectPerSpecBasePath: "respectPerSpecBasePath",
+      namespacedErrors: "namespacedErrors"
     };
   }
 });
@@ -264966,7 +265029,8 @@ function parseOpenApiDefinitionSettingsSchema(settings) {
     disambiguateRequestNames: settings?.["disambiguate-request-names"],
     ignoreTags: settings?.["ignore-tags"],
     respectParameterContent: settings?.["respect-parameter-content"],
-    respectPerSpecBasePath: settings?.["respect-per-spec-base-path"]
+    respectPerSpecBasePath: settings?.["respect-per-spec-base-path"],
+    namespacedErrors: settings?.["namespaced-errors"]
   };
 }
 function parseAsyncApiDefinitionSettingsSchema(settings) {
@@ -265836,7 +265900,8 @@ var init_convertGeneratorsConfiguration = __esm({
       disambiguateRequestNames: void 0,
       ignoreTags: void 0,
       respectParameterContent: void 0,
-      respectPerSpecBasePath: void 0
+      respectPerSpecBasePath: void 0,
+      namespacedErrors: void 0
     };
   }
 });
@@ -374357,7 +374422,8 @@ var init_OSSWorkspace = __esm({
           inferDefaultEnvironment: collapseSpecBooleanSetting(specs, (s5) => s5?.inferDefaultEnvironment),
           defaultIntegerFormat: specs[0]?.settings?.defaultIntegerFormat,
           pathParameterOrder: specs[0]?.settings?.pathParameterOrder,
-          coerceConstsTo: specs[0]?.settings?.coerceConstsTo
+          coerceConstsTo: specs[0]?.settings?.coerceConstsTo,
+          namespacedErrors: specs.some((spec) => spec.settings?.namespacedErrors)
         });
         this.specs = specs;
         this.allSpecs = allSpecs;
@@ -696945,7 +697011,13 @@ var OpenApiSettingsSchema2 = BaseApiSettingsSchema2.extend({
    * If true, apply each OpenAPI document's plain `x-fern-base-path` to that document's endpoints.
    * Defaults to false.
    */
-  "respect-per-spec-base-path": external_exports.boolean().optional()
+  "respect-per-spec-base-path": external_exports.boolean().optional(),
+  /**
+   * If true, an error whose body schema carries `x-fern-sdk-namespace` is declared in, and shared
+   * within, that namespace instead of the endpoint's namespace.
+   * Defaults to false.
+   */
+  "namespaced-errors": external_exports.boolean().optional()
 });
 
 // ../config/lib/schemas/specs/OpenApiSpecSchema.js
@@ -705536,7 +705608,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "5.113.3",
+          version: "5.114.0",
           usingAccessToken: true,
           ...getRunIdProperties()
         }
@@ -705602,7 +705674,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "5.113.3",
+        version: "5.114.0",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -712421,7 +712493,8 @@ var LegacyApiSpecAdapter = class {
       disambiguateRequestNames: settings["disambiguate-request-names"],
       ignoreTags: settings["ignore-tags"],
       respectParameterContent: settings["respect-parameter-content"],
-      respectPerSpecBasePath: settings["respect-per-spec-base-path"]
+      respectPerSpecBasePath: settings["respect-per-spec-base-path"],
+      namespacedErrors: settings["namespaced-errors"]
     };
     const hasSettings = Object.values(result).some((v3) => v3 != null);
     return hasSettings ? result : void 0;
@@ -885358,6 +885431,7 @@ var SETTINGS_KEY_MAP = {
   "prefer-undiscriminated-unions-with-literals": "preferUndiscriminatedUnionsWithLiterals",
   "object-query-parameters": "objectQueryParameters",
   "respect-readonly-schemas": "respectReadonlySchemas",
+  "namespaced-errors": "namespacedErrors",
   "use-read-variant-for-responses": "useReadVariantForResponses",
   "respect-forward-compatible-enums": "respectForwardCompatibleEnums",
   "respect-optional-request-body": "respectOptionalRequestBody",
@@ -887278,7 +887352,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.113.3";
+  const version7 = "5.114.0";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -914591,7 +914665,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "5.113.3",
+        cliVersion: "5.114.0",
         loginCommand: "fern auth login"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
@@ -981847,7 +981921,7 @@ function getAutomationContextFromEnv() {
     config_branch: process.env.FERN_CONFIG_BRANCH,
     config_pr_number: process.env.FERN_CONFIG_PR_NUMBER,
     trigger: process.env.GITHUB_EVENT_NAME,
-    cli_version: "5.113.3"
+    cli_version: "5.114.0"
   };
 }
 function isAutomationMode() {
@@ -982679,7 +982753,7 @@ var CliContext = class _CliContext {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "5.113.3";
+    return "5.114.0";
   }
   getCliName() {
     if (false) {

package/package.json

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