fern-api 0.19.0-rc4 → 0.19.0-rc5

package/bundle.cjs

@@ -357355,7 +357355,8 @@ var init_GlobalHeader2 = __esm({
       header: schemas_exports4.string(),
       name: schemas_exports4.string().optional(),
       optional: schemas_exports4.boolean().optional(),
-      env: schemas_exports4.string().optional()
+      env: schemas_exports4.string().optional(),
+      schema: schemas_exports4.lazy(async () => (await Promise.resolve().then(() => (init_serialization3(), serialization_exports3))).Schema).optional()
     });
   }
 });
@@ -799137,7 +799138,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "0.19.0-rc4",
+          version: "0.19.0-rc5",
           usingAccessToken: true
         }
       });
@@ -799199,7 +799200,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "0.19.0-rc4",
+        version: "0.19.0-rc5",
         ...event,
         ...event.properties
       }
@@ -812057,11 +812058,20 @@ function getFernEnum(schema2) {
 // pnp:/home/circleci/project/packages/cli/openapi-parser/lib/openapi/v3/extensions/getFernTypeExtension.js
 function getFernTypeExtension({ nameOverride, generatedName, schema: schema2, description }) {
   const groupName = getExtension(schema2, FernOpenAPIExtension.SDK_GROUP_NAME);
-  const typeDefinition = getExtension(schema2, FernOpenAPIExtension.TYPE_DEFINITION);
-  if (typeDefinition == null) {
+  const fernType = getExtension(schema2, FernOpenAPIExtension.TYPE_DEFINITION);
+  if (fernType == null) {
     return;
   }
-  return recursivelyVisitRawTypeReference(typeDefinition, {
+  return getSchemaFromFernType({
+    fernType,
+    nameOverride,
+    generatedName,
+    description,
+    groupName
+  });
+}
+function getSchemaFromFernType({ fernType, nameOverride, generatedName, description, groupName }) {
+  return recursivelyVisitRawTypeReference(fernType, {
     primitive: (primitive) => {
       switch (primitive) {
         case "BASE_64":
@@ -816434,7 +816444,21 @@ function convertToError({ statusCode, errorBodyCollector, context }) {
 
 // pnp:/home/circleci/project/packages/cli/openapi-parser/lib/openapi/v3/extensions/getGlobalHeaders.js
 function getGlobalHeaders(document4) {
-  return getExtension(document4, FernOpenAPIExtension.FERN_GLOBAL_HEADERS);
+  const globalHeaders = getExtension(document4, FernOpenAPIExtension.FERN_GLOBAL_HEADERS);
+  const result2 = [];
+  for (const header of globalHeaders ?? []) {
+    result2.push({
+      ...header,
+      schema: header.type != null ? getSchemaFromFernType({
+        fernType: header.type,
+        description: void 0,
+        generatedName: header.name ?? header.header,
+        groupName: void 0,
+        nameOverride: void 0
+      }) : void 0
+    });
+  }
+  return result2;
 }
 
 // pnp:/home/circleci/project/packages/cli/openapi-parser/lib/openapi/v3/extensions/getVariableDefinitions.js
@@ -817404,107 +817428,6 @@ function buildEnvironments(context) {
   }
 }
 
-// pnp:/home/circleci/project/packages/cli/openapi-ir-to-fern/lib/utils/getEndpointLocation.js
-function getEndpointLocation(endpoint) {
-  if (endpoint.sdkName != null) {
-    const filename = endpoint.sdkName.groupName.length === 0 ? "__package__.yml" : `${endpoint.sdkName.groupName.map((part) => camelCase_default(part)).join("/")}.yml`;
-    return {
-      file: RelativeFilePath.of(filename),
-      endpointId: endpoint.sdkName.methodName
-    };
-  }
-  const tag = endpoint.tags[0];
-  const operationId = endpoint.operationId;
-  if (operationId == null) {
-    if (tag != null) {
-      return {
-        file: RelativeFilePath.of(`${camelCase_default(tag)}.yml`),
-        endpointId: endpoint.summary != null ? camelCase_default(endpoint.summary) : camelCase_default(`${endpoint.method}_${endpoint.path.split("/").join("_")}`)
-      };
-    }
-    if (endpoint.summary != null) {
-      return {
-        file: RelativeFilePath.of(FERN_PACKAGE_MARKER_FILENAME),
-        endpointId: camelCase_default(endpoint.summary)
-      };
-    }
-    return {
-      file: RelativeFilePath.of(FERN_PACKAGE_MARKER_FILENAME),
-      endpointId: camelCase_default(`${endpoint.method}_${endpoint.path.split("/").join("_")}`)
-    };
-  }
-  if (tag == null) {
-    return {
-      file: RelativeFilePath.of(FERN_PACKAGE_MARKER_FILENAME),
-      endpointId: operationId
-    };
-  }
-  const tagTokens = tokenizeString(tag);
-  const operationIdTokens = tokenizeString(operationId);
-  if (isEqual_default(tagTokens, operationIdTokens)) {
-    return {
-      file: RelativeFilePath.of("__package__.yml"),
-      endpointId: tag
-    };
-  }
-  const fastapiEndpointLocation = maybeGetFastApiEndpointLocation({
-    operationId,
-    tag,
-    path: endpoint.path,
-    method: endpoint.method
-  });
-  if (fastapiEndpointLocation != null) {
-    return fastapiEndpointLocation;
-  }
-  const fileParts = [];
-  for (let i2 = 0; i2 < tagTokens.length; ++i2) {
-    const tagElement = tagTokens[i2];
-    if (tagElement != null && tagElement === operationIdTokens[i2]) {
-      fileParts.push(tagElement);
-    } else {
-      const camelCasedTag = camelCase_default(tag);
-      return {
-        file: RelativeFilePath.of(`${camelCasedTag}.yml`),
-        endpointId: operationId,
-        tag
-      };
-    }
-  }
-  if (fileParts.length >= operationIdTokens.length) {
-    throw new Error(`Cannot get file for endpoint ${JSON.stringify(endpoint)}`);
-  }
-  return {
-    file: RelativeFilePath.of(camelCase_default(fileParts.join("_")) + ".yml"),
-    endpointId: camelCase_default(operationIdTokens.slice(fileParts.length).join("_")),
-    tag
-  };
-}
-function tokenizeString(input) {
-  let tokens;
-  if (/^[a-z]+(?:[A-Z][a-z]+)*$/.test(input)) {
-    tokens = input.split(/(?=[A-Z])/);
-  } else {
-    tokens = input.split(/[^a-zA-Z0-9]+/);
-  }
-  tokens = tokens.map((token) => token.toLowerCase());
-  tokens = compact_default(tokens);
-  return tokens;
-}
-var NON_ALPHANUMERIC_EXCEPT_BRACES_REGEX = new RegExp("[^a-zA-Z0-9{}]+");
-var BRACE_REGEX = new RegExp("[{}]", "g");
-function maybeGetFastApiEndpointLocation({ operationId, tag, path: path33, method: method2 }) {
-  const pathSegment = path33.split(NON_ALPHANUMERIC_EXCEPT_BRACES_REGEX).join("_").replaceAll(BRACE_REGEX, "_");
-  const operationIdSuffix = `${pathSegment}_${method2.toLowerCase()}`;
-  if (operationId.endsWith(operationIdSuffix)) {
-    return {
-      file: RelativeFilePath.of(camelCase_default(tag) + ".yml"),
-      endpointId: camelCase_default(operationId.slice(0, -1 * operationIdSuffix.length)),
-      tag
-    };
-  }
-  return void 0;
-}
-
 // pnp:/home/circleci/project/packages/cli/openapi-ir-to-fern/lib/utils/wrapTypeReferenceAsOptional.js
 function wrapTypeReferenceAsOptional(typeReference) {
   const type2 = getTypeFromTypeReference(typeReference);
@@ -817532,17 +817455,22 @@ var GLOBAL_HEADER_PERCENTAGE_THRESHOLD = 0.75;
 var HEADERS_TO_IGNORE = new Set(...["Authorization"]);
 function buildGlobalHeaders(context) {
   var _a2;
+  const predefinedGlobalHeaders = new Map((_a2 = context.ir.globalHeaders) == null ? void 0 : _a2.map((header) => [header.header, header]));
   const globalHeaders = {};
   for (const endpoint of context.ir.endpoints) {
     for (const header of endpoint.headers) {
       if (HEADERS_TO_IGNORE.has(header.name)) {
         continue;
       }
-      const { file } = getEndpointLocation(endpoint);
       let headerWithCount = globalHeaders[header.name];
       if (headerWithCount == null) {
+        const predefinedHeader = predefinedGlobalHeaders.get(header.name);
         const convertedHeader = buildHeader({
-          header,
+          header: {
+            ...header,
+            schema: (predefinedHeader == null ? void 0 : predefinedHeader.schema) ?? header.schema,
+            name: (predefinedHeader == null ? void 0 : predefinedHeader.name) ?? header.name
+          },
           fileContainingReference: RelativeFilePath.of(ROOT_API_FILENAME),
           context
         });
@@ -817553,21 +817481,24 @@ function buildGlobalHeaders(context) {
     }
   }
   const globalHeaderThreshold = context.ir.endpoints.length * GLOBAL_HEADER_PERCENTAGE_THRESHOLD;
-  const predefinedGlobalHeaders = new Map((_a2 = context.ir.globalHeaders) == null ? void 0 : _a2.map((header) => [header.header, header]));
   for (const [headerName, header] of Object.entries(globalHeaders)) {
     const predefinedHeader = predefinedGlobalHeaders.get(headerName);
     let isRequired = header.count === context.ir.endpoints.length;
     const isOptional = header.count >= globalHeaderThreshold;
-    if (predefinedHeader !== void 0) {
+    if (predefinedHeader != null) {
       isRequired = isRequired && predefinedHeader.optional !== true || predefinedHeader.optional === false;
-      const convertedHeaderSchema = typeof header.schema === "string" ? header.schema : {
-        ...header.schema,
-        name: predefinedHeader.name ?? header.schema.name,
-        env: predefinedHeader.env ?? header.schema.env
-      };
+      let schema2;
+      if (typeof header.schema === "string") {
+        schema2 = header.schema;
+      } else {
+        schema2 = {
+          ...header.schema,
+          env: predefinedHeader.env ?? header.schema.env
+        };
+      }
       context.builder.addGlobalHeader({
         name: headerName,
-        schema: isRequired ? convertedHeaderSchema : wrapTypeReferenceAsOptional(convertedHeaderSchema)
+        schema: isRequired ? schema2 : wrapTypeReferenceAsOptional(schema2)
       });
     } else if (isRequired) {
       context.builder.addGlobalHeader({
@@ -818093,6 +818024,107 @@ function getRequest({ declarationFile, context, request, requestNameOverride, ge
   }
 }
 
+// pnp:/home/circleci/project/packages/cli/openapi-ir-to-fern/lib/utils/getEndpointLocation.js
+function getEndpointLocation(endpoint) {
+  if (endpoint.sdkName != null) {
+    const filename = endpoint.sdkName.groupName.length === 0 ? "__package__.yml" : `${endpoint.sdkName.groupName.map((part) => camelCase_default(part)).join("/")}.yml`;
+    return {
+      file: RelativeFilePath.of(filename),
+      endpointId: endpoint.sdkName.methodName
+    };
+  }
+  const tag = endpoint.tags[0];
+  const operationId = endpoint.operationId;
+  if (operationId == null) {
+    if (tag != null) {
+      return {
+        file: RelativeFilePath.of(`${camelCase_default(tag)}.yml`),
+        endpointId: endpoint.summary != null ? camelCase_default(endpoint.summary) : camelCase_default(`${endpoint.method}_${endpoint.path.split("/").join("_")}`)
+      };
+    }
+    if (endpoint.summary != null) {
+      return {
+        file: RelativeFilePath.of(FERN_PACKAGE_MARKER_FILENAME),
+        endpointId: camelCase_default(endpoint.summary)
+      };
+    }
+    return {
+      file: RelativeFilePath.of(FERN_PACKAGE_MARKER_FILENAME),
+      endpointId: camelCase_default(`${endpoint.method}_${endpoint.path.split("/").join("_")}`)
+    };
+  }
+  if (tag == null) {
+    return {
+      file: RelativeFilePath.of(FERN_PACKAGE_MARKER_FILENAME),
+      endpointId: operationId
+    };
+  }
+  const tagTokens = tokenizeString(tag);
+  const operationIdTokens = tokenizeString(operationId);
+  if (isEqual_default(tagTokens, operationIdTokens)) {
+    return {
+      file: RelativeFilePath.of("__package__.yml"),
+      endpointId: tag
+    };
+  }
+  const fastapiEndpointLocation = maybeGetFastApiEndpointLocation({
+    operationId,
+    tag,
+    path: endpoint.path,
+    method: endpoint.method
+  });
+  if (fastapiEndpointLocation != null) {
+    return fastapiEndpointLocation;
+  }
+  const fileParts = [];
+  for (let i2 = 0; i2 < tagTokens.length; ++i2) {
+    const tagElement = tagTokens[i2];
+    if (tagElement != null && tagElement === operationIdTokens[i2]) {
+      fileParts.push(tagElement);
+    } else {
+      const camelCasedTag = camelCase_default(tag);
+      return {
+        file: RelativeFilePath.of(`${camelCasedTag}.yml`),
+        endpointId: operationId,
+        tag
+      };
+    }
+  }
+  if (fileParts.length >= operationIdTokens.length) {
+    throw new Error(`Cannot get file for endpoint ${JSON.stringify(endpoint)}`);
+  }
+  return {
+    file: RelativeFilePath.of(camelCase_default(fileParts.join("_")) + ".yml"),
+    endpointId: camelCase_default(operationIdTokens.slice(fileParts.length).join("_")),
+    tag
+  };
+}
+function tokenizeString(input) {
+  let tokens;
+  if (/^[a-z]+(?:[A-Z][a-z]+)*$/.test(input)) {
+    tokens = input.split(/(?=[A-Z])/);
+  } else {
+    tokens = input.split(/[^a-zA-Z0-9]+/);
+  }
+  tokens = tokens.map((token) => token.toLowerCase());
+  tokens = compact_default(tokens);
+  return tokens;
+}
+var NON_ALPHANUMERIC_EXCEPT_BRACES_REGEX = new RegExp("[^a-zA-Z0-9{}]+");
+var BRACE_REGEX = new RegExp("[{}]", "g");
+function maybeGetFastApiEndpointLocation({ operationId, tag, path: path33, method: method2 }) {
+  const pathSegment = path33.split(NON_ALPHANUMERIC_EXCEPT_BRACES_REGEX).join("_").replaceAll(BRACE_REGEX, "_");
+  const operationIdSuffix = `${pathSegment}_${method2.toLowerCase()}`;
+  if (operationId.endsWith(operationIdSuffix)) {
+    return {
+      file: RelativeFilePath.of(camelCase_default(tag) + ".yml"),
+      endpointId: camelCase_default(operationId.slice(0, -1 * operationIdSuffix.length)),
+      tag
+    };
+  }
+  return void 0;
+}
+
 // pnp:/home/circleci/project/packages/cli/openapi-ir-to-fern/lib/buildServices.js
 function buildServices(context) {
   const sdkGroups = /* @__PURE__ */ new Set();
@@ -825914,10 +825946,10 @@ var CliContext = class {
     return "fern-api";
   }
   getPackageVersion() {
-    if ("0.19.0-rc4" == null) {
+    if ("0.19.0-rc5" == null) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "0.19.0-rc4";
+    return "0.19.0-rc5";
   }
   getCliName() {
     if ("fern" == null) {

package/package.json

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