@fern-api/fern-api-dev 5.110.1 → 5.111.0

package/cli.cjs

@@ -25708,6 +25708,116 @@ var init_addPrefixToString = __esm({
   }
 });
 
+// ../../commons/core-utils/lib/anyOfPresenceConstraint.js
+function isRecord(value2) {
+  return typeof value2 === "object" && value2 != null && !Array.isArray(value2);
+}
+function isObjectTypeOrAbsent(type7) {
+  if (type7 == null) {
+    return true;
+  }
+  if (typeof type7 === "string") {
+    return type7 === "object";
+  }
+  if (Array.isArray(type7)) {
+    const nonNull = type7.filter((entry) => entry !== "null");
+    return nonNull.length === 1 && nonNull[0] === "object";
+  }
+  return false;
+}
+function restatesSiblingSubschema(branchSubschema, siblingSubschema) {
+  if (branchSubschema === true) {
+    return true;
+  }
+  if (!isRecord(branchSubschema)) {
+    return false;
+  }
+  const sibling2 = isRecord(siblingSubschema) ? siblingSubschema : void 0;
+  for (const [keyword, value2] of Object.entries(branchSubschema)) {
+    if (ANNOTATION_KEYWORDS.has(keyword)) {
+      continue;
+    }
+    if (sibling2 == null || !(keyword in sibling2) || !deepEquals(value2, sibling2[keyword])) {
+      return false;
+    }
+  }
+  return true;
+}
+function deepEquals(a3, b5) {
+  if (a3 === b5) {
+    return true;
+  }
+  if (Array.isArray(a3) && Array.isArray(b5)) {
+    return a3.length === b5.length && a3.every((entry, index3) => deepEquals(entry, b5[index3]));
+  }
+  if (isRecord(a3) && isRecord(b5)) {
+    const aKeys = Object.keys(a3).sort();
+    const bKeys = Object.keys(b5).sort();
+    return aKeys.length === bKeys.length && aKeys.every((key2, index3) => key2 === bKeys[index3]) && aKeys.every((key2) => deepEquals(a3[key2], b5[key2]));
+  }
+  return false;
+}
+function isPresenceConstraintBranch(branch, siblingProperties) {
+  if (!isRecord(branch) || "$ref" in branch) {
+    return false;
+  }
+  if (branch.allOf != null || branch.oneOf != null || branch.anyOf != null || branch.additionalProperties != null || !isObjectTypeOrAbsent(branch.type)) {
+    return false;
+  }
+  const branchProperties = isRecord(branch.properties) ? branch.properties : {};
+  const branchRequired = Array.isArray(branch.required) ? branch.required : [];
+  if (Object.keys(branchProperties).length === 0 && branchRequired.length === 0) {
+    return false;
+  }
+  for (const name2 of branchRequired) {
+    if (typeof name2 !== "string" || !(name2 in siblingProperties)) {
+      return false;
+    }
+  }
+  for (const [name2, subschema] of Object.entries(branchProperties)) {
+    if (!(name2 in siblingProperties)) {
+      return false;
+    }
+    if (!restatesSiblingSubschema(subschema, siblingProperties[name2])) {
+      return false;
+    }
+  }
+  return true;
+}
+function anyOfIsPresenceConstraint(schema) {
+  const anyOf = schema.anyOf;
+  if (!Array.isArray(anyOf) || anyOf.length === 0) {
+    return false;
+  }
+  if (schema.oneOf != null || schema.allOf != null) {
+    return false;
+  }
+  if (!isRecord(schema.properties) || Object.keys(schema.properties).length === 0) {
+    return false;
+  }
+  const siblingProperties = schema.properties;
+  return anyOf.every((branch) => isPresenceConstraintBranch(branch, siblingProperties));
+}
+var ANNOTATION_KEYWORDS;
+var init_anyOfPresenceConstraint = __esm({
+  "../../commons/core-utils/lib/anyOfPresenceConstraint.js"() {
+    "use strict";
+    ANNOTATION_KEYWORDS = /* @__PURE__ */ new Set([
+      "title",
+      "description",
+      "default",
+      "deprecated",
+      "example",
+      "examples",
+      "readOnly",
+      "writeOnly",
+      "externalDocs",
+      "xml",
+      "$comment"
+    ]);
+  }
+});
+
 // ../../../node_modules/.pnpm/jsonpath-plus@10.4.0/node_modules/jsonpath-plus/dist/index-node-esm.js
 function push(arr, item) {
   arr = arr.slice();
@@ -44690,6 +44800,7 @@ __export(lib_exports, {
   SKIP_MARKER: () => SKIP_MARKER,
   SymbolRegistry: () => SymbolRegistry,
   addPrefixToString: () => addPrefixToString,
+  anyOfIsPresenceConstraint: () => anyOfIsPresenceConstraint,
   applyOpenAPIOverlay: () => applyOpenAPIOverlay,
   assert: () => assert2,
   assertDefined: () => assertDefined,
@@ -44710,6 +44821,7 @@ __export(lib_exports, {
   isGitAvailable: () => isGitAvailable,
   isNonNullish: () => isNonNullish,
   isPlainObject: () => isPlainObject4,
+  isPresenceConstraintBranch: () => isPresenceConstraintBranch,
   keys: () => keys2,
   mapValues: () => mapValues2,
   mergeWithOverrides: () => mergeWithOverrides,
@@ -44737,6 +44849,7 @@ var init_lib4 = __esm({
   "../../commons/core-utils/lib/index.js"() {
     "use strict";
     init_addPrefixToString();
+    init_anyOfPresenceConstraint();
     init_applyOpenAPIOverlay();
     init_assert();
     init_delay();
@@ -131124,6 +131237,7 @@ var init_OpenApiSettingsSchema2 = __esm({
       "type-dates-as-strings": schemas_exports8.boolean().optional(),
       "preserve-single-schema-oneof": schemas_exports8.boolean().optional(),
       "preserve-one-of-in-all-of": schemas_exports8.boolean().optional(),
+      "any-of-sibling-properties-as-object": schemas_exports8.boolean().optional(),
       "inline-all-of-schemas": schemas_exports8.boolean().optional(),
       "resolve-aliases": ResolveAliases.optional(),
       "group-multi-api-environments": schemas_exports8.boolean().optional(),
@@ -152982,6 +153096,7 @@ var init_options2 = __esm({
       typeDatesAsStrings: false,
       preserveSingleSchemaOneOf: false,
       preserveOneOfInAllOf: false,
+      anyOfSiblingPropertiesAsObject: false,
       inlineAllOfSchemas: false,
       resolveAliases: false,
       groupMultiApiEnvironments: false,
@@ -156641,6 +156756,12 @@ function convertSchemaObject(schema, wrapAsOptional, wrapAsNullable, context3, b
       }
     }
     if (schema.anyOf != null && schema.anyOf.length > 0) {
+      if (context3.options.anyOfSiblingPropertiesAsObject && anyOfIsPresenceConstraint(schema)) {
+        context3.logger.debug(`Treating the anyOf at ${breadcrumbs.join(".")} as an "at least one of" constraint over its sibling properties rather than a union, and converting the schema as an object.`);
+        const { anyOf: _constraint, ...schemaWithoutAnyOf } = schema;
+        const convertedSchema = convertSchema2(schemaWithoutAnyOf, wrapAsOptional, wrapAsNullable, context3, breadcrumbs, source2, namespace, referencedAsRequest);
+        return maybeInjectDescriptionOrGroupName(convertedSchema, description, namespace, groupName);
+      }
       if (schema.anyOf.length === 1 && schema.anyOf[0] != null) {
         const convertedSchema = convertSchema2(schema.anyOf[0], wrapAsOptional, wrapAsNullable, context3, breadcrumbs, source2, namespace, referencedAsRequest);
         return maybeInjectDescriptionOrGroupName(convertedSchema, description, namespace, groupName);
@@ -157251,6 +157372,7 @@ var SCHEMA_REFERENCE_PREFIX, globalTitleCollisionTracker;
 var init_convertSchemas = __esm({
   "../api-importers/openapi/openapi-ir-parser/lib/schema/convertSchemas.js"() {
     "use strict";
+    init_lib4();
     init_lib13();
     init_lib6();
     init_lodash();
@@ -200202,6 +200324,7 @@ var init_getAPIDefinitionSettings = __esm({
       typeDatesAsStrings: "typeDatesAsStrings",
       preserveSingleSchemaOneOf: "preserveSingleSchemaOneOf",
       preserveOneOfInAllOf: "preserveOneOfInAllOf",
+      anyOfSiblingPropertiesAsObject: "anyOfSiblingPropertiesAsObject",
       inlineAllOfSchemas: "inlineAllOfSchemas",
       resolveAliases: "resolveAliases",
       groupMultiApiEnvironments: "groupMultiApiEnvironments",
@@ -264823,6 +264946,7 @@ function parseOpenApiDefinitionSettingsSchema(settings) {
     typeDatesAsStrings: settings?.["type-dates-as-strings"],
     preserveSingleSchemaOneOf: settings?.["preserve-single-schema-oneof"],
     preserveOneOfInAllOf: settings?.["preserve-one-of-in-all-of"],
+    anyOfSiblingPropertiesAsObject: settings?.["any-of-sibling-properties-as-object"],
     inlineAllOfSchemas: settings?.["inline-all-of-schemas"],
     resolveAliases: settings?.["resolve-aliases"],
     groupMultiApiEnvironments: settings?.["group-multi-api-environments"],
@@ -265685,6 +265809,7 @@ var init_convertGeneratorsConfiguration = __esm({
       typeDatesAsStrings: void 0,
       preserveSingleSchemaOneOf: void 0,
       preserveOneOfInAllOf: void 0,
+      anyOfSiblingPropertiesAsObject: void 0,
       inlineAllOfSchemas: void 0,
       resolveAliases: void 0,
       groupMultiApiEnvironments: void 0,
@@ -343851,7 +343976,7 @@ var require_oas_kit_common = __commonJS({
     function allSame(array3) {
       return new Set(array3).size <= 1;
     }
-    function deepEquals(obj1, obj2) {
+    function deepEquals2(obj1, obj2) {
       function _equals(obj12, obj22) {
         return sjs.stringify(obj12) === sjs.stringify(Object.assign({}, obj12, obj22));
       }
@@ -343861,7 +343986,7 @@ var require_oas_kit_common = __commonJS({
       let result = [];
       for (let candidate of arr) {
         let dupe = result.find(function(e2, i5, a3) {
-          return deepEquals(e2, candidate);
+          return deepEquals2(e2, candidate);
         });
         if (!dupe) result.push(candidate);
       }
@@ -346319,7 +346444,7 @@ async function parseOverlayFile(absoluteFilePathToOverlay, context3) {
   }
 }
 function validateOverlay(overlay, context3) {
-  if (!isRecord(overlay)) {
+  if (!isRecord2(overlay)) {
     context3.logger.error("Overlay file must be a YAML or JSON object");
     return false;
   }
@@ -346328,7 +346453,7 @@ function validateOverlay(overlay, context3) {
     return false;
   }
   const info = overlay.info;
-  if (!isRecord(info) || typeof info.title !== "string" || info.title.length === 0 || typeof info.version !== "string" || info.version.length === 0) {
+  if (!isRecord2(info) || typeof info.title !== "string" || info.title.length === 0 || typeof info.version !== "string" || info.version.length === 0) {
     context3.logger.error("Overlay file missing required 'info.title' or 'info.version' field");
     return false;
   }
@@ -346339,7 +346464,7 @@ function validateOverlay(overlay, context3) {
   }
   for (let i5 = 0; i5 < actions.length; i5++) {
     const action = actions[i5];
-    if (!isRecord(action) || !action.target) {
+    if (!isRecord2(action) || !action.target) {
       context3.logger.error(`Overlay action at index ${i5} missing required 'target' field`);
       return false;
     }
@@ -346350,7 +346475,7 @@ function validateOverlay(overlay, context3) {
   }
   return true;
 }
-function isRecord(value2) {
+function isRecord2(value2) {
   return typeof value2 === "object" && value2 != null && !Array.isArray(value2);
 }
 var import_promises28, import_path36, import_tmp_promise6, tempDir;
@@ -351696,6 +351821,7 @@ var TYPE_INVARIANT_KEYS, SchemaConverter;
 var init_SchemaConverter = __esm({
   "../api-importers/v3-importer-commons/lib/converters/schema/SchemaConverter.js"() {
     "use strict";
+    init_lib4();
     init_lib9();
     init_lib30();
     init_CreateTypeReferenceFromFernType();
@@ -351769,6 +351895,10 @@ var init_SchemaConverter = __esm({
         if (maybeConvertedTypeArraySchema != null) {
           return maybeConvertedTypeArraySchema;
         }
+        const maybeConvertedSiblingAnyOfConstraint = this.tryConvertSiblingAnyOfConstraint();
+        if (maybeConvertedSiblingAnyOfConstraint != null) {
+          return maybeConvertedSiblingAnyOfConstraint;
+        }
         const maybeConvertedOneOfAnyOfSchema = this.tryConvertOneOfAnyOfSchema();
         if (maybeConvertedOneOfAnyOfSchema != null) {
           return maybeConvertedOneOfAnyOfSchema;
@@ -352109,6 +352239,50 @@ var init_SchemaConverter = __esm({
         }
         return void 0;
       }
+      /**
+       * A schema may declare `properties` alongside an `anyOf` whose branches only
+       * re-declare some of those same properties as required, for example:
+       *
+       *     type: object
+       *     properties: { a: {...}, b: {...} }
+       *     anyOf:
+       *       - { properties: { a: {...} }, required: [a] }
+       *       - { properties: { b: {...} }, required: [b] }
+       *
+       * Per JSON Schema an instance must satisfy both keywords, so the `anyOf` here
+       * is a validation constraint -- "at least one of a, b" -- and not a set of
+       * variants. Converting it as a union discards the sibling `properties`
+       * entirely and makes the variants mutually exclusive, so a body carrying both
+       * `a` and `b` silently loses one on the wire.
+       *
+       * Drop the `anyOf` and convert the schema as the object it declares. The "at
+       * least one" constraint is not expressible in the IR and is not enforced.
+       *
+       * This only applies when every branch is an inline object whose properties are
+       * a subset of the sibling `properties`. A branch that introduces a property,
+       * or is a reference, is a genuine variant and is left to the union converter.
+       *
+       * Gated behind the `any-of-sibling-properties-as-object` setting.
+       */
+      tryConvertSiblingAnyOfConstraint() {
+        if (!this.context.settings.anyOfSiblingPropertiesAsObject) {
+          return void 0;
+        }
+        if (!anyOfIsPresenceConstraint(this.schema)) {
+          return void 0;
+        }
+        this.context.logger.debug(`Treating the anyOf at ${this.breadcrumbs.join(".")} as an "at least one of" constraint over its sibling properties rather than a union, and converting the schema as an object.`);
+        const { anyOf: _constraint, ...schemaWithoutAnyOf } = this.schema;
+        return new _SchemaConverter({
+          id: this.id,
+          context: this.context,
+          breadcrumbs: this.breadcrumbs,
+          schema: schemaWithoutAnyOf,
+          inlined: this.inlined,
+          nameOverride: this.nameOverride,
+          visitedRefs: this.visitedRefs
+        }).convert();
+      }
       tryConvertOneOfAnyOfSchema() {
         if (this.schema.oneOf != null || this.schema.anyOf != null) {
           const oneOfConverter = new OneOfSchemaConverter({
@@ -696678,6 +696852,14 @@ var OpenApiSettingsSchema2 = BaseApiSettingsSchema2.extend({
    * Defaults to false.
    */
   preserveOneOfInAllOf: external_exports.boolean().optional(),
+  /**
+   * When a schema declares `properties` alongside an `anyOf` that only marks
+   * some of those same properties required, the `anyOf` is a constraint rather
+   * than a set of variants. Set to true to convert such a schema as an object.
+   * Defaults to false, converting it to a union, which drops the sibling
+   * `properties`.
+   */
+  anyOfSiblingPropertiesAsObject: external_exports.boolean().optional(),
   /**
    * Whether to inline allOf schemas. If false, allOf schemas will be
    * extended in the code generation.
@@ -705322,7 +705504,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "5.110.1",
+          version: "5.111.0",
           usingAccessToken: true,
           ...getRunIdProperties()
         }
@@ -705388,7 +705570,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "5.110.1",
+        version: "5.111.0",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -712197,6 +712379,7 @@ var LegacyApiSpecAdapter = class {
       typeDatesAsStrings: settings.typeDatesAsStrings,
       preserveSingleSchemaOneOf: settings.preserveSingleSchemaOneof,
       preserveOneOfInAllOf: settings.preserveOneOfInAllOf,
+      anyOfSiblingPropertiesAsObject: settings.anyOfSiblingPropertiesAsObject,
       inlineAllOfSchemas: settings.inlineAllOfSchemas,
       resolveAliases: settings.resolveAliases,
       groupMultiApiEnvironments: settings.groupMultiApiEnvironments,
@@ -885153,6 +885336,7 @@ var SETTINGS_KEY_MAP = {
   "type-dates-as-strings": "typeDatesAsStrings",
   "preserve-single-schema-oneof": "preserveSingleSchemaOneof",
   "preserve-one-of-in-all-of": "preserveOneOfInAllOf",
+  "any-of-sibling-properties-as-object": "anyOfSiblingPropertiesAsObject",
   "inline-all-of-schemas": "inlineAllOfSchemas",
   "resolve-aliases": "resolveAliases",
   "group-multi-api-environments": "groupMultiApiEnvironments",
@@ -887062,7 +887246,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.110.1";
+  const version7 = "5.111.0";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -914026,7 +914210,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "5.110.1",
+        cliVersion: "5.111.0",
         loginCommand: "fern auth login"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
@@ -930503,16 +930687,16 @@ var TestClass = class extends Node5 {
 };
 
 // ../../../generators/csharp/codegen/lib/context/filesystem-nuget-publish-target.js
-function isRecord2(value2) {
+function isRecord3(value2) {
   return typeof value2 === "object" && value2 != null;
 }
 function getFilesystemNugetPublishTarget(ir3) {
   const publishConfig = ir3.publishConfig;
-  if (!isRecord2(publishConfig) || publishConfig.type !== "filesystem") {
+  if (!isRecord3(publishConfig) || publishConfig.type !== "filesystem") {
     return void 0;
   }
   const publishTarget = publishConfig.publishTarget;
-  if (!isRecord2(publishTarget) || publishTarget.type !== "nuget") {
+  if (!isRecord3(publishTarget) || publishTarget.type !== "nuget") {
     return void 0;
   }
   return {
@@ -973201,11 +973385,11 @@ function getFirstUrlSegment({ path: path122 }) {
 }
 
 // ../docs-importers/mintlify/lib/MintlifyImporter.js
-function isRecord3(value2) {
+function isRecord4(value2) {
   return typeof value2 === "object" && value2 != null && !Array.isArray(value2);
 }
 function hasNavigationArray(value2) {
-  return isRecord3(value2) && Array.isArray(value2.navigation);
+  return isRecord4(value2) && Array.isArray(value2.navigation);
 }
 var MintlifyImporter = class extends DocsImporter {
   documentationTab = void 0;
@@ -980946,7 +981130,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.110.1"
+    cli_version: "5.111.0"
   };
 }
 function isAutomationMode() {
@@ -981778,7 +981962,7 @@ var CliContext = class _CliContext {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "5.110.1";
+    return "5.111.0";
   }
   getCliName() {
     if (false) {
@@ -994994,7 +995178,7 @@ function upsertServerInJsonConfig({
   includeTransportType
 }) {
   const config5 = parseJsonConfig(existingContents);
-  const mcpServers = isRecord4(config5.mcpServers) ? config5.mcpServers : {};
+  const mcpServers = isRecord5(config5.mcpServers) ? config5.mcpServers : {};
   config5.mcpServers = {
     ...mcpServers,
     [MCP_SERVER_NAME]: {
@@ -995011,12 +995195,12 @@ function parseJsonConfig(existingContents) {
     return {};
   }
   const parsed = JSON.parse(existingContents);
-  if (!isRecord4(parsed)) {
+  if (!isRecord5(parsed)) {
     throw new Error("Expected the config to contain a JSON object");
   }
   return parsed;
 }
-function isRecord4(value2) {
+function isRecord5(value2) {
   return typeof value2 === "object" && value2 !== null && !Array.isArray(value2);
 }
 var CODEX_SERVER_TABLE_PATH = `mcp_servers.${MCP_SERVER_NAME}`;

package/package.json

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