@bufbuild/protobuf 1.7.0 → 1.7.1

package/dist/cjs/create-descriptor-set.d.ts

@@ -1,5 +1,6 @@
 import { FeatureSetDefaults, FileDescriptorProto, FileDescriptorSet } from "./google/protobuf/descriptor_pb.js";
 import type { DescriptorSet } from "./descriptor-set.js";
+import type { BinaryReadOptions, BinaryWriteOptions } from "./binary-format.js";
 /**
  * Create a DescriptorSet, a convenient interface for working with a set of
  * google.protobuf.FileDescriptorProto.
@@ -26,5 +27,10 @@ interface CreateDescriptorSetOptions {
      * `--experimental_edition_defaults_out`.
      */
     featureSetDefaults?: FeatureSetDefaults;
+    /**
+     * Internally, data is serialized when features are resolved. The
+     * serialization options given here will be used for feature resolution.
+     */
+    serializationOptions?: Partial<BinaryReadOptions & BinaryWriteOptions>;
 }
 export {};

package/dist/cjs/create-descriptor-set.js

@@ -44,11 +44,11 @@ function createDescriptorSet(input, options) {
             : input;
     const resolverByEdition = new Map();
     const files = fileDescriptors.map((proto) => {
-        var _a, _b;
+        var _a;
         const edition = (_a = proto.edition) !== null && _a !== void 0 ? _a : parseFileSyntax(proto.syntax, proto.edition).edition;
         let resolveFeatures = resolverByEdition.get(edition);
         if (resolveFeatures === undefined) {
-            resolveFeatures = (0, feature_set_js_1.createFeatureResolver)((_b = options === null || options === void 0 ? void 0 : options.featureSetDefaults) !== null && _b !== void 0 ? _b : feature_set_js_1.featureSetDefaults, edition);
+            resolveFeatures = (0, feature_set_js_1.createFeatureResolver)(edition, options === null || options === void 0 ? void 0 : options.featureSetDefaults, options === null || options === void 0 ? void 0 : options.serializationOptions);
             resolverByEdition.set(edition, resolveFeatures);
         }
         return newFile(proto, cart, resolveFeatures);

package/dist/cjs/google/protobuf/descriptor_pb.js

@@ -21,7 +21,7 @@ exports.GeneratedCodeInfo_Annotation_Semantic = exports.GeneratedCodeInfo_Annota
 // The messages in this file describe the definitions found in .proto files.
 // A valid .proto file can be translated directly to a FileDescriptorProto
 // without any other information (e.g. without reading its imports).
-// @generated by protoc-gen-es v1.7.0 with parameter "bootstrap_wkt=true,ts_nocheck=false,target=ts"
+// @generated by protoc-gen-es v1.7.1 with parameter "bootstrap_wkt=true,ts_nocheck=false,target=ts"
 // @generated from file google/protobuf/descriptor.proto (package google.protobuf, syntax proto2)
 /* eslint-disable */
 const proto2_js_1 = require("../../proto2.js");

package/dist/cjs/google/protobuf/struct_pb.js

@@ -14,7 +14,7 @@
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ListValue = exports.Value = exports.Struct = exports.NullValue = void 0;
-// @generated by protoc-gen-es v1.7.0 with parameter "bootstrap_wkt=true,ts_nocheck=false,target=ts"
+// @generated by protoc-gen-es v1.7.1 with parameter "bootstrap_wkt=true,ts_nocheck=false,target=ts"
 // @generated from file google/protobuf/struct.proto (package google.protobuf, syntax proto3)
 /* eslint-disable */
 const proto3_js_1 = require("../../proto3.js");

package/dist/cjs/google/protobuf/type_pb.js

@@ -14,7 +14,7 @@
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Option = exports.EnumValue = exports.Enum = exports.Field_Cardinality = exports.Field_Kind = exports.Field = exports.Type = exports.Syntax = void 0;
-// @generated by protoc-gen-es v1.7.0 with parameter "bootstrap_wkt=true,ts_nocheck=false,target=ts"
+// @generated by protoc-gen-es v1.7.1 with parameter "bootstrap_wkt=true,ts_nocheck=false,target=ts"
 // @generated from file google/protobuf/type.proto (package google.protobuf, syntax proto3)
 /* eslint-disable */
 const proto3_js_1 = require("../../proto3.js");

package/dist/cjs/private/feature-set.d.ts

@@ -1,8 +1,5 @@
 import { Edition, FeatureSet, FeatureSetDefaults } from "../google/protobuf/descriptor_pb.js";
-/**
- * Static edition feature defaults supported by @bufbuild/protobuf.
- */
-export declare const featureSetDefaults: FeatureSetDefaults;
+import type { BinaryReadOptions, BinaryWriteOptions } from "../binary-format.js";
 /**
  * A merged google.protobuf.FeaturesSet, with all fields guaranteed to be set.
  */
@@ -16,6 +13,7 @@ export type MergedFeatureSet = FeatureSet & Required<FeatureSet>;
  */
 export type FeatureResolverFn = (a?: FeatureSet, b?: FeatureSet) => MergedFeatureSet;
 /**
- * Create an edition feature resolver with the given feature set defaults.
+ * Create an edition feature resolver with the given feature set defaults, or
+ * the feature set defaults supported by @bufbuild/protobuf.
  */
-export declare function createFeatureResolver(compiledFeatureSetDefaults: FeatureSetDefaults, edition: Edition): FeatureResolverFn;
+export declare function createFeatureResolver(edition: Edition, compiledFeatureSetDefaults?: FeatureSetDefaults, serializationOptions?: Partial<BinaryReadOptions & BinaryWriteOptions>): FeatureResolverFn;

package/dist/cjs/private/feature-set.js

@@ -13,24 +13,28 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createFeatureResolver = exports.featureSetDefaults = void 0;
+exports.createFeatureResolver = void 0;
 const descriptor_pb_js_1 = require("../google/protobuf/descriptor_pb.js");
 const proto_base64_js_1 = require("../proto-base64.js");
 /**
- * Static edition feature defaults supported by @bufbuild/protobuf.
+ * Return the edition feature defaults supported by @bufbuild/protobuf.
  */
-exports.featureSetDefaults = descriptor_pb_js_1.FeatureSetDefaults.fromBinary(proto_base64_js_1.protoBase64.dec(
-/*upstream-inject-feature-defaults-start*/ "ChESDAgBEAIYAiABKAEwAhjmBwoREgwIAhABGAEgAigBMAEY5wcKERIMCAEQARgBIAIoATABGOgHIOYHKOgH" /*upstream-inject-feature-defaults-end*/));
+function getFeatureSetDefaults(options) {
+    return descriptor_pb_js_1.FeatureSetDefaults.fromBinary(proto_base64_js_1.protoBase64.dec(
+    /*upstream-inject-feature-defaults-start*/ "ChESDAgBEAIYAiABKAEwAhjmBwoREgwIAhABGAEgAigBMAEY5wcKERIMCAEQARgBIAIoATABGOgHIOYHKOgH" /*upstream-inject-feature-defaults-end*/), options);
+}
 /**
- * Create an edition feature resolver with the given feature set defaults.
+ * Create an edition feature resolver with the given feature set defaults, or
+ * the feature set defaults supported by @bufbuild/protobuf.
  */
-function createFeatureResolver(compiledFeatureSetDefaults, edition) {
+function createFeatureResolver(edition, compiledFeatureSetDefaults, serializationOptions) {
     var _a, _b;
-    const min = compiledFeatureSetDefaults.minimumEdition;
-    const max = compiledFeatureSetDefaults.maximumEdition;
+    const fds = compiledFeatureSetDefaults !== null && compiledFeatureSetDefaults !== void 0 ? compiledFeatureSetDefaults : getFeatureSetDefaults(serializationOptions);
+    const min = fds.minimumEdition;
+    const max = fds.maximumEdition;
     if (min === undefined ||
         max === undefined ||
-        compiledFeatureSetDefaults.defaults.some((d) => d.edition === undefined)) {
+        fds.defaults.some((d) => d.edition === undefined)) {
         throw new Error("Invalid FeatureSetDefaults");
     }
     if (edition < min) {
@@ -40,7 +44,7 @@ function createFeatureResolver(compiledFeatureSetDefaults, edition) {
         throw new Error(`Edition ${descriptor_pb_js_1.Edition[edition]} is later than the maximum supported edition ${descriptor_pb_js_1.Edition[max]}`);
     }
     let highestMatch = undefined;
-    for (const c of compiledFeatureSetDefaults.defaults) {
+    for (const c of fds.defaults) {
         const e = (_a = c.edition) !== null && _a !== void 0 ? _a : 0;
         if (e > edition) {
             continue;
@@ -56,12 +60,12 @@ function createFeatureResolver(compiledFeatureSetDefaults, edition) {
     if (highestMatch === undefined) {
         throw new Error(`No valid default found for edition ${descriptor_pb_js_1.Edition[edition]}`);
     }
-    const defaultsBin = highestMatch.f.toBinary();
+    const featureSetBin = highestMatch.f.toBinary(serializationOptions);
     return (...rest) => {
-        const f = descriptor_pb_js_1.FeatureSet.fromBinary(defaultsBin);
+        const f = descriptor_pb_js_1.FeatureSet.fromBinary(featureSetBin, serializationOptions);
         for (const c of rest) {
             if (c !== undefined) {
-                f.fromBinary(c.toBinary());
+                f.fromBinary(c.toBinary(serializationOptions), serializationOptions);
             }
         }
         if (!validateMergedFeatures(f)) {

package/dist/cjs/private/json-format-common.d.ts

@@ -3,7 +3,7 @@ import type { FieldInfo } from "../field.js";
 import { ScalarType } from "../field.js";
 import type { EnumType } from "../enum.js";
 type JsonFormatWriteFieldFn = (field: FieldInfo, value: any, options: JsonWriteOptions) => JsonValue | undefined;
-export declare function makeJsonFormatCommon(makeWriteField: (writeEnumFn: typeof writeEnum, writeScalarFn: typeof writeScalar) => JsonFormatWriteFieldFn): JsonFormat;
-declare function writeEnum(type: EnumType, value: number | undefined, emitIntrinsicDefault: boolean, enumAsInteger: boolean): JsonValue | undefined;
-declare function writeScalar(type: ScalarType, value: any, emitIntrinsicDefault: boolean): JsonValue | undefined;
+export declare function makeJsonFormatCommon(nullAsZeroValue: boolean, makeWriteField: (writeEnumFn: typeof writeEnum, writeScalarFn: typeof writeScalar) => JsonFormatWriteFieldFn): JsonFormat;
+declare function writeEnum(type: EnumType, value: number | undefined, emitZeroValue: boolean, enumAsInteger: boolean): JsonValue | undefined;
+declare function writeScalar(type: ScalarType, value: any, emitZeroValue: boolean): JsonValue | undefined;
 export {};

package/dist/cjs/private/json-format-common.js

@@ -39,7 +39,7 @@ function makeReadOptions(options) {
 function makeWriteOptions(options) {
     return options ? Object.assign(Object.assign({}, jsonWriteDefaults), options) : jsonWriteDefaults;
 }
-function makeJsonFormatCommon(makeWriteField) {
+function makeJsonFormatCommon(nullAsZeroValue, makeWriteField) {
     const writeField = makeWriteField(writeEnum, writeScalar);
     return {
         makeReadOptions,
@@ -65,7 +65,7 @@ function makeJsonFormatCommon(makeWriteField) {
                         }
                         oneofSeen.set(field.oneof, jsonKey);
                     }
-                    readField(message, jsonValue, field, options, type);
+                    readField(message, jsonValue, field, options, type, nullAsZeroValue);
                 }
                 else {
                     let found = false;
@@ -76,7 +76,7 @@ function makeJsonFormatCommon(makeWriteField) {
                         if (ext && ext.extendee.typeName == type.typeName) {
                             found = true;
                             const [container, get] = (0, extensions_js_1.createExtensionContainer)(ext);
-                            readField(container, jsonValue, ext.field, options, ext);
+                            readField(container, jsonValue, ext.field, options, ext, true);
                             // We pass on the options as BinaryReadOptions/BinaryWriteOptions,
                             // so that users can bring their own binary reader and writer factories
                             // if necessary.
@@ -142,7 +142,7 @@ function makeJsonFormatCommon(makeWriteField) {
             }
             return json;
         },
-        readScalar,
+        readScalar: (type, json, longType) => readScalar(type, json, longType, nullAsZeroValue), // eslint-disable-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-return
         writeScalar,
         debug: debugJsonValue,
     };
@@ -163,8 +163,11 @@ function debugJsonValue(json) {
 }
 // Read a JSON value for a field.
 // The "type" argument is only used to provide context in errors.
+// The argument "nullAsZeroValue" applies to singular fields (not repeated, map,
+// or oneof). If the argument is `true`, JSON null is parsed as the fields
+// zero-value. If the argument is false, JSON null sets the field to `undefined`.
 function readField(target, // eslint-disable-line @typescript-eslint/no-explicit-any -- `any` is the best choice for dynamic access
-jsonValue, field, options, type) {
+jsonValue, field, options, type, nullAsZeroValue) {
     let localName = field.localName;
     if (field.oneof) {
         if (jsonValue === null && field.kind == "scalar") {
@@ -193,13 +196,13 @@ jsonValue, field, options, type) {
                     val = field.T.fromJson(jsonItem, options);
                     break;
                 case "enum":
-                    val = readEnum(field.T, jsonItem, options.ignoreUnknownFields);
+                    val = readEnum(field.T, jsonItem, options.ignoreUnknownFields, true);
                     if (val === undefined)
                         continue;
                     break;
                 case "scalar":
                     try {
-                        val = readScalar(field.T, jsonItem, field.L);
+                        val = readScalar(field.T, jsonItem, field.L, true);
                     }
                     catch (e) {
                         let m = `cannot decode field ${type.typeName}.${field.name} from JSON: ${debugJsonValue(jsonItem)}`;
@@ -231,13 +234,13 @@ jsonValue, field, options, type) {
                     val = field.V.T.fromJson(jsonMapValue, options);
                     break;
                 case "enum":
-                    val = readEnum(field.V.T, jsonMapValue, options.ignoreUnknownFields);
+                    val = readEnum(field.V.T, jsonMapValue, options.ignoreUnknownFields, true);
                     if (val === undefined)
                         continue;
                     break;
                 case "scalar":
                     try {
-                        val = readScalar(field.V.T, jsonMapValue, field_js_1.LongType.BIGINT);
+                        val = readScalar(field.V.T, jsonMapValue, field_js_1.LongType.BIGINT, true);
                     }
                     catch (e) {
                         let m = `cannot decode map value for field ${type.typeName}.${field.name} from JSON: ${debugJsonValue(jsonValue)}`;
@@ -255,7 +258,7 @@ jsonValue, field, options, type) {
                         : jsonMapKey == "false"
                             ? false
                             : jsonMapKey
-                    : jsonMapKey, field_js_1.LongType.BIGINT).toString()] = val;
+                    : jsonMapKey, field_js_1.LongType.BIGINT, true).toString()] = val;
             }
             catch (e) {
                 let m = `cannot decode map key for field ${type.typeName}.${field.name} from JSON: ${debugJsonValue(jsonValue)}`;
@@ -288,14 +291,14 @@ jsonValue, field, options, type) {
                 }
                 break;
             case "enum":
-                const enumValue = readEnum(field.T, jsonValue, options.ignoreUnknownFields);
+                const enumValue = readEnum(field.T, jsonValue, options.ignoreUnknownFields, nullAsZeroValue);
                 if (enumValue !== undefined) {
                     target[localName] = enumValue;
                 }
                 break;
             case "scalar":
                 try {
-                    target[localName] = readScalar(field.T, jsonValue, field.L);
+                    target[localName] = readScalar(field.T, jsonValue, field.L, nullAsZeroValue);
                 }
                 catch (e) {
                     let m = `cannot decode field ${type.typeName}.${field.name} from JSON: ${debugJsonValue(jsonValue)}`;
@@ -310,7 +313,10 @@ jsonValue, field, options, type) {
 }
 // May throw an error. If the error message is non-blank, it should be shown.
 // It is up to the caller to provide context.
-function readScalar(type, json, longType) {
+// If the argument "nullAsZeroValue" is `true`, this function returns the zero-value
+// for JSON null. If the argument is `false`, this function returns `undefined`
+// for JSON null.
+function readScalar(type, json, longType, nullAsZeroValue) {
     // every valid case in the switch below returns, and every fall
     // through is regarded as a failure.
     switch (type) {
@@ -319,7 +325,7 @@ function readScalar(type, json, longType) {
         case field_js_1.ScalarType.DOUBLE:
         case field_js_1.ScalarType.FLOAT:
             if (json === null)
-                return 0.0; // TODO field presence: this should reset the field with explicit presence
+                return nullAsZeroValue ? 0.0 : undefined;
             if (json === "NaN")
                 return Number.NaN;
             if (json === "Infinity")
@@ -356,7 +362,7 @@ function readScalar(type, json, longType) {
         case field_js_1.ScalarType.SINT32:
         case field_js_1.ScalarType.UINT32:
             if (json === null)
-                return 0; // TODO field presence: this should reset the field with explicit presence
+                return nullAsZeroValue ? 0 : undefined;
             let int32;
             if (typeof json == "number")
                 int32 = json;
@@ -376,7 +382,7 @@ function readScalar(type, json, longType) {
         case field_js_1.ScalarType.SFIXED64:
         case field_js_1.ScalarType.SINT64:
             if (json === null)
-                return proto_int64_js_1.protoInt64.zero; // TODO field presence: this should reset the field with explicit presence
+                return nullAsZeroValue ? proto_int64_js_1.protoInt64.zero : undefined;
             if (typeof json != "number" && typeof json != "string")
                 break;
             const long = proto_int64_js_1.protoInt64.parse(json);
@@ -385,7 +391,7 @@ function readScalar(type, json, longType) {
         case field_js_1.ScalarType.FIXED64:
         case field_js_1.ScalarType.UINT64:
             if (json === null)
-                return proto_int64_js_1.protoInt64.zero; // TODO field presence: this should reset the field with explicit presence
+                return nullAsZeroValue ? proto_int64_js_1.protoInt64.zero : undefined;
             if (typeof json != "number" && typeof json != "string")
                 break;
             const uLong = proto_int64_js_1.protoInt64.uParse(json);
@@ -394,14 +400,14 @@ function readScalar(type, json, longType) {
         // bool:
         case field_js_1.ScalarType.BOOL:
             if (json === null)
-                return false; // TODO field presence: this should reset the field with explicit presence
+                return nullAsZeroValue ? false : undefined;
             if (typeof json !== "boolean")
                 break;
             return json;
         // string:
         case field_js_1.ScalarType.STRING:
             if (json === null)
-                return ""; // TODO field presence: this should reset the field with explicit presence
+                return nullAsZeroValue ? "" : undefined;
             if (typeof json !== "string") {
                 break;
             }
@@ -417,19 +423,24 @@ function readScalar(type, json, longType) {
         // bytes: JSON value will be the data encoded as a string using standard base64 encoding with paddings.
         // Either standard or URL-safe base64 encoding with/without paddings are accepted.
         case field_js_1.ScalarType.BYTES:
-            if (json === null || json === "")
-                return new Uint8Array(0); // TODO field presence: this should reset the field with explicit presence
+            if (json === null)
+                return nullAsZeroValue ? new Uint8Array(0) : undefined;
+            if (json === "")
+                return new Uint8Array(0);
             if (typeof json !== "string")
                 break;
             return proto_base64_js_1.protoBase64.dec(json);
     }
     throw new Error();
 }
-function readEnum(type, json, ignoreUnknownFields) {
+// If the argument "nullAsZeroValue" is `true`, this function returns the first
+// enum value for JSON null. If the argument is `false`, this function returns
+// `undefined`.
+function readEnum(type, json, ignoreUnknownFields, nullAsZeroValue) {
     if (json === null) {
-        // proto3 requires 0 to be default value for all enums
-        // TODO field presence: this should reset the field with explicit presence
-        return 0;
+        // proto3 requires 0 to be default value for all enums (which is required to be the first value).
+        // proto2 uses the first value (at least with protoc-gen-go).
+        return nullAsZeroValue ? type.values[0].no : undefined;
     }
     // eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check
     switch (typeof json) {
@@ -448,12 +459,12 @@ function readEnum(type, json, ignoreUnknownFields) {
     }
     throw new Error(`cannot decode enum ${type.typeName} from JSON: ${debugJsonValue(json)}`);
 }
-function writeEnum(type, value, emitIntrinsicDefault, enumAsInteger) {
+function writeEnum(type, value, emitZeroValue, enumAsInteger) {
     var _a;
     if (value === undefined) {
         return value;
     }
-    if (value === 0 && !emitIntrinsicDefault) {
+    if (!emitZeroValue && type.values[0].no === value) {
         // proto3 requires 0 to be default value for all enums
         return undefined;
     }
@@ -466,7 +477,7 @@ function writeEnum(type, value, emitIntrinsicDefault, enumAsInteger) {
     const val = type.findNumber(value);
     return (_a = val === null || val === void 0 ? void 0 : val.name) !== null && _a !== void 0 ? _a : value; // if we don't know the enum value, just return the number
 }
-function writeScalar(type, value, emitIntrinsicDefault) {
+function writeScalar(type, value, emitZeroValue) {
     if (value === undefined) {
         return undefined;
     }
@@ -478,7 +489,7 @@ function writeScalar(type, value, emitIntrinsicDefault) {
         case field_js_1.ScalarType.FIXED32:
         case field_js_1.ScalarType.UINT32:
             (0, assert_js_1.assert)(typeof value == "number");
-            return value != 0 || emitIntrinsicDefault ? value : undefined;
+            return value != 0 || emitZeroValue ? value : undefined;
         // float, double: JSON value will be a number or one of the special string values "NaN", "Infinity", and "-Infinity".
         // Either numbers or strings are accepted. Exponent notation is also accepted.
         case field_js_1.ScalarType.FLOAT:
@@ -491,15 +502,15 @@ function writeScalar(type, value, emitIntrinsicDefault) {
                 return "Infinity";
             if (value === Number.NEGATIVE_INFINITY)
                 return "-Infinity";
-            return value !== 0 || emitIntrinsicDefault ? value : undefined;
+            return value !== 0 || emitZeroValue ? value : undefined;
         // string:
         case field_js_1.ScalarType.STRING:
             (0, assert_js_1.assert)(typeof value == "string");
-            return value.length > 0 || emitIntrinsicDefault ? value : undefined;
+            return value.length > 0 || emitZeroValue ? value : undefined;
         // bool:
         case field_js_1.ScalarType.BOOL:
             (0, assert_js_1.assert)(typeof value == "boolean");
-            return value || emitIntrinsicDefault ? value : undefined;
+            return value || emitZeroValue ? value : undefined;
         // JSON value will be a decimal string. Either numbers or strings are accepted.
         case field_js_1.ScalarType.UINT64:
         case field_js_1.ScalarType.FIXED64:
@@ -512,14 +523,12 @@ function writeScalar(type, value, emitIntrinsicDefault) {
             // We use implicit conversion with `value != 0` to catch both 0n and "0"
             // eslint-disable-next-line @typescript-eslint/ban-ts-comment
             // @ts-ignore
-            return emitIntrinsicDefault || value != 0
-                ? value.toString(10)
-                : undefined;
+            return emitZeroValue || value != 0 ? value.toString(10) : undefined;
         // bytes: JSON value will be the data encoded as a string using standard base64 encoding with paddings.
         // Either standard or URL-safe base64 encoding with/without paddings are accepted.
         case field_js_1.ScalarType.BYTES:
             (0, assert_js_1.assert)(value instanceof Uint8Array);
-            return emitIntrinsicDefault || value.byteLength > 0
+            return emitZeroValue || value.byteLength > 0
                 ? proto_base64_js_1.protoBase64.enc(value)
                 : undefined;
     }

package/dist/cjs/private/json-format-proto2.js

@@ -19,8 +19,8 @@ const assert_js_1 = require("./assert.js");
 const json_format_common_js_1 = require("./json-format-common.js");
 /* eslint-disable no-case-declarations, @typescript-eslint/restrict-plus-operands,@typescript-eslint/no-explicit-any,@typescript-eslint/no-unsafe-return,@typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-argument */
 function makeJsonFormatProto2() {
-    // TODO field presence: merge this function with proto2
-    return (0, json_format_common_js_1.makeJsonFormatCommon)((writeEnum, writeScalar) => {
+    // TODO field presence: merge this function with proto3. the reading side already switches behavior on the nullAsZeroValue argument.
+    return (0, json_format_common_js_1.makeJsonFormatCommon)(false, (writeEnum, writeScalar) => {
         return function writeField(field, value, options) {
             if (field.kind == "map") {
                 const jsonObj = {};

package/dist/cjs/private/json-format-proto3.js

@@ -19,8 +19,8 @@ const assert_js_1 = require("./assert.js");
 const json_format_common_js_1 = require("./json-format-common.js");
 /* eslint-disable no-case-declarations, @typescript-eslint/restrict-plus-operands,@typescript-eslint/no-explicit-any,@typescript-eslint/no-unsafe-return,@typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-argument */
 function makeJsonFormatProto3() {
-    // TODO field presence: merge this function with proto2
-    return (0, json_format_common_js_1.makeJsonFormatCommon)((writeEnum, writeScalar) => {
+    // TODO field presence: merge this function with proto2. the reading side already switches behavior on the nullAsZeroValue argument.
+    return (0, json_format_common_js_1.makeJsonFormatCommon)(true, (writeEnum, writeScalar) => {
         return function writeField(field, value, options) {
             if (field.kind == "map") {
                 const jsonObj = {};

package/dist/esm/create-descriptor-set.d.ts

@@ -1,5 +1,6 @@
 import { FeatureSetDefaults, FileDescriptorProto, FileDescriptorSet } from "./google/protobuf/descriptor_pb.js";
 import type { DescriptorSet } from "./descriptor-set.js";
+import type { BinaryReadOptions, BinaryWriteOptions } from "./binary-format.js";
 /**
  * Create a DescriptorSet, a convenient interface for working with a set of
  * google.protobuf.FileDescriptorProto.
@@ -26,5 +27,10 @@ interface CreateDescriptorSetOptions {
      * `--experimental_edition_defaults_out`.
      */
     featureSetDefaults?: FeatureSetDefaults;
+    /**
+     * Internally, data is serialized when features are resolved. The
+     * serialization options given here will be used for feature resolution.
+     */
+    serializationOptions?: Partial<BinaryReadOptions & BinaryWriteOptions>;
 }
 export {};

package/dist/esm/create-descriptor-set.js

@@ -17,7 +17,7 @@ import { LongType, ScalarType } from "./field.js";
 import { MethodIdempotency, MethodKind } from "./service-type.js";
 import { fieldJsonName, findEnumSharedPrefix } from "./private/names.js";
 import { parseTextFormatEnumValue, parseTextFormatScalarValue, } from "./private/text-format.js";
-import { createFeatureResolver, featureSetDefaults, } from "./private/feature-set.js";
+import { createFeatureResolver } from "./private/feature-set.js";
 /**
  * Create a DescriptorSet, a convenient interface for working with a set of
  * google.protobuf.FileDescriptorProto.
@@ -41,11 +41,11 @@ export function createDescriptorSet(input, options) {
             : input;
     const resolverByEdition = new Map();
     const files = fileDescriptors.map((proto) => {
-        var _a, _b;
+        var _a;
         const edition = (_a = proto.edition) !== null && _a !== void 0 ? _a : parseFileSyntax(proto.syntax, proto.edition).edition;
         let resolveFeatures = resolverByEdition.get(edition);
         if (resolveFeatures === undefined) {
-            resolveFeatures = createFeatureResolver((_b = options === null || options === void 0 ? void 0 : options.featureSetDefaults) !== null && _b !== void 0 ? _b : featureSetDefaults, edition);
+            resolveFeatures = createFeatureResolver(edition, options === null || options === void 0 ? void 0 : options.featureSetDefaults, options === null || options === void 0 ? void 0 : options.serializationOptions);
             resolverByEdition.set(edition, resolveFeatures);
         }
         return newFile(proto, cart, resolveFeatures);

package/dist/esm/google/protobuf/descriptor_pb.js

@@ -18,7 +18,7 @@
 // The messages in this file describe the definitions found in .proto files.
 // A valid .proto file can be translated directly to a FileDescriptorProto
 // without any other information (e.g. without reading its imports).
-// @generated by protoc-gen-es v1.7.0 with parameter "bootstrap_wkt=true,ts_nocheck=false,target=ts"
+// @generated by protoc-gen-es v1.7.1 with parameter "bootstrap_wkt=true,ts_nocheck=false,target=ts"
 // @generated from file google/protobuf/descriptor.proto (package google.protobuf, syntax proto2)
 /* eslint-disable */
 import { proto2 } from "../../proto2.js";

package/dist/esm/google/protobuf/struct_pb.js

@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// @generated by protoc-gen-es v1.7.0 with parameter "bootstrap_wkt=true,ts_nocheck=false,target=ts"
+// @generated by protoc-gen-es v1.7.1 with parameter "bootstrap_wkt=true,ts_nocheck=false,target=ts"
 // @generated from file google/protobuf/struct.proto (package google.protobuf, syntax proto3)
 /* eslint-disable */
 import { proto3 } from "../../proto3.js";

package/dist/esm/google/protobuf/type_pb.js

@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// @generated by protoc-gen-es v1.7.0 with parameter "bootstrap_wkt=true,ts_nocheck=false,target=ts"
+// @generated by protoc-gen-es v1.7.1 with parameter "bootstrap_wkt=true,ts_nocheck=false,target=ts"
 // @generated from file google/protobuf/type.proto (package google.protobuf, syntax proto3)
 /* eslint-disable */
 import { proto3 } from "../../proto3.js";

package/dist/esm/private/feature-set.d.ts

@@ -1,8 +1,5 @@
 import { Edition, FeatureSet, FeatureSetDefaults } from "../google/protobuf/descriptor_pb.js";
-/**
- * Static edition feature defaults supported by @bufbuild/protobuf.
- */
-export declare const featureSetDefaults: FeatureSetDefaults;
+import type { BinaryReadOptions, BinaryWriteOptions } from "../binary-format.js";
 /**
  * A merged google.protobuf.FeaturesSet, with all fields guaranteed to be set.
  */
@@ -16,6 +13,7 @@ export type MergedFeatureSet = FeatureSet & Required<FeatureSet>;
  */
 export type FeatureResolverFn = (a?: FeatureSet, b?: FeatureSet) => MergedFeatureSet;
 /**
- * Create an edition feature resolver with the given feature set defaults.
+ * Create an edition feature resolver with the given feature set defaults, or
+ * the feature set defaults supported by @bufbuild/protobuf.
  */
-export declare function createFeatureResolver(compiledFeatureSetDefaults: FeatureSetDefaults, edition: Edition): FeatureResolverFn;
+export declare function createFeatureResolver(edition: Edition, compiledFeatureSetDefaults?: FeatureSetDefaults, serializationOptions?: Partial<BinaryReadOptions & BinaryWriteOptions>): FeatureResolverFn;

package/dist/esm/private/feature-set.js

@@ -14,20 +14,24 @@
 import { Edition, FeatureSet, FeatureSetDefaults, } from "../google/protobuf/descriptor_pb.js";
 import { protoBase64 } from "../proto-base64.js";
 /**
- * Static edition feature defaults supported by @bufbuild/protobuf.
+ * Return the edition feature defaults supported by @bufbuild/protobuf.
  */
-export const featureSetDefaults = FeatureSetDefaults.fromBinary(protoBase64.dec(
-/*upstream-inject-feature-defaults-start*/ "ChESDAgBEAIYAiABKAEwAhjmBwoREgwIAhABGAEgAigBMAEY5wcKERIMCAEQARgBIAIoATABGOgHIOYHKOgH" /*upstream-inject-feature-defaults-end*/));
+function getFeatureSetDefaults(options) {
+    return FeatureSetDefaults.fromBinary(protoBase64.dec(
+    /*upstream-inject-feature-defaults-start*/ "ChESDAgBEAIYAiABKAEwAhjmBwoREgwIAhABGAEgAigBMAEY5wcKERIMCAEQARgBIAIoATABGOgHIOYHKOgH" /*upstream-inject-feature-defaults-end*/), options);
+}
 /**
- * Create an edition feature resolver with the given feature set defaults.
+ * Create an edition feature resolver with the given feature set defaults, or
+ * the feature set defaults supported by @bufbuild/protobuf.
  */
-export function createFeatureResolver(compiledFeatureSetDefaults, edition) {
+export function createFeatureResolver(edition, compiledFeatureSetDefaults, serializationOptions) {
     var _a, _b;
-    const min = compiledFeatureSetDefaults.minimumEdition;
-    const max = compiledFeatureSetDefaults.maximumEdition;
+    const fds = compiledFeatureSetDefaults !== null && compiledFeatureSetDefaults !== void 0 ? compiledFeatureSetDefaults : getFeatureSetDefaults(serializationOptions);
+    const min = fds.minimumEdition;
+    const max = fds.maximumEdition;
     if (min === undefined ||
         max === undefined ||
-        compiledFeatureSetDefaults.defaults.some((d) => d.edition === undefined)) {
+        fds.defaults.some((d) => d.edition === undefined)) {
         throw new Error("Invalid FeatureSetDefaults");
     }
     if (edition < min) {
@@ -37,7 +41,7 @@ export function createFeatureResolver(compiledFeatureSetDefaults, edition) {
         throw new Error(`Edition ${Edition[edition]} is later than the maximum supported edition ${Edition[max]}`);
     }
     let highestMatch = undefined;
-    for (const c of compiledFeatureSetDefaults.defaults) {
+    for (const c of fds.defaults) {
         const e = (_a = c.edition) !== null && _a !== void 0 ? _a : 0;
         if (e > edition) {
             continue;
@@ -53,12 +57,12 @@ export function createFeatureResolver(compiledFeatureSetDefaults, edition) {
     if (highestMatch === undefined) {
         throw new Error(`No valid default found for edition ${Edition[edition]}`);
     }
-    const defaultsBin = highestMatch.f.toBinary();
+    const featureSetBin = highestMatch.f.toBinary(serializationOptions);
     return (...rest) => {
-        const f = FeatureSet.fromBinary(defaultsBin);
+        const f = FeatureSet.fromBinary(featureSetBin, serializationOptions);
         for (const c of rest) {
             if (c !== undefined) {
-                f.fromBinary(c.toBinary());
+                f.fromBinary(c.toBinary(serializationOptions), serializationOptions);
             }
         }
         if (!validateMergedFeatures(f)) {

package/dist/esm/private/json-format-common.d.ts

@@ -3,7 +3,7 @@ import type { FieldInfo } from "../field.js";
 import { ScalarType } from "../field.js";
 import type { EnumType } from "../enum.js";
 type JsonFormatWriteFieldFn = (field: FieldInfo, value: any, options: JsonWriteOptions) => JsonValue | undefined;
-export declare function makeJsonFormatCommon(makeWriteField: (writeEnumFn: typeof writeEnum, writeScalarFn: typeof writeScalar) => JsonFormatWriteFieldFn): JsonFormat;
-declare function writeEnum(type: EnumType, value: number | undefined, emitIntrinsicDefault: boolean, enumAsInteger: boolean): JsonValue | undefined;
-declare function writeScalar(type: ScalarType, value: any, emitIntrinsicDefault: boolean): JsonValue | undefined;
+export declare function makeJsonFormatCommon(nullAsZeroValue: boolean, makeWriteField: (writeEnumFn: typeof writeEnum, writeScalarFn: typeof writeScalar) => JsonFormatWriteFieldFn): JsonFormat;
+declare function writeEnum(type: EnumType, value: number | undefined, emitZeroValue: boolean, enumAsInteger: boolean): JsonValue | undefined;
+declare function writeScalar(type: ScalarType, value: any, emitZeroValue: boolean): JsonValue | undefined;
 export {};

package/dist/esm/private/json-format-common.js

@@ -36,7 +36,7 @@ function makeReadOptions(options) {
 function makeWriteOptions(options) {
     return options ? Object.assign(Object.assign({}, jsonWriteDefaults), options) : jsonWriteDefaults;
 }
-export function makeJsonFormatCommon(makeWriteField) {
+export function makeJsonFormatCommon(nullAsZeroValue, makeWriteField) {
     const writeField = makeWriteField(writeEnum, writeScalar);
     return {
         makeReadOptions,
@@ -62,7 +62,7 @@ export function makeJsonFormatCommon(makeWriteField) {
                         }
                         oneofSeen.set(field.oneof, jsonKey);
                     }
-                    readField(message, jsonValue, field, options, type);
+                    readField(message, jsonValue, field, options, type, nullAsZeroValue);
                 }
                 else {
                     let found = false;
@@ -73,7 +73,7 @@ export function makeJsonFormatCommon(makeWriteField) {
                         if (ext && ext.extendee.typeName == type.typeName) {
                             found = true;
                             const [container, get] = createExtensionContainer(ext);
-                            readField(container, jsonValue, ext.field, options, ext);
+                            readField(container, jsonValue, ext.field, options, ext, true);
                             // We pass on the options as BinaryReadOptions/BinaryWriteOptions,
                             // so that users can bring their own binary reader and writer factories
                             // if necessary.
@@ -139,7 +139,7 @@ export function makeJsonFormatCommon(makeWriteField) {
             }
             return json;
         },
-        readScalar,
+        readScalar: (type, json, longType) => readScalar(type, json, longType, nullAsZeroValue), // eslint-disable-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-return
         writeScalar,
         debug: debugJsonValue,
     };
@@ -159,8 +159,11 @@ function debugJsonValue(json) {
 }
 // Read a JSON value for a field.
 // The "type" argument is only used to provide context in errors.
+// The argument "nullAsZeroValue" applies to singular fields (not repeated, map,
+// or oneof). If the argument is `true`, JSON null is parsed as the fields
+// zero-value. If the argument is false, JSON null sets the field to `undefined`.
 function readField(target, // eslint-disable-line @typescript-eslint/no-explicit-any -- `any` is the best choice for dynamic access
-jsonValue, field, options, type) {
+jsonValue, field, options, type, nullAsZeroValue) {
     let localName = field.localName;
     if (field.oneof) {
         if (jsonValue === null && field.kind == "scalar") {
@@ -189,13 +192,13 @@ jsonValue, field, options, type) {
                     val = field.T.fromJson(jsonItem, options);
                     break;
                 case "enum":
-                    val = readEnum(field.T, jsonItem, options.ignoreUnknownFields);
+                    val = readEnum(field.T, jsonItem, options.ignoreUnknownFields, true);
                     if (val === undefined)
                         continue;
                     break;
                 case "scalar":
                     try {
-                        val = readScalar(field.T, jsonItem, field.L);
+                        val = readScalar(field.T, jsonItem, field.L, true);
                     }
                     catch (e) {
                         let m = `cannot decode field ${type.typeName}.${field.name} from JSON: ${debugJsonValue(jsonItem)}`;
@@ -227,13 +230,13 @@ jsonValue, field, options, type) {
                     val = field.V.T.fromJson(jsonMapValue, options);
                     break;
                 case "enum":
-                    val = readEnum(field.V.T, jsonMapValue, options.ignoreUnknownFields);
+                    val = readEnum(field.V.T, jsonMapValue, options.ignoreUnknownFields, true);
                     if (val === undefined)
                         continue;
                     break;
                 case "scalar":
                     try {
-                        val = readScalar(field.V.T, jsonMapValue, LongType.BIGINT);
+                        val = readScalar(field.V.T, jsonMapValue, LongType.BIGINT, true);
                     }
                     catch (e) {
                         let m = `cannot decode map value for field ${type.typeName}.${field.name} from JSON: ${debugJsonValue(jsonValue)}`;
@@ -251,7 +254,7 @@ jsonValue, field, options, type) {
                         : jsonMapKey == "false"
                             ? false
                             : jsonMapKey
-                    : jsonMapKey, LongType.BIGINT).toString()] = val;
+                    : jsonMapKey, LongType.BIGINT, true).toString()] = val;
             }
             catch (e) {
                 let m = `cannot decode map key for field ${type.typeName}.${field.name} from JSON: ${debugJsonValue(jsonValue)}`;
@@ -284,14 +287,14 @@ jsonValue, field, options, type) {
                 }
                 break;
             case "enum":
-                const enumValue = readEnum(field.T, jsonValue, options.ignoreUnknownFields);
+                const enumValue = readEnum(field.T, jsonValue, options.ignoreUnknownFields, nullAsZeroValue);
                 if (enumValue !== undefined) {
                     target[localName] = enumValue;
                 }
                 break;
             case "scalar":
                 try {
-                    target[localName] = readScalar(field.T, jsonValue, field.L);
+                    target[localName] = readScalar(field.T, jsonValue, field.L, nullAsZeroValue);
                 }
                 catch (e) {
                     let m = `cannot decode field ${type.typeName}.${field.name} from JSON: ${debugJsonValue(jsonValue)}`;
@@ -306,7 +309,10 @@ jsonValue, field, options, type) {
 }
 // May throw an error. If the error message is non-blank, it should be shown.
 // It is up to the caller to provide context.
-function readScalar(type, json, longType) {
+// If the argument "nullAsZeroValue" is `true`, this function returns the zero-value
+// for JSON null. If the argument is `false`, this function returns `undefined`
+// for JSON null.
+function readScalar(type, json, longType, nullAsZeroValue) {
     // every valid case in the switch below returns, and every fall
     // through is regarded as a failure.
     switch (type) {
@@ -315,7 +321,7 @@ function readScalar(type, json, longType) {
         case ScalarType.DOUBLE:
         case ScalarType.FLOAT:
             if (json === null)
-                return 0.0; // TODO field presence: this should reset the field with explicit presence
+                return nullAsZeroValue ? 0.0 : undefined;
             if (json === "NaN")
                 return Number.NaN;
             if (json === "Infinity")
@@ -352,7 +358,7 @@ function readScalar(type, json, longType) {
         case ScalarType.SINT32:
         case ScalarType.UINT32:
             if (json === null)
-                return 0; // TODO field presence: this should reset the field with explicit presence
+                return nullAsZeroValue ? 0 : undefined;
             let int32;
             if (typeof json == "number")
                 int32 = json;
@@ -372,7 +378,7 @@ function readScalar(type, json, longType) {
         case ScalarType.SFIXED64:
         case ScalarType.SINT64:
             if (json === null)
-                return protoInt64.zero; // TODO field presence: this should reset the field with explicit presence
+                return nullAsZeroValue ? protoInt64.zero : undefined;
             if (typeof json != "number" && typeof json != "string")
                 break;
             const long = protoInt64.parse(json);
@@ -381,7 +387,7 @@ function readScalar(type, json, longType) {
         case ScalarType.FIXED64:
         case ScalarType.UINT64:
             if (json === null)
-                return protoInt64.zero; // TODO field presence: this should reset the field with explicit presence
+                return nullAsZeroValue ? protoInt64.zero : undefined;
             if (typeof json != "number" && typeof json != "string")
                 break;
             const uLong = protoInt64.uParse(json);
@@ -390,14 +396,14 @@ function readScalar(type, json, longType) {
         // bool:
         case ScalarType.BOOL:
             if (json === null)
-                return false; // TODO field presence: this should reset the field with explicit presence
+                return nullAsZeroValue ? false : undefined;
             if (typeof json !== "boolean")
                 break;
             return json;
         // string:
         case ScalarType.STRING:
             if (json === null)
-                return ""; // TODO field presence: this should reset the field with explicit presence
+                return nullAsZeroValue ? "" : undefined;
             if (typeof json !== "string") {
                 break;
             }
@@ -413,19 +419,24 @@ function readScalar(type, json, longType) {
         // bytes: JSON value will be the data encoded as a string using standard base64 encoding with paddings.
         // Either standard or URL-safe base64 encoding with/without paddings are accepted.
         case ScalarType.BYTES:
-            if (json === null || json === "")
-                return new Uint8Array(0); // TODO field presence: this should reset the field with explicit presence
+            if (json === null)
+                return nullAsZeroValue ? new Uint8Array(0) : undefined;
+            if (json === "")
+                return new Uint8Array(0);
             if (typeof json !== "string")
                 break;
             return protoBase64.dec(json);
     }
     throw new Error();
 }
-function readEnum(type, json, ignoreUnknownFields) {
+// If the argument "nullAsZeroValue" is `true`, this function returns the first
+// enum value for JSON null. If the argument is `false`, this function returns
+// `undefined`.
+function readEnum(type, json, ignoreUnknownFields, nullAsZeroValue) {
     if (json === null) {
-        // proto3 requires 0 to be default value for all enums
-        // TODO field presence: this should reset the field with explicit presence
-        return 0;
+        // proto3 requires 0 to be default value for all enums (which is required to be the first value).
+        // proto2 uses the first value (at least with protoc-gen-go).
+        return nullAsZeroValue ? type.values[0].no : undefined;
     }
     // eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check
     switch (typeof json) {
@@ -444,12 +455,12 @@ function readEnum(type, json, ignoreUnknownFields) {
     }
     throw new Error(`cannot decode enum ${type.typeName} from JSON: ${debugJsonValue(json)}`);
 }
-function writeEnum(type, value, emitIntrinsicDefault, enumAsInteger) {
+function writeEnum(type, value, emitZeroValue, enumAsInteger) {
     var _a;
     if (value === undefined) {
         return value;
     }
-    if (value === 0 && !emitIntrinsicDefault) {
+    if (!emitZeroValue && type.values[0].no === value) {
         // proto3 requires 0 to be default value for all enums
         return undefined;
     }
@@ -462,7 +473,7 @@ function writeEnum(type, value, emitIntrinsicDefault, enumAsInteger) {
     const val = type.findNumber(value);
     return (_a = val === null || val === void 0 ? void 0 : val.name) !== null && _a !== void 0 ? _a : value; // if we don't know the enum value, just return the number
 }
-function writeScalar(type, value, emitIntrinsicDefault) {
+function writeScalar(type, value, emitZeroValue) {
     if (value === undefined) {
         return undefined;
     }
@@ -474,7 +485,7 @@ function writeScalar(type, value, emitIntrinsicDefault) {
         case ScalarType.FIXED32:
         case ScalarType.UINT32:
             assert(typeof value == "number");
-            return value != 0 || emitIntrinsicDefault ? value : undefined;
+            return value != 0 || emitZeroValue ? value : undefined;
         // float, double: JSON value will be a number or one of the special string values "NaN", "Infinity", and "-Infinity".
         // Either numbers or strings are accepted. Exponent notation is also accepted.
         case ScalarType.FLOAT:
@@ -487,15 +498,15 @@ function writeScalar(type, value, emitIntrinsicDefault) {
                 return "Infinity";
             if (value === Number.NEGATIVE_INFINITY)
                 return "-Infinity";
-            return value !== 0 || emitIntrinsicDefault ? value : undefined;
+            return value !== 0 || emitZeroValue ? value : undefined;
         // string:
         case ScalarType.STRING:
             assert(typeof value == "string");
-            return value.length > 0 || emitIntrinsicDefault ? value : undefined;
+            return value.length > 0 || emitZeroValue ? value : undefined;
         // bool:
         case ScalarType.BOOL:
             assert(typeof value == "boolean");
-            return value || emitIntrinsicDefault ? value : undefined;
+            return value || emitZeroValue ? value : undefined;
         // JSON value will be a decimal string. Either numbers or strings are accepted.
         case ScalarType.UINT64:
         case ScalarType.FIXED64:
@@ -508,14 +519,12 @@ function writeScalar(type, value, emitIntrinsicDefault) {
             // We use implicit conversion with `value != 0` to catch both 0n and "0"
             // eslint-disable-next-line @typescript-eslint/ban-ts-comment
             // @ts-ignore
-            return emitIntrinsicDefault || value != 0
-                ? value.toString(10)
-                : undefined;
+            return emitZeroValue || value != 0 ? value.toString(10) : undefined;
         // bytes: JSON value will be the data encoded as a string using standard base64 encoding with paddings.
         // Either standard or URL-safe base64 encoding with/without paddings are accepted.
         case ScalarType.BYTES:
             assert(value instanceof Uint8Array);
-            return emitIntrinsicDefault || value.byteLength > 0
+            return emitZeroValue || value.byteLength > 0
                 ? protoBase64.enc(value)
                 : undefined;
     }

package/dist/esm/private/json-format-proto2.js

@@ -16,8 +16,8 @@ import { assert } from "./assert.js";
 import { makeJsonFormatCommon } from "./json-format-common.js";
 /* eslint-disable no-case-declarations, @typescript-eslint/restrict-plus-operands,@typescript-eslint/no-explicit-any,@typescript-eslint/no-unsafe-return,@typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-argument */
 export function makeJsonFormatProto2() {
-    // TODO field presence: merge this function with proto2
-    return makeJsonFormatCommon((writeEnum, writeScalar) => {
+    // TODO field presence: merge this function with proto3. the reading side already switches behavior on the nullAsZeroValue argument.
+    return makeJsonFormatCommon(false, (writeEnum, writeScalar) => {
         return function writeField(field, value, options) {
             if (field.kind == "map") {
                 const jsonObj = {};

package/dist/esm/private/json-format-proto3.js

@@ -16,8 +16,8 @@ import { assert } from "./assert.js";
 import { makeJsonFormatCommon } from "./json-format-common.js";
 /* eslint-disable no-case-declarations, @typescript-eslint/restrict-plus-operands,@typescript-eslint/no-explicit-any,@typescript-eslint/no-unsafe-return,@typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-argument */
 export function makeJsonFormatProto3() {
-    // TODO field presence: merge this function with proto2
-    return makeJsonFormatCommon((writeEnum, writeScalar) => {
+    // TODO field presence: merge this function with proto2. the reading side already switches behavior on the nullAsZeroValue argument.
+    return makeJsonFormatCommon(true, (writeEnum, writeScalar) => {
         return function writeField(field, value, options) {
             if (field.kind == "map") {
                 const jsonObj = {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bufbuild/protobuf",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "license": "(Apache-2.0 AND BSD-3-Clause)",
   "description": "A complete implementation of Protocol Buffers in TypeScript, suitable for web browsers and Node.js.",
   "repository": {