@bufbuild/protobuf 0.2.1 → 0.4.0

package/dist/cjs/codegen-info.js

@@ -44,6 +44,7 @@ exports.codegenInfo = {
         ScalarType: { typeOnly: false, privateImportPath: "./field.js", publicImportPath: packageName },
         MethodKind: { typeOnly: false, privateImportPath: "./service-type.js", publicImportPath: packageName },
         MethodIdempotency: { typeOnly: false, privateImportPath: "./service-type.js", publicImportPath: packageName },
+        IMessageTypeRegistry: { typeOnly: true, privateImportPath: "./type-registry.js", publicImportPath: packageName },
     },
     wktSourceFiles: [
         "google/protobuf/compiler/plugin.proto",

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

@@ -204,8 +204,29 @@ class Any extends message_js_1.Message {
         target.fromBinary(this.value);
         return true;
     }
+    unpack(registry) {
+        if (this.typeUrl === "") {
+            return undefined;
+        }
+        const messageType = registry.findMessage(this.typeUrlToName(this.typeUrl));
+        if (!messageType) {
+            return undefined;
+        }
+        return messageType.fromBinary(this.value);
+    }
     is(type) {
-        return this.typeUrl === this.typeNameToUrl(type.typeName);
+        if (this.typeUrl === '') {
+            return false;
+        }
+        const name = this.typeUrlToName(this.typeUrl);
+        let typeName = '';
+        if (typeof type === 'string') {
+            typeName = type;
+        }
+        else {
+            typeName = type.typeName;
+        }
+        return name === typeName;
     }
     typeNameToUrl(name) {
         return `type.googleapis.com/${name}`;

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 v0.2.1 with parameter "bootstrap_wkt=true,ts_nocheck=false,target=ts"
+// @generated by protoc-gen-es v0.4.0 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 v0.2.1 with parameter "bootstrap_wkt=true,ts_nocheck=false,target=ts"
+// @generated by protoc-gen-es v0.4.0 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/google/protobuf/wrappers_pb.js

@@ -73,7 +73,7 @@ DoubleValue.fields = proto3_js_1.proto3.util.newFieldList(() => [
 ]);
 DoubleValue.fieldWrapper = {
     wrapField(value) {
-        return value instanceof DoubleValue ? value : new DoubleValue({ value });
+        return new DoubleValue({ value });
     },
     unwrapField(value) {
         return value.value;
@@ -134,7 +134,7 @@ FloatValue.fields = proto3_js_1.proto3.util.newFieldList(() => [
 ]);
 FloatValue.fieldWrapper = {
     wrapField(value) {
-        return value instanceof FloatValue ? value : new FloatValue({ value });
+        return new FloatValue({ value });
     },
     unwrapField(value) {
         return value.value;
@@ -195,7 +195,7 @@ Int64Value.fields = proto3_js_1.proto3.util.newFieldList(() => [
 ]);
 Int64Value.fieldWrapper = {
     wrapField(value) {
-        return value instanceof Int64Value ? value : new Int64Value({ value });
+        return new Int64Value({ value });
     },
     unwrapField(value) {
         return value.value;
@@ -256,7 +256,7 @@ UInt64Value.fields = proto3_js_1.proto3.util.newFieldList(() => [
 ]);
 UInt64Value.fieldWrapper = {
     wrapField(value) {
-        return value instanceof UInt64Value ? value : new UInt64Value({ value });
+        return new UInt64Value({ value });
     },
     unwrapField(value) {
         return value.value;
@@ -317,7 +317,7 @@ Int32Value.fields = proto3_js_1.proto3.util.newFieldList(() => [
 ]);
 Int32Value.fieldWrapper = {
     wrapField(value) {
-        return value instanceof Int32Value ? value : new Int32Value({ value });
+        return new Int32Value({ value });
     },
     unwrapField(value) {
         return value.value;
@@ -378,7 +378,7 @@ UInt32Value.fields = proto3_js_1.proto3.util.newFieldList(() => [
 ]);
 UInt32Value.fieldWrapper = {
     wrapField(value) {
-        return value instanceof UInt32Value ? value : new UInt32Value({ value });
+        return new UInt32Value({ value });
     },
     unwrapField(value) {
         return value.value;
@@ -439,7 +439,7 @@ BoolValue.fields = proto3_js_1.proto3.util.newFieldList(() => [
 ]);
 BoolValue.fieldWrapper = {
     wrapField(value) {
-        return value instanceof BoolValue ? value : new BoolValue({ value });
+        return new BoolValue({ value });
     },
     unwrapField(value) {
         return value.value;
@@ -500,7 +500,7 @@ StringValue.fields = proto3_js_1.proto3.util.newFieldList(() => [
 ]);
 StringValue.fieldWrapper = {
     wrapField(value) {
-        return value instanceof StringValue ? value : new StringValue({ value });
+        return new StringValue({ value });
     },
     unwrapField(value) {
         return value.value;
@@ -561,7 +561,7 @@ BytesValue.fields = proto3_js_1.proto3.util.newFieldList(() => [
 ]);
 BytesValue.fieldWrapper = {
     wrapField(value) {
-        return value instanceof BytesValue ? value : new BytesValue({ value });
+        return new BytesValue({ value });
     },
     unwrapField(value) {
         return value.value;

package/dist/cjs/message.js

@@ -32,7 +32,6 @@ class Message {
      * Create a deep copy.
      */
     clone() {
-        // return this.getType().runtime.util.clone(this);
         return this.getType().runtime.util.clone(this);
     }
     /**
@@ -61,8 +60,14 @@ class Message {
      * Parse a message from a JSON string.
      */
     fromJsonString(jsonString, options) {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument -- assigning to JsonValue is safe here
-        return this.fromJson(JSON.parse(jsonString), options);
+        let json;
+        try {
+            json = JSON.parse(jsonString);
+        }
+        catch (e) {
+            throw new Error(`cannot decode ${this.getType().typeName} from JSON: ${e instanceof Error ? e.message : String(e)}`);
+        }
+        return this.fromJson(json, options);
     }
     /**
      * Serialize the message to binary data.
@@ -88,6 +93,21 @@ class Message {
         const value = this.toJson(options);
         return JSON.stringify(value, null, (_a = options === null || options === void 0 ? void 0 : options.prettySpaces) !== null && _a !== void 0 ? _a : 0);
     }
+    /**
+     * Override for serialization behavior. This will be invoked when calling
+     * JSON.stringify on this message (i.e. JSON.stringify(msg)).
+     *
+     * Note that this will not serialize google.protobuf.Any with a packed
+     * message because the protobuf JSON format specifies that it needs to be
+     * unpacked, and this is only possible with a type registry to look up the
+     * message type.  As a result, attempting to serialize a message with this
+     * type will throw an Error.
+     */
+    toJSON() {
+        return this.toJson({
+            emitDefaultValues: true,
+        });
+    }
     /**
      * Retrieve the MessageType of this message - a singleton that represents
      * the protobuf message declaration and provides metadata for reflection-

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

@@ -15,6 +15,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.writePacked = exports.writeScalar = exports.writeMessageField = exports.writeMapEntry = exports.makeBinaryFormatCommon = void 0;
 const binary_encoding_js_1 = require("../binary-encoding.js");
+const message_js_1 = require("../message.js");
 const field_js_1 = require("../field.js");
 const field_wrapper_js_1 = require("./field-wrapper.js");
 const scalars_js_1 = require("./scalars.js");
@@ -114,11 +115,16 @@ function makeBinaryFormatCommon() {
                             target[localName].push(messageType.fromBinary(reader.bytes(), options));
                         }
                         else {
-                            if (target[localName] instanceof messageType) {
+                            if (target[localName] instanceof message_js_1.Message) {
                                 target[localName].fromBinary(reader.bytes(), options);
                             }
                             else {
-                                target[localName] = (0, field_wrapper_js_1.unwrapField)(messageType, messageType.fromBinary(reader.bytes(), options));
+                                target[localName] = messageType.fromBinary(reader.bytes(), options);
+                                if (messageType.fieldWrapper &&
+                                    !field.oneof &&
+                                    !field.repeated) {
+                                    target[localName] = messageType.fieldWrapper.unwrapField(target[localName]);
+                                }
                             }
                         }
                         break;

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

@@ -13,31 +13,23 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUnwrappedFieldType = exports.unwrapField = exports.wrapField = void 0;
+exports.getUnwrappedFieldType = exports.wrapField = void 0;
+const message_js_1 = require("../message.js");
 const field_js_1 = require("../field.js");
 /**
- * Wrap field values whose message type has a wrapper.
+ * Wrap a primitive message field value in its corresponding wrapper
+ * message. This function is idempotent.
  */
 function wrapField(type, value) {
-    if (value instanceof type) {
+    if (value instanceof message_js_1.Message || !type.fieldWrapper) {
         return value;
     }
-    if (type.fieldWrapper) {
-        return type.fieldWrapper.wrapField(value);
-    }
-    throw new Error(`cannot unwrap field value, ${type.typeName} does not define a field wrapper`);
+    return type.fieldWrapper.wrapField(value);
 }
 exports.wrapField = wrapField;
-/**
- * Unwrap field values whose message type has a wrapper.
- */
-function unwrapField(type, value) {
-    return type.fieldWrapper ? type.fieldWrapper.unwrapField(value) : value;
-}
-exports.unwrapField = unwrapField;
 /**
  * If the given field uses one of the well-known wrapper types, return
- * the base type it wraps.
+ * the primitive type it wraps.
  */
 function getUnwrappedFieldType(field) {
     if (field.fieldKind !== "message") {

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

@@ -14,7 +14,7 @@
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeJsonFormatCommon = void 0;
-const field_wrapper_js_1 = require("./field-wrapper.js");
+const message_js_1 = require("../message.js");
 const field_js_1 = require("../field.js");
 const assert_js_1 = require("./assert.js");
 const proto_int64_js_1 = require("../proto-int64.js");
@@ -174,10 +174,15 @@ function makeJsonFormatCommon(makeWriteField) {
                                 }
                                 continue;
                             }
-                            const targetMessage = target[localName] === undefined
-                                ? new messageType()
-                                : (0, field_wrapper_js_1.wrapField)(messageType, target[localName]);
-                            target[localName] = (0, field_wrapper_js_1.unwrapField)(messageType, targetMessage.fromJson(jsonValue, options));
+                            if (target[localName] instanceof message_js_1.Message) {
+                                target[localName].fromJson(jsonValue, options);
+                            }
+                            else {
+                                target[localName] = messageType.fromJson(jsonValue, options);
+                                if (messageType.fieldWrapper && !field.oneof) {
+                                    target[localName] = messageType.fieldWrapper.unwrapField(target[localName]);
+                                }
+                            }
                             break;
                         case "enum":
                             const enumValue = readEnum(field.T, jsonValue, options.ignoreUnknownFields);

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

@@ -15,6 +15,7 @@
 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");
 /* 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 */
@@ -139,10 +140,7 @@ function makeUtilCommon() {
                         }
                         throw new Error(`oneof cannot contain ${s.kind}`);
                     case "map":
-                        const keys = Object.keys(va);
-                        if (keys.some((k) => vb[k] === undefined)) {
-                            return false;
-                        }
+                        const keys = Object.keys(va).concat(Object.keys(vb));
                         switch (m.V.kind) {
                             case "message":
                                 const messageType = m.V.T;
@@ -192,21 +190,13 @@ function cloneSingularField(field, value) {
     if (value === undefined) {
         return value;
     }
-    // eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check -- unmatched "map" is unsupported
-    switch (field.kind) {
-        case "enum":
-            return value;
-        case "scalar":
-            if (field.T === field_js_1.ScalarType.BYTES) {
-                const c = new Uint8Array(value.byteLength);
-                c.set(value);
-                return c;
-            }
-            return value;
-        case "message":
-            if (field.T.fieldWrapper) {
-                return field.T.fieldWrapper.unwrapField(field.T.fieldWrapper.wrapField(value).clone());
-            }
-            return value.clone();
+    if (value instanceof message_js_1.Message) {
+        return value.clone();
+    }
+    if (value instanceof Uint8Array) {
+        const c = new Uint8Array(value.byteLength);
+        c.set(value);
+        return c;
     }
+    return value;
 }

package/dist/esm/codegen-info.js

@@ -41,6 +41,7 @@ export const codegenInfo = {
         ScalarType: { typeOnly: false, privateImportPath: "./field.js", publicImportPath: packageName },
         MethodKind: { typeOnly: false, privateImportPath: "./service-type.js", publicImportPath: packageName },
         MethodIdempotency: { typeOnly: false, privateImportPath: "./service-type.js", publicImportPath: packageName },
+        IMessageTypeRegistry: { typeOnly: true, privateImportPath: "./type-registry.js", publicImportPath: packageName },
     },
     wktSourceFiles: [
         "google/protobuf/compiler/plugin.proto",

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

@@ -201,8 +201,29 @@ export class Any extends Message {
         target.fromBinary(this.value);
         return true;
     }
+    unpack(registry) {
+        if (this.typeUrl === "") {
+            return undefined;
+        }
+        const messageType = registry.findMessage(this.typeUrlToName(this.typeUrl));
+        if (!messageType) {
+            return undefined;
+        }
+        return messageType.fromBinary(this.value);
+    }
     is(type) {
-        return this.typeUrl === this.typeNameToUrl(type.typeName);
+        if (this.typeUrl === '') {
+            return false;
+        }
+        const name = this.typeUrlToName(this.typeUrl);
+        let typeName = '';
+        if (typeof type === 'string') {
+            typeName = type;
+        }
+        else {
+            typeName = type.typeName;
+        }
+        return name === typeName;
     }
     typeNameToUrl(name) {
         return `type.googleapis.com/${name}`;

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 v0.2.1 with parameter "bootstrap_wkt=true,ts_nocheck=false,target=ts"
+// @generated by protoc-gen-es v0.4.0 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 v0.2.1 with parameter "bootstrap_wkt=true,ts_nocheck=false,target=ts"
+// @generated by protoc-gen-es v0.4.0 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/google/protobuf/wrappers_pb.js

@@ -69,7 +69,7 @@ DoubleValue.fields = proto3.util.newFieldList(() => [
 ]);
 DoubleValue.fieldWrapper = {
     wrapField(value) {
-        return value instanceof DoubleValue ? value : new DoubleValue({ value });
+        return new DoubleValue({ value });
     },
     unwrapField(value) {
         return value.value;
@@ -129,7 +129,7 @@ FloatValue.fields = proto3.util.newFieldList(() => [
 ]);
 FloatValue.fieldWrapper = {
     wrapField(value) {
-        return value instanceof FloatValue ? value : new FloatValue({ value });
+        return new FloatValue({ value });
     },
     unwrapField(value) {
         return value.value;
@@ -189,7 +189,7 @@ Int64Value.fields = proto3.util.newFieldList(() => [
 ]);
 Int64Value.fieldWrapper = {
     wrapField(value) {
-        return value instanceof Int64Value ? value : new Int64Value({ value });
+        return new Int64Value({ value });
     },
     unwrapField(value) {
         return value.value;
@@ -249,7 +249,7 @@ UInt64Value.fields = proto3.util.newFieldList(() => [
 ]);
 UInt64Value.fieldWrapper = {
     wrapField(value) {
-        return value instanceof UInt64Value ? value : new UInt64Value({ value });
+        return new UInt64Value({ value });
     },
     unwrapField(value) {
         return value.value;
@@ -309,7 +309,7 @@ Int32Value.fields = proto3.util.newFieldList(() => [
 ]);
 Int32Value.fieldWrapper = {
     wrapField(value) {
-        return value instanceof Int32Value ? value : new Int32Value({ value });
+        return new Int32Value({ value });
     },
     unwrapField(value) {
         return value.value;
@@ -369,7 +369,7 @@ UInt32Value.fields = proto3.util.newFieldList(() => [
 ]);
 UInt32Value.fieldWrapper = {
     wrapField(value) {
-        return value instanceof UInt32Value ? value : new UInt32Value({ value });
+        return new UInt32Value({ value });
     },
     unwrapField(value) {
         return value.value;
@@ -429,7 +429,7 @@ BoolValue.fields = proto3.util.newFieldList(() => [
 ]);
 BoolValue.fieldWrapper = {
     wrapField(value) {
-        return value instanceof BoolValue ? value : new BoolValue({ value });
+        return new BoolValue({ value });
     },
     unwrapField(value) {
         return value.value;
@@ -489,7 +489,7 @@ StringValue.fields = proto3.util.newFieldList(() => [
 ]);
 StringValue.fieldWrapper = {
     wrapField(value) {
-        return value instanceof StringValue ? value : new StringValue({ value });
+        return new StringValue({ value });
     },
     unwrapField(value) {
         return value.value;
@@ -549,7 +549,7 @@ BytesValue.fields = proto3.util.newFieldList(() => [
 ]);
 BytesValue.fieldWrapper = {
     wrapField(value) {
-        return value instanceof BytesValue ? value : new BytesValue({ value });
+        return new BytesValue({ value });
     },
     unwrapField(value) {
         return value.value;

package/dist/esm/message.js

@@ -29,7 +29,6 @@ export class Message {
      * Create a deep copy.
      */
     clone() {
-        // return this.getType().runtime.util.clone(this);
         return this.getType().runtime.util.clone(this);
     }
     /**
@@ -58,8 +57,14 @@ export class Message {
      * Parse a message from a JSON string.
      */
     fromJsonString(jsonString, options) {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument -- assigning to JsonValue is safe here
-        return this.fromJson(JSON.parse(jsonString), options);
+        let json;
+        try {
+            json = JSON.parse(jsonString);
+        }
+        catch (e) {
+            throw new Error(`cannot decode ${this.getType().typeName} from JSON: ${e instanceof Error ? e.message : String(e)}`);
+        }
+        return this.fromJson(json, options);
     }
     /**
      * Serialize the message to binary data.
@@ -85,6 +90,21 @@ export class Message {
         const value = this.toJson(options);
         return JSON.stringify(value, null, (_a = options === null || options === void 0 ? void 0 : options.prettySpaces) !== null && _a !== void 0 ? _a : 0);
     }
+    /**
+     * Override for serialization behavior. This will be invoked when calling
+     * JSON.stringify on this message (i.e. JSON.stringify(msg)).
+     *
+     * Note that this will not serialize google.protobuf.Any with a packed
+     * message because the protobuf JSON format specifies that it needs to be
+     * unpacked, and this is only possible with a type registry to look up the
+     * message type.  As a result, attempting to serialize a message with this
+     * type will throw an Error.
+     */
+    toJSON() {
+        return this.toJson({
+            emitDefaultValues: true,
+        });
+    }
     /**
      * Retrieve the MessageType of this message - a singleton that represents
      * the protobuf message declaration and provides metadata for reflection-

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

@@ -12,8 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 import { BinaryReader, BinaryWriter, WireType, } from "../binary-encoding.js";
+import { Message } from "../message.js";
 import { ScalarType } from "../field.js";
-import { unwrapField, wrapField } from "./field-wrapper.js";
+import { wrapField } from "./field-wrapper.js";
 import { scalarDefaultValue, scalarTypeInfo } from "./scalars.js";
 import { assert } from "./assert.js";
 /* eslint-disable @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unnecessary-condition, no-case-declarations, prefer-const */
@@ -111,11 +112,16 @@ export function makeBinaryFormatCommon() {
                             target[localName].push(messageType.fromBinary(reader.bytes(), options));
                         }
                         else {
-                            if (target[localName] instanceof messageType) {
+                            if (target[localName] instanceof Message) {
                                 target[localName].fromBinary(reader.bytes(), options);
                             }
                             else {
-                                target[localName] = unwrapField(messageType, messageType.fromBinary(reader.bytes(), options));
+                                target[localName] = messageType.fromBinary(reader.bytes(), options);
+                                if (messageType.fieldWrapper &&
+                                    !field.oneof &&
+                                    !field.repeated) {
+                                    target[localName] = messageType.fieldWrapper.unwrapField(target[localName]);
+                                }
                             }
                         }
                         break;

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

@@ -11,28 +11,21 @@
 // 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.
+import { Message } from "../message.js";
 import { ScalarType } from "../field.js";
 /**
- * Wrap field values whose message type has a wrapper.
+ * Wrap a primitive message field value in its corresponding wrapper
+ * message. This function is idempotent.
  */
 export function wrapField(type, value) {
-    if (value instanceof type) {
+    if (value instanceof Message || !type.fieldWrapper) {
         return value;
     }
-    if (type.fieldWrapper) {
-        return type.fieldWrapper.wrapField(value);
-    }
-    throw new Error(`cannot unwrap field value, ${type.typeName} does not define a field wrapper`);
-}
-/**
- * Unwrap field values whose message type has a wrapper.
- */
-export function unwrapField(type, value) {
-    return type.fieldWrapper ? type.fieldWrapper.unwrapField(value) : value;
+    return type.fieldWrapper.wrapField(value);
 }
 /**
  * If the given field uses one of the well-known wrapper types, return
- * the base type it wraps.
+ * the primitive type it wraps.
  */
 export function getUnwrappedFieldType(field) {
     if (field.fieldKind !== "message") {

package/dist/esm/private/json-format-common.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.
-import { unwrapField, wrapField } from "./field-wrapper.js";
+import { Message } from "../message.js";
 import { ScalarType } from "../field.js";
 import { assert, assertFloat32, assertInt32, assertUInt32 } from "./assert.js";
 import { protoInt64 } from "../proto-int64.js";
@@ -171,10 +171,15 @@ export function makeJsonFormatCommon(makeWriteField) {
                                 }
                                 continue;
                             }
-                            const targetMessage = target[localName] === undefined
-                                ? new messageType()
-                                : wrapField(messageType, target[localName]);
-                            target[localName] = unwrapField(messageType, targetMessage.fromJson(jsonValue, options));
+                            if (target[localName] instanceof Message) {
+                                target[localName].fromJson(jsonValue, options);
+                            }
+                            else {
+                                target[localName] = messageType.fromJson(jsonValue, options);
+                                if (messageType.fieldWrapper && !field.oneof) {
+                                    target[localName] = messageType.fieldWrapper.unwrapField(target[localName]);
+                                }
+                            }
                             break;
                         case "enum":
                             const enumValue = readEnum(field.T, jsonValue, options.ignoreUnknownFields);

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

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 import { setEnumType } from "./enum.js";
+import { Message, } from "../message.js";
 import { ScalarType } from "../field.js";
 import { scalarEquals } from "./scalars.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 */
@@ -136,10 +137,7 @@ export function makeUtilCommon() {
                         }
                         throw new Error(`oneof cannot contain ${s.kind}`);
                     case "map":
-                        const keys = Object.keys(va);
-                        if (keys.some((k) => vb[k] === undefined)) {
-                            return false;
-                        }
+                        const keys = Object.keys(va).concat(Object.keys(vb));
                         switch (m.V.kind) {
                             case "message":
                                 const messageType = m.V.T;
@@ -188,21 +186,13 @@ function cloneSingularField(field, value) {
     if (value === undefined) {
         return value;
     }
-    // eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check -- unmatched "map" is unsupported
-    switch (field.kind) {
-        case "enum":
-            return value;
-        case "scalar":
-            if (field.T === ScalarType.BYTES) {
-                const c = new Uint8Array(value.byteLength);
-                c.set(value);
-                return c;
-            }
-            return value;
-        case "message":
-            if (field.T.fieldWrapper) {
-                return field.T.fieldWrapper.unwrapField(field.T.fieldWrapper.wrapField(value).clone());
-            }
-            return value.clone();
+    if (value instanceof Message) {
+        return value.clone();
+    }
+    if (value instanceof Uint8Array) {
+        const c = new Uint8Array(value.byteLength);
+        c.set(value);
+        return c;
     }
+    return value;
 }

package/dist/types/binary-format.d.ts

@@ -17,7 +17,7 @@ export interface BinaryFormat {
     /**
      * Parse a message from binary data, merging fields.
      */
-    readMessage<T extends Message>(message: T, reader: IBinaryReader, length: number, options: BinaryReadOptions): void;
+    readMessage(message: Message, reader: IBinaryReader, length: number, options: BinaryReadOptions): void;
     /**
      * Serialize a message to binary data.
      */

package/dist/types/codegen-info.d.ts

@@ -11,7 +11,7 @@ interface CodegenInfo {
     readonly scalarDefaultValue: typeof scalarDefaultValue;
     readonly reifyWkt: typeof reifyWkt;
 }
-declare type RuntimeSymbolName = "proto2" | "proto3" | "Message" | "PartialMessage" | "PlainMessage" | "FieldList" | "MessageType" | "BinaryReadOptions" | "BinaryWriteOptions" | "JsonReadOptions" | "JsonWriteOptions" | "JsonValue" | "JsonObject" | "protoInt64" | "ScalarType" | "MethodKind" | "MethodIdempotency";
+declare type RuntimeSymbolName = "proto2" | "proto3" | "Message" | "PartialMessage" | "PlainMessage" | "FieldList" | "MessageType" | "BinaryReadOptions" | "BinaryWriteOptions" | "JsonReadOptions" | "JsonWriteOptions" | "JsonValue" | "JsonObject" | "protoInt64" | "ScalarType" | "MethodKind" | "MethodIdempotency" | "IMessageTypeRegistry";
 declare type RuntimeSymbolInfo = {
     typeOnly: boolean;
     publicImportPath: string;

package/dist/types/google/protobuf/any_pb.d.ts

@@ -1,6 +1,7 @@
 import type { PartialMessage, PlainMessage } from "../../message.js";
 import { Message } from "../../message.js";
 import type { JsonReadOptions, JsonValue, JsonWriteOptions } from "../../json-format.js";
+import type { IMessageTypeRegistry } from "../../type-registry.js";
 import type { MessageType } from "../../message-type.js";
 import type { FieldList } from "../../field-list.js";
 import type { BinaryReadOptions } from "../../binary-format.js";
@@ -136,7 +137,8 @@ export declare class Any extends Message<Any> {
     fromJson(json: JsonValue, options?: Partial<JsonReadOptions>): this;
     packFrom(message: Message): void;
     unpackTo(target: Message): boolean;
-    is(type: MessageType): boolean;
+    unpack(registry: IMessageTypeRegistry): Message | undefined;
+    is(type: MessageType | string): boolean;
     private typeNameToUrl;
     private typeUrlToName;
     static readonly runtime: import("../../private/proto-runtime.js").ProtoRuntime;

package/dist/types/google/protobuf/wrappers_pb.d.ts

@@ -24,7 +24,7 @@ export declare class DoubleValue extends Message<DoubleValue> {
     static readonly typeName = "google.protobuf.DoubleValue";
     static readonly fields: FieldList;
     static readonly fieldWrapper: {
-        wrapField(value: number | DoubleValue): DoubleValue;
+        wrapField(value: number): DoubleValue;
         unwrapField(value: DoubleValue): number;
     };
     static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): DoubleValue;
@@ -53,7 +53,7 @@ export declare class FloatValue extends Message<FloatValue> {
     static readonly typeName = "google.protobuf.FloatValue";
     static readonly fields: FieldList;
     static readonly fieldWrapper: {
-        wrapField(value: number | FloatValue): FloatValue;
+        wrapField(value: number): FloatValue;
         unwrapField(value: FloatValue): number;
     };
     static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): FloatValue;
@@ -82,7 +82,7 @@ export declare class Int64Value extends Message<Int64Value> {
     static readonly typeName = "google.protobuf.Int64Value";
     static readonly fields: FieldList;
     static readonly fieldWrapper: {
-        wrapField(value: bigint | Int64Value): Int64Value;
+        wrapField(value: bigint): Int64Value;
         unwrapField(value: Int64Value): bigint;
     };
     static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): Int64Value;
@@ -111,7 +111,7 @@ export declare class UInt64Value extends Message<UInt64Value> {
     static readonly typeName = "google.protobuf.UInt64Value";
     static readonly fields: FieldList;
     static readonly fieldWrapper: {
-        wrapField(value: bigint | UInt64Value): UInt64Value;
+        wrapField(value: bigint): UInt64Value;
         unwrapField(value: UInt64Value): bigint;
     };
     static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): UInt64Value;
@@ -140,7 +140,7 @@ export declare class Int32Value extends Message<Int32Value> {
     static readonly typeName = "google.protobuf.Int32Value";
     static readonly fields: FieldList;
     static readonly fieldWrapper: {
-        wrapField(value: number | Int32Value): Int32Value;
+        wrapField(value: number): Int32Value;
         unwrapField(value: Int32Value): number;
     };
     static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): Int32Value;
@@ -169,7 +169,7 @@ export declare class UInt32Value extends Message<UInt32Value> {
     static readonly typeName = "google.protobuf.UInt32Value";
     static readonly fields: FieldList;
     static readonly fieldWrapper: {
-        wrapField(value: number | UInt32Value): UInt32Value;
+        wrapField(value: number): UInt32Value;
         unwrapField(value: UInt32Value): number;
     };
     static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): UInt32Value;
@@ -198,7 +198,7 @@ export declare class BoolValue extends Message<BoolValue> {
     static readonly typeName = "google.protobuf.BoolValue";
     static readonly fields: FieldList;
     static readonly fieldWrapper: {
-        wrapField(value: boolean | BoolValue): BoolValue;
+        wrapField(value: boolean): BoolValue;
         unwrapField(value: BoolValue): boolean;
     };
     static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): BoolValue;
@@ -227,7 +227,7 @@ export declare class StringValue extends Message<StringValue> {
     static readonly typeName = "google.protobuf.StringValue";
     static readonly fields: FieldList;
     static readonly fieldWrapper: {
-        wrapField(value: string | StringValue): StringValue;
+        wrapField(value: string): StringValue;
         unwrapField(value: StringValue): string;
     };
     static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): StringValue;
@@ -256,7 +256,7 @@ export declare class BytesValue extends Message<BytesValue> {
     static readonly typeName = "google.protobuf.BytesValue";
     static readonly fields: FieldList;
     static readonly fieldWrapper: {
-        wrapField(value: Uint8Array | BytesValue): BytesValue;
+        wrapField(value: Uint8Array): BytesValue;
         unwrapField(value: BytesValue): Uint8Array;
     };
     static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): BytesValue;

package/dist/types/message.d.ts

@@ -56,6 +56,17 @@ export declare class Message<T extends Message<T> = AnyMessage> {
      * Serialize the message to a JSON string.
      */
     toJsonString(options?: Partial<JsonWriteStringOptions>): string;
+    /**
+     * Override for serialization behavior. This will be invoked when calling
+     * JSON.stringify on this message (i.e. JSON.stringify(msg)).
+     *
+     * Note that this will not serialize google.protobuf.Any with a packed
+     * message because the protobuf JSON format specifies that it needs to be
+     * unpacked, and this is only possible with a type registry to look up the
+     * message type.  As a result, attempting to serialize a message with this
+     * type will throw an Error.
+     */
+    toJSON(): JsonValue;
     /**
      * Retrieve the MessageType of this message - a singleton that represents
      * the protobuf message declaration and provides metadata for reflection-
@@ -65,23 +76,38 @@ export declare class Message<T extends Message<T> = AnyMessage> {
 }
 /**
  * PlainMessage<T> strips all methods from a message, leaving only fields
- * and oneof groups.
+ * and oneof groups.  It is recursive, meaning it applies this same logic to all
+ * nested message fields as well.
  */
-export declare type PlainMessage<T extends Message> = {
-    [P in keyof T as T[P] extends Function ? never : P]: T[P];
+export declare type PlainMessage<T extends Message<T>> = {
+    [P in keyof T as T[P] extends Function ? never : P]: PlainField<T[P]>;
 };
+declare type PlainField<F> = F extends (Date | Uint8Array | bigint | boolean | string | number) ? F : F extends Array<infer U> ? Array<PlainField<U>> : F extends ReadonlyArray<infer U> ? ReadonlyArray<PlainField<U>> : F extends Message<infer U> ? PlainMessage<U> : F extends OneofSelectedMessage<infer C, infer V> ? {
+    case: C;
+    value: PlainField<V>;
+} : F extends {
+    case: string | undefined;
+    value?: unknown;
+} ? F : F extends {
+    [key: string | number]: Message<infer U>;
+} ? {
+    [key: string | number]: PlainField<U>;
+} : F;
 /**
  * PartialMessage<T> constructs a type from a message. The resulting type
  * only contains the protobuf field members of the message, and all of them
  * are optional.
  *
+ * Note that the optionality of the fields is the only difference between
+ * PartialMessage and PlainMessage.
+ *
  * PartialMessage is similar to the built-in type Partial<T>, but recursive,
  * and respects `oneof` groups.
  */
-export declare type PartialMessage<T extends Message> = {
+export declare type PartialMessage<T extends Message<T>> = {
     [P in keyof T as T[P] extends Function ? never : P]?: PartialField<T[P]>;
 };
-declare type PartialField<F> = F extends (Date | Uint8Array | bigint | boolean | string | number) ? F : F extends Array<infer U> ? Array<PartialField<U>> : F extends ReadonlyArray<infer U> ? ReadonlyArray<PartialField<U>> : F extends Message ? PartialMessage<F> : F extends OneofSelectedMessage<infer C, infer V> ? {
+declare type PartialField<F> = F extends (Date | Uint8Array | bigint | boolean | string | number) ? F : F extends Array<infer U> ? Array<PartialField<U>> : F extends ReadonlyArray<infer U> ? ReadonlyArray<PartialField<U>> : F extends Message<infer U> ? PartialMessage<U> : F extends OneofSelectedMessage<infer C, infer V> ? {
     case: C;
     value: PartialMessage<V>;
 } : F extends {
@@ -92,7 +118,7 @@ declare type PartialField<F> = F extends (Date | Uint8Array | bigint | boolean |
 } ? {
     [key: string | number]: PartialMessage<U>;
 } : F;
-declare type OneofSelectedMessage<K extends string, M extends Message> = {
+declare type OneofSelectedMessage<K extends string, M extends Message<M>> = {
     case: K;
     value: M;
 };

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

@@ -1,4 +1,4 @@
-import type { Message } from "../message.js";
+import { Message } from "../message.js";
 import type { MessageType } from "../message-type.js";
 import type { DescField } from "../descriptor-set.js";
 import { ScalarType } from "../field.js";
@@ -6,7 +6,7 @@ import { ScalarType } from "../field.js";
  * A field wrapper unwraps a message to a primitive value that is more
  * ergonomic for use as a message field.
  *
- * Note that this feature exists for google/protobuf/{wrappers,struct}.proto
+ * Note that this feature exists for google/protobuf/wrappers.proto
  * and cannot be used to arbitrarily modify types in generated code.
  */
 export interface FieldWrapper<T extends Message<T> = any, U = any> {
@@ -14,15 +14,12 @@ export interface FieldWrapper<T extends Message<T> = any, U = any> {
     unwrapField(value: T): U;
 }
 /**
- * Wrap field values whose message type has a wrapper.
+ * Wrap a primitive message field value in its corresponding wrapper
+ * message. This function is idempotent.
  */
 export declare function wrapField<T extends Message<T>>(type: MessageType<T>, value: any): T;
-/**
- * Unwrap field values whose message type has a wrapper.
- */
-export declare function unwrapField<T extends Message<T>>(type: MessageType<T>, value: T): any;
 /**
  * If the given field uses one of the well-known wrapper types, return
- * the base type it wraps.
+ * the primitive type it wraps.
  */
 export declare function getUnwrappedFieldType(field: DescField): ScalarType | undefined;

package/dist/types/private/util.d.ts

@@ -30,7 +30,7 @@ export interface Util {
      * Compares two messages of the same type recursively.
      * Will also return true if both messages are `undefined` or `null`.
      */
-    equals<T extends Message<T>>(type: MessageType, a: T | PlainMessage<T> | undefined | null, b: T | PlainMessage<T> | undefined | null): boolean;
+    equals<T extends Message<T>>(type: MessageType<T>, a: T | PlainMessage<T> | undefined | null, b: T | PlainMessage<T> | undefined | null): boolean;
     /**
      * Create a deep copy.
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bufbuild/protobuf",
-  "version": "0.2.1",
+  "version": "0.4.0",
   "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": {