@bufbuild/protobuf 1.7.2 → 1.8.0

package/dist/cjs/private/proto-runtime.d.ts

@@ -50,4 +50,4 @@ export interface ProtoRuntime {
      */
     makeExtension<E extends Message<E> = AnyMessage, V = unknown>(typeName: string, extendee: MessageType<E>, field: ExtensionFieldSource): Extension<E, V>;
 }
-export declare function makeProtoRuntime(syntax: string, json: JsonFormat, bin: BinaryFormat, util: Util): ProtoRuntime;
+export declare function makeProtoRuntime(syntax: string, newFieldList: Util["newFieldList"], initFields: Util["initFields"]): ProtoRuntime;

package/dist/cjs/private/proto-runtime.js

@@ -17,12 +17,16 @@ exports.makeProtoRuntime = void 0;
 const enum_js_1 = require("./enum.js");
 const message_type_js_1 = require("./message-type.js");
 const extensions_js_1 = require("./extensions.js");
-function makeProtoRuntime(syntax, json, bin, util) {
+const json_format_js_1 = require("./json-format.js");
+const binary_format_js_1 = require("./binary-format.js");
+const util_common_js_1 = require("./util-common.js");
+function makeProtoRuntime(syntax, newFieldList, initFields) {
     return {
         syntax,
-        json,
-        bin,
-        util,
+        json: (0, json_format_js_1.makeJsonFormat)(),
+        bin: (0, binary_format_js_1.makeBinaryFormat)(),
+        util: Object.assign(Object.assign({}, (0, util_common_js_1.makeUtilCommon)()), { newFieldList,
+            initFields }),
         makeMessageType(typeName, fields, opt) {
             return (0, message_type_js_1.makeMessageType)(this, typeName, fields, opt);
         },

package/dist/cjs/private/reflect.d.ts

@@ -0,0 +1,9 @@
+import type { FieldInfo } from "../field.js";
+/**
+ * Returns true if the field is set.
+ */
+export declare function isFieldSet(field: FieldInfo, target: Record<string, any>): boolean;
+/**
+ * Resets the field, so that isFieldSet() will return false.
+ */
+export declare function clearField(field: FieldInfo, target: Record<string, any>): void;

package/dist/cjs/private/reflect.js

@@ -0,0 +1,79 @@
+"use strict";
+// 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.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.clearField = exports.isFieldSet = void 0;
+const scalars_js_1 = require("./scalars.js");
+/**
+ * Returns true if the field is set.
+ */
+function isFieldSet(field, target) {
+    const localName = field.localName;
+    if (field.repeated) {
+        return target[localName].length > 0;
+    }
+    if (field.oneof) {
+        return target[field.oneof.localName].case === localName; // eslint-disable-line @typescript-eslint/no-unsafe-member-access
+    }
+    switch (field.kind) {
+        case "enum":
+        case "scalar":
+            if (field.opt || field.req) {
+                // explicit presence
+                return target[localName] !== undefined;
+            }
+            // implicit presence
+            if (field.kind == "enum") {
+                return target[localName] !== field.T.values[0].no;
+            }
+            return !(0, scalars_js_1.isScalarZeroValue)(field.T, target[localName]);
+        case "message":
+            return target[localName] !== undefined;
+        case "map":
+            return Object.keys(target[localName]).length > 0; // eslint-disable-line @typescript-eslint/no-unsafe-argument
+    }
+}
+exports.isFieldSet = isFieldSet;
+/**
+ * Resets the field, so that isFieldSet() will return false.
+ */
+function clearField(field, target) {
+    const localName = field.localName;
+    const implicitPresence = !field.opt && !field.req;
+    if (field.repeated) {
+        target[localName] = [];
+    }
+    else if (field.oneof) {
+        target[field.oneof.localName] = { case: undefined };
+    }
+    else {
+        switch (field.kind) {
+            case "map":
+                target[localName] = {};
+                break;
+            case "enum":
+                target[localName] = implicitPresence ? field.T.values[0].no : undefined;
+                break;
+            case "scalar":
+                target[localName] = implicitPresence
+                    ? (0, scalars_js_1.scalarZeroValue)(field.T, field.L)
+                    : undefined;
+                break;
+            case "message":
+                target[localName] = undefined;
+                break;
+        }
+    }
+}
+exports.clearField = clearField;

package/dist/cjs/private/reify-wkt.js

@@ -14,7 +14,7 @@
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.reifyWkt = void 0;
-const field_js_1 = require("../field.js");
+const scalar_js_1 = require("../scalar.js");
 /**
  * @deprecated please use reifyWkt from @bufbuild/protoplugin/ecmascript instead
  *
@@ -33,10 +33,10 @@ function reifyWkt(message) {
         case "google.protobuf.Any": {
             const typeUrl = message.fields.find((f) => f.number == 1 &&
                 f.fieldKind == "scalar" &&
-                f.scalar === field_js_1.ScalarType.STRING);
+                f.scalar === scalar_js_1.ScalarType.STRING);
             const value = message.fields.find((f) => f.number == 2 &&
                 f.fieldKind == "scalar" &&
-                f.scalar === field_js_1.ScalarType.BYTES);
+                f.scalar === scalar_js_1.ScalarType.BYTES);
             if (typeUrl && value) {
                 return {
                     typeName: message.typeName,
@@ -49,10 +49,10 @@ function reifyWkt(message) {
         case "google.protobuf.Timestamp": {
             const seconds = message.fields.find((f) => f.number == 1 &&
                 f.fieldKind == "scalar" &&
-                f.scalar === field_js_1.ScalarType.INT64);
+                f.scalar === scalar_js_1.ScalarType.INT64);
             const nanos = message.fields.find((f) => f.number == 2 &&
                 f.fieldKind == "scalar" &&
-                f.scalar === field_js_1.ScalarType.INT32);
+                f.scalar === scalar_js_1.ScalarType.INT32);
             if (seconds && nanos) {
                 return {
                     typeName: message.typeName,
@@ -65,10 +65,10 @@ function reifyWkt(message) {
         case "google.protobuf.Duration": {
             const seconds = message.fields.find((f) => f.number == 1 &&
                 f.fieldKind == "scalar" &&
-                f.scalar === field_js_1.ScalarType.INT64);
+                f.scalar === scalar_js_1.ScalarType.INT64);
             const nanos = message.fields.find((f) => f.number == 2 &&
                 f.fieldKind == "scalar" &&
-                f.scalar === field_js_1.ScalarType.INT32);
+                f.scalar === scalar_js_1.ScalarType.INT32);
             if (seconds && nanos) {
                 return {
                     typeName: message.typeName,
@@ -96,15 +96,15 @@ function reifyWkt(message) {
             }
             const numberValue = message.fields.find((f) => f.number == 2 &&
                 f.fieldKind == "scalar" &&
-                f.scalar === field_js_1.ScalarType.DOUBLE &&
+                f.scalar === scalar_js_1.ScalarType.DOUBLE &&
                 f.oneof === kind);
             const stringValue = message.fields.find((f) => f.number == 3 &&
                 f.fieldKind == "scalar" &&
-                f.scalar === field_js_1.ScalarType.STRING &&
+                f.scalar === scalar_js_1.ScalarType.STRING &&
                 f.oneof === kind);
             const boolValue = message.fields.find((f) => f.number == 4 &&
                 f.fieldKind == "scalar" &&
-                f.scalar === field_js_1.ScalarType.BOOL &&
+                f.scalar === scalar_js_1.ScalarType.BOOL &&
                 f.oneof === kind);
             const structValue = message.fields.find((f) => f.number == 5 && f.oneof === kind);
             if ((structValue === null || structValue === void 0 ? void 0 : structValue.fieldKind) !== "message" ||
@@ -141,7 +141,7 @@ function reifyWkt(message) {
         case "google.protobuf.FieldMask": {
             const paths = message.fields.find((f) => f.number == 1 &&
                 f.fieldKind == "scalar" &&
-                f.scalar === field_js_1.ScalarType.STRING &&
+                f.scalar === scalar_js_1.ScalarType.STRING &&
                 f.repeated);
             if (paths) {
                 return { typeName: message.typeName, paths };

package/dist/cjs/private/scalars.d.ts

@@ -1,27 +1,18 @@
-import { LongType, ScalarType } from "../field.js";
-import type { IBinaryWriter } from "../binary-encoding.js";
-import { WireType } from "../binary-encoding.js";
+import { LongType, ScalarType } from "../scalar.js";
+import type { ScalarValue } from "../scalar.js";
 /**
  * Returns true if both scalar values are equal.
  */
 export declare function scalarEquals(type: ScalarType, a: string | boolean | number | bigint | Uint8Array | undefined, b: string | boolean | number | bigint | Uint8Array | undefined): boolean;
 /**
- * Returns the default value for the given scalar type, following
- * proto3 semantics.
+ * Returns the zero value for the given scalar type.
  */
-export declare function scalarDefaultValue(type: ScalarType, longType: LongType): any;
+export declare function scalarZeroValue<T extends ScalarType, L extends LongType>(type: T, longType: L): ScalarValue<T, L>;
 /**
- * Get information for writing a scalar value.
+ * Returns true for a zero-value. For example, an integer has the zero-value `0`,
+ * a boolean is `false`, a string is `""`, and bytes is an empty Uint8Array.
  *
- * Returns tuple:
- * [0]: appropriate WireType
- * [1]: name of the appropriate method of IBinaryWriter
- * [2]: whether the given value is a default value for proto3 semantics
- *
- * If argument `value` is omitted, [2] is always false.
+ * In proto3, zero-values are not written to the wire, unless the field is
+ * optional or repeated.
  */
-export declare function scalarTypeInfo(type: ScalarType, value?: any): [
-    WireType,
-    Exclude<keyof IBinaryWriter, "tag" | "raw" | "fork" | "join" | "finish">,
-    boolean
-];
+export declare function isScalarZeroValue(type: ScalarType, value: unknown): boolean;

package/dist/cjs/private/scalars.js

@@ -13,11 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.scalarTypeInfo = exports.scalarDefaultValue = exports.scalarEquals = void 0;
-const field_js_1 = require("../field.js");
-const binary_encoding_js_1 = require("../binary-encoding.js");
+exports.isScalarZeroValue = exports.scalarZeroValue = exports.scalarEquals = void 0;
 const proto_int64_js_1 = require("../proto-int64.js");
-/* eslint-disable @typescript-eslint/no-explicit-any */
+const scalar_js_1 = require("../scalar.js");
 /**
  * Returns true if both scalar values are equal.
  */
@@ -27,7 +25,7 @@ function scalarEquals(type, a, b) {
         return true;
     }
     // Special case BYTES - we need to compare each byte individually
-    if (type == field_js_1.ScalarType.BYTES) {
+    if (type == scalar_js_1.ScalarType.BYTES) {
         if (!(a instanceof Uint8Array) || !(b instanceof Uint8Array)) {
             return false;
         }
@@ -44,11 +42,11 @@ function scalarEquals(type, a, b) {
     // Special case 64-bit integers - we support number, string and bigint representation.
     // eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check
     switch (type) {
-        case field_js_1.ScalarType.UINT64:
-        case field_js_1.ScalarType.FIXED64:
-        case field_js_1.ScalarType.INT64:
-        case field_js_1.ScalarType.SFIXED64:
-        case field_js_1.ScalarType.SINT64:
+        case scalar_js_1.ScalarType.UINT64:
+        case scalar_js_1.ScalarType.FIXED64:
+        case scalar_js_1.ScalarType.INT64:
+        case scalar_js_1.ScalarType.SFIXED64:
+        case scalar_js_1.ScalarType.SINT64:
             // Loose comparison will match between 0n, 0 and "0".
             return a == b;
     }
@@ -58,26 +56,25 @@ function scalarEquals(type, a, b) {
 }
 exports.scalarEquals = scalarEquals;
 /**
- * Returns the default value for the given scalar type, following
- * proto3 semantics.
+ * Returns the zero value for the given scalar type.
  */
-function scalarDefaultValue(type, longType) {
+function scalarZeroValue(type, longType) {
     switch (type) {
-        case field_js_1.ScalarType.BOOL:
+        case scalar_js_1.ScalarType.BOOL:
             return false;
-        case field_js_1.ScalarType.UINT64:
-        case field_js_1.ScalarType.FIXED64:
-        case field_js_1.ScalarType.INT64:
-        case field_js_1.ScalarType.SFIXED64:
-        case field_js_1.ScalarType.SINT64:
+        case scalar_js_1.ScalarType.UINT64:
+        case scalar_js_1.ScalarType.FIXED64:
+        case scalar_js_1.ScalarType.INT64:
+        case scalar_js_1.ScalarType.SFIXED64:
+        case scalar_js_1.ScalarType.SINT64:
             // eslint-disable-next-line @typescript-eslint/no-unsafe-enum-comparison -- acceptable since it's covered by tests
-            return longType == 0 ? proto_int64_js_1.protoInt64.zero : "0";
-        case field_js_1.ScalarType.DOUBLE:
-        case field_js_1.ScalarType.FLOAT:
+            return (longType == 0 ? proto_int64_js_1.protoInt64.zero : "0");
+        case scalar_js_1.ScalarType.DOUBLE:
+        case scalar_js_1.ScalarType.FLOAT:
             return 0.0;
-        case field_js_1.ScalarType.BYTES:
+        case scalar_js_1.ScalarType.BYTES:
             return new Uint8Array(0);
-        case field_js_1.ScalarType.STRING:
+        case scalar_js_1.ScalarType.STRING:
             return "";
         default:
             // Handles INT32, UINT32, SINT32, FIXED32, SFIXED32.
@@ -85,65 +82,24 @@ function scalarDefaultValue(type, longType) {
             return 0;
     }
 }
-exports.scalarDefaultValue = scalarDefaultValue;
+exports.scalarZeroValue = scalarZeroValue;
 /**
- * Get information for writing a scalar value.
+ * Returns true for a zero-value. For example, an integer has the zero-value `0`,
+ * a boolean is `false`, a string is `""`, and bytes is an empty Uint8Array.
  *
- * Returns tuple:
- * [0]: appropriate WireType
- * [1]: name of the appropriate method of IBinaryWriter
- * [2]: whether the given value is a default value for proto3 semantics
- *
- * If argument `value` is omitted, [2] is always false.
+ * In proto3, zero-values are not written to the wire, unless the field is
+ * optional or repeated.
  */
-function scalarTypeInfo(type, value) {
-    const isUndefined = value === undefined;
-    let wireType = binary_encoding_js_1.WireType.Varint;
-    let isIntrinsicDefault = value === 0;
-    // eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check -- INT32, UINT32, SINT32 are covered by the defaults
+function isScalarZeroValue(type, value) {
     switch (type) {
-        case field_js_1.ScalarType.STRING:
-            isIntrinsicDefault = isUndefined || !value.length;
-            wireType = binary_encoding_js_1.WireType.LengthDelimited;
-            break;
-        case field_js_1.ScalarType.BOOL:
-            isIntrinsicDefault = value === false;
-            break;
-        case field_js_1.ScalarType.DOUBLE:
-            wireType = binary_encoding_js_1.WireType.Bit64;
-            break;
-        case field_js_1.ScalarType.FLOAT:
-            wireType = binary_encoding_js_1.WireType.Bit32;
-            break;
-        case field_js_1.ScalarType.INT64:
-            isIntrinsicDefault = isUndefined || value == 0; // Loose comparison matches 0n, 0 and "0"
-            break;
-        case field_js_1.ScalarType.UINT64:
-            isIntrinsicDefault = isUndefined || value == 0; // Loose comparison matches 0n, 0 and "0"
-            break;
-        case field_js_1.ScalarType.FIXED64:
-            isIntrinsicDefault = isUndefined || value == 0; // Loose comparison matches 0n, 0 and "0"
-            wireType = binary_encoding_js_1.WireType.Bit64;
-            break;
-        case field_js_1.ScalarType.BYTES:
-            isIntrinsicDefault = isUndefined || !value.byteLength;
-            wireType = binary_encoding_js_1.WireType.LengthDelimited;
-            break;
-        case field_js_1.ScalarType.FIXED32:
-            wireType = binary_encoding_js_1.WireType.Bit32;
-            break;
-        case field_js_1.ScalarType.SFIXED32:
-            wireType = binary_encoding_js_1.WireType.Bit32;
-            break;
-        case field_js_1.ScalarType.SFIXED64:
-            isIntrinsicDefault = isUndefined || value == 0;
-            wireType = binary_encoding_js_1.WireType.Bit64;
-            break;
-        case field_js_1.ScalarType.SINT64:
-            isIntrinsicDefault = isUndefined || value == 0;
-            break;
+        case scalar_js_1.ScalarType.BOOL:
+            return value === false;
+        case scalar_js_1.ScalarType.STRING:
+            return value === "";
+        case scalar_js_1.ScalarType.BYTES:
+            return value instanceof Uint8Array && !value.byteLength;
+        default:
+            return value == 0; // Loose comparison matches 0n, 0 and "0"
     }
-    const method = field_js_1.ScalarType[type].toLowerCase();
-    return [wireType, method, isUndefined || isIntrinsicDefault];
 }
-exports.scalarTypeInfo = scalarTypeInfo;
+exports.isScalarZeroValue = isScalarZeroValue;

package/dist/cjs/private/text-format.d.ts

@@ -1,4 +1,4 @@
 import type { DescEnum } from "../descriptor-set.js";
-import { ScalarType } from "../field.js";
+import { ScalarType } from "../scalar.js";
 export declare function parseTextFormatEnumValue(descEnum: DescEnum, value: string): number;
 export declare function parseTextFormatScalarValue(type: ScalarType, value: string): number | boolean | string | bigint | Uint8Array;

package/dist/cjs/private/text-format.js

@@ -15,8 +15,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseTextFormatScalarValue = exports.parseTextFormatEnumValue = void 0;
 const assert_js_1 = require("./assert.js");
-const field_js_1 = require("../field.js");
 const proto_int64_js_1 = require("../proto-int64.js");
+const scalar_js_1 = require("../scalar.js");
 function parseTextFormatEnumValue(descEnum, value) {
     const enumValue = descEnum.values.find((v) => v.name === value);
     (0, assert_js_1.assert)(enumValue, `cannot parse ${descEnum.name} default value: ${value}`);
@@ -25,24 +25,24 @@ function parseTextFormatEnumValue(descEnum, value) {
 exports.parseTextFormatEnumValue = parseTextFormatEnumValue;
 function parseTextFormatScalarValue(type, value) {
     switch (type) {
-        case field_js_1.ScalarType.STRING:
+        case scalar_js_1.ScalarType.STRING:
             return value;
-        case field_js_1.ScalarType.BYTES: {
+        case scalar_js_1.ScalarType.BYTES: {
             const u = unescapeBytesDefaultValue(value);
             if (u === false) {
-                throw new Error(`cannot parse ${field_js_1.ScalarType[type]} default value: ${value}`);
+                throw new Error(`cannot parse ${scalar_js_1.ScalarType[type]} default value: ${value}`);
             }
             return u;
         }
-        case field_js_1.ScalarType.INT64:
-        case field_js_1.ScalarType.SFIXED64:
-        case field_js_1.ScalarType.SINT64:
+        case scalar_js_1.ScalarType.INT64:
+        case scalar_js_1.ScalarType.SFIXED64:
+        case scalar_js_1.ScalarType.SINT64:
             return proto_int64_js_1.protoInt64.parse(value);
-        case field_js_1.ScalarType.UINT64:
-        case field_js_1.ScalarType.FIXED64:
+        case scalar_js_1.ScalarType.UINT64:
+        case scalar_js_1.ScalarType.FIXED64:
             return proto_int64_js_1.protoInt64.uParse(value);
-        case field_js_1.ScalarType.DOUBLE:
-        case field_js_1.ScalarType.FLOAT:
+        case scalar_js_1.ScalarType.DOUBLE:
+        case scalar_js_1.ScalarType.FLOAT:
             switch (value) {
                 case "inf":
                     return Number.POSITIVE_INFINITY;
@@ -53,13 +53,13 @@ function parseTextFormatScalarValue(type, value) {
                 default:
                     return parseFloat(value);
             }
-        case field_js_1.ScalarType.BOOL:
+        case scalar_js_1.ScalarType.BOOL:
             return value === "true";
-        case field_js_1.ScalarType.INT32:
-        case field_js_1.ScalarType.UINT32:
-        case field_js_1.ScalarType.SINT32:
-        case field_js_1.ScalarType.FIXED32:
-        case field_js_1.ScalarType.SFIXED32:
+        case scalar_js_1.ScalarType.INT32:
+        case scalar_js_1.ScalarType.UINT32:
+        case scalar_js_1.ScalarType.SINT32:
+        case scalar_js_1.ScalarType.FIXED32:
+        case scalar_js_1.ScalarType.SFIXED32:
             return parseInt(value, 10);
     }
 }

package/dist/cjs/private/util-common.js

@@ -15,9 +15,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeUtilCommon = void 0;
 const enum_js_1 = require("./enum.js");
-const message_js_1 = require("../message.js");
-const field_js_1 = require("../field.js");
 const scalars_js_1 = require("./scalars.js");
+const scalar_js_1 = require("../scalar.js");
+const is_message_js_1 = require("../is-message.js");
 /* eslint-disable @typescript-eslint/no-explicit-any,@typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-return,@typescript-eslint/no-unsafe-argument,no-case-declarations */
 function makeUtilCommon() {
     return {
@@ -30,6 +30,7 @@ function makeUtilCommon() {
             for (const member of type.fields.byMember()) {
                 const localName = member.localName, t = target, s = source;
                 if (s[localName] === undefined) {
+                    // TODO if source is a Message instance, we should use isFieldSet() here to support future field presence
                     continue;
                 }
                 switch (member.kind) {
@@ -42,12 +43,12 @@ function makeUtilCommon() {
                         let val = s[localName].value;
                         if (sourceField &&
                             sourceField.kind == "message" &&
-                            !(val instanceof sourceField.T)) {
+                            !(0, is_message_js_1.isMessage)(val, sourceField.T)) {
                             val = new sourceField.T(val);
                         }
                         else if (sourceField &&
                             sourceField.kind === "scalar" &&
-                            sourceField.T === field_js_1.ScalarType.BYTES) {
+                            sourceField.T === scalar_js_1.ScalarType.BYTES) {
                             val = toU8Arr(val);
                         }
                         t[localName] = { case: sk, value: val };
@@ -55,7 +56,7 @@ function makeUtilCommon() {
                     case "scalar":
                     case "enum":
                         let copy = s[localName];
-                        if (member.T === field_js_1.ScalarType.BYTES) {
+                        if (member.T === scalar_js_1.ScalarType.BYTES) {
                             copy = member.repeated
                                 ? copy.map(toU8Arr)
                                 : toU8Arr(copy);
@@ -66,7 +67,7 @@ function makeUtilCommon() {
                         switch (member.V.kind) {
                             case "scalar":
                             case "enum":
-                                if (member.V.T === field_js_1.ScalarType.BYTES) {
+                                if (member.V.T === scalar_js_1.ScalarType.BYTES) {
                                     for (const [k, v] of Object.entries(s[localName])) {
                                         t[localName][k] = toU8Arr(v);
                                     }
@@ -92,9 +93,9 @@ function makeUtilCommon() {
                     case "message":
                         const mt = member.T;
                         if (member.repeated) {
-                            t[localName] = s[localName].map((val) => val instanceof mt ? val : new mt(val));
+                            t[localName] = s[localName].map((val) => (0, is_message_js_1.isMessage)(val, mt) ? val : new mt(val));
                         }
-                        else if (s[localName] !== undefined) {
+                        else {
                             const val = s[localName];
                             if (mt.fieldWrapper) {
                                 if (
@@ -107,13 +108,14 @@ function makeUtilCommon() {
                                 }
                             }
                             else {
-                                t[localName] = val instanceof mt ? val : new mt(val);
+                                t[localName] = (0, is_message_js_1.isMessage)(val, mt) ? val : new mt(val);
                             }
                         }
                         break;
                 }
             }
         },
+        // TODO use isFieldSet() here to support future field presence
         equals(type, a, b) {
             if (a === b) {
                 return true;
@@ -135,7 +137,7 @@ function makeUtilCommon() {
                         case "scalar":
                             return va.every((a, i) => (0, scalars_js_1.scalarEquals)(m.T, a, vb[i]));
                         case "enum":
-                            return va.every((a, i) => (0, scalars_js_1.scalarEquals)(field_js_1.ScalarType.INT32, a, vb[i]));
+                            return va.every((a, i) => (0, scalars_js_1.scalarEquals)(scalar_js_1.ScalarType.INT32, a, vb[i]));
                     }
                     throw new Error(`repeated cannot contain ${m.kind}`);
                 }
@@ -143,7 +145,7 @@ function makeUtilCommon() {
                     case "message":
                         return m.T.equals(va, vb);
                     case "enum":
-                        return (0, scalars_js_1.scalarEquals)(field_js_1.ScalarType.INT32, va, vb);
+                        return (0, scalars_js_1.scalarEquals)(scalar_js_1.ScalarType.INT32, va, vb);
                     case "scalar":
                         return (0, scalars_js_1.scalarEquals)(m.T, va, vb);
                     case "oneof":
@@ -159,7 +161,7 @@ function makeUtilCommon() {
                             case "message":
                                 return s.T.equals(va.value, vb.value);
                             case "enum":
-                                return (0, scalars_js_1.scalarEquals)(field_js_1.ScalarType.INT32, va.value, vb.value);
+                                return (0, scalars_js_1.scalarEquals)(scalar_js_1.ScalarType.INT32, va.value, vb.value);
                             case "scalar":
                                 return (0, scalars_js_1.scalarEquals)(s.T, va.value, vb.value);
                         }
@@ -171,7 +173,7 @@ function makeUtilCommon() {
                                 const messageType = m.V.T;
                                 return keys.every((k) => messageType.equals(va[k], vb[k]));
                             case "enum":
-                                return keys.every((k) => (0, scalars_js_1.scalarEquals)(field_js_1.ScalarType.INT32, va[k], vb[k]));
+                                return keys.every((k) => (0, scalars_js_1.scalarEquals)(scalar_js_1.ScalarType.INT32, va[k], vb[k]));
                             case "scalar":
                                 const scalarType = m.V.T;
                                 return keys.every((k) => (0, scalars_js_1.scalarEquals)(scalarType, va[k], vb[k]));
@@ -180,6 +182,7 @@ function makeUtilCommon() {
                 }
             });
         },
+        // TODO use isFieldSet() here to support future field presence
         clone(message) {
             const type = message.getType(), target = new type(), any = target;
             for (const member of type.fields.byMember()) {
@@ -215,7 +218,7 @@ function cloneSingularField(value) {
     if (value === undefined) {
         return value;
     }
-    if (value instanceof message_js_1.Message) {
+    if ((0, is_message_js_1.isMessage)(value)) {
         return value.clone();
     }
     if (value instanceof Uint8Array) {

package/dist/cjs/proto-delimited.js

@@ -34,7 +34,6 @@ var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _ar
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.protoDelimited = void 0;
-const binary_format_common_js_1 = require("./private/binary-format-common.js");
 const binary_encoding_js_1 = require("./binary-encoding.js");
 /**
  * protoDelimited provides functions to serialize and parse size-delimited
@@ -51,14 +50,14 @@ exports.protoDelimited = {
      * Serialize a message, prefixing it with its size.
      */
     enc(message, options) {
-        const opt = (0, binary_format_common_js_1.makeBinaryFormatCommon)().makeWriteOptions(options);
+        const opt = message.getType().runtime.bin.makeWriteOptions(options);
         return opt.writerFactory().bytes(message.toBinary(opt)).finish();
     },
     /**
      * Parse a size-delimited message, ignoring extra bytes.
      */
     dec(type, bytes, options) {
-        const opt = (0, binary_format_common_js_1.makeBinaryFormatCommon)().makeReadOptions(options);
+        const opt = type.runtime.bin.makeReadOptions(options);
         return type.fromBinary(opt.readerFactory(bytes).bytes(), opt);
     },
     /**