@bufbuild/protobuf 1.6.0 → 1.7.1

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

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2024 Buf Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -13,60 +13,59 @@
 // 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) {
-    const min = compiledFeatureSetDefaults.minimumEdition;
-    const max = compiledFeatureSetDefaults.maximumEdition;
+function createFeatureResolver(edition, compiledFeatureSetDefaults, serializationOptions) {
+    var _a, _b;
+    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");
     }
-    const defaultsBinByEdition = new Map();
-    return (edition, ...rest) => {
-        var _a, _b;
-        let defaultsBin = defaultsBinByEdition.get(edition);
-        if (defaultsBin === undefined) {
-            if (edition < min) {
-                throw new Error(`Edition ${descriptor_pb_js_1.Edition[edition]} is earlier than the minimum supported edition ${descriptor_pb_js_1.Edition[min]}`);
-            }
-            if (max < 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) {
-                const e = (_a = c.edition) !== null && _a !== void 0 ? _a : 0;
-                if (e > edition) {
-                    continue;
-                }
-                if (highestMatch !== undefined && highestMatch.e > e) {
-                    continue;
-                }
-                highestMatch = {
-                    e,
-                    f: (_b = c.features) !== null && _b !== void 0 ? _b : new descriptor_pb_js_1.FeatureSet(),
-                };
-            }
-            if (highestMatch === undefined) {
-                throw new Error(`No valid default found for edition ${descriptor_pb_js_1.Edition[edition]}`);
-            }
-            defaultsBin = highestMatch.f.toBinary();
-            defaultsBinByEdition.set(edition, defaultsBin);
+    if (edition < min) {
+        throw new Error(`Edition ${descriptor_pb_js_1.Edition[edition]} is earlier than the minimum supported edition ${descriptor_pb_js_1.Edition[min]}`);
+    }
+    if (max < 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 fds.defaults) {
+        const e = (_a = c.edition) !== null && _a !== void 0 ? _a : 0;
+        if (e > edition) {
+            continue;
+        }
+        if (highestMatch !== undefined && highestMatch.e > e) {
+            continue;
         }
-        const f = descriptor_pb_js_1.FeatureSet.fromBinary(defaultsBin);
+        highestMatch = {
+            e,
+            f: (_b = c.features) !== null && _b !== void 0 ? _b : new descriptor_pb_js_1.FeatureSet(),
+        };
+    }
+    if (highestMatch === undefined) {
+        throw new Error(`No valid default found for edition ${descriptor_pb_js_1.Edition[edition]}`);
+    }
+    const featureSetBin = highestMatch.f.toBinary(serializationOptions);
+    return (...rest) => {
+        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/field-list.js

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2024 Buf Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

package/dist/cjs/private/field-wrapper.d.ts

@@ -1,6 +1,6 @@
 import { Message } from "../message.js";
 import type { MessageType } from "../message-type.js";
-import type { DescField } from "../descriptor-set.js";
+import type { DescExtension, DescField } from "../descriptor-set.js";
 import { ScalarType } from "../field.js";
 /**
  * A field wrapper unwraps a message to a primitive value that is more
@@ -22,4 +22,4 @@ export declare function wrapField<T extends Message<T>>(type: MessageType<T>, va
  * If the given field uses one of the well-known wrapper types, return
  * the primitive type it wraps.
  */
-export declare function getUnwrappedFieldType(field: DescField): ScalarType | undefined;
+export declare function getUnwrappedFieldType(field: DescField | DescExtension): ScalarType | undefined;

package/dist/cjs/private/field-wrapper.js

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2024 Buf Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

package/dist/cjs/private/field.js

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2021-2023 Buf Technologies, Inc.
+// Copyright 2021-2024 Buf Technologies, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

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 {};