fern-api 0.23.5 → 0.23.7

package/bundle.cjs

@@ -345019,7 +345019,8 @@ var init_WebsocketHandshake2 = __esm({
     init_core3();
     WebsocketHandshake = schemas_exports5.objectWithoutOptionalProperties({
       queryParameters: schemas_exports5.list(schemas_exports5.lazyObject(async () => (await Promise.resolve().then(() => (init_serialization3(), serialization_exports3))).QueryParameter)),
-      headers: schemas_exports5.list(schemas_exports5.lazyObject(async () => (await Promise.resolve().then(() => (init_serialization3(), serialization_exports3))).Header))
+      headers: schemas_exports5.list(schemas_exports5.lazyObject(async () => (await Promise.resolve().then(() => (init_serialization3(), serialization_exports3))).Header)),
+      pathParameters: schemas_exports5.list(schemas_exports5.lazyObject(async () => (await Promise.resolve().then(() => (init_serialization3(), serialization_exports3))).PathParameter))
     });
   }
 });
@@ -345716,6 +345717,7 @@ var init_ObjectProperty4 = __esm({
       schema: schemas_exports5.lazy(async () => (await Promise.resolve().then(() => (init_serialization3(), serialization_exports3))).Schema),
       conflict: schemas_exports5.record(schemas_exports5.lazy(async () => (await Promise.resolve().then(() => (init_serialization3(), serialization_exports3))).SchemaId), schemas_exports5.lazyObject(async () => (await Promise.resolve().then(() => (init_serialization3(), serialization_exports3))).ObjectPropertyConflictInfo)),
       generatedName: schemas_exports5.string(),
+      nameOverride: schemas_exports5.string().optional(),
       audiences: schemas_exports5.list(schemas_exports5.string())
     });
   }
@@ -346373,6 +346375,7 @@ var init_ObjectPropertyWithExample2 = __esm({
       schema: schemas_exports5.lazy(async () => (await Promise.resolve().then(() => (init_serialization3(), serialization_exports3))).SchemaWithExample),
       audiences: schemas_exports5.list(schemas_exports5.string()),
       conflict: schemas_exports5.record(schemas_exports5.lazy(async () => (await Promise.resolve().then(() => (init_serialization3(), serialization_exports3))).SchemaId), schemas_exports5.lazyObject(async () => (await Promise.resolve().then(() => (init_serialization3(), serialization_exports3))).ObjectPropertyConflictInfo)),
+      nameOverride: schemas_exports5.string().optional(),
       generatedName: schemas_exports5.string()
     });
   }
@@ -890696,7 +890699,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "0.23.5",
+          version: "0.23.7",
           usingAccessToken: true
         }
       });
@@ -890758,7 +890761,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "0.23.5",
+        version: "0.23.7",
         ...event,
         ...event.properties
       }
@@ -903034,8 +903037,14 @@ function buildObjectTypeDeclaration({ schema: schema2, context, declarationFile
       context,
       fileContainingReference: declarationFile
     });
-    if (property5.audiences.length > 0) {
-      properties[property5.key] = typeof typeReference === "string" ? { type: typeReference, audiences: property5.audiences } : { ...typeReference, audiences: property5.audiences };
+    const audiences = property5.audiences;
+    const name2 = property5.nameOverride;
+    if (audiences.length > 0 && name2 != null) {
+      properties[property5.key] = typeof typeReference === "string" ? { type: typeReference, audiences, name: name2 } : { ...typeReference, audiences, name: name2 };
+    } else if (name2 != null) {
+      properties[property5.key] = typeof typeReference === "string" ? { type: typeReference, name: name2 } : { ...typeReference, name: name2 };
+    } else if (audiences.length > 0) {
+      properties[property5.key] = typeof typeReference === "string" ? { type: typeReference, audiences } : { ...typeReference, audiences };
     } else {
       properties[property5.key] = typeReference;
     }
@@ -903493,6 +903502,27 @@ function buildHeader({ header, context, fileContainingReference }) {
   return headerSchema;
 }
 
+// pnp:/home/circleci/project/packages/cli/openapi-ir-to-fern/lib/buildPathParameter.js
+function buildPathParameter({ pathParameter, context, fileContainingReference }) {
+  const typeReference = buildTypeReference({
+    schema: pathParameter.schema,
+    context,
+    fileContainingReference
+  });
+  if (pathParameter.variableReference == null && pathParameter.description == null) {
+    return getTypeFromTypeReference(typeReference);
+  }
+  const pathParameterSchema = pathParameter.variableReference != null ? {
+    variable: `$${pathParameter.variableReference}`
+  } : {
+    type: getTypeFromTypeReference(typeReference)
+  };
+  if (pathParameter.description != null) {
+    pathParameterSchema.docs = pathParameter.description;
+  }
+  return pathParameterSchema;
+}
+
 // pnp:/home/circleci/project/packages/cli/openapi-parser/lib/openapi/parse.js
 var import_promises25 = require("fs/promises");
 
@@ -903572,7 +903602,8 @@ var FernOpenAPIExtension = {
   FERN_BEARER_TOKEN: "x-fern-bearer",
   FERN_HEADER_AUTH: "x-fern-header",
   FERN_BASIC_AUTH: "x-fern-basic",
-  FERN_GLOBAL_HEADERS: "x-fern-global-headers"
+  FERN_GLOBAL_HEADERS: "x-fern-global-headers",
+  FERN_PROPERTY_NAME: "x-fern-property-name"
 };
 
 // pnp:/home/circleci/project/packages/cli/openapi-parser/lib/openapi/v3/extensions/getFernEnum.js
@@ -904245,6 +904276,115 @@ function convertNumber({ nameOverride, generatedName, format: format5, descripti
   });
 }
 
+// pnp:/home/circleci/project/packages/cli/openapi-parser/lib/schema/utils/getBreadcrumbsFromReference.js
+var STARTS_WITH_COMPONENTS_SCHEMAS = {
+  isApplicable: (refUnderProcessing) => refUnderProcessing[0] === "#" && refUnderProcessing[1] === "components" && refUnderProcessing[2] === "schemas",
+  applyStrategy: (refUnderProcessing) => {
+    const newBreadcrumbs = [refUnderProcessing[3] ?? ""];
+    return {
+      refUnderProcessing: refUnderProcessing.slice(4),
+      newBreadcrumbs
+    };
+  }
+};
+var STARTS_WITH_COMPONENTS_RESPONSES = {
+  isApplicable: (breadcrumbs) => breadcrumbs[0] === "#" && breadcrumbs[1] === "components" && breadcrumbs[2] === "responses",
+  applyStrategy: (refUnderProcessing) => {
+    const newBreadcrumbs = [refUnderProcessing[3] ?? ""];
+    refUnderProcessing = refUnderProcessing.slice(4);
+    return {
+      refUnderProcessing: refUnderProcessing.slice(4),
+      newBreadcrumbs
+    };
+  }
+};
+var STARTS_WITH_COMPONENTS_PARAMETERS = {
+  isApplicable: (refUnderProcessing) => refUnderProcessing[0] === "#" && refUnderProcessing[1] === "components" && refUnderProcessing[2] === "parameters",
+  applyStrategy: (refUnderProcessing) => {
+    const newBreadcrumbs = [refUnderProcessing[3] ?? ""];
+    refUnderProcessing = refUnderProcessing.slice(4);
+    if (refUnderProcessing[0] === "schema") {
+      refUnderProcessing = refUnderProcessing.slice(1);
+    }
+    return {
+      refUnderProcessing,
+      newBreadcrumbs
+    };
+  }
+};
+var EXTRACT_PROPERTY = {
+  isApplicable: (refUnderProcessing) => refUnderProcessing[0] === "properties",
+  applyStrategy: (refUnderProcessing) => {
+    const newBreadcrumbs = [refUnderProcessing[1] ?? ""];
+    return {
+      refUnderProcessing: refUnderProcessing.slice(2),
+      newBreadcrumbs
+    };
+  }
+};
+var REMOVE_ITEMS_KEYWORD = {
+  isApplicable: (refUnderProcessing) => refUnderProcessing[0] === "items",
+  applyStrategy: (refUnderProcessing) => {
+    return {
+      refUnderProcessing: refUnderProcessing.slice(1),
+      newBreadcrumbs: []
+    };
+  }
+};
+var REMOVE_ALL_OF_KEYWORD = {
+  isApplicable: (refUnderProcessing) => refUnderProcessing[0] === "allOf",
+  applyStrategy: (refUnderProcessing) => {
+    return {
+      refUnderProcessing: refUnderProcessing.slice(1),
+      newBreadcrumbs: []
+    };
+  }
+};
+var REMOVE_ANY_OF_KEYWORD = {
+  isApplicable: (refUnderProcessing) => refUnderProcessing[0] === "anyOf",
+  applyStrategy: (refUnderProcessing) => {
+    return {
+      refUnderProcessing: refUnderProcessing.slice(1),
+      newBreadcrumbs: []
+    };
+  }
+};
+var REMOVE_ONE_OF_KEYWORD = {
+  isApplicable: (refUnderProcessing) => refUnderProcessing[0] === "oneOf",
+  applyStrategy: (refUnderProcessing) => {
+    return {
+      refUnderProcessing: refUnderProcessing.slice(1),
+      newBreadcrumbs: []
+    };
+  }
+};
+function getBreadcrumbsFromReference(reference) {
+  let refUnderProcessing = reference.split("/").map((breadcrumb) => breadcrumb.replace(/~1/g, "/"));
+  let breadcrumbs = [];
+  const strategies = [
+    STARTS_WITH_COMPONENTS_SCHEMAS,
+    STARTS_WITH_COMPONENTS_RESPONSES,
+    STARTS_WITH_COMPONENTS_PARAMETERS,
+    EXTRACT_PROPERTY,
+    REMOVE_ITEMS_KEYWORD,
+    REMOVE_ALL_OF_KEYWORD,
+    REMOVE_ANY_OF_KEYWORD,
+    REMOVE_ONE_OF_KEYWORD
+  ];
+  let previousRefUnderProcessing;
+  do {
+    previousRefUnderProcessing = refUnderProcessing;
+    for (const strategy of strategies) {
+      if (strategy.isApplicable(refUnderProcessing)) {
+        const { refUnderProcessing: newRefUnderProcessing, newBreadcrumbs } = strategy.applyStrategy(refUnderProcessing);
+        refUnderProcessing = newRefUnderProcessing;
+        breadcrumbs = [...breadcrumbs, ...newBreadcrumbs];
+      }
+    }
+  } while (refUnderProcessing.join("") !== previousRefUnderProcessing.join(""));
+  return breadcrumbs;
+}
+
 // pnp:/home/circleci/project/packages/cli/openapi-parser/lib/schema/utils/getSchemaName.js
 function getGeneratedTypeName(breadcrumbs) {
   const underscoreDelimeted = breadcrumbs.join("_");
@@ -904415,7 +904555,8 @@ function convertToObjectProperty(objectProperty) {
     generatedName: objectProperty.generatedName,
     key: objectProperty.key,
     schema: convertSchemaWithExampleToSchema(objectProperty.schema),
-    audiences: objectProperty.audiences
+    audiences: objectProperty.audiences,
+    nameOverride: objectProperty.nameOverride
   };
 }
 
@@ -904492,115 +904633,6 @@ function isObjectEqual(a2, b2) {
   });
 }
 
-// pnp:/home/circleci/project/packages/cli/openapi-parser/lib/schema/utils/getBreadcrumbsFromReference.js
-var STARTS_WITH_COMPONENTS_SCHEMAS = {
-  isApplicable: (refUnderProcessing) => refUnderProcessing[0] === "#" && refUnderProcessing[1] === "components" && refUnderProcessing[2] === "schemas",
-  applyStrategy: (refUnderProcessing) => {
-    const newBreadcrumbs = [refUnderProcessing[3] ?? ""];
-    return {
-      refUnderProcessing: refUnderProcessing.slice(4),
-      newBreadcrumbs
-    };
-  }
-};
-var STARTS_WITH_COMPONENTS_RESPONSES = {
-  isApplicable: (breadcrumbs) => breadcrumbs[0] === "#" && breadcrumbs[1] === "components" && breadcrumbs[2] === "responses",
-  applyStrategy: (refUnderProcessing) => {
-    const newBreadcrumbs = [refUnderProcessing[3] ?? ""];
-    refUnderProcessing = refUnderProcessing.slice(4);
-    return {
-      refUnderProcessing: refUnderProcessing.slice(4),
-      newBreadcrumbs
-    };
-  }
-};
-var STARTS_WITH_COMPONENTS_PARAMETERS = {
-  isApplicable: (refUnderProcessing) => refUnderProcessing[0] === "#" && refUnderProcessing[1] === "components" && refUnderProcessing[2] === "parameters",
-  applyStrategy: (refUnderProcessing) => {
-    const newBreadcrumbs = [refUnderProcessing[3] ?? ""];
-    refUnderProcessing = refUnderProcessing.slice(4);
-    if (refUnderProcessing[0] === "schema") {
-      refUnderProcessing = refUnderProcessing.slice(1);
-    }
-    return {
-      refUnderProcessing,
-      newBreadcrumbs
-    };
-  }
-};
-var EXTRACT_PROPERTY = {
-  isApplicable: (refUnderProcessing) => refUnderProcessing[0] === "properties",
-  applyStrategy: (refUnderProcessing) => {
-    const newBreadcrumbs = [refUnderProcessing[1] ?? ""];
-    return {
-      refUnderProcessing: refUnderProcessing.slice(2),
-      newBreadcrumbs
-    };
-  }
-};
-var REMOVE_ITEMS_KEYWORD = {
-  isApplicable: (refUnderProcessing) => refUnderProcessing[0] === "items",
-  applyStrategy: (refUnderProcessing) => {
-    return {
-      refUnderProcessing: refUnderProcessing.slice(1),
-      newBreadcrumbs: []
-    };
-  }
-};
-var REMOVE_ALL_OF_KEYWORD = {
-  isApplicable: (refUnderProcessing) => refUnderProcessing[0] === "allOf",
-  applyStrategy: (refUnderProcessing) => {
-    return {
-      refUnderProcessing: refUnderProcessing.slice(1),
-      newBreadcrumbs: []
-    };
-  }
-};
-var REMOVE_ANY_OF_KEYWORD = {
-  isApplicable: (refUnderProcessing) => refUnderProcessing[0] === "anyOf",
-  applyStrategy: (refUnderProcessing) => {
-    return {
-      refUnderProcessing: refUnderProcessing.slice(1),
-      newBreadcrumbs: []
-    };
-  }
-};
-var REMOVE_ONE_OF_KEYWORD = {
-  isApplicable: (refUnderProcessing) => refUnderProcessing[0] === "oneOf",
-  applyStrategy: (refUnderProcessing) => {
-    return {
-      refUnderProcessing: refUnderProcessing.slice(1),
-      newBreadcrumbs: []
-    };
-  }
-};
-function getBreadcrumbsFromReference(reference) {
-  let refUnderProcessing = reference.split("/").map((breadcrumb) => breadcrumb.replace(/~1/g, "/"));
-  let breadcrumbs = [];
-  const strategies = [
-    STARTS_WITH_COMPONENTS_SCHEMAS,
-    STARTS_WITH_COMPONENTS_RESPONSES,
-    STARTS_WITH_COMPONENTS_PARAMETERS,
-    EXTRACT_PROPERTY,
-    REMOVE_ITEMS_KEYWORD,
-    REMOVE_ALL_OF_KEYWORD,
-    REMOVE_ANY_OF_KEYWORD,
-    REMOVE_ONE_OF_KEYWORD
-  ];
-  let previousRefUnderProcessing;
-  do {
-    previousRefUnderProcessing = refUnderProcessing;
-    for (const strategy of strategies) {
-      if (strategy.isApplicable(refUnderProcessing)) {
-        const { refUnderProcessing: newRefUnderProcessing, newBreadcrumbs } = strategy.applyStrategy(refUnderProcessing);
-        refUnderProcessing = newRefUnderProcessing;
-        breadcrumbs = [...breadcrumbs, ...newBreadcrumbs];
-      }
-    }
-  } while (refUnderProcessing.join("") !== previousRefUnderProcessing.join(""));
-  return breadcrumbs;
-}
-
 // pnp:/home/circleci/project/packages/cli/openapi-parser/lib/schema/convertObject.js
 function convertObject({ nameOverride, generatedName, breadcrumbs, properties, description, required, wrapAsNullable, allOf, context, propertiesToExclude, groupName, fullExamples }) {
   const allRequired = [...required ?? []];
@@ -904684,6 +904716,7 @@ function convertObject({ nameOverride, generatedName, breadcrumbs, properties, d
   const convertedProperties = Object.entries(propertiesToConvert).map(([propertyName, propertySchema]) => {
     const isRequired = allRequired.includes(propertyName);
     const audiences = getExtension(propertySchema, FernOpenAPIExtension.AUDIENCES) ?? [];
+    const propertyNameOverride = getExtension(propertySchema, FernOpenAPIExtension.FERN_PROPERTY_NAME);
     const propertyBreadcrumbs = [...breadcrumbs, propertyName];
     const generatedName2 = getGeneratedPropertyName(propertyBreadcrumbs);
     const schema2 = isRequired ? convertSchema(propertySchema, false, context, propertyBreadcrumbs) : SchemaWithExample.optional({
@@ -904705,6 +904738,7 @@ function convertObject({ nameOverride, generatedName, breadcrumbs, properties, d
     return {
       key: propertyName,
       schema: schema2,
+      nameOverride: propertyNameOverride,
       audiences,
       conflict: conflicts,
       generatedName: getGeneratedPropertyName([...breadcrumbs, propertyName])
@@ -905368,7 +905402,7 @@ function convertSchemaObject(schema2, wrapAsNullable, context, breadcrumbs, prop
     for (const allOf of schema2.allOf ?? []) {
       if (isReferenceObject(allOf)) {
         filteredAllOfs.push(allOf);
-      } else if (Object.keys(allOf).length > 0) {
+      } else if (Object.keys(allOf).length > 0 && Object.keys(allOf).includes("type")) {
         filteredAllOfs.push(allOf);
       }
     }
@@ -906519,7 +906553,8 @@ function convertToObjectProperty2(objectProperty) {
     generatedName: objectProperty.generatedName,
     key: objectProperty.key,
     schema: convertSchemaToSchemaWithExample(objectProperty.schema),
-    audiences: objectProperty.audiences
+    audiences: objectProperty.audiences,
+    nameOverride: objectProperty.nameOverride
   };
 }
 
@@ -906937,7 +906972,8 @@ function convertMultipartRequestToSchema(request) {
         schema: convertSchemaToSchemaWithExample(property5.schema.value),
         audiences: [],
         conflict: {},
-        generatedName: property5.key
+        generatedName: property5.key,
+        nameOverride: void 0
       };
     }).filter(isNonNullish),
     allOf: [],
@@ -907189,6 +907225,28 @@ function parseAsyncAPI({ document: document6, taskContext }) {
       context.logger.error(`Channel ${channelPath} does not have websocket bindings. Skipping.`);
       continue;
     }
+    const pathParameters = [];
+    if (channel.parameters != null) {
+      for (const [name2, parameter] of Object.entries(channel.parameters ?? {})) {
+        pathParameters.push({
+          name: name2,
+          description: parameter.description,
+          schema: parameter.schema != null ? convertSchema(parameter.schema, false, context, breadcrumbs) : SchemaWithExample.primitive({
+            schema: PrimitiveSchemaValueWithExample.string({
+              example: void 0,
+              format: void 0,
+              maxLength: void 0,
+              minLength: void 0
+            }),
+            description: void 0,
+            generatedName: "",
+            groupName: void 0,
+            nameOverride: void 0
+          }),
+          variableReference: void 0
+        });
+      }
+    }
     const headers = [];
     if (channel.bindings.ws.headers != null) {
       const required = channel.bindings.ws.headers.required ?? [];
@@ -907276,6 +907334,12 @@ function parseAsyncAPI({ document: document6, taskContext }) {
               ...param,
               schema: convertSchemaWithExampleToSchema(param.schema)
             };
+          }),
+          pathParameters: pathParameters.map((param) => {
+            return {
+              ...param,
+              schema: convertSchemaWithExampleToSchema(param.schema)
+            };
           })
         },
         groupName: (tag == null ? void 0 : tag.name) != null ? [tag.name] : ["Websocket"],
@@ -909728,6 +909792,19 @@ function buildChannel({ channel, context, declarationFile }) {
   if (channel.summary != null) {
     convertedChannel["display-name"] = channel.summary;
   }
+  const pathParameters = {};
+  if (channel.handshake.pathParameters.length > 0) {
+    for (const pathParameter of channel.handshake.pathParameters) {
+      pathParameters[pathParameter.name] = buildPathParameter({
+        pathParameter,
+        context,
+        fileContainingReference: declarationFile
+      });
+    }
+  }
+  if (Object.keys(pathParameters).length > 0) {
+    convertedChannel["path-parameters"] = pathParameters;
+  }
   const queryParameters = {};
   if (channel.handshake.queryParameters.length > 0) {
     for (const queryParameter of channel.handshake.queryParameters) {
@@ -910118,27 +910195,6 @@ function convertLiteralExample2(literal2) {
   }
 }
 
-// pnp:/home/circleci/project/packages/cli/openapi-ir-to-fern/lib/buildPathParameter.js
-function buildPathParameter({ pathParameter, context, fileContainingReference }) {
-  const typeReference = buildTypeReference({
-    schema: pathParameter.schema,
-    context,
-    fileContainingReference
-  });
-  if (pathParameter.variableReference == null && pathParameter.description == null) {
-    return getTypeFromTypeReference(typeReference);
-  }
-  const pathParameterSchema = pathParameter.variableReference != null ? {
-    variable: `$${pathParameter.variableReference}`
-  } : {
-    type: getTypeFromTypeReference(typeReference)
-  };
-  if (pathParameter.description != null) {
-    pathParameterSchema.docs = pathParameter.description;
-  }
-  return pathParameterSchema;
-}
-
 // pnp:/home/circleci/project/packages/cli/openapi-ir-to-fern/lib/utils/convertToHttpMethod.js
 function convertToHttpMethod(httpMethod) {
   return HttpMethod5._visit(httpMethod, {
@@ -915217,10 +915273,10 @@ var CliContext = class {
     return "fern-api";
   }
   getPackageVersion() {
-    if ("0.23.5" == null) {
+    if ("0.23.7" == null) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "0.23.5";
+    return "0.23.7";
   }
   getCliName() {
     if ("fern" == null) {

package/package.json

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