@fern-api/fern-api-dev 5.23.3-372-g237c4d96421 → 5.23.3-375-gb6a6467a47e

package/cli.cjs

@@ -589242,7 +589242,7 @@ var GeneratorName = {
   STOPLIGHT: "fernapi/fern-stoplight",
   POSTMAN: "fernapi/fern-postman",
   OPENAPI_PYTHON_CLIENT: "fernapi/openapi-python-client",
-  CLI: "fernapi/fern-cli"
+  CLI: "fernapi/fern-cli-generator"
 };
 
 // ../configuration-loader/lib/generators-yml/addGenerator.js
@@ -649843,8 +649843,8 @@ var OR_KEYS = ["deprecated", "readOnly", "writeOnly", "uniqueItems", "nullable"]
 var MAX_OF_MINS_KEYS = ["minimum", "exclusiveMinimum", "minLength", "minItems", "minProperties"];
 var MIN_OF_MAXS_KEYS = ["maximum", "exclusiveMaximum", "maxLength", "maxItems", "maxProperties"];
 var SKIP_FROM_CHILDREN = ["allOf", "oneOf", "anyOf"];
-function mergeAllOfSchemas(outerSchema, elements) {
-  const flatElements = flattenNestedAllOf(elements);
+function mergeAllOfSchemas(outerSchema, elements, resolveRef4) {
+  const flatElements = flattenNestedAllOf(elements, resolveRef4);
   let result = {};
   for (const element4 of flatElements) {
     result = mergeSchemaElement(result, element4);
@@ -649852,13 +649852,32 @@ function mergeAllOfSchemas(outerSchema, elements) {
   applyOuterSchema(result, outerSchema);
   return result;
 }
-function flattenNestedAllOf(elements) {
+function flattenNestedAllOf(elements, resolveRef4, visitedRefs) {
+  const visited = visitedRefs ?? /* @__PURE__ */ new Set();
   const flat = [];
   for (const element4 of elements) {
     if (Array.isArray(element4.allOf) && element4.allOf.length > 0) {
       const { allOf, ...sibling2 } = element4;
-      const schemaChildren = allOf.filter((child) => !("$ref" in child));
-      flat.push(...flattenNestedAllOf(schemaChildren));
+      const schemaChildren = [];
+      for (const child of allOf) {
+        if ("$ref" in child) {
+          if (resolveRef4 == null) {
+            continue;
+          }
+          const refPath = child.$ref;
+          if (visited.has(refPath)) {
+            continue;
+          }
+          visited.add(refPath);
+          const resolved = resolveRef4(child);
+          if (resolved != null) {
+            schemaChildren.push(resolved);
+          }
+        } else {
+          schemaChildren.push(child);
+        }
+      }
+      flat.push(...flattenNestedAllOf(schemaChildren, resolveRef4, visited));
       if (Object.keys(sibling2).length > 0) {
         flat.push(sibling2);
       }
@@ -651256,7 +651275,16 @@ var SchemaConverter = class _SchemaConverter extends AbstractConverter {
       if (hasCycle) {
         return void 0;
       }
-      const mergedSchema = mergeAllOfSchemas(this.schema, resolvedElements);
+      const mergedSchema = mergeAllOfSchemas(this.schema, resolvedElements, (ref2) => {
+        const resolved = this.context.resolveMaybeReference({
+          schemaOrReference: ref2,
+          breadcrumbs: this.breadcrumbs
+        });
+        if (resolved != null && this.context.isReferenceObject(resolved)) {
+          return void 0;
+        }
+        return resolved;
+      });
       const allResolvedRefs = /* @__PURE__ */ new Set([...this.visitedRefs, ...localResolvedRefs]);
       const mergedConverter = new _SchemaConverter({
         context: this.context,
@@ -669505,7 +669533,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "5.23.3-372-g237c4d96421",
+          version: "5.23.3-375-gb6a6467a47e",
           usingAccessToken: true,
           ...getRunIdProperties()
         }
@@ -669569,7 +669597,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "5.23.3-372-g237c4d96421",
+        version: "5.23.3-375-gb6a6467a47e",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -675129,7 +675157,7 @@ var DOCKER_IMAGE_TO_GENERATOR_ID = {
   "fernapi/fern-swift-model": "swift-model",
   "fernapi/fern-postman": "postman",
   "fernapi/fern-openapi": "openapi",
-  "fernapi/fern-cli": "cli"
+  "fernapi/fern-cli-generator": "cli"
 };
 var DOCKER_IMAGE_TO_CHANGELOG_URL = {
   "fernapi/fern-typescript-sdk": "https://buildwithfern.com/learn/sdks/generators/typescript/changelog",
@@ -676948,7 +676976,7 @@ var MINIMUM_SUPPORTED_IR_VERSION = 53;
 
 // ../generation/ir-migrations/lib/generatorVersionMap.js
 var GENERATOR_MINIMUM_VERSIONS = {
-  "fernapi/fern-cli": "0.0.1",
+  "fernapi/fern-cli-generator": "0.0.1",
   "fernapi/fern-csharp-model": "0.0.2",
   "fernapi/fern-csharp-sdk": "0.5.0",
   "fernapi/fern-express": "0.17.3",
@@ -861010,7 +861038,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.23.3-372-g237c4d96421";
+  const version7 = "5.23.3-375-gb6a6467a47e";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -891985,7 +892013,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "5.23.3-372-g237c4d96421",
+        cliVersion: "5.23.3-375-gb6a6467a47e",
         loginCommand: "fern auth login"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
@@ -895590,7 +895618,7 @@ var CONTAINER_SOURCES_DIRECTORY = DOCKER_SOURCES_DIRECTORY;
 var DOCKER_SPECS_DIRECTORY = import_path84.default.join(DOCKER_FERN_DIRECTORY, SPECS_DIRECTORY_NAME);
 var CONTAINER_SPECS_DIRECTORY = DOCKER_SPECS_DIRECTORY;
 var DEFAULT_NODE_DEBUG_PORT = "9229";
-var GENERATORS_WANTING_SPECS = /* @__PURE__ */ new Set(["fernapi/fern-cli"]);
+var GENERATORS_WANTING_SPECS = /* @__PURE__ */ new Set(["fernapi/fern-cli-generator"]);
 function generatorWantsSpecs(generatorName) {
   return GENERATORS_WANTING_SPECS.has(generatorName);
 }
@@ -957072,7 +957100,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.23.3-372-g237c4d96421"
+    cli_version: "5.23.3-375-gb6a6467a47e"
   };
 }
 function isAutomationMode() {
@@ -957898,7 +957926,7 @@ var CliContext = class _CliContext {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "5.23.3-372-g237c4d96421";
+    return "5.23.3-375-gb6a6467a47e";
   }
   getCliName() {
     if (false) {

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "5.23.3-372-g237c4d96421",
+  "version": "5.23.3-375-gb6a6467a47e",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/fern-api/fern.git",