@fern-api/fern-api-dev 5.70.2 → 5.71.0

package/cli.cjs

@@ -75088,7 +75088,8 @@ var init_DiscriminatedUnionType2 = __esm({
     DiscriminatedUnionType = schemas_exports3.objectWithoutOptionalProperties({
       declaration: Declaration2,
       discriminant: NameAndWireValue2,
-      types: schemas_exports3.record(schemas_exports3.string(), SingleDiscriminatedUnionType2)
+      types: schemas_exports3.record(schemas_exports3.string(), SingleDiscriminatedUnionType2),
+      inheritedBaseProperties: schemas_exports3.list(NameAndWireValue2).optional()
     });
   }
 });
@@ -75114,6 +75115,7 @@ var init_ObjectType2 = __esm({
   "../../ir-sdk/lib/sdk/serialization/resources/dynamic/resources/types/types/ObjectType.js"() {
     "use strict";
     init_core2();
+    init_NameAndWireValue4();
     init_TypeId4();
     init_Declaration4();
     init_NamedParameter2();
@@ -75121,7 +75123,8 @@ var init_ObjectType2 = __esm({
       declaration: Declaration2,
       properties: schemas_exports3.list(NamedParameter),
       extends: schemas_exports3.list(TypeId2).optional(),
-      additionalProperties: schemas_exports3.boolean().optional()
+      additionalProperties: schemas_exports3.boolean().optional(),
+      deferredUnionBaseProperties: schemas_exports3.list(NameAndWireValue2).optional()
     });
   }
 });
@@ -80451,13 +80454,15 @@ var init_ObjectTypeDeclaration2 = __esm({
   "../../ir-sdk/lib/sdk/serialization/resources/types/types/ObjectTypeDeclaration.js"() {
     "use strict";
     init_core2();
+    init_NameAndWireValue3();
     init_DeclaredTypeName2();
     init_ObjectProperty2();
     ObjectTypeDeclaration = schemas_exports3.objectWithoutOptionalProperties({
       extends: schemas_exports3.list(DeclaredTypeName),
       properties: schemas_exports3.list(ObjectProperty),
       extendedProperties: schemas_exports3.list(ObjectProperty).optional(),
-      extraProperties: schemas_exports3.property("extra-properties", schemas_exports3.boolean())
+      extraProperties: schemas_exports3.property("extra-properties", schemas_exports3.boolean()),
+      deferredUnionBaseProperties: schemas_exports3.list(NameAndWireValue).optional()
     });
   }
 });
@@ -80572,6 +80577,7 @@ var init_UnionTypeDeclaration2 = __esm({
   "../../ir-sdk/lib/sdk/serialization/resources/types/types/UnionTypeDeclaration.js"() {
     "use strict";
     init_core2();
+    init_NameAndWireValue3();
     init_NameAndWireValueOrString3();
     init_DeclaredTypeName2();
     init_ObjectProperty2();
@@ -80582,6 +80588,7 @@ var init_UnionTypeDeclaration2 = __esm({
       extends: schemas_exports3.list(DeclaredTypeName),
       types: schemas_exports3.list(SingleUnionType),
       baseProperties: schemas_exports3.list(ObjectProperty),
+      inheritedBaseProperties: schemas_exports3.list(NameAndWireValue).optional(),
       default: SingleUnionType.optional(),
       discriminatorContext: UnionDiscriminatorContext4.optional()
     });
@@ -262030,7 +262037,15 @@ function computeName(inputName, opts, config5) {
         return word2;
       }).join("") + nameTrailing);
     }
-    const smartSnakeFn = (n2) => n2.split(" ").map((part) => part.split(/(\d+)/).map(snakeCase_default).join("")).join("_");
+    const smartSnakeFn = (n2) => n2.split(" ").map((part) => {
+      const segments = part.split(/(\d+)/);
+      return segments.map((segment, index3) => {
+        const casedSegment = snakeCase_default(segment);
+        const previousSegment = segments[index3 - 1];
+        const startsNewWord = casedSegment !== "" && previousSegment != null && /^\d+$/.test(previousSegment) && /^[^a-z0-9]/.test(segment);
+        return startsNewWord ? `_${casedSegment}` : casedSegment;
+      }).join("");
+    }).join("_");
     snakeCaseName = preserve ? withUnderscorePreservation(name2, smartSnakeFn) : smartSnakeFn(name2);
   }
   return {
@@ -267946,7 +267961,9 @@ function convertObjectTypeDeclaration({ object: object23, file: file4 }) {
     extends: getExtensionsAsList(object23.extends).map((extended) => parseTypeName({ typeName: extended, file: file4 })),
     properties: getObjectPropertiesFromRawObjectSchema(object23, file4),
     extraProperties: object23["extra-properties"] ?? false,
-    extendedProperties: void 0
+    extendedProperties: void 0,
+    // Populated by the computeUnionBasePropertyDedupe post-build pass; undefined here.
+    deferredUnionBaseProperties: void 0
   });
 }
 function getObjectPropertiesFromRawObjectSchema(object23, file4) {
@@ -268751,6 +268768,9 @@ function convertDiscriminatedUnionTypeDeclaration({ union: union23, file: file4,
         autogeneratedExamples: {}
       }
     })) : [],
+    // Populated by the computeUnionBasePropertyDedupe post-build pass once the full types map
+    // is assembled; initialized empty here.
+    inheritedBaseProperties: [],
     types: unionTypes,
     default: defaultUnionType,
     discriminatorContext: getDiscriminatorContext({ union: union23 })
@@ -272470,15 +272490,18 @@ var init_DynamicSnippetsConverter = __esm({
           declaration,
           properties: properties7,
           extends_: extendsTypeIds,
-          additionalProperties: object23.extraProperties
+          additionalProperties: object23.extraProperties,
+          deferredUnionBaseProperties: object23.deferredUnionBaseProperties
         });
       }
-      convertObjectProperties({ declaration, properties: properties7, extends_, additionalProperties: additionalProperties7 }) {
+      convertObjectProperties({ declaration, properties: properties7, extends_, additionalProperties: additionalProperties7, deferredUnionBaseProperties }) {
         return dynamic_exports.NamedType.object({
           declaration,
           properties: this.convertBodyPropertiesToParameters({ properties: properties7 }),
           extends: extends_,
-          additionalProperties: additionalProperties7
+          additionalProperties: additionalProperties7,
+          // Mirror the pre-computed regular-IR fact; computed once by the IR generator, never here.
+          deferredUnionBaseProperties: deferredUnionBaseProperties?.map((property24) => this.inflateNameAndWireValue(property24))
         });
       }
       convertDiscriminatedUnion({ declaration, union: union23 }) {
@@ -272486,6 +272509,8 @@ var init_DynamicSnippetsConverter = __esm({
         return dynamic_exports.NamedType.discriminatedUnion({
           declaration,
           discriminant: this.inflateNameAndWireValue(union23.discriminant),
+          // Mirror the pre-computed regular-IR fact; computed once by the IR generator, never here.
+          inheritedBaseProperties: (union23.inheritedBaseProperties ?? []).map((property24) => this.inflateNameAndWireValue(property24)),
           types: Object.fromEntries(union23.types.map((unionType2) => [
             getWireValue(unionType2.discriminantValue),
             this.convertDiscriminatedUnionType({
@@ -274883,7 +274908,9 @@ function convertGenericTypeDeclaration({ generic, file: file4, typeResolver }) {
       extends: newExtends,
       properties: getObjectPropertiesFromRawObjectSchema({ properties: Object.fromEntries(newProperties) }, file4),
       extraProperties: resolvedBaseGeneric.declaration["extra-properties"] ?? false,
-      extendedProperties: void 0
+      extendedProperties: void 0,
+      // Populated by the computeUnionBasePropertyDedupe post-build pass; undefined here.
+      deferredUnionBaseProperties: void 0
     });
   }
   throw new CliError({
@@ -276683,6 +276710,303 @@ var init_VariableResolver = __esm({
   }
 });
 
+// ../generation/ir-generator/lib/union-base-properties/computeUnionBasePropertyDedupe.js
+function collectApiSurfaceTypeReferences(value2, into) {
+  if (Array.isArray(value2)) {
+    for (const item of value2) {
+      collectApiSurfaceTypeReferences(item, into);
+    }
+    return;
+  }
+  if (value2 == null || typeof value2 !== "object") {
+    return;
+  }
+  for (const [key2, child] of Object.entries(value2)) {
+    if (EXAMPLE_KEYS.has(key2)) {
+      continue;
+    }
+    if (key2 === "typeId" && typeof child === "string") {
+      into.add(child);
+      continue;
+    }
+    collectApiSurfaceTypeReferences(child, into);
+  }
+}
+function extractNamedTypeIds(typeReference2, types4, visited) {
+  switch (typeReference2.type) {
+    case "named": {
+      const ids = [typeReference2.typeId];
+      const declaration = types4[typeReference2.typeId];
+      if (declaration?.shape.type === "alias" && !visited.has(typeReference2.typeId)) {
+        visited.add(typeReference2.typeId);
+        ids.push(...extractNamedTypeIds(declaration.shape.aliasOf, types4, visited));
+      }
+      return ids;
+    }
+    case "container":
+      switch (typeReference2.container.type) {
+        case "list":
+          return extractNamedTypeIds(typeReference2.container.list, types4, visited);
+        case "set":
+          return extractNamedTypeIds(typeReference2.container.set, types4, visited);
+        case "map":
+          return [
+            ...extractNamedTypeIds(typeReference2.container.keyType, types4, visited),
+            ...extractNamedTypeIds(typeReference2.container.valueType, types4, visited)
+          ];
+        case "optional":
+          return extractNamedTypeIds(typeReference2.container.optional, types4, visited);
+        case "nullable":
+          return extractNamedTypeIds(typeReference2.container.nullable, types4, visited);
+        case "literal":
+          return [];
+        default:
+          return [];
+      }
+    case "primitive":
+    case "unknown":
+      return [];
+    default:
+      return [];
+  }
+}
+function getOutgoingTypeReferences(typeDeclaration2, types4) {
+  const variantEdges = [];
+  const nonVariantEdges = [];
+  const addNonVariant = (typeReference2) => {
+    nonVariantEdges.push(...extractNamedTypeIds(typeReference2, types4, /* @__PURE__ */ new Set()));
+  };
+  typeDeclaration2.shape._visit({
+    alias: (alias2) => {
+      addNonVariant(alias2.aliasOf);
+    },
+    enum: () => void 0,
+    object: (object23) => {
+      for (const extended of object23.extends) {
+        nonVariantEdges.push(extended.typeId);
+      }
+      for (const property24 of [...object23.properties, ...object23.extendedProperties ?? []]) {
+        addNonVariant(property24.valueType);
+      }
+    },
+    union: (union23) => {
+      for (const extended of union23.extends) {
+        nonVariantEdges.push(extended.typeId);
+      }
+      for (const baseProperty2 of union23.baseProperties) {
+        addNonVariant(baseProperty2.valueType);
+      }
+      for (const unionType2 of union23.types) {
+        unionType2.shape._visit({
+          samePropertiesAsObject: (declaredTypeName) => {
+            variantEdges.push(declaredTypeName.typeId);
+          },
+          singleProperty: (singleProperty) => {
+            addNonVariant(singleProperty.type);
+          },
+          noProperties: () => void 0,
+          _other: () => void 0
+        });
+      }
+    },
+    undiscriminatedUnion: (undiscriminatedUnion22) => {
+      for (const member of undiscriminatedUnion22.members) {
+        addNonVariant(member.type);
+      }
+    },
+    _other: () => void 0
+  });
+  return { variantEdges, nonVariantEdges };
+}
+function buildTypeReferenceInfo(ir3) {
+  const variantReferrers = /* @__PURE__ */ new Map();
+  const nonVariantReferenced = /* @__PURE__ */ new Set();
+  for (const [typeId, typeDeclaration2] of Object.entries(ir3.types)) {
+    const { variantEdges, nonVariantEdges } = getOutgoingTypeReferences(typeDeclaration2, ir3.types);
+    for (const variantTypeId of variantEdges) {
+      const referrers = variantReferrers.get(variantTypeId) ?? /* @__PURE__ */ new Set();
+      referrers.add(typeId);
+      variantReferrers.set(variantTypeId, referrers);
+    }
+    for (const referencedTypeId of nonVariantEdges) {
+      nonVariantReferenced.add(referencedTypeId);
+    }
+  }
+  for (const apiSurface of [
+    ir3.services,
+    ir3.webhookGroups,
+    ir3.websocketChannels,
+    ir3.errors,
+    ir3.headers,
+    ir3.idempotencyHeaders,
+    ir3.pathParameters,
+    ir3.variables
+  ]) {
+    collectApiSurfaceTypeReferences(apiSurface, nonVariantReferenced);
+  }
+  return { variantReferrers, nonVariantReferenced };
+}
+function resolveToObjectTypeId(typeId, types4) {
+  const declaration = types4[typeId];
+  if (declaration == null) {
+    return void 0;
+  }
+  switch (declaration.shape.type) {
+    case "object":
+      return typeId;
+    case "alias": {
+      const resolved = declaration.shape.resolvedType;
+      if (resolved.type === "named" && resolved.shape === "OBJECT") {
+        return resolved.name.typeId;
+      }
+      return void 0;
+    }
+    default:
+      return void 0;
+  }
+}
+function getDeclaredProperties(typeId, types4) {
+  const result = /* @__PURE__ */ new Map();
+  const objectTypeId = resolveToObjectTypeId(typeId, types4);
+  if (objectTypeId == null) {
+    return result;
+  }
+  const declaration = types4[objectTypeId];
+  if (declaration == null || declaration.shape.type !== "object") {
+    return result;
+  }
+  for (const property24 of [...declaration.shape.properties, ...declaration.shape.extendedProperties ?? []]) {
+    result.set(getWireValue(property24.name), {
+      valueType: property24.valueType,
+      name: toNameAndWireValue(property24.name)
+    });
+  }
+  return result;
+}
+function typeReferencesEqual(a3, b5) {
+  return JSON.stringify(a3) === JSON.stringify(b5);
+}
+function toNameAndWireValue(name2) {
+  if (typeof name2 === "string") {
+    return { wireValue: name2, name: name2 };
+  }
+  return name2;
+}
+function computeUnionBasePropertyDedupe(ir3) {
+  const { types: types4 } = ir3;
+  const inheritedBasePropertiesByUnion = /* @__PURE__ */ new Map();
+  const deferredUnionBasePropertiesByObject = /* @__PURE__ */ new Map();
+  const unionBaseProperties = /* @__PURE__ */ new Map();
+  for (const [typeId, typeDeclaration2] of Object.entries(types4)) {
+    if (typeDeclaration2.shape.type !== "union") {
+      continue;
+    }
+    const union23 = typeDeclaration2.shape;
+    if (union23.baseProperties.length === 0) {
+      continue;
+    }
+    const baseByWireValue = /* @__PURE__ */ new Map();
+    for (const baseProperty2 of union23.baseProperties) {
+      baseByWireValue.set(getWireValue(baseProperty2.name), baseProperty2.valueType);
+    }
+    unionBaseProperties.set(typeId, baseByWireValue);
+    const everyVariantIsObject = union23.types.every((variant) => variant.shape.propertiesType === "samePropertiesAsObject");
+    if (!everyVariantIsObject) {
+      inheritedBasePropertiesByUnion.set(typeId, []);
+      continue;
+    }
+    const variantProperties = union23.types.map((variant) => variant.shape.propertiesType === "samePropertiesAsObject" ? getDeclaredProperties(variant.shape.typeId, types4) : /* @__PURE__ */ new Map());
+    const inherited = [];
+    for (const baseProperty2 of union23.baseProperties) {
+      const wireValue = getWireValue(baseProperty2.name);
+      const carriedByEveryVariant = variantProperties.every((declared) => {
+        const match3 = declared.get(wireValue);
+        return match3 != null && typeReferencesEqual(match3.valueType, baseProperty2.valueType);
+      });
+      if (carriedByEveryVariant) {
+        inherited.push(toNameAndWireValue(baseProperty2.name));
+      }
+    }
+    inheritedBasePropertiesByUnion.set(typeId, inherited);
+  }
+  const { variantReferrers, nonVariantReferenced } = buildTypeReferenceInfo(ir3);
+  for (const [variantTypeId, owningUnionTypeIds] of variantReferrers) {
+    const declaration = types4[variantTypeId];
+    if (declaration == null || declaration.shape.type !== "object") {
+      continue;
+    }
+    if (nonVariantReferenced.has(variantTypeId)) {
+      continue;
+    }
+    const declaredProperties = getDeclaredProperties(variantTypeId, types4);
+    if (declaredProperties.size === 0) {
+      continue;
+    }
+    const deferred2 = [];
+    for (const [wireValue, declared] of declaredProperties) {
+      const deferredToEveryUnion = [...owningUnionTypeIds].every((unionTypeId) => {
+        const baseType = unionBaseProperties.get(unionTypeId)?.get(wireValue);
+        return baseType != null && typeReferencesEqual(baseType, declared.valueType);
+      });
+      if (deferredToEveryUnion) {
+        deferred2.push(declared.name);
+      }
+    }
+    if (deferred2.length > 0) {
+      deferredUnionBasePropertiesByObject.set(variantTypeId, deferred2);
+    }
+  }
+  return { inheritedBasePropertiesByUnion, deferredUnionBasePropertiesByObject };
+}
+function addUnionBasePropertyDedupeToIr(ir3) {
+  const { inheritedBasePropertiesByUnion, deferredUnionBasePropertiesByObject } = computeUnionBasePropertyDedupe(ir3);
+  ir3.types = Object.fromEntries(Object.entries(ir3.types).map(([typeId, typeDeclaration2]) => {
+    switch (typeDeclaration2.shape.type) {
+      case "union":
+        return [
+          typeId,
+          {
+            ...typeDeclaration2,
+            shape: {
+              ...typeDeclaration2.shape,
+              inheritedBaseProperties: inheritedBasePropertiesByUnion.get(typeId) ?? []
+            }
+          }
+        ];
+      case "object": {
+        const deferred2 = deferredUnionBasePropertiesByObject.get(typeId);
+        return [
+          typeId,
+          {
+            ...typeDeclaration2,
+            shape: {
+              ...typeDeclaration2.shape,
+              deferredUnionBaseProperties: deferred2
+            }
+          }
+        ];
+      }
+      default:
+        return [typeId, typeDeclaration2];
+    }
+  }));
+}
+var EXAMPLE_KEYS;
+var init_computeUnionBasePropertyDedupe = __esm({
+  "../generation/ir-generator/lib/union-base-properties/computeUnionBasePropertyDedupe.js"() {
+    "use strict";
+    init_lib21();
+    EXAMPLE_KEYS = /* @__PURE__ */ new Set([
+      "v2Examples",
+      "autogeneratedExamples",
+      "userSpecifiedExamples",
+      "userProvidedExamples",
+      "examples",
+      "example"
+    ]);
+  }
+});
+
 // ../generation/ir-generator/lib/utils/getEnvironmentsByAudience.js
 function getAudienceForEnvironment(environmentId, rawEnvironments) {
   if (rawEnvironments) {
@@ -277018,6 +277342,7 @@ function generateIntermediateRepresentation({ workspace, generationLanguage, key
   });
   intermediateRepresentation.serviceTypeReferenceInfo = computeServiceTypeReferenceInfo(irGraph);
   addExtendedPropertiesToIr(intermediateRepresentation);
+  addUnionBasePropertyDedupeToIr(intermediateRepresentation);
   resolveGlobalParameterApplicability(intermediateRepresentation, {
     onWarning: (message) => context3.logger.warn(message)
   });
@@ -277187,6 +277512,7 @@ var init_generateIntermediateRepresentation = __esm({
     init_PropertyResolver();
     init_TypeResolver();
     init_VariableResolver();
+    init_computeUnionBasePropertyDedupe();
     init_convertToFernFilepath();
     init_getEnvironmentsByAudience();
     init_getIrGenerationSettings();
@@ -344625,7 +344951,8 @@ var init_ObjectSchemaConverter = __esm({
               properties: [],
               extends: [],
               extendedProperties: [],
-              extraProperties: hasAdditionalProperties
+              extraProperties: hasAdditionalProperties,
+              deferredUnionBaseProperties: void 0
             }),
             propertiesByAudience: {},
             inlinedTypes: {},
@@ -344779,7 +345106,8 @@ var init_ObjectSchemaConverter = __esm({
             properties: properties7,
             extends: extends_.map((ext2) => this.context.typeReferenceToDeclaredTypeName(ext2)).filter(isNonNullish),
             extendedProperties: [],
-            extraProperties: hasAdditionalProperties
+            extraProperties: hasAdditionalProperties,
+            deferredUnionBaseProperties: void 0
           }),
           propertiesByAudience,
           referencedTypes,
@@ -345103,6 +345431,9 @@ var init_OneOfSchemaConverter = __esm({
         return {
           type: Type.union({
             baseProperties,
+            // Populated by the computeUnionBasePropertyDedupe post-build pass once the full
+            // types map is assembled; initialized empty here.
+            inheritedBaseProperties: [],
             discriminant: this.context.casingsGenerator.generateNameAndWireValue({
               name: this.schema.discriminator.propertyName,
               wireValue: this.schema.discriminator.propertyName
@@ -689343,7 +689674,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "5.70.2",
+          version: "5.71.0",
           usingAccessToken: true,
           ...getRunIdProperties()
         }
@@ -689409,7 +689740,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "5.70.2",
+        version: "5.71.0",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -870510,7 +870841,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.70.2";
+  const version7 = "5.71.0";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -903082,7 +903413,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "5.70.2",
+        cliVersion: "5.71.0",
         loginCommand: "fern auth login"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
@@ -966257,7 +966588,8 @@ var MessageConverter = class extends AbstractConverter {
             properties: convertedFields,
             extends: [],
             extendedProperties: [],
-            extraProperties: false
+            extraProperties: false,
+            deferredUnionBaseProperties: void 0
           }),
           referencedTypes: allReferencedTypes,
           typeName: this.message.name,
@@ -969508,7 +969840,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.70.2"
+    cli_version: "5.71.0"
   };
 }
 function isAutomationMode() {
@@ -970340,7 +970672,7 @@ var CliContext = class _CliContext {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "5.70.2";
+    return "5.71.0";
   }
   getCliName() {
     if (false) {

package/package.json

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