@fern-api/fern-api-dev 5.75.2 → 5.75.3

package/cli.cjs

@@ -344223,13 +344223,28 @@ function getLiteralValueFromSchema(schema) {
   }
   return void 0;
 }
-var LITERAL_REGEX, ExampleConverter;
+var LITERAL_REGEX, EXAMPLE_CONVERTER_SHARED_STATE, MERGE_ONLY_OBJECT_SCHEMA_FIELDS, ExampleConverter;
 var init_ExampleConverter = __esm({
   "../api-importers/v3-importer-commons/lib/converters/ExampleConverter.js"() {
     "use strict";
     init_lib4();
     init_lib29();
     LITERAL_REGEX = /^literal<\s*(?:"(.*)"|(true|false))\s*>$/;
+    EXAMPLE_CONVERTER_SHARED_STATE = /* @__PURE__ */ new WeakMap();
+    MERGE_ONLY_OBJECT_SCHEMA_FIELDS = /* @__PURE__ */ new Set([
+      "type",
+      "properties",
+      "required",
+      "allOf",
+      "description",
+      "title",
+      "deprecated",
+      "readOnly",
+      "writeOnly",
+      "xml",
+      "externalDocs",
+      "discriminator"
+    ]);
     ExampleConverter = class _ExampleConverter extends AbstractConverter {
       MAX_DEPTH = 12;
       EXAMPLE_STRING = examples_exports.STRING;
@@ -344244,6 +344259,7 @@ var init_ExampleConverter = __esm({
       exampleGenerationStrategy;
       generateOptionalProperties;
       seenRefs;
+      sharedState;
       constructor({ breadcrumbs, context: context3, schema, example, depth = 0, exampleGenerationStrategy, generateOptionalProperties = false, seenRefs = /* @__PURE__ */ new Set() }) {
         super({ breadcrumbs, context: context3 });
         this.example = example;
@@ -344252,6 +344268,16 @@ var init_ExampleConverter = __esm({
         this.exampleGenerationStrategy = exampleGenerationStrategy;
         this.generateOptionalProperties = generateOptionalProperties;
         this.seenRefs = seenRefs;
+        const existingSharedState = EXAMPLE_CONVERTER_SHARED_STATE.get(context3);
+        if (existingSharedState != null) {
+          this.sharedState = existingSharedState;
+        } else {
+          this.sharedState = {
+            mergedAllOfProperties: /* @__PURE__ */ new WeakMap(),
+            mergeOnlyAllOfSchemas: /* @__PURE__ */ new WeakMap()
+          };
+          EXAMPLE_CONVERTER_SHARED_STATE.set(context3, this.sharedState);
+        }
       }
       convert() {
         if (this.depth > this.MAX_DEPTH) {
@@ -344720,7 +344746,8 @@ var init_ExampleConverter = __esm({
           };
         }
         const exampleObj = typeof this.example !== "object" || this.example == null ? {} : this.example;
-        const { mergedProperties, mergedRequired } = this.mergeAllOfProperties(resolvedSchema);
+        const canGenerateFromMergedAllOf = this.example === void 0 && this.canGenerateFromMergedAllOf(resolvedSchema);
+        const { mergedProperties, mergedRequired } = this.mergeAllOfProperties(resolvedSchema, /* @__PURE__ */ new Set(), 0, canGenerateFromMergedAllOf);
         const resultsByKey = Object.entries(mergedProperties).map(([key2, property24]) => {
           if (typeof property24 !== "object") {
             return {
@@ -344830,7 +344857,7 @@ var init_ExampleConverter = __esm({
             return { key: key2, result };
           }
         });
-        const allOfResults = (resolvedSchema.allOf ?? []).map((subSchema, index3) => {
+        const allOfResults = canGenerateFromMergedAllOf ? [] : (resolvedSchema.allOf ?? []).map((subSchema, index3) => {
           const resolvedSubSchema = this.context.resolveMaybeReference({
             schemaOrReference: subSchema,
             breadcrumbs: [...this.breadcrumbs, `allOf[${index3}]`],
@@ -345212,11 +345239,21 @@ var init_ExampleConverter = __esm({
        *
        * Precedence: the override's fields win; the base's fields fill in anything missing.
        */
-      mergeAllOfProperties(resolvedSchema, visited = /* @__PURE__ */ new Set(), depth = 0) {
+      mergeAllOfProperties(resolvedSchema, visited = /* @__PURE__ */ new Set(), depth = 0, useCache = false) {
+        if (useCache) {
+          const cached2 = this.sharedState.mergedAllOfProperties.get(resolvedSchema)?.get(depth);
+          if (cached2 != null) {
+            return cached2;
+          }
+        }
         const directProps = resolvedSchema.properties ?? {};
         const directRequired = resolvedSchema.required ?? [];
         if (depth > this.MAX_DEPTH || resolvedSchema.allOf == null || resolvedSchema.allOf.length === 0) {
-          return { mergedProperties: directProps, mergedRequired: directRequired };
+          const result2 = { mergedProperties: directProps, mergedRequired: directRequired };
+          if (useCache) {
+            this.cacheMergedAllOfProperties(resolvedSchema, depth, result2);
+          }
+          return result2;
         }
         const baseProps = {};
         const baseRequired = new Set(directRequired);
@@ -345238,7 +345275,7 @@ var init_ExampleConverter = __esm({
             if (refKey != null) {
               childVisited.add(refKey);
             }
-            const nested = this.mergeAllOfProperties(resolved, childVisited, depth + 1);
+            const nested = this.mergeAllOfProperties(resolved, childVisited, depth + 1, useCache);
             for (const req of nested.mergedRequired) {
               baseRequired.add(req);
             }
@@ -345292,7 +345329,58 @@ var init_ExampleConverter = __esm({
             merged[key2] = baseProp;
           }
         }
-        return { mergedProperties: merged, mergedRequired: [...baseRequired] };
+        const result = { mergedProperties: merged, mergedRequired: [...baseRequired] };
+        if (useCache) {
+          this.cacheMergedAllOfProperties(resolvedSchema, depth, result);
+        }
+        return result;
+      }
+      cacheMergedAllOfProperties(schema, depth, mergedAllOfProperties) {
+        const cachedByDepth = this.sharedState.mergedAllOfProperties.get(schema);
+        if (cachedByDepth != null) {
+          cachedByDepth.set(depth, mergedAllOfProperties);
+        } else {
+          this.sharedState.mergedAllOfProperties.set(schema, /* @__PURE__ */ new Map([[depth, mergedAllOfProperties]]));
+        }
+      }
+      canGenerateFromMergedAllOf(resolvedSchema, visiting = /* @__PURE__ */ new WeakSet()) {
+        if (resolvedSchema.allOf == null || resolvedSchema.allOf.length === 0) {
+          return false;
+        }
+        if (!this.isMergeOnlyObjectSchema(resolvedSchema)) {
+          return false;
+        }
+        const cached2 = this.sharedState.mergeOnlyAllOfSchemas.get(resolvedSchema);
+        if (cached2 != null) {
+          return cached2;
+        }
+        if (visiting.has(resolvedSchema)) {
+          return false;
+        }
+        visiting.add(resolvedSchema);
+        const canGenerateFromMergedAllOf = resolvedSchema.allOf.every((subSchema) => {
+          const resolved = this.context.resolveMaybeReference({
+            schemaOrReference: subSchema,
+            breadcrumbs: this.breadcrumbs,
+            skipErrorCollector: true
+          });
+          if (resolved == null || !this.isMergeOnlyObjectSchema(resolved)) {
+            return false;
+          }
+          return resolved.allOf == null || resolved.allOf.length === 0 ? true : this.canGenerateFromMergedAllOf(resolved, visiting);
+        });
+        visiting.delete(resolvedSchema);
+        this.sharedState.mergeOnlyAllOfSchemas.set(resolvedSchema, canGenerateFromMergedAllOf);
+        return canGenerateFromMergedAllOf;
+      }
+      isMergeOnlyObjectSchema(schema) {
+        if (schema.type != null && schema.type !== "object") {
+          return false;
+        }
+        if (schema.type == null && schema.properties == null && schema.allOf == null) {
+          return false;
+        }
+        return Object.keys(schema).every((key2) => MERGE_ONLY_OBJECT_SCHEMA_FIELDS.has(key2));
       }
       /**
        * Checks if a schema is a "constraint-only" schema that only has validation constraints
@@ -691061,7 +691149,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "5.75.2",
+          version: "5.75.3",
           usingAccessToken: true,
           ...getRunIdProperties()
         }
@@ -691127,7 +691215,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "5.75.2",
+        version: "5.75.3",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -872228,7 +872316,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.75.2";
+  const version7 = "5.75.3";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -904817,7 +904905,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "5.75.2",
+        cliVersion: "5.75.3",
         loginCommand: "fern auth login"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
@@ -971604,7 +971692,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.75.2"
+    cli_version: "5.75.3"
   };
 }
 function isAutomationMode() {
@@ -972436,7 +972524,7 @@ var CliContext = class _CliContext {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "5.75.2";
+    return "5.75.3";
   }
   getCliName() {
     if (false) {

package/package.json

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