@bufbuild/protobuf 2.0.0-alpha.3 → 2.0.0-alpha.4

package/dist/cjs/clone.js

@@ -40,18 +40,21 @@ function cloneReflect(i) {
                 break;
             }
             case "list":
+                // eslint-disable-next-line no-case-declarations
+                const list = o.get(f);
                 for (const item of i.get(f)) {
-                    // TODO fix type error
-                    // @ts-expect-error TODO
-                    const err = o.addListItem(f, cloneSingular(f, item));
+                    const err = list.add(cloneSingular(f, item));
                     if (err) {
                         throw err;
                     }
                 }
                 break;
             case "map":
+                // eslint-disable-next-line no-case-declarations
+                const map = o.get(f);
                 for (const entry of i.get(f).entries()) {
-                    const err = o.setMapEntry(f, entry[0], cloneSingular(f, entry[1]));
+                    // @ts-expect-error TODO fix type error
+                    const err = map.set(entry[0], cloneSingular(f, entry[1]));
                     if (err) {
                         throw err;
                     }

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

@@ -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>): void;
+export declare function mergeFromBinary<Desc extends DescMessage>(messageDesc: Desc, target: MessageShape<Desc>, bytes: Uint8Array, options?: Partial<BinaryReadOptions>): MessageShape<Desc>;
 /**
  * @private
  */

package/dist/cjs/from-binary.js

@@ -45,6 +45,7 @@ exports.fromBinary = fromBinary;
  */
 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);
+    return target;
 }
 exports.mergeFromBinary = mergeFromBinary;
 /**
@@ -99,16 +100,17 @@ function readField(message, reader, field, wireType, options) {
             message.set(field, readMessageField(reader, options, field, message.get(field)));
             break;
         case "list":
-            readListField(message, reader, options, field, wireType);
+            readListField(reader, wireType, message.get(field), options);
             break;
         case "map":
-            readMapEntry(message, field, reader, options);
+            readMapEntry(reader, message.get(field), options);
             break;
     }
 }
 exports.readField = readField;
 // Read a map field, expecting key field = 1, value field = 2
-function readMapEntry(message, field, reader, options) {
+function readMapEntry(reader, map, options) {
+    const field = map.field();
     let key, val;
     const end = reader.pos + reader.uint32();
     while (reader.pos < end) {
@@ -148,12 +150,13 @@ function readMapEntry(message, field, reader, options) {
                 break;
         }
     }
-    message.setMapEntry(field, key, val);
+    map.set(key, val);
 }
-function readListField(message, reader, options, field, wireType) {
+function readListField(reader, wireType, list, options) {
     var _a;
+    const field = list.field();
     if (field.listKind === "message") {
-        message.addListItem(field, readMessageField(reader, options, field));
+        list.add(readMessageField(reader, options, field));
         return;
     }
     const scalarType = (_a = field.scalar) !== null && _a !== void 0 ? _a : descriptors_js_1.ScalarType.INT32;
@@ -161,12 +164,12 @@ function readListField(message, reader, options, field, wireType) {
         scalarType != descriptors_js_1.ScalarType.STRING &&
         scalarType != descriptors_js_1.ScalarType.BYTES;
     if (!packed) {
-        message.addListItem(field, readScalar(reader, scalarType));
+        list.add(readScalar(reader, scalarType));
         return;
     }
     const e = reader.uint32() + reader.pos;
     while (reader.pos < e) {
-        message.addListItem(field, readScalar(reader, scalarType));
+        list.add(readScalar(reader, scalarType));
     }
 }
 function readMessageField(reader, options, field, mergeMessage) {

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

@@ -31,7 +31,7 @@ export declare function fromJsonString<Desc extends DescMessage>(messageDesc: De
  * If a message field is already present, it will be merged with the
  * new data.
  */
-export declare function mergeFromJsonString<Desc extends DescMessage>(messageDesc: Desc, target: MessageShape<Desc>, json: string, options?: Partial<JsonReadOptions>): void;
+export declare function mergeFromJsonString<Desc extends DescMessage>(messageDesc: Desc, target: MessageShape<Desc>, json: string, options?: Partial<JsonReadOptions>): MessageShape<Desc>;
 /**
  * Parse a message from a JSON value.
  */
@@ -45,4 +45,4 @@ export declare function fromJson<Desc extends DescMessage>(messageDesc: Desc, js
  * If a message field is already present, it will be merged with the
  * new data.
  */
-export declare function mergeFromJson<Desc extends DescMessage>(messageDesc: Desc, target: MessageShape<Desc>, json: JsonValue, options?: Partial<JsonReadOptions>): void;
+export declare function mergeFromJson<Desc extends DescMessage>(messageDesc: Desc, target: MessageShape<Desc>, json: JsonValue, options?: Partial<JsonReadOptions>): MessageShape<Desc>;

package/dist/cjs/from-json.js

@@ -49,7 +49,7 @@ exports.fromJsonString = fromJsonString;
  * new data.
  */
 function mergeFromJsonString(messageDesc, target, json, options) {
-    mergeFromJson(messageDesc, target, parseJsonString(json, messageDesc.typeName), options);
+    return mergeFromJson(messageDesc, target, parseJsonString(json, messageDesc.typeName), options);
 }
 exports.mergeFromJsonString = mergeFromJsonString;
 /**
@@ -94,6 +94,7 @@ function mergeFromJson(messageDesc, target, json, options) {
         }
         throw e;
     }
+    return target;
 }
 exports.mergeFromJson = mergeFromJson;
 function readMessage(msg, json, opts) {
@@ -153,17 +154,18 @@ function readField(msg, field, json, opts) {
             readMessageField(msg, field, json, opts);
             break;
         case "list":
-            readListField(msg, field, json, opts);
+            readListField(msg.get(field), json, opts);
             break;
         case "map":
-            readMapField(msg, field, json, opts);
+            readMapField(msg.get(field), json, opts);
             break;
     }
 }
-function readMapField(msg, field, json, opts) {
+function readMapField(map, json, opts) {
     if (json === null) {
         return;
     }
+    const field = map.field();
     if (typeof json != "object" || Array.isArray(json)) {
         throw new error_js_1.FieldError(field, "expected object, got " + (0, reflect_check_js_1.formatVal)(json));
     }
@@ -171,45 +173,37 @@ function readMapField(msg, field, json, opts) {
         if (jsonMapValue === null) {
             throw new error_js_1.FieldError(field, "map value must not be null");
         }
-        const key = mapKeyFromJson(field.mapKey, jsonMapKey);
+        let value;
         switch (field.mapKind) {
             case "message":
                 const msgValue = (0, reflect_js_1.reflect)(field.message);
                 readMessage(msgValue, jsonMapValue, opts);
-                // TODO fix types
-                // @ts-expect-error TODO
-                const err = msg.setMapEntry(field, key, msgValue);
-                if (err) {
-                    throw err;
-                }
+                value = msgValue;
                 break;
             case "enum":
-                const enumValue = readEnum(field.enum, jsonMapValue, opts.ignoreUnknownFields, true);
-                if (enumValue !== tokenIgnoredUnknownEnum) {
-                    // TODO fix types
-                    // @ts-expect-error TODO
-                    const err = msg.setMapEntry(field, key, enumValue);
-                    if (err) {
-                        throw err;
-                    }
+                value = readEnum(field.enum, jsonMapValue, opts.ignoreUnknownFields, true);
+                if (value === tokenIgnoredUnknownEnum) {
+                    return;
                 }
                 break;
             case "scalar":
-                const err2 = msg.setMapEntry(field, 
-                // TODO fix types
-                // @ts-expect-error TODO
-                key, scalarFromJson(field, jsonMapValue, true));
-                if (err2) {
-                    throw err2;
-                }
+                value = scalarFromJson(field, jsonMapValue, true);
                 break;
         }
+        const key = mapKeyFromJson(field.mapKey, jsonMapKey);
+        // TODO fix types
+        // @ts-expect-error TODO
+        const err = map.set(key, value);
+        if (err) {
+            throw err;
+        }
     }
 }
-function readListField(msg, field, json, opts) {
+function readListField(list, json, opts) {
     if (json === null) {
         return;
     }
+    const field = list.field();
     if (!Array.isArray(json)) {
         throw new error_js_1.FieldError(field, "expected Array, got " + (0, reflect_check_js_1.formatVal)(json));
     }
@@ -221,16 +215,16 @@ function readListField(msg, field, json, opts) {
             case "message":
                 const msgValue = (0, reflect_js_1.reflect)(field.message);
                 readMessage(msgValue, jsonItem, opts);
-                msg.addListItem(field, msgValue);
+                list.add(msgValue);
                 break;
             case "enum":
                 const enumValue = readEnum(field.enum, jsonItem, opts.ignoreUnknownFields, true);
                 if (enumValue !== tokenIgnoredUnknownEnum) {
-                    msg.addListItem(field, enumValue);
+                    list.add(enumValue);
                 }
                 break;
             case "scalar":
-                const err = msg.addListItem(field, scalarFromJson(field, jsonItem, true));
+                const err = list.add(scalarFromJson(field, jsonItem, true));
                 if (err) {
                     throw err;
                 }

package/dist/cjs/reflect/guard.js

@@ -15,7 +15,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isReflectMessage = exports.isReflectMap = exports.isReflectList = exports.isOneofADT = exports.isObject = void 0;
 const unsafe_js_1 = require("./unsafe.js");
-const is_message_js_1 = require("../is-message.js");
 function isObject(arg) {
     return arg !== null && typeof arg == "object" && !Array.isArray(arg);
 }
@@ -71,8 +70,9 @@ exports.isReflectMap = isReflectMap;
 function isReflectMessage(arg, messageDesc) {
     return (isObject(arg) &&
         unsafe_js_1.unsafeLocal in arg &&
-        "message" in arg &&
-        (0, is_message_js_1.isMessage)(arg.message) &&
-        (messageDesc === undefined || arg.message.$typeName == messageDesc.typeName));
+        "desc" in arg &&
+        isObject(arg.desc) &&
+        arg.desc.kind === "message" &&
+        (messageDesc === undefined || arg.desc.typeName == messageDesc.typeName));
 }
 exports.isReflectMessage = isReflectMessage;

package/dist/cjs/reflect/reflect-types.d.ts

@@ -109,18 +109,6 @@ export interface ReflectMessage {
      * a valid value. To reset a field, use clear().
      */
     set<Field extends DescField>(field: Field, value: ReflectSetValue<Field>): FieldError | undefined;
-    /**
-     * Add an item to a list field.
-     */
-    addListItem<Field extends DescField & {
-        fieldKind: "list";
-    }>(field: Field, value: ReflectAddListItemValue<Field>): FieldError | undefined;
-    /**
-     * Set a map entry.
-     */
-    setMapEntry<Field extends DescField & {
-        fieldKind: "map";
-    }>(field: Field, key: MapEntryKey, value: ReflectSetMapEntryValue<Field>): FieldError | undefined;
     /**
      * Returns the unknown fields of the message.
      */
@@ -255,30 +243,4 @@ export type ReflectSetValue<Field extends DescField = DescField> = (Field extend
     fieldKind: "scalar";
     scalar: infer T;
 } ? ScalarValue<T> : never);
-/**
- * The type of the "value" argument of ReflectMessage.addListItem()
- */
-export type ReflectAddListItemValue<Field extends DescField & {
-    fieldKind: "list";
-}> = (Field extends {
-    listKind: "scalar";
-    scalar: infer T;
-} ? ScalarValue<T> : Field extends {
-    listKind: "enum";
-} ? enumVal : Field extends {
-    listKind: "message";
-} ? ReflectMessage : never);
-/**
- * The type of the "value" argument of ReflectMessage.setMapEntry()
- */
-export type ReflectSetMapEntryValue<Field extends DescField & {
-    fieldKind: "map";
-}> = (Field extends {
-    mapKind: "enum";
-} ? enumVal : Field extends {
-    mapKind: "message";
-} ? ReflectMessage : Field extends {
-    mapKind: "scalar";
-    scalar: infer T;
-} ? ScalarValue<T> : never);
 export {};

package/dist/cjs/reflect/reflect.js

@@ -42,6 +42,8 @@ class ReflectMessageImpl {
     constructor(messageDesc, message, 
     // TODO either remove this option, or support it in reflect-list and reflect-map as well
     check = true) {
+        this.lists = new Map();
+        this.maps = new Map();
         this.check = check;
         this.desc = messageDesc;
         this.message = this[unsafe_js_1.unsafeLocal] = message !== null && message !== void 0 ? message : (0, create_js_1.create)(messageDesc);
@@ -72,11 +74,19 @@ class ReflectMessageImpl {
         let value = (0, unsafe_js_1.unsafeGet)(this.message, field);
         switch (field.fieldKind) {
             case "list":
-                return new ReflectListImpl(field, value, this.check);
+                // eslint-disable-next-line no-case-declarations
+                let list = this.lists.get(field);
+                if (!list || list[unsafe_js_1.unsafeLocal] !== value) {
+                    this.lists.set(field, (list = new ReflectListImpl(field, value, this.check)));
+                }
+                return list;
             case "map":
-                // TODO fix types
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-return
-                return reflectMap(field, value, this.check); // eslint-disable-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-return
+                // eslint-disable-next-line no-case-declarations
+                let map = this.maps.get(field);
+                if (!map || map[unsafe_js_1.unsafeLocal] !== value) {
+                    this.maps.set(field, (map = new ReflectMapImpl(field, value, this.check)));
+                }
+                return map;
             case "message":
                 if (value !== undefined &&
                     !field.oneof &&
@@ -117,30 +127,6 @@ class ReflectMessageImpl {
         (0, unsafe_js_1.unsafeSet)(this.message, field, local);
         return undefined;
     }
-    addListItem(field, value) {
-        assertOwn(this.message, field);
-        assertKind(field, "list");
-        if (this.check) {
-            if ((0, reflect_check_js_1.checkListItem)(field, 0, value)) {
-                const arr = (0, unsafe_js_1.unsafeGet)(this.message, field);
-                return (0, reflect_check_js_1.checkListItem)(field, arr.length, value);
-            }
-        }
-        (0, unsafe_js_1.unsafeAddListItem)(this.message, field, listItemToLocal(field, value));
-        return undefined;
-    }
-    setMapEntry(field, key, value) {
-        assertOwn(this.message, field);
-        assertKind(field, "map");
-        if (this.check) {
-            const err = (0, reflect_check_js_1.checkMapEntry)(field, key, value);
-            if (err) {
-                return err;
-            }
-        }
-        (0, unsafe_js_1.unsafeSetMapEntry)(this.message, field, mapKeyToLocal(key), mapValueToLocal(field, value));
-        return undefined;
-    }
     getUnknown() {
         return this.message.$unknown;
     }
@@ -148,11 +134,6 @@ class ReflectMessageImpl {
         this.message.$unknown = value;
     }
 }
-function assertKind(field, kind) {
-    if (field.fieldKind != kind) {
-        throw new error_js_1.FieldError(field, `${field.toString()} is ${field.fieldKind}`, "ForeignFieldError");
-    }
-}
 function assertOwn(owner, member) {
     if (member.parent.typeName !== owner.$typeName) {
         throw new error_js_1.FieldError(member, `cannot use ${member.toString()} with message ${owner.$typeName}`, "ForeignFieldError");

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

@@ -40,19 +40,3 @@ export declare function unsafeSet(target: Record<string, unknown>, field: DescFi
  */
 export declare function unsafeClear(target: Record<string, any>, // eslint-disable-line @typescript-eslint/no-explicit-any -- `any` is the best choice for dynamic access
 field: DescField): void;
-/**
- * Add an item to a list field.
- *
- * @private
- */
-export declare function unsafeAddListItem(target: Record<string, unknown>, field: DescField & {
-    fieldKind: "list";
-}, value: unknown): void;
-/**
- * Set a map entry.
- *
- * @private
- */
-export declare function unsafeSetMapEntry(target: Record<string, unknown>, field: DescField & {
-    fieldKind: "map";
-}, key: string | number, value: unknown): void;

package/dist/cjs/reflect/unsafe.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.unsafeSetMapEntry = exports.unsafeAddListItem = exports.unsafeClear = exports.unsafeSet = exports.unsafeGet = exports.unsafeIsSetExplicit = exports.unsafeIsSet = exports.unsafeOneofCase = exports.unsafeLocal = void 0;
+exports.unsafeClear = exports.unsafeSet = exports.unsafeGet = exports.unsafeIsSetExplicit = exports.unsafeIsSet = exports.unsafeOneofCase = exports.unsafeLocal = void 0;
 const scalar_js_1 = require("./scalar.js");
 // bootstrap-inject google.protobuf.FeatureSet.FieldPresence.IMPLICIT: const $name: FeatureSet_FieldPresence.$localName = $number;
 const IMPLICIT = 2;
@@ -146,21 +146,3 @@ field) {
     }
 }
 exports.unsafeClear = unsafeClear;
-/**
- * Add an item to a list field.
- *
- * @private
- */
-function unsafeAddListItem(target, field, value) {
-    target[field.localName].push(value);
-}
-exports.unsafeAddListItem = unsafeAddListItem;
-/**
- * Set a map entry.
- *
- * @private
- */
-function unsafeSetMapEntry(target, field, key, value) {
-    target[field.localName][key] = value;
-}
-exports.unsafeSetMapEntry = unsafeSetMapEntry;

package/dist/cjs/wire/binary-encoding.js

@@ -462,29 +462,50 @@ class BinaryReader {
 }
 exports.BinaryReader = BinaryReader;
 /**
- * Assert a valid signed protobuf 32-bit integer.
+ * Assert a valid signed protobuf 32-bit integer as a number or string.
  */
 function assertInt32(arg) {
-    if (typeof arg !== "number")
+    if (typeof arg == "string") {
+        arg = Number(arg);
+    }
+    else if (typeof arg != "number") {
         throw new Error("invalid int32: " + typeof arg);
-    if (!Number.isInteger(arg) || arg > exports.INT32_MAX || arg < exports.INT32_MIN)
+    }
+    if (!Number.isInteger(arg) ||
+        arg > exports.INT32_MAX ||
+        arg < exports.INT32_MIN)
         throw new Error("invalid int32: " + arg);
 }
 /**
- * Assert a valid unsigned protobuf 32-bit integer.
+ * Assert a valid unsigned protobuf 32-bit integer as a number or string.
  */
 function assertUInt32(arg) {
-    if (typeof arg !== "number")
+    if (typeof arg == "string") {
+        arg = Number(arg);
+    }
+    else if (typeof arg != "number") {
         throw new Error("invalid uint32: " + typeof arg);
-    if (!Number.isInteger(arg) || arg > exports.UINT32_MAX || arg < 0)
+    }
+    if (!Number.isInteger(arg) ||
+        arg > exports.UINT32_MAX ||
+        arg < 0)
         throw new Error("invalid uint32: " + arg);
 }
 /**
- * Assert a valid protobuf float value.
+ * Assert a valid protobuf float value as a number or string.
  */
 function assertFloat32(arg) {
-    if (typeof arg !== "number")
+    if (typeof arg == "string") {
+        const o = arg;
+        arg = Number(arg);
+        if (isNaN(arg) && o !== "NaN") {
+            throw new Error("invalid float32: " + o);
+        }
+    }
+    else if (typeof arg != "number") {
         throw new Error("invalid float32: " + typeof arg);
-    if (Number.isFinite(arg) && (arg > exports.FLOAT32_MAX || arg < exports.FLOAT32_MIN))
+    }
+    if (Number.isFinite(arg) &&
+        (arg > exports.FLOAT32_MAX || arg < exports.FLOAT32_MIN))
         throw new Error("invalid float32: " + arg);
 }

package/dist/cjs/wkt/any.d.ts

@@ -35,4 +35,4 @@ export declare function anyUnpack<Desc extends DescMessage>(any: Any, messageDes
 /**
  * Same as anyUnpack but unpacks into the target message.
  */
-export declare function anyUnpackTo<Desc extends DescMessage>(any: Any, messageDesc: Desc, message: MessageShape<Desc>): void;
+export declare function anyUnpackTo<Desc extends DescMessage>(any: Any, messageDesc: Desc, message: MessageShape<Desc>): MessageShape<Desc> | undefined;

package/dist/esm/clone.js

@@ -36,18 +36,21 @@ function cloneReflect(i) {
                 break;
             }
             case "list":
+                // eslint-disable-next-line no-case-declarations
+                const list = o.get(f);
                 for (const item of i.get(f)) {
-                    // TODO fix type error
-                    // @ts-expect-error TODO
-                    const err = o.addListItem(f, cloneSingular(f, item));
+                    const err = list.add(cloneSingular(f, item));
                     if (err) {
                         throw err;
                     }
                 }
                 break;
             case "map":
+                // eslint-disable-next-line no-case-declarations
+                const map = o.get(f);
                 for (const entry of i.get(f).entries()) {
-                    const err = o.setMapEntry(f, entry[0], cloneSingular(f, entry[1]));
+                    // @ts-expect-error TODO fix type error
+                    const err = map.set(entry[0], cloneSingular(f, entry[1]));
                     if (err) {
                         throw err;
                     }

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

@@ -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>): void;
+export declare function mergeFromBinary<Desc extends DescMessage>(messageDesc: Desc, target: MessageShape<Desc>, bytes: Uint8Array, options?: Partial<BinaryReadOptions>): MessageShape<Desc>;
 /**
  * @private
  */

package/dist/esm/from-binary.js

@@ -41,6 +41,7 @@ export function fromBinary(messageDesc, bytes, options) {
  */
 export function mergeFromBinary(messageDesc, target, bytes, options) {
     readMessage(reflect(messageDesc, target), new BinaryReader(bytes), makeReadOptions(options), false, bytes.byteLength);
+    return target;
 }
 /**
  * If `delimited` is false, read the length given in `lengthOrDelimitedFieldNo`.
@@ -94,15 +95,16 @@ export function readField(message, reader, field, wireType, options) {
             message.set(field, readMessageField(reader, options, field, message.get(field)));
             break;
         case "list":
-            readListField(message, reader, options, field, wireType);
+            readListField(reader, wireType, message.get(field), options);
             break;
         case "map":
-            readMapEntry(message, field, reader, options);
+            readMapEntry(reader, message.get(field), options);
             break;
     }
 }
 // Read a map field, expecting key field = 1, value field = 2
-function readMapEntry(message, field, reader, options) {
+function readMapEntry(reader, map, options) {
+    const field = map.field();
     let key, val;
     const end = reader.pos + reader.uint32();
     while (reader.pos < end) {
@@ -142,12 +144,13 @@ function readMapEntry(message, field, reader, options) {
                 break;
         }
     }
-    message.setMapEntry(field, key, val);
+    map.set(key, val);
 }
-function readListField(message, reader, options, field, wireType) {
+function readListField(reader, wireType, list, options) {
     var _a;
+    const field = list.field();
     if (field.listKind === "message") {
-        message.addListItem(field, readMessageField(reader, options, field));
+        list.add(readMessageField(reader, options, field));
         return;
     }
     const scalarType = (_a = field.scalar) !== null && _a !== void 0 ? _a : ScalarType.INT32;
@@ -155,12 +158,12 @@ function readListField(message, reader, options, field, wireType) {
         scalarType != ScalarType.STRING &&
         scalarType != ScalarType.BYTES;
     if (!packed) {
-        message.addListItem(field, readScalar(reader, scalarType));
+        list.add(readScalar(reader, scalarType));
         return;
     }
     const e = reader.uint32() + reader.pos;
     while (reader.pos < e) {
-        message.addListItem(field, readScalar(reader, scalarType));
+        list.add(readScalar(reader, scalarType));
     }
 }
 function readMessageField(reader, options, field, mergeMessage) {

package/dist/esm/from-json.d.ts

@@ -31,7 +31,7 @@ export declare function fromJsonString<Desc extends DescMessage>(messageDesc: De
  * If a message field is already present, it will be merged with the
  * new data.
  */
-export declare function mergeFromJsonString<Desc extends DescMessage>(messageDesc: Desc, target: MessageShape<Desc>, json: string, options?: Partial<JsonReadOptions>): void;
+export declare function mergeFromJsonString<Desc extends DescMessage>(messageDesc: Desc, target: MessageShape<Desc>, json: string, options?: Partial<JsonReadOptions>): MessageShape<Desc>;
 /**
  * Parse a message from a JSON value.
  */
@@ -45,4 +45,4 @@ export declare function fromJson<Desc extends DescMessage>(messageDesc: Desc, js
  * If a message field is already present, it will be merged with the
  * new data.
  */
-export declare function mergeFromJson<Desc extends DescMessage>(messageDesc: Desc, target: MessageShape<Desc>, json: JsonValue, options?: Partial<JsonReadOptions>): void;
+export declare function mergeFromJson<Desc extends DescMessage>(messageDesc: Desc, target: MessageShape<Desc>, json: JsonValue, options?: Partial<JsonReadOptions>): MessageShape<Desc>;

package/dist/esm/from-json.js

@@ -45,7 +45,7 @@ export function fromJsonString(messageDesc, json, options) {
  * new data.
  */
 export function mergeFromJsonString(messageDesc, target, json, options) {
-    mergeFromJson(messageDesc, target, parseJsonString(json, messageDesc.typeName), options);
+    return mergeFromJson(messageDesc, target, parseJsonString(json, messageDesc.typeName), options);
 }
 /**
  * Parse a message from a JSON value.
@@ -88,6 +88,7 @@ export function mergeFromJson(messageDesc, target, json, options) {
         }
         throw e;
     }
+    return target;
 }
 function readMessage(msg, json, opts) {
     var _a;
@@ -146,17 +147,18 @@ function readField(msg, field, json, opts) {
             readMessageField(msg, field, json, opts);
             break;
         case "list":
-            readListField(msg, field, json, opts);
+            readListField(msg.get(field), json, opts);
             break;
         case "map":
-            readMapField(msg, field, json, opts);
+            readMapField(msg.get(field), json, opts);
             break;
     }
 }
-function readMapField(msg, field, json, opts) {
+function readMapField(map, json, opts) {
     if (json === null) {
         return;
     }
+    const field = map.field();
     if (typeof json != "object" || Array.isArray(json)) {
         throw new FieldError(field, "expected object, got " + formatVal(json));
     }
@@ -164,45 +166,37 @@ function readMapField(msg, field, json, opts) {
         if (jsonMapValue === null) {
             throw new FieldError(field, "map value must not be null");
         }
-        const key = mapKeyFromJson(field.mapKey, jsonMapKey);
+        let value;
         switch (field.mapKind) {
             case "message":
                 const msgValue = reflect(field.message);
                 readMessage(msgValue, jsonMapValue, opts);
-                // TODO fix types
-                // @ts-expect-error TODO
-                const err = msg.setMapEntry(field, key, msgValue);
-                if (err) {
-                    throw err;
-                }
+                value = msgValue;
                 break;
             case "enum":
-                const enumValue = readEnum(field.enum, jsonMapValue, opts.ignoreUnknownFields, true);
-                if (enumValue !== tokenIgnoredUnknownEnum) {
-                    // TODO fix types
-                    // @ts-expect-error TODO
-                    const err = msg.setMapEntry(field, key, enumValue);
-                    if (err) {
-                        throw err;
-                    }
+                value = readEnum(field.enum, jsonMapValue, opts.ignoreUnknownFields, true);
+                if (value === tokenIgnoredUnknownEnum) {
+                    return;
                 }
                 break;
             case "scalar":
-                const err2 = msg.setMapEntry(field, 
-                // TODO fix types
-                // @ts-expect-error TODO
-                key, scalarFromJson(field, jsonMapValue, true));
-                if (err2) {
-                    throw err2;
-                }
+                value = scalarFromJson(field, jsonMapValue, true);
                 break;
         }
+        const key = mapKeyFromJson(field.mapKey, jsonMapKey);
+        // TODO fix types
+        // @ts-expect-error TODO
+        const err = map.set(key, value);
+        if (err) {
+            throw err;
+        }
     }
 }
-function readListField(msg, field, json, opts) {
+function readListField(list, json, opts) {
     if (json === null) {
         return;
     }
+    const field = list.field();
     if (!Array.isArray(json)) {
         throw new FieldError(field, "expected Array, got " + formatVal(json));
     }
@@ -214,16 +208,16 @@ function readListField(msg, field, json, opts) {
             case "message":
                 const msgValue = reflect(field.message);
                 readMessage(msgValue, jsonItem, opts);
-                msg.addListItem(field, msgValue);
+                list.add(msgValue);
                 break;
             case "enum":
                 const enumValue = readEnum(field.enum, jsonItem, opts.ignoreUnknownFields, true);
                 if (enumValue !== tokenIgnoredUnknownEnum) {
-                    msg.addListItem(field, enumValue);
+                    list.add(enumValue);
                 }
                 break;
             case "scalar":
-                const err = msg.addListItem(field, scalarFromJson(field, jsonItem, true));
+                const err = list.add(scalarFromJson(field, jsonItem, true));
                 if (err) {
                     throw err;
                 }

package/dist/esm/reflect/guard.js

@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 import { unsafeLocal } from "./unsafe.js";
-import { isMessage } from "../is-message.js";
 export function isObject(arg) {
     return arg !== null && typeof arg == "object" && !Array.isArray(arg);
 }
@@ -64,7 +63,8 @@ export function isReflectMap(arg, field) {
 export function isReflectMessage(arg, messageDesc) {
     return (isObject(arg) &&
         unsafeLocal in arg &&
-        "message" in arg &&
-        isMessage(arg.message) &&
-        (messageDesc === undefined || arg.message.$typeName == messageDesc.typeName));
+        "desc" in arg &&
+        isObject(arg.desc) &&
+        arg.desc.kind === "message" &&
+        (messageDesc === undefined || arg.desc.typeName == messageDesc.typeName));
 }

package/dist/esm/reflect/reflect-types.d.ts

@@ -109,18 +109,6 @@ export interface ReflectMessage {
      * a valid value. To reset a field, use clear().
      */
     set<Field extends DescField>(field: Field, value: ReflectSetValue<Field>): FieldError | undefined;
-    /**
-     * Add an item to a list field.
-     */
-    addListItem<Field extends DescField & {
-        fieldKind: "list";
-    }>(field: Field, value: ReflectAddListItemValue<Field>): FieldError | undefined;
-    /**
-     * Set a map entry.
-     */
-    setMapEntry<Field extends DescField & {
-        fieldKind: "map";
-    }>(field: Field, key: MapEntryKey, value: ReflectSetMapEntryValue<Field>): FieldError | undefined;
     /**
      * Returns the unknown fields of the message.
      */
@@ -255,30 +243,4 @@ export type ReflectSetValue<Field extends DescField = DescField> = (Field extend
     fieldKind: "scalar";
     scalar: infer T;
 } ? ScalarValue<T> : never);
-/**
- * The type of the "value" argument of ReflectMessage.addListItem()
- */
-export type ReflectAddListItemValue<Field extends DescField & {
-    fieldKind: "list";
-}> = (Field extends {
-    listKind: "scalar";
-    scalar: infer T;
-} ? ScalarValue<T> : Field extends {
-    listKind: "enum";
-} ? enumVal : Field extends {
-    listKind: "message";
-} ? ReflectMessage : never);
-/**
- * The type of the "value" argument of ReflectMessage.setMapEntry()
- */
-export type ReflectSetMapEntryValue<Field extends DescField & {
-    fieldKind: "map";
-}> = (Field extends {
-    mapKind: "enum";
-} ? enumVal : Field extends {
-    mapKind: "message";
-} ? ReflectMessage : Field extends {
-    mapKind: "scalar";
-    scalar: infer T;
-} ? ScalarValue<T> : never);
 export {};

package/dist/esm/reflect/reflect.js

@@ -14,7 +14,7 @@
 import { ScalarType, } from "../descriptors.js";
 import { checkField, checkListItem, checkMapEntry } from "./reflect-check.js";
 import { FieldError } from "./error.js";
-import { unsafeAddListItem, unsafeClear, unsafeGet, unsafeIsSet, unsafeLocal, unsafeOneofCase, unsafeSet, unsafeSetMapEntry, } from "./unsafe.js";
+import { unsafeClear, unsafeGet, unsafeIsSet, unsafeLocal, unsafeOneofCase, unsafeSet, } from "./unsafe.js";
 import { create } from "../create.js";
 import { isWrapper, isWrapperDesc } from "../wkt/wrappers.js";
 import { scalarZeroValue } from "./scalar.js";
@@ -38,6 +38,8 @@ class ReflectMessageImpl {
     constructor(messageDesc, message, 
     // TODO either remove this option, or support it in reflect-list and reflect-map as well
     check = true) {
+        this.lists = new Map();
+        this.maps = new Map();
         this.check = check;
         this.desc = messageDesc;
         this.message = this[unsafeLocal] = message !== null && message !== void 0 ? message : create(messageDesc);
@@ -68,11 +70,19 @@ class ReflectMessageImpl {
         let value = unsafeGet(this.message, field);
         switch (field.fieldKind) {
             case "list":
-                return new ReflectListImpl(field, value, this.check);
+                // eslint-disable-next-line no-case-declarations
+                let list = this.lists.get(field);
+                if (!list || list[unsafeLocal] !== value) {
+                    this.lists.set(field, (list = new ReflectListImpl(field, value, this.check)));
+                }
+                return list;
             case "map":
-                // TODO fix types
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-return
-                return reflectMap(field, value, this.check); // eslint-disable-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-return
+                // eslint-disable-next-line no-case-declarations
+                let map = this.maps.get(field);
+                if (!map || map[unsafeLocal] !== value) {
+                    this.maps.set(field, (map = new ReflectMapImpl(field, value, this.check)));
+                }
+                return map;
             case "message":
                 if (value !== undefined &&
                     !field.oneof &&
@@ -113,30 +123,6 @@ class ReflectMessageImpl {
         unsafeSet(this.message, field, local);
         return undefined;
     }
-    addListItem(field, value) {
-        assertOwn(this.message, field);
-        assertKind(field, "list");
-        if (this.check) {
-            if (checkListItem(field, 0, value)) {
-                const arr = unsafeGet(this.message, field);
-                return checkListItem(field, arr.length, value);
-            }
-        }
-        unsafeAddListItem(this.message, field, listItemToLocal(field, value));
-        return undefined;
-    }
-    setMapEntry(field, key, value) {
-        assertOwn(this.message, field);
-        assertKind(field, "map");
-        if (this.check) {
-            const err = checkMapEntry(field, key, value);
-            if (err) {
-                return err;
-            }
-        }
-        unsafeSetMapEntry(this.message, field, mapKeyToLocal(key), mapValueToLocal(field, value));
-        return undefined;
-    }
     getUnknown() {
         return this.message.$unknown;
     }
@@ -144,11 +130,6 @@ class ReflectMessageImpl {
         this.message.$unknown = value;
     }
 }
-function assertKind(field, kind) {
-    if (field.fieldKind != kind) {
-        throw new FieldError(field, `${field.toString()} is ${field.fieldKind}`, "ForeignFieldError");
-    }
-}
 function assertOwn(owner, member) {
     if (member.parent.typeName !== owner.$typeName) {
         throw new FieldError(member, `cannot use ${member.toString()} with message ${owner.$typeName}`, "ForeignFieldError");

package/dist/esm/reflect/unsafe.d.ts

@@ -40,19 +40,3 @@ export declare function unsafeSet(target: Record<string, unknown>, field: DescFi
  */
 export declare function unsafeClear(target: Record<string, any>, // eslint-disable-line @typescript-eslint/no-explicit-any -- `any` is the best choice for dynamic access
 field: DescField): void;
-/**
- * Add an item to a list field.
- *
- * @private
- */
-export declare function unsafeAddListItem(target: Record<string, unknown>, field: DescField & {
-    fieldKind: "list";
-}, value: unknown): void;
-/**
- * Set a map entry.
- *
- * @private
- */
-export declare function unsafeSetMapEntry(target: Record<string, unknown>, field: DescField & {
-    fieldKind: "map";
-}, key: string | number, value: unknown): void;

package/dist/esm/reflect/unsafe.js

@@ -137,19 +137,3 @@ field) {
         }
     }
 }
-/**
- * Add an item to a list field.
- *
- * @private
- */
-export function unsafeAddListItem(target, field, value) {
-    target[field.localName].push(value);
-}
-/**
- * Set a map entry.
- *
- * @private
- */
-export function unsafeSetMapEntry(target, field, key, value) {
-    target[field.localName][key] = value;
-}

package/dist/esm/wire/binary-encoding.js

@@ -457,29 +457,50 @@ export class BinaryReader {
     }
 }
 /**
- * Assert a valid signed protobuf 32-bit integer.
+ * Assert a valid signed protobuf 32-bit integer as a number or string.
  */
 function assertInt32(arg) {
-    if (typeof arg !== "number")
+    if (typeof arg == "string") {
+        arg = Number(arg);
+    }
+    else if (typeof arg != "number") {
         throw new Error("invalid int32: " + typeof arg);
-    if (!Number.isInteger(arg) || arg > INT32_MAX || arg < INT32_MIN)
+    }
+    if (!Number.isInteger(arg) ||
+        arg > INT32_MAX ||
+        arg < INT32_MIN)
         throw new Error("invalid int32: " + arg);
 }
 /**
- * Assert a valid unsigned protobuf 32-bit integer.
+ * Assert a valid unsigned protobuf 32-bit integer as a number or string.
  */
 function assertUInt32(arg) {
-    if (typeof arg !== "number")
+    if (typeof arg == "string") {
+        arg = Number(arg);
+    }
+    else if (typeof arg != "number") {
         throw new Error("invalid uint32: " + typeof arg);
-    if (!Number.isInteger(arg) || arg > UINT32_MAX || arg < 0)
+    }
+    if (!Number.isInteger(arg) ||
+        arg > UINT32_MAX ||
+        arg < 0)
         throw new Error("invalid uint32: " + arg);
 }
 /**
- * Assert a valid protobuf float value.
+ * Assert a valid protobuf float value as a number or string.
  */
 function assertFloat32(arg) {
-    if (typeof arg !== "number")
+    if (typeof arg == "string") {
+        const o = arg;
+        arg = Number(arg);
+        if (isNaN(arg) && o !== "NaN") {
+            throw new Error("invalid float32: " + o);
+        }
+    }
+    else if (typeof arg != "number") {
         throw new Error("invalid float32: " + typeof arg);
-    if (Number.isFinite(arg) && (arg > FLOAT32_MAX || arg < FLOAT32_MIN))
+    }
+    if (Number.isFinite(arg) &&
+        (arg > FLOAT32_MAX || arg < FLOAT32_MIN))
         throw new Error("invalid float32: " + arg);
 }

package/dist/esm/wkt/any.d.ts

@@ -35,4 +35,4 @@ export declare function anyUnpack<Desc extends DescMessage>(any: Any, messageDes
 /**
  * Same as anyUnpack but unpacks into the target message.
  */
-export declare function anyUnpackTo<Desc extends DescMessage>(any: Any, messageDesc: Desc, message: MessageShape<Desc>): void;
+export declare function anyUnpackTo<Desc extends DescMessage>(any: Any, messageDesc: Desc, message: MessageShape<Desc>): MessageShape<Desc> | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bufbuild/protobuf",
-  "version": "2.0.0-alpha.3",
+  "version": "2.0.0-alpha.4",
   "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": {