fern-api 0.19.18 → 0.19.19

package/bundle.cjs

@@ -832299,7 +832299,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "0.19.18",
+          version: "0.19.19",
           usingAccessToken: true
         }
       });
@@ -832361,7 +832361,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "0.19.18",
+        version: "0.19.19",
         ...event,
         ...event.properties
       }
@@ -846024,6 +846024,115 @@ 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 ?? []];
@@ -846061,6 +846170,9 @@ function convertObject({ nameOverride, generatedName, breadcrumbs, properties, d
         continue;
       }
       const schemaId = getSchemaIdFromReference(allOfElement);
+      if (schemaId == null) {
+        continue;
+      }
       parents.push({
         schemaId,
         convertedSchema: convertToReferencedSchema(allOfElement, [schemaId]),
@@ -846191,7 +846303,7 @@ function wrapObject({ nameOverride, generatedName, wrapAsNullable, properties, d
 }
 function getAllProperties({ schema: schema2, context, breadcrumbs }) {
   let properties = {};
-  const [resolvedSchema, resolvedBreadCrumbs] = isReferenceObject(schema2) ? [context.resolveSchemaReference(schema2), [getSchemaIdFromReference(schema2)]] : [schema2, breadcrumbs];
+  const [resolvedSchema, resolvedBreadCrumbs] = isReferenceObject(schema2) ? [context.resolveSchemaReference(schema2), getBreadcrumbsFromReference(schema2.$ref)] : [schema2, breadcrumbs];
   for (const allOfElement of resolvedSchema.allOf ?? []) {
     properties = {
       ...properties,
@@ -846370,12 +846482,16 @@ function getExamplesString(schema2) {
 var SCHEMA_REFERENCE_PREFIX = "#/components/schemas/";
 function convertSchema(schema2, wrapAsNullable, context, breadcrumbs, referencedAsRequest = false, propertiesToExclude = /* @__PURE__ */ new Set()) {
   if (isReferenceObject(schema2)) {
-    if (!referencedAsRequest) {
-      context.markSchemaAsReferencedByNonRequest(getSchemaIdFromReference(schema2));
-    } else {
-      context.markSchemaAsReferencedByRequest(getSchemaIdFromReference(schema2));
+    const schemaId = getSchemaIdFromReference(schema2);
+    if (schemaId != null) {
+      if (!referencedAsRequest) {
+        context.markSchemaAsReferencedByNonRequest(schemaId);
+      } else {
+        context.markSchemaAsReferencedByRequest(schemaId);
+      }
+      return convertReferenceObject(schema2, wrapAsNullable, context, breadcrumbs);
     }
-    return convertReferenceObject(schema2, wrapAsNullable, context, breadcrumbs);
+    return convertSchemaObject(context.resolveSchemaReference(schema2), wrapAsNullable, context, getBreadcrumbsFromReference(schema2.$ref), propertiesToExclude, referencedAsRequest);
   } else {
     return convertSchemaObject(schema2, wrapAsNullable, context, breadcrumbs, propertiesToExclude, referencedAsRequest);
   }
@@ -846837,7 +846953,7 @@ function convertSchemaObject(schema2, wrapAsNullable, context, breadcrumbs, prop
 }
 function getSchemaIdFromReference(ref2) {
   if (!ref2.$ref.startsWith(SCHEMA_REFERENCE_PREFIX)) {
-    throw new Error(`Cannot get schema id from reference: ${ref2.$ref}`);
+    return void 0;
   }
   return ref2.$ref.replace(SCHEMA_REFERENCE_PREFIX, "");
 }
@@ -846845,10 +846961,14 @@ function convertToReferencedSchema(schema2, breadcrumbs) {
   const nameOverride = getExtension(schema2, FernOpenAPIExtension.TYPE_NAME);
   const generatedName = getGeneratedTypeName(breadcrumbs);
   const description = schema2.description;
+  const schemaId = getSchemaIdFromReference(schema2);
+  if (schemaId == null) {
+    throw new Error(`Invalid schema reference ${JSON.stringify(schema2)}`);
+  }
   return Schema2.reference({
     generatedName,
     nameOverride,
-    schema: getSchemaIdFromReference(schema2),
+    schema: schemaId,
     description: description ?? void 0,
     groupName: void 0
   });
@@ -848467,6 +848587,9 @@ function resolveSchema(schema2, document4) {
     throw new Error(`Failed to resolve schema reference because of unsupported prefix: ${schema2.$ref}`);
   }
   const schemaId = getSchemaIdFromReference(schema2);
+  if (schemaId == null) {
+    throw new Error(`Failed to resolve schema reference because missing schema id: ${schema2.$ref}`);
+  }
   const resolvedSchema = (_b2 = (_a2 = document4.components) == null ? void 0 : _a2.schemas) == null ? void 0 : _b2[schemaId];
   if (resolvedSchema == null) {
     throw new Error(`Failed to resolve schema reference because missing: ${schema2.$ref}`);
@@ -848582,32 +848705,20 @@ var AbstractOpenAPIV3ParserContext = class {
     return this.refOccurrences[schema2.$ref] ?? 0;
   }
   resolveSchemaReference(schema2) {
-    var _a2;
-    if (this.document.components == null || this.document.components.schemas == null || !schema2.$ref.startsWith(SCHEMA_REFERENCE_PREFIX)) {
-      throw new Error(`Failed to resolve ${schema2.$ref}`);
-    }
-    const schemaKey = schema2.$ref.substring(SCHEMA_REFERENCE_PREFIX.length);
-    const splitSchemaKey = schemaKey.split("/");
-    if (splitSchemaKey[0] == null) {
-      throw new Error(`${schema2.$ref} is undefined`);
+    const keys7 = schema2.$ref.substring(2).split("/").map((key2) => key2.replace(/~1/g, "/"));
+    let resolvedSchema = this.document;
+    for (const key2 of keys7) {
+      if (typeof resolvedSchema !== "object" || resolvedSchema == null) {
+        throw new Error(`Failed to resolve ${schema2.$ref}`);
+      }
+      resolvedSchema = resolvedSchema[key2];
     }
-    let resolvedSchema = this.document.components.schemas[splitSchemaKey[0]];
     if (resolvedSchema == null) {
-      throw new Error(`${splitSchemaKey[0]} is undefined`);
+      throw new Error(`Failed to resolve ${schema2.$ref}`);
     }
     if (isReferenceObject(resolvedSchema)) {
       resolvedSchema = this.resolveSchemaReference(resolvedSchema);
     }
-    if (splitSchemaKey[1] === "properties" && splitSchemaKey[2] != null) {
-      const resolvedProperty = (_a2 = resolvedSchema.properties) == null ? void 0 : _a2[splitSchemaKey[2]];
-      if (resolvedProperty == null) {
-        throw new Error(`${schema2.$ref} is undefiened. Property does not exist on object.`);
-      } else if (isReferenceObject(resolvedProperty)) {
-        resolvedSchema = this.resolveSchemaReference(resolvedProperty);
-      } else {
-        resolvedSchema = resolvedProperty;
-      }
-    }
     return resolvedSchema;
   }
   resolveParameterReference(parameter) {
@@ -849197,7 +849308,10 @@ function convertStreamingOperation({ operationContext, context, streamingExtensi
         isStreaming: true
       });
       if ((streamingRequestBody == null ? void 0 : streamingRequestBody.schemaReference) != null) {
-        context.excludeSchema(getSchemaIdFromReference(streamingRequestBody.schemaReference));
+        const schemaId = getSchemaIdFromReference(streamingRequestBody.schemaReference);
+        if (schemaId != null) {
+          context.excludeSchema(schemaId);
+        }
       }
       const streamingResponses = getResponses({
         operation: operationContext.operation,
@@ -855966,10 +856080,10 @@ var CliContext = class {
     return "fern-api";
   }
   getPackageVersion() {
-    if ("0.19.18" == null) {
+    if ("0.19.19" == null) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "0.19.18";
+    return "0.19.19";
   }
   getCliName() {
     if ("fern" == null) {

package/package.json

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