@fern-api/fern-api-dev 5.23.3-829-g64985efd096 → 5.23.3-832-gfa15174fbb2

package/cli.cjs

@@ -685536,7 +685536,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "5.23.3-829-g64985efd096",
+          version: "5.23.3-832-gfa15174fbb2",
           usingAccessToken: true,
           ...getRunIdProperties()
         }
@@ -685602,7 +685602,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "5.23.3-829-g64985efd096",
+        version: "5.23.3-832-gfa15174fbb2",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -866664,7 +866664,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-829-g64985efd096";
+  const version7 = "5.23.3-832-gfa15174fbb2";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -898891,7 +898891,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "5.23.3-829-g64985efd096",
+        cliVersion: "5.23.3-832-gfa15174fbb2",
         loginCommand: "fern auth login"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
@@ -924876,6 +924876,7 @@ var BaseJavaCustomConfigSchema = external_exports2.object({
   "use-default-request-parameter-values": external_exports2.boolean().optional(),
   "enable-wire-tests": external_exports2.boolean().default(false),
   "collapse-optional-nullable": external_exports2.boolean().optional(),
+  "use-nullable-annotation": external_exports2.boolean().optional(),
   "custom-readme-sections": external_exports2.array(CustomReadmeSectionSchema).optional(),
   "custom-pager-name": external_exports2.string().optional(),
   "offset-semantics": external_exports2.enum(["item-index", "page-index"]).optional(),
@@ -925619,7 +925620,7 @@ var TypeLiteral = class _TypeLiteral extends AstNode3 {
     writer2.write(".build()");
   }
   orderBuilderParameters(parameters2) {
-    const hasRequiredFields = parameters2.some((p6) => !p6.value.isOptional() && !this.isCollection(p6.value));
+    const hasRequiredFields = parameters2.some((p6) => this.isRequiredBuilderParameter(p6));
     if (!hasRequiredFields) {
       return parameters2.sort((a3, b5) => {
         const aIsOptional = a3.value.isOptional();
@@ -925634,8 +925635,8 @@ var TypeLiteral = class _TypeLiteral extends AstNode3 {
       });
     }
     return parameters2.sort((a3, b5) => {
-      const aIsNonRequired = this.isNonRequired(a3.value);
-      const bIsNonRequired = this.isNonRequired(b5.value);
+      const aIsNonRequired = !this.isRequiredBuilderParameter(a3);
+      const bIsNonRequired = !this.isRequiredBuilderParameter(b5);
       if (aIsNonRequired && !bIsNonRequired) {
         return 1;
       }
@@ -925649,6 +925650,12 @@ var TypeLiteral = class _TypeLiteral extends AstNode3 {
     const internalType = value2.internalType.type;
     return internalType === "list" || internalType === "set" || internalType === "map";
   }
+  isRequiredBuilderParameter(parameter6) {
+    if (parameter6.isRequired != null) {
+      return parameter6.isRequired;
+    }
+    return !this.isNonRequired(parameter6.value);
+  }
   isNonRequired(value2) {
     return value2.isOptional() || this.isCollection(value2);
   }
@@ -926159,7 +926166,10 @@ var DynamicTypeLiteralMapper = class {
     this.context = context3;
   }
   usesOptionalNullable() {
-    return this.context.customConfig?.["collapse-optional-nullable"] === true;
+    return this.context.usesOptionalNullable();
+  }
+  usesNullableAnnotation() {
+    return this.context.usesNullableAnnotation();
   }
   wrapInOptionalIfNotNop(value2, useOf = false, isCollapsedOptionalNullable = false) {
     if (java_exports.TypeLiteral.isNop(value2)) {
@@ -926170,6 +926180,22 @@ var DynamicTypeLiteralMapper = class {
     }
     return java_exports.TypeLiteral.optional({ value: value2, useOf });
   }
+  // Wraps an already-converted inner value for an `optional`/`nullable` wrapper type, honoring
+  // the `use-nullable-annotation` (raw, no wrapper) and `collapse-optional-nullable`
+  // (OptionalNullable<T>) configs. `propagatedCollapse` is set when an outer optional+nullable
+  // collapsed into this node.
+  wrapNullableOrOptionalValue({ value: value2, wrapperType, useOf, propagatedCollapse }) {
+    if (java_exports.TypeLiteral.isNop(value2)) {
+      return value2;
+    }
+    if (wrapperType === "nullable" && this.usesNullableAnnotation()) {
+      return value2;
+    }
+    if (propagatedCollapse || this.usesOptionalNullable() && wrapperType === "nullable") {
+      return this.context.getOptionalNullableOf(value2);
+    }
+    return java_exports.TypeLiteral.optional({ value: value2, useOf });
+  }
   convert(args) {
     if (args.value === null) {
       if (this.context.isNullable(args.typeReference)) {
@@ -926205,11 +926231,14 @@ var DynamicTypeLiteralMapper = class {
       }
       case "nullable":
       case "optional": {
-        if (args.value === void 0 || typeof args.value === "object" && args.value !== null && Object.keys(args.value).length === 0 && args.typeReference.value.type === "named") {
-          const isCollapsed = args.isCollapsedOptionalNullable || this.usesOptionalNullable() && (args.typeReference.value.type === "optional" || args.typeReference.value.type === "nullable");
-          if (isCollapsed) {
-            return this.context.getOptionalNullableAbsent();
-          } else {
+        const wrapperType = args.typeReference.type;
+        const inner2 = args.typeReference.value;
+        if (args.value === void 0 || typeof args.value === "object" && args.value !== null && Object.keys(args.value).length === 0 && inner2.type === "named") {
+          if (!(wrapperType === "nullable" && this.usesNullableAnnotation())) {
+            const isCollapsed = args.isCollapsedOptionalNullable || this.usesOptionalNullable() && (wrapperType === "nullable" || inner2.type === "optional" || inner2.type === "nullable");
+            if (isCollapsed) {
+              return this.context.getOptionalNullableAbsent();
+            }
             return java_exports.TypeLiteral.reference(java_exports.invokeMethod({
               on: java_exports.classReference({
                 name: "Optional",
@@ -926220,27 +926249,37 @@ var DynamicTypeLiteralMapper = class {
             }));
           }
         }
-        if (args.typeReference.value.type === "list") {
-          const listLiteral = this.convertList({ list: args.typeReference.value.value, value: args.value });
-          return this.wrapInOptionalIfNotNop(listLiteral, true, args.isCollapsedOptionalNullable === true);
-        }
-        if (this.usesOptionalNullable() && (args.typeReference.value.type === "optional" || args.typeReference.value.type === "nullable")) {
+        if (this.usesOptionalNullable() && (inner2.type === "optional" || inner2.type === "nullable")) {
           return this.convert({
-            typeReference: args.typeReference.value,
+            typeReference: inner2,
             value: args.value,
             as: args.as,
             inUndiscriminatedUnion: args.inUndiscriminatedUnion,
             isCollapsedOptionalNullable: true
           });
         }
+        if (inner2.type === "list") {
+          const listLiteral = this.convertList({ list: inner2.value, value: args.value });
+          return this.wrapNullableOrOptionalValue({
+            value: listLiteral,
+            wrapperType,
+            useOf: true,
+            propagatedCollapse: args.isCollapsedOptionalNullable === true
+          });
+        }
         const convertedValue = this.convert({
-          typeReference: args.typeReference.value,
+          typeReference: inner2,
           value: args.value,
           as: args.as,
           inUndiscriminatedUnion: args.inUndiscriminatedUnion
         });
         const useOf = args.as === "mapValue" || args.inUndiscriminatedUnion === true;
-        return this.wrapInOptionalIfNotNop(convertedValue, useOf, args.isCollapsedOptionalNullable === true);
+        return this.wrapNullableOrOptionalValue({
+          value: convertedValue,
+          wrapperType,
+          useOf,
+          propagatedCollapse: args.isCollapsedOptionalNullable === true
+        });
       }
       case "primitive":
         return this.convertPrimitive({ primitive: args.typeReference.value, value: args.value, as: args.as });
@@ -926266,9 +926305,14 @@ var DynamicTypeLiteralMapper = class {
       values: value2.map((v3, index3) => {
         this.context.errors.scope({ index: index3 });
         try {
-          if (isItemOptional) {
+          if (isItemOptional && (list29.type === "optional" || list29.type === "nullable")) {
             const itemValue = this.convert({ typeReference: list29.value, value: v3, as: as2 });
-            return this.wrapInOptionalIfNotNop(itemValue, true);
+            return this.wrapNullableOrOptionalValue({
+              value: itemValue,
+              wrapperType: list29.type,
+              useOf: true,
+              propagatedCollapse: false
+            });
           }
           return this.convert({ typeReference: list29, value: v3, as: as2 });
         } finally {
@@ -926489,7 +926533,8 @@ var DynamicTypeLiteralMapper = class {
         }
         builderParameters.push({
           name: this.context.getMethodName(property24.name.name),
-          value: convertedValue
+          value: convertedValue,
+          isRequired: this.isStagedBuilderProperty(property24.typeReference)
         });
       } finally {
         this.context.errors.unscope();
@@ -926501,7 +926546,8 @@ var DynamicTypeLiteralMapper = class {
         if (rawValue != null) {
           builderParameters.push({
             name: "additionalProperty",
-            value: java_exports.TypeLiteral.raw(`"${this.escapeJavaString(key2)}", ${rawValue}`)
+            value: java_exports.TypeLiteral.raw(`"${this.escapeJavaString(key2)}", ${rawValue}`),
+            isRequired: false
           });
         }
       }
@@ -926513,6 +926559,31 @@ var DynamicTypeLiteralMapper = class {
       parameters: builderParameters
     });
   }
+  /**
+   * Returns true when a property becomes a required stage in v1's staged builder. v1 stages
+   * fields that are neither optional, nullable, nor collections (list/set/map); those are all
+   * exposed on the final stage instead. This intentionally resolves aliases itself because the
+   * shared `isOptional` helper does not treat an alias to an optional type as optional.
+   */
+  isStagedBuilderProperty(typeReference2) {
+    switch (typeReference2.type) {
+      case "optional":
+      case "nullable":
+      case "list":
+      case "set":
+      case "map":
+        return false;
+      case "named": {
+        const resolvedType = this.context.resolveNamedType({ typeId: typeReference2.value });
+        if (resolvedType != null && resolvedType.type === "alias") {
+          return this.isStagedBuilderProperty(resolvedType.typeReference);
+        }
+        return true;
+      }
+      default:
+        return true;
+    }
+  }
   convertToRawJavaLiteral(value2) {
     if (typeof value2 === "string") {
       return `"${this.escapeJavaString(value2)}"`;
@@ -926991,9 +927062,26 @@ var DynamicTypeMapper3 = class {
         }
         return this.convertNamed({ named });
       }
-      case "optional":
+      case "optional": {
+        const inner2 = args.typeReference.value;
+        if (this.context.usesOptionalNullable() && inner2.type === "nullable") {
+          return java_exports.Type.generic(this.context.getOptionalNullableClassReference(), [
+            this.convert({ typeReference: inner2.value })
+          ]);
+        }
+        return java_exports.Type.optional(this.convert({ typeReference: inner2 }));
+      }
       case "nullable": {
-        return java_exports.Type.optional(this.convert({ typeReference: args.typeReference.value }));
+        const inner2 = args.typeReference.value;
+        if (this.context.usesNullableAnnotation()) {
+          return this.convert({ typeReference: inner2 });
+        }
+        if (this.context.usesOptionalNullable()) {
+          return java_exports.Type.generic(this.context.getOptionalNullableClassReference(), [
+            this.convert({ typeReference: inner2 })
+          ]);
+        }
+        return java_exports.Type.optional(this.convert({ typeReference: inner2 }));
       }
       case "primitive":
         return this.convertPrimitive({ primitive: args.typeReference.value });
@@ -927459,6 +927547,12 @@ var DynamicSnippetsGeneratorContext3 = class _DynamicSnippetsGeneratorContext ex
   shouldInlineFileProperties() {
     return this.customConfig?.["inline-file-properties"] ?? false;
   }
+  usesNullableAnnotation() {
+    return this.customConfig?.["use-nullable-annotation"] === true;
+  }
+  usesOptionalNullable() {
+    return this.customConfig?.["collapse-optional-nullable"] === true;
+  }
   getPackageNameSegments(fernFilepath) {
     return fernFilepath.packagePath.map((segment) => this.getPackageNameSegment(segment));
   }
@@ -964576,7 +964670,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-829-g64985efd096"
+    cli_version: "5.23.3-832-gfa15174fbb2"
   };
 }
 function isAutomationMode() {
@@ -965408,7 +965502,7 @@ var CliContext = class _CliContext {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "5.23.3-829-g64985efd096";
+    return "5.23.3-832-gfa15174fbb2";
   }
   getCliName() {
     if (false) {

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "5.23.3-829-g64985efd096",
+  "version": "5.23.3-832-gfa15174fbb2",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/fern-api/fern.git",