@bufbuild/protobuf 2.0.0-alpha.4 → 2.0.0-beta.2

package/README.md

@@ -8,7 +8,7 @@ This package provides the runtime library for the code generator plugin
 A complete implementation of [Protocol Buffers](https://developers.google.com/protocol-buffers) in TypeScript,
 suitable for web browsers and Node.js.
 
-**Protobuf-ES** is intended to be a solid, modern alternative to existing Protobuf implementations for the JavaScript ecosystem.  It is the first project in this space to provide a comprehensive plugin framework and decouple the base types from RPC functionality.
+**Protobuf-ES** is intended to be a solid, modern alternative to existing Protobuf implementations for the JavaScript ecosystem. It is the first project in this space to provide a comprehensive plugin framework and decouple the base types from RPC functionality.
 
 Some additional features that set it apart from the others:
 
@@ -17,7 +17,7 @@ Some additional features that set it apart from the others:
 - Generation of idiomatic JavaScript and TypeScript code.
 - Generation of [much smaller bundles](https://github.com/bufbuild/protobuf-es/blob/main/packages/bundle-size)
 - Implementation of all proto3 features, including the [canonical JSON format](https://developers.google.com/protocol-buffers/docs/proto3#json).
-- Implementation of all proto2 features, except for extensions and the text format.  
+- Implementation of all proto2 features, except for extensions and the text format.
 - Usage of standard JavaScript APIs instead of the [Closure Library](http://googlecode.blogspot.com/2009/11/introducing-closure-tools.html)
 - Compatibility is covered by the protocol buffers [conformance tests](https://github.com/bufbuild/protobuf-es/blob/main/packages/protobuf-conformance).
 - Descriptor and reflection support
@@ -40,4 +40,3 @@ For more information on Buf, check out the official [Buf documentation](https://
 ## Examples
 
 A complete code example can be found in the **Protobuf-ES** repo [here](https://github.com/bufbuild/protobuf-es/tree/main/packages/protobuf-example).
-

package/dist/cjs/clone.d.ts

@@ -3,4 +3,4 @@ import { type DescMessage } from "./descriptors.js";
 /**
  * Create a deep copy of a message, including extensions and unknown fields.
  */
-export declare function clone<Desc extends DescMessage>(messageDesc: Desc, message: MessageShape<Desc>): MessageShape<Desc>;
+export declare function clone<Desc extends DescMessage>(schema: Desc, message: MessageShape<Desc>): MessageShape<Desc>;

package/dist/cjs/clone.js

@@ -20,9 +20,8 @@ const guard_js_1 = require("./reflect/guard.js");
 /**
  * Create a deep copy of a message, including extensions and unknown fields.
  */
-function clone(messageDesc, message) {
-    return cloneReflect((0, reflect_js_1.reflect)(messageDesc, message))
-        .message;
+function clone(schema, message) {
+    return cloneReflect((0, reflect_js_1.reflect)(schema, message)).message;
 }
 exports.clone = clone;
 function cloneReflect(i) {
@@ -33,31 +32,21 @@ function cloneReflect(i) {
         }
         switch (f.fieldKind) {
             default: {
-                const err = o.set(f, cloneSingular(f, i.get(f)));
-                if (err) {
-                    throw err;
-                }
+                o.set(f, cloneSingular(f, i.get(f)));
                 break;
             }
             case "list":
                 // eslint-disable-next-line no-case-declarations
                 const list = o.get(f);
                 for (const item of i.get(f)) {
-                    const err = list.add(cloneSingular(f, item));
-                    if (err) {
-                        throw err;
-                    }
+                    list.add(cloneSingular(f, item));
                 }
                 break;
             case "map":
                 // eslint-disable-next-line no-case-declarations
                 const map = o.get(f);
                 for (const entry of i.get(f).entries()) {
-                    // @ts-expect-error TODO fix type error
-                    const err = map.set(entry[0], cloneSingular(f, entry[1]));
-                    if (err) {
-                        throw err;
-                    }
+                    map.set(entry[0], cloneSingular(f, entry[1]));
                 }
                 break;
         }

package/dist/cjs/codegenv1/embed.js

@@ -30,14 +30,14 @@ function embedFileDesc(file) {
     const embed = {
         bootable: false,
         proto() {
-            const stripped = (0, clone_js_1.clone)(descriptor_pb_js_1.FileDescriptorProtoDesc, file);
-            (0, fields_js_1.clearField)(stripped, descriptor_pb_js_1.FileDescriptorProtoDesc.field.dependency);
-            (0, fields_js_1.clearField)(stripped, descriptor_pb_js_1.FileDescriptorProtoDesc.field.sourceCodeInfo);
+            const stripped = (0, clone_js_1.clone)(descriptor_pb_js_1.FileDescriptorProtoSchema, file);
+            (0, fields_js_1.clearField)(stripped, descriptor_pb_js_1.FileDescriptorProtoSchema.field.dependency);
+            (0, fields_js_1.clearField)(stripped, descriptor_pb_js_1.FileDescriptorProtoSchema.field.sourceCodeInfo);
             stripped.messageType.map(stripJsonNames);
             return stripped;
         },
         base64() {
-            const bytes = (0, to_binary_js_1.toBinary)(descriptor_pb_js_1.FileDescriptorProtoDesc, this.proto());
+            const bytes = (0, to_binary_js_1.toBinary)(descriptor_pb_js_1.FileDescriptorProtoSchema, this.proto());
             return (0, base64_encoding_js_1.base64Encode)(bytes, "std_raw");
         },
     };
@@ -50,7 +50,7 @@ exports.embedFileDesc = embedFileDesc;
 function stripJsonNames(d) {
     for (const f of d.field) {
         if (f.jsonName === (0, names_js_1.protoCamelCase)(f.name)) {
-            (0, fields_js_1.clearField)(f, descriptor_pb_js_1.FieldDescriptorProtoDesc.field.jsonName);
+            (0, fields_js_1.clearField)(f, descriptor_pb_js_1.FieldDescriptorProtoSchema.field.jsonName);
         }
     }
     for (const n of d.nestedType) {
@@ -161,27 +161,27 @@ function createDescriptorBoot(proto) {
     return b;
 }
 function createFieldDescriptorBoot(proto) {
-    assert((0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldDescriptorProtoDesc.field.name));
-    assert((0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldDescriptorProtoDesc.field.number));
-    assert((0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldDescriptorProtoDesc.field.type));
-    assert(!(0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldDescriptorProtoDesc.field.oneofIndex));
-    assert(!(0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldDescriptorProtoDesc.field.jsonName) ||
+    assert((0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldDescriptorProtoSchema.field.name));
+    assert((0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldDescriptorProtoSchema.field.number));
+    assert((0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldDescriptorProtoSchema.field.type));
+    assert(!(0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldDescriptorProtoSchema.field.oneofIndex));
+    assert(!(0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldDescriptorProtoSchema.field.jsonName) ||
         proto.jsonName === (0, names_js_1.protoCamelCase)(proto.name));
     const b = {
         name: proto.name,
         number: proto.number,
         type: proto.type,
     };
-    if ((0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldDescriptorProtoDesc.field.label)) {
+    if ((0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldDescriptorProtoSchema.field.label)) {
         b.label = proto.label;
     }
-    if ((0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldDescriptorProtoDesc.field.typeName)) {
+    if ((0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldDescriptorProtoSchema.field.typeName)) {
         b.typeName = proto.typeName;
     }
-    if ((0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldDescriptorProtoDesc.field.extendee)) {
+    if ((0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldDescriptorProtoSchema.field.extendee)) {
         b.extendee = proto.extendee;
     }
-    if ((0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldDescriptorProtoDesc.field.defaultValue)) {
+    if ((0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldDescriptorProtoSchema.field.defaultValue)) {
         b.defaultValue = proto.defaultValue;
     }
     if (proto.options) {
@@ -191,19 +191,19 @@ function createFieldDescriptorBoot(proto) {
 }
 function createFieldOptionsBoot(proto) {
     const b = {};
-    assert(!(0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldOptionsDesc.field.ctype));
-    if ((0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldOptionsDesc.field.packed)) {
+    assert(!(0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldOptionsSchema.field.ctype));
+    if ((0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldOptionsSchema.field.packed)) {
         b.packed = proto.packed;
     }
-    assert(!(0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldOptionsDesc.field.jstype));
-    assert(!(0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldOptionsDesc.field.lazy));
-    assert(!(0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldOptionsDesc.field.unverifiedLazy));
-    if ((0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldOptionsDesc.field.deprecated)) {
+    assert(!(0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldOptionsSchema.field.jstype));
+    assert(!(0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldOptionsSchema.field.lazy));
+    assert(!(0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldOptionsSchema.field.unverifiedLazy));
+    if ((0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldOptionsSchema.field.deprecated)) {
         b.deprecated = proto.deprecated;
     }
-    assert(!(0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldOptionsDesc.field.weak));
-    assert(!(0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldOptionsDesc.field.debugRedact));
-    if ((0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldOptionsDesc.field.retention)) {
+    assert(!(0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldOptionsSchema.field.weak));
+    assert(!(0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldOptionsSchema.field.debugRedact));
+    if ((0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldOptionsSchema.field.retention)) {
         b.retention = proto.retention;
     }
     if (proto.targets.length) {
@@ -215,8 +215,8 @@ function createFieldOptionsBoot(proto) {
             edition: d.edition,
         }));
     }
-    assert(!(0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldOptionsDesc.field.features));
-    assert(!(0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldOptionsDesc.field.uninterpretedOption));
+    assert(!(0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldOptionsSchema.field.features));
+    assert(!(0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldOptionsSchema.field.uninterpretedOption));
     return b;
 }
 function createEnumDescriptorBoot(proto) {

package/dist/cjs/codegenv1/enum.d.ts

@@ -1,11 +1,12 @@
 import type { DescEnum, DescFile } from "../descriptors.js";
 import type { GenDescEnum } from "./types.js";
+import type { JsonValue } from "../json-value.js";
 /**
  * Hydrate an enum descriptor.
  *
  * @private
  */
-export declare function enumDesc<Shape>(file: DescFile, path: number, ...paths: number[]): GenDescEnum<Shape>;
+export declare function enumDesc<Shape, JsonType extends JsonValue = JsonValue>(file: DescFile, path: number, ...paths: number[]): GenDescEnum<Shape, JsonType>;
 /**
  * Construct a TypeScript enum object at runtime from a descriptor.
  */

package/dist/cjs/codegenv1/file.js

@@ -26,7 +26,7 @@ const from_binary_js_1 = require("../from-binary.js");
  */
 function fileDesc(b64, imports) {
     var _a;
-    const root = (0, from_binary_js_1.fromBinary)(descriptor_pb_js_1.FileDescriptorProtoDesc, (0, base64_encoding_js_1.base64Decode)(b64));
+    const root = (0, from_binary_js_1.fromBinary)(descriptor_pb_js_1.FileDescriptorProtoSchema, (0, base64_encoding_js_1.base64Decode)(b64));
     root.messageType.forEach(restore_json_names_js_1.restoreJsonNames);
     root.dependency = (_a = imports === null || imports === void 0 ? void 0 : imports.map((f) => f.proto.name)) !== null && _a !== void 0 ? _a : [];
     const reg = (0, registry_js_1.createFileRegistry)(root, (protoFileName) => imports === null || imports === void 0 ? void 0 : imports.find((f) => f.proto.name === protoFileName));

package/dist/cjs/codegenv1/message.d.ts

@@ -1,9 +1,10 @@
 import type { Message } from "../types.js";
 import type { DescFile } from "../descriptors.js";
 import type { GenDescMessage } from "./types.js";
+import type { JsonValue } from "../json-value.js";
 /**
  * Hydrate a message descriptor.
  *
  * @private
  */
-export declare function messageDesc<Shape extends Message>(file: DescFile, path: number, ...paths: number[]): GenDescMessage<Shape>;
+export declare function messageDesc<Shape extends Message, JsonType extends JsonValue = JsonValue>(file: DescFile, path: number, ...paths: number[]): GenDescMessage<Shape, JsonType>;

package/dist/cjs/codegenv1/scalar.d.ts

@@ -3,3 +3,7 @@ import { ScalarType } from "../descriptors.js";
  * Return the TypeScript type (as a string) for the given scalar type.
  */
 export declare function scalarTypeScriptType(scalar: ScalarType, longAsString: boolean): "string" | "boolean" | "bigint" | "bigint | string" | "Uint8Array" | "number";
+/**
+ * Return the JSON type (as a string) for the given scalar type.
+ */
+export declare function scalarJsonType(scalar: ScalarType): "string" | "boolean" | "number" | `number | "NaN" | "Infinity" | "-Infinity"`;

package/dist/cjs/codegenv1/scalar.js

@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.scalarTypeScriptType = void 0;
+exports.scalarJsonType = exports.scalarTypeScriptType = void 0;
 const descriptors_js_1 = require("../descriptors.js");
 /**
  * Return the TypeScript type (as a string) for the given scalar type.
@@ -37,3 +37,32 @@ function scalarTypeScriptType(scalar, longAsString) {
     }
 }
 exports.scalarTypeScriptType = scalarTypeScriptType;
+/**
+ * Return the JSON type (as a string) for the given scalar type.
+ */
+function scalarJsonType(scalar) {
+    switch (scalar) {
+        case descriptors_js_1.ScalarType.DOUBLE:
+        case descriptors_js_1.ScalarType.FLOAT:
+            return `number | "NaN" | "Infinity" | "-Infinity"`;
+        case descriptors_js_1.ScalarType.UINT64:
+        case descriptors_js_1.ScalarType.SFIXED64:
+        case descriptors_js_1.ScalarType.FIXED64:
+        case descriptors_js_1.ScalarType.SINT64:
+        case descriptors_js_1.ScalarType.INT64:
+            return "string";
+        case descriptors_js_1.ScalarType.INT32:
+        case descriptors_js_1.ScalarType.FIXED32:
+        case descriptors_js_1.ScalarType.UINT32:
+        case descriptors_js_1.ScalarType.SFIXED32:
+        case descriptors_js_1.ScalarType.SINT32:
+            return "number";
+        case descriptors_js_1.ScalarType.STRING:
+            return "string";
+        case descriptors_js_1.ScalarType.BOOL:
+            return "boolean";
+        case descriptors_js_1.ScalarType.BYTES:
+            return "string";
+    }
+}
+exports.scalarJsonType = scalarJsonType;

package/dist/cjs/codegenv1/symbols.d.ts

@@ -60,6 +60,16 @@ export declare const symbols: {
         readonly bootstrapWktFrom: "../../proto-int64.js";
         readonly from: "@bufbuild/protobuf";
     };
+    readonly JsonValue: {
+        readonly typeOnly: true;
+        readonly bootstrapWktFrom: "../../json-value.js";
+        readonly from: "@bufbuild/protobuf";
+    };
+    readonly JsonObject: {
+        readonly typeOnly: true;
+        readonly bootstrapWktFrom: "../../json-value.js";
+        readonly from: "@bufbuild/protobuf";
+    };
     readonly codegen: {
         readonly boot: {
             readonly typeOnly: false;

package/dist/cjs/codegenv1/symbols.js

@@ -50,6 +50,8 @@ exports.symbols = {
     toJson: { typeOnly: false, bootstrapWktFrom: "../../to-json.js", from: exports.packageName },
     toJsonString: { typeOnly: false, bootstrapWktFrom: "../../to-json.js", from: exports.packageName },
     protoInt64: { typeOnly: false, bootstrapWktFrom: "../../proto-int64.js", from: exports.packageName },
+    JsonValue: { typeOnly: true, bootstrapWktFrom: "../../json-value.js", from: exports.packageName },
+    JsonObject: { typeOnly: true, bootstrapWktFrom: "../../json-value.js", from: exports.packageName },
     codegen: {
         boot: { typeOnly: false, bootstrapWktFrom: "../../codegenv1/boot.js", from: exports.packageName + "/codegenv1" },
         fileDesc: { typeOnly: false, bootstrapWktFrom: "../../codegenv1/file.js", from: exports.packageName + "/codegenv1" },

package/dist/cjs/codegenv1/types.d.ts

@@ -1,5 +1,6 @@
 import type { Message } from "../types.js";
 import type { DescEnum, DescExtension, DescField, DescFile, DescMessage, DescMethod, DescService } from "../descriptors.js";
+import type { JsonValue } from "../json-value.js";
 /**
  * Describes a protobuf source file.
  *
@@ -14,9 +15,9 @@ export type GenDescFile = DescFile;
  *
  * @private
  */
-export type GenDescMessage<RuntimeShape extends Message> = Omit<DescMessage, "field"> & {
+export type GenDescMessage<RuntimeShape extends Message, JsonType = JsonValue> = Omit<DescMessage, "field"> & {
     field: Record<MessageFieldNames<RuntimeShape>, DescField>;
-} & brand<RuntimeShape>;
+} & brandv1<RuntimeShape, JsonType>;
 /**
  * Describes an enumeration in a protobuf source file.
  *
@@ -25,7 +26,7 @@ export type GenDescMessage<RuntimeShape extends Message> = Omit<DescMessage, "fi
  *
  * @private
  */
-export type GenDescEnum<RuntimeShape> = DescEnum & brand<RuntimeShape>;
+export type GenDescEnum<RuntimeShape, JsonType extends JsonValue = JsonValue> = DescEnum & brandv1<RuntimeShape, JsonType>;
 /**
  * Describes an extension in a protobuf source file.
  *
@@ -34,7 +35,7 @@ export type GenDescEnum<RuntimeShape> = DescEnum & brand<RuntimeShape>;
  *
  * @private
  */
-export type GenDescExtension<Extendee extends Message = Message, RuntimeShape = unknown> = DescExtension & brand<Extendee, RuntimeShape>;
+export type GenDescExtension<Extendee extends Message = Message, RuntimeShape = unknown> = DescExtension & brandv1<Extendee, RuntimeShape>;
 /**
  * Describes a service declaration in a protobuf source file.
  *
@@ -52,7 +53,8 @@ export type GenDescService<RuntimeShape extends GenDescServiceMethods> = Omit<De
  * @private
  */
 export type GenDescServiceMethods = Record<string, Pick<DescMethod, "input" | "output" | "methodKind">>;
-declare class brand<A, B = unknown> {
+declare class brandv1<A, B = unknown> {
+    protected v: "codegenv1";
     protected a: A | boolean;
     protected b: B | boolean;
 }

package/dist/cjs/codegenv1/types.js

@@ -13,8 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
-class brand {
+class brandv1 {
     constructor() {
+        this.v = "codegenv1";
         this.a = false;
         this.b = false;
     }

package/dist/cjs/create.d.ts

@@ -6,4 +6,4 @@ import type { MessageInitShape, MessageShape } from "./types.js";
  * The second argument is an optional initializer object, where all fields are
  * optional.
  */
-export declare function create<Desc extends DescMessage>(messageDesc: Desc, init?: MessageInitShape<Desc>): MessageShape<Desc>;
+export declare function create<Desc extends DescMessage>(schema: Desc, init?: MessageInitShape<Desc>): MessageShape<Desc>;

package/dist/cjs/create.js

@@ -22,6 +22,8 @@ const unsafe_js_1 = require("./reflect/unsafe.js");
 const wrappers_js_1 = require("./wkt/wrappers.js");
 // bootstrap-inject google.protobuf.Edition.EDITION_PROTO3: const $name: Edition.$localName = $number;
 const EDITION_PROTO3 = 999;
+// bootstrap-inject google.protobuf.Edition.EDITION_PROTO2: const $name: Edition.$localName = $number;
+const EDITION_PROTO2 = 998;
 // bootstrap-inject google.protobuf.FeatureSet.FieldPresence.IMPLICIT: const $name: FeatureSet_FieldPresence.$localName = $number;
 const IMPLICIT = 2;
 /**
@@ -30,13 +32,13 @@ const IMPLICIT = 2;
  * The second argument is an optional initializer object, where all fields are
  * optional.
  */
-function create(messageDesc, init) {
-    if ((0, is_message_js_1.isMessage)(init, messageDesc)) {
+function create(schema, init) {
+    if ((0, is_message_js_1.isMessage)(init, schema)) {
         return init;
     }
-    const message = createZeroMessage(messageDesc);
+    const message = createZeroMessage(schema);
     if (init !== undefined) {
-        initMessage(messageDesc, message, init);
+        initMessage(schema, message, init);
     }
     return message;
 }
@@ -66,12 +68,7 @@ function initMessage(messageDesc, message, init) {
         // eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check -- no need to convert enum
         switch (field.fieldKind) {
             case "message":
-                if ((0, wrappers_js_1.isWrapperDesc)(field.message)) {
-                    value = initScalar(field.message.fields[0], value);
-                }
-                else {
-                    value = toMessage(value, field.message);
-                }
+                value = toMessage(field, value);
                 break;
             case "scalar":
                 value = initScalar(field, value);
@@ -99,7 +96,7 @@ function initMap(field, value) {
             return convertObjectValues(value, toU8Arr);
         }
         if (field.mapKind == "message") {
-            return convertObjectValues(value, (val) => toMessage(val, field.message));
+            return convertObjectValues(value, (val) => toMessage(field, val));
         }
     }
     return value;
@@ -110,14 +107,29 @@ function initList(field, value) {
             return value.map(toU8Arr);
         }
         if (field.listKind == "message") {
-            return value.map((item) => toMessage(item, field.message));
+            return value.map((item) => toMessage(field, item));
         }
     }
     return value;
 }
-function toMessage(value, message) {
-    if (!(0, is_message_js_1.isMessage)(value, message) && (0, guard_js_1.isObject)(value)) {
-        return create(message, value);
+function toMessage(field, value) {
+    if (field.fieldKind == "message" &&
+        !field.oneof &&
+        (0, wrappers_js_1.isWrapperDesc)(field.message)) {
+        // Types from google/protobuf/wrappers.proto are unwrapped when used in
+        // a singular field that is not part of a oneof group.
+        return initScalar(field.message.fields[0], value);
+    }
+    if ((0, guard_js_1.isObject)(value)) {
+        if (field.message.typeName == "google.protobuf.Struct" &&
+            field.parent.typeName !== "google.protobuf.Value") {
+            // google.protobuf.Struct is represented with JsonObject when used in a
+            // field, except when used in google.protobuf.Value.
+            return value;
+        }
+        if (!(0, is_message_js_1.isMessage)(value, field.message)) {
+            return create(field.message, value);
+        }
     }
     return value;
 }
@@ -139,9 +151,7 @@ const messagePrototypes = new WeakMap();
  */
 function createZeroMessage(desc) {
     let msg;
-    if (desc.file.edition == EDITION_PROTO3) {
-        // we special case proto3: since it does not have default values, we let
-        // the `optional` keyword generate an optional property.
+    if (!needsPrototypeChain(desc)) {
         msg = {};
         for (const member of desc.members) {
             if (member.kind == "oneof" || member.presence == IMPLICIT) {
@@ -150,8 +160,7 @@ function createZeroMessage(desc) {
         }
     }
     else {
-        // for everything but proto3, we support default values, and track presence
-        // via the prototype chain
+        // Support default values and track presence via the prototype chain
         const cached = messagePrototypes.get(desc);
         let prototype;
         let members;
@@ -203,6 +212,24 @@ function createZeroMessage(desc) {
     msg.$typeName = desc.typeName;
     return msg;
 }
+/**
+ * Do we need the prototype chain to track field presence?
+ */
+function needsPrototypeChain(desc) {
+    switch (desc.file.edition) {
+        case EDITION_PROTO3:
+            // proto3 always uses implicit presence, we never need the prototype chain.
+            return false;
+        case EDITION_PROTO2:
+            // proto2 never uses implicit presence, we always need the prototype chain.
+            return true;
+        default:
+            // If a message uses scalar or enum fields with explicit presence, we need
+            // the prototype chain to track presence. This rule does not apply to fields
+            // in a oneof group - they use a different mechanism to track presence.
+            return desc.fields.some((f) => f.presence != IMPLICIT && f.fieldKind != "message" && !f.oneof);
+    }
+}
 /**
  * Returns a zero value for oneof groups, and for every field kind except
  * messages. Scalar and enum fields can have default values.

package/dist/cjs/equals.d.ts

@@ -6,4 +6,4 @@ import type { DescMessage } from "./descriptors.js";
  * Note that this function disregards extensions and unknown fields, and that
  * NaN is not equal NaN, following the IEEE standard.
  */
-export declare function equals<Desc extends DescMessage>(messageDesc: Desc, a: MessageShape<Desc>, b: MessageShape<Desc>): boolean;
+export declare function equals<Desc extends DescMessage>(schema: Desc, a: MessageShape<Desc>, b: MessageShape<Desc>): boolean;

package/dist/cjs/equals.js

@@ -22,15 +22,14 @@ const reflect_js_1 = require("./reflect/reflect.js");
  * Note that this function disregards extensions and unknown fields, and that
  * NaN is not equal NaN, following the IEEE standard.
  */
-function equals(messageDesc, a, b) {
-    if (a.$typeName != messageDesc.typeName ||
-        b.$typeName != messageDesc.typeName) {
+function equals(schema, a, b) {
+    if (a.$typeName != schema.typeName || b.$typeName != schema.typeName) {
         return false;
     }
     if (a === b) {
         return true;
     }
-    return reflectEquals((0, reflect_js_1.reflect)(messageDesc, a), (0, reflect_js_1.reflect)(messageDesc, b));
+    return reflectEquals((0, reflect_js_1.reflect)(schema, a), (0, reflect_js_1.reflect)(schema, b));
 }
 exports.equals = equals;
 function reflectEquals(a, b) {
@@ -80,15 +79,11 @@ function fieldEquals(f, a, b) {
                     case "enum":
                         return false;
                     case "message":
-                        // TODO fix type error
-                        // @ts-expect-error TODO
                         if (!reflectEquals(va, vb)) {
                             return false;
                         }
                         break;
                     case "scalar":
-                        // TODO fix type error
-                        // @ts-expect-error TODO
                         if (!(0, scalar_js_1.scalarEquals)(f.scalar, va, vb)) {
                             return false;
                         }
@@ -104,23 +99,21 @@ function fieldEquals(f, a, b) {
                 return false;
             }
             for (let i = 0; i < la.size; i++) {
-                if (la.get(i) === lb.get(i)) {
+                const va = la.get(i);
+                const vb = lb.get(i);
+                if (va === vb) {
                     continue;
                 }
                 switch (f.listKind) {
                     case "enum":
                         return false;
                     case "message":
-                        // TODO fix type error
-                        // @ts-expect-error TODO
-                        if (!reflectEquals(la.get(i), lb.get(i))) {
+                        if (!reflectEquals(va, vb)) {
                             return false;
                         }
                         break;
                     case "scalar":
-                        // TODO fix type error
-                        // @ts-expect-error TODO
-                        if (!(0, scalar_js_1.scalarEquals)(f.scalar, la.get(i), lb.get(i))) {
+                        if (!(0, scalar_js_1.scalarEquals)(f.scalar, va, vb)) {
                             return false;
                         }
                         break;

package/dist/cjs/from-binary.d.ts

@@ -17,7 +17,7 @@ export interface BinaryReadOptions {
 /**
  * Parse serialized binary data.
  */
-export declare function fromBinary<Desc extends DescMessage>(messageDesc: Desc, bytes: Uint8Array, options?: Partial<BinaryReadOptions>): MessageShape<Desc>;
+export declare function fromBinary<Desc extends DescMessage>(schema: Desc, bytes: Uint8Array, options?: Partial<BinaryReadOptions>): MessageShape<Desc>;
 /**
  * Parse from binary data, merging fields.
  *
@@ -27,7 +27,7 @@ export declare function fromBinary<Desc extends DescMessage>(messageDesc: Desc,
  * If a message field is already present, it will be merged with the
  * new data.
  */
-export declare function mergeFromBinary<Desc extends DescMessage>(messageDesc: Desc, target: MessageShape<Desc>, bytes: Uint8Array, options?: Partial<BinaryReadOptions>): MessageShape<Desc>;
+export declare function mergeFromBinary<Desc extends DescMessage>(schema: Desc, target: MessageShape<Desc>, bytes: Uint8Array, options?: Partial<BinaryReadOptions>): MessageShape<Desc>;
 /**
  * @private
  */

package/dist/cjs/from-binary.js

@@ -28,8 +28,8 @@ function makeReadOptions(options) {
 /**
  * Parse serialized binary data.
  */
-function fromBinary(messageDesc, bytes, options) {
-    const msg = (0, reflect_js_1.reflect)(messageDesc);
+function fromBinary(schema, bytes, options) {
+    const msg = (0, reflect_js_1.reflect)(schema, undefined, false);
     readMessage(msg, new binary_encoding_js_1.BinaryReader(bytes), makeReadOptions(options), false, bytes.byteLength);
     return msg.message;
 }
@@ -43,8 +43,8 @@ exports.fromBinary = fromBinary;
  * If a message field is already present, it will be merged with the
  * new data.
  */
-function mergeFromBinary(messageDesc, target, bytes, options) {
-    readMessage((0, reflect_js_1.reflect)(messageDesc, target), new binary_encoding_js_1.BinaryReader(bytes), makeReadOptions(options), false, bytes.byteLength);
+function mergeFromBinary(schema, target, bytes, options) {
+    readMessage((0, reflect_js_1.reflect)(schema, target, false), new binary_encoding_js_1.BinaryReader(bytes), makeReadOptions(options), false, bytes.byteLength);
     return target;
 }
 exports.mergeFromBinary = mergeFromBinary;
@@ -146,7 +146,7 @@ function readMapEntry(reader, map, options) {
                 val = field.enum.values[0].number;
                 break;
             case "message":
-                val = (0, reflect_js_1.reflect)(field.message);
+                val = (0, reflect_js_1.reflect)(field.message, undefined, false);
                 break;
         }
     }
@@ -174,7 +174,7 @@ function readListField(reader, wireType, list, options) {
 }
 function readMessageField(reader, options, field, mergeMessage) {
     const delimited = field.delimitedEncoding;
-    const message = mergeMessage !== null && mergeMessage !== void 0 ? mergeMessage : (0, reflect_js_1.reflect)(field.message);
+    const message = mergeMessage !== null && mergeMessage !== void 0 ? mergeMessage : (0, reflect_js_1.reflect)(field.message, undefined, false);
     readMessage(message, reader, options, delimited, delimited ? field.number : reader.uint32());
     return message;
 }