@fern-api/fern-api-dev 5.23.3-369-gd40ae18d3a4 → 5.23.3-372-g237c4d96421

package/cli.cjs

@@ -576868,6 +576868,14 @@ function inferCommonPropertiesFromVariants({ variants, discriminant: discriminan
   if (firstVariantProps == null) {
     return [];
   }
+  const inheritedFromSharedParent = getPropertyNamesInheritedFromSharedAllOfRefParents({
+    variants,
+    context: context3,
+    breadcrumbs,
+    source: source2,
+    namespace
+  });
+  const variantRequiredSets = variants.map((variant) => getAllRequiredPropertyNames({ schema: variant, context: context3, visited: /* @__PURE__ */ new Set() }));
   const result = [];
   for (const [propertyName, firstSchema] of Object.entries(firstVariantProps)) {
     if (propertyName === discriminant22) {
@@ -576876,6 +576884,9 @@ function inferCommonPropertiesFromVariants({ variants, discriminant: discriminan
     if (existingPropertyNames.has(propertyName)) {
       continue;
     }
+    if (inheritedFromSharedParent.has(propertyName)) {
+      continue;
+    }
     let presentInAll = true;
     for (let i9 = 1; i9 < variantPropertyMaps.length; i9++) {
       const map16 = variantPropertyMaps[i9];
@@ -576885,8 +576896,106 @@ function inferCommonPropertiesFromVariants({ variants, discriminant: discriminan
         break;
       }
     }
-    if (presentInAll) {
-      result.push({ key: propertyName, schema: firstSchema });
+    if (!presentInAll) {
+      continue;
+    }
+    const requiredInEveryVariant = variantRequiredSets.every((set27) => set27.has(propertyName));
+    const schemaToLift = requiredInEveryVariant || firstSchema.type === "optional" || firstSchema.type === "nullable" ? firstSchema : SchemaWithExample.optional({
+      nameOverride: void 0,
+      generatedName: "",
+      title: void 0,
+      value: firstSchema,
+      description: void 0,
+      availability: void 0,
+      namespace: void 0,
+      groupName: void 0,
+      inline: void 0
+    });
+    result.push({ key: propertyName, schema: schemaToLift });
+  }
+  return result;
+}
+function getAllRequiredPropertyNames({ schema: schema2, context: context3, visited }) {
+  const result = /* @__PURE__ */ new Set();
+  let resolved;
+  if (isReferenceObject(schema2)) {
+    if (visited.has(schema2.$ref)) {
+      return result;
+    }
+    visited.add(schema2.$ref);
+    resolved = context3.resolveSchemaReference(schema2);
+  } else {
+    resolved = schema2;
+  }
+  for (const name2 of resolved.required ?? []) {
+    result.add(name2);
+  }
+  for (const allOfElement of resolved.allOf ?? []) {
+    const childRequired = getAllRequiredPropertyNames({ schema: allOfElement, context: context3, visited });
+    for (const name2 of childRequired) {
+      result.add(name2);
+    }
+  }
+  return result;
+}
+function getPropertyNamesInheritedFromSharedAllOfRefParents({ variants, context: context3, breadcrumbs, source: source2, namespace }) {
+  if (variants.length === 0) {
+    return /* @__PURE__ */ new Set();
+  }
+  const refsPerVariant = variants.map((variant) => collectTransitiveAllOfRefs({ schema: variant, context: context3, visited: /* @__PURE__ */ new Set() }));
+  const firstSet = refsPerVariant[0];
+  if (firstSet == null || firstSet.size === 0) {
+    return /* @__PURE__ */ new Set();
+  }
+  const inherited = /* @__PURE__ */ new Set();
+  for (const [refKey, refObject] of firstSet) {
+    const sharedAcrossAllVariants = refsPerVariant.every((s9) => s9.has(refKey));
+    if (!sharedAcrossAllVariants) {
+      continue;
+    }
+    const parentProperties = getAllProperties({
+      schema: refObject,
+      context: context3,
+      breadcrumbs,
+      source: source2,
+      namespace
+    });
+    for (const propertyName of Object.keys(parentProperties)) {
+      inherited.add(propertyName);
+    }
+  }
+  return inherited;
+}
+function collectTransitiveAllOfRefs({ schema: schema2, context: context3, visited }) {
+  const result = /* @__PURE__ */ new Map();
+  let resolved;
+  if (isReferenceObject(schema2)) {
+    if (visited.has(schema2.$ref)) {
+      return result;
+    }
+    visited.add(schema2.$ref);
+    resolved = context3.resolveSchemaReference(schema2);
+  } else {
+    resolved = schema2;
+  }
+  for (const allOfElement of resolved.allOf ?? []) {
+    if (isReferenceObject(allOfElement)) {
+      if (!result.has(allOfElement.$ref)) {
+        result.set(allOfElement.$ref, allOfElement);
+      }
+      const nested = collectTransitiveAllOfRefs({ schema: allOfElement, context: context3, visited });
+      for (const [k5, v9] of nested) {
+        if (!result.has(k5)) {
+          result.set(k5, v9);
+        }
+      }
+    } else {
+      const nested = collectTransitiveAllOfRefs({ schema: allOfElement, context: context3, visited });
+      for (const [k5, v9] of nested) {
+        if (!result.has(k5)) {
+          result.set(k5, v9);
+        }
+      }
     }
   }
   return result;
@@ -669396,7 +669505,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "5.23.3-369-gd40ae18d3a4",
+          version: "5.23.3-372-g237c4d96421",
           usingAccessToken: true,
           ...getRunIdProperties()
         }
@@ -669460,7 +669569,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "5.23.3-369-gd40ae18d3a4",
+        version: "5.23.3-372-g237c4d96421",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -860901,7 +861010,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-369-gd40ae18d3a4";
+  const version7 = "5.23.3-372-g237c4d96421";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -891876,7 +891985,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "5.23.3-369-gd40ae18d3a4",
+        cliVersion: "5.23.3-372-g237c4d96421",
         loginCommand: "fern auth login"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
@@ -944174,6 +944283,7 @@ var LocalTaskHandler = class {
     const pathsToPreserve = await this.getPathsToPreserve(fernIgnorePaths);
     await (0, import_promises129.cp)(this.absolutePathToLocalOutput, tmpOutputResolutionDir, { recursive: true });
     await this.runThrowawayGitCommand(["init"], tmpOutputResolutionDir);
+    await this.runThrowawayGitCommand(["config", "gc.auto", "0"], tmpOutputResolutionDir);
     await this.runThrowawayGitCommand(["add", "."], tmpOutputResolutionDir);
     await this.runThrowawayGitCommand([
       "-c",
@@ -944192,7 +944302,12 @@ var LocalTaskHandler = class {
     await this.runThrowawayGitCommand(["reset", "--", ...pathsToPreserve], tmpOutputResolutionDir);
     await this.runThrowawayGitCommand(["clean", "-fd", "--", ...pathsToPreserve], tmpOutputResolutionDir);
     await this.runThrowawayGitCommand(["restore", "."], tmpOutputResolutionDir);
-    await (0, import_promises129.rm)(join8(tmpOutputResolutionDir, RelativeFilePath2.of(".git")), { recursive: true });
+    await (0, import_promises129.rm)(join8(tmpOutputResolutionDir, RelativeFilePath2.of(".git")), {
+      recursive: true,
+      force: true,
+      maxRetries: 3,
+      retryDelay: 100
+    });
     await (0, import_promises129.rm)(this.absolutePathToLocalOutput, { recursive: true });
     await (0, import_promises129.cp)(tmpOutputResolutionDir, this.absolutePathToLocalOutput, { recursive: true });
   }
@@ -956957,7 +957072,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-369-gd40ae18d3a4"
+    cli_version: "5.23.3-372-g237c4d96421"
   };
 }
 function isAutomationMode() {
@@ -957783,7 +957898,7 @@ var CliContext = class _CliContext {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "5.23.3-369-gd40ae18d3a4";
+    return "5.23.3-372-g237c4d96421";
   }
   getCliName() {
     if (false) {

package/package.json

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