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

package/dist/cjs/from-binary.js

@@ -14,6 +14,7 @@
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.readField = exports.mergeFromBinary = exports.fromBinary = void 0;
+const descriptors_js_1 = require("./descriptors.js");
 const scalar_js_1 = require("./reflect/scalar.js");
 const reflect_js_1 = require("./reflect/reflect.js");
 const binary_encoding_js_1 = require("./wire/binary-encoding.js");
@@ -44,7 +45,6 @@ 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;
 /**
@@ -62,12 +62,12 @@ function readMessage(message, reader, options, delimited, lengthOrDelimitedField
     const unknownFields = (_a = message.getUnknown()) !== null && _a !== void 0 ? _a : [];
     while (reader.pos < end) {
         [fieldNo, wireType] = reader.tag();
-        if (wireType == binary_encoding_js_1.WireType.EndGroup) {
+        if (delimited && wireType == binary_encoding_js_1.WireType.EndGroup) {
             break;
         }
         const field = message.findNumber(fieldNo);
         if (!field) {
-            const data = reader.skip(wireType);
+            const data = reader.skip(wireType, fieldNo);
             if (options.readUnknownFields) {
                 unknownFields.push({ no: fieldNo, wireType, data });
             }
@@ -90,10 +90,10 @@ function readMessage(message, reader, options, delimited, lengthOrDelimitedField
 function readField(message, reader, field, wireType, options) {
     switch (field.fieldKind) {
         case "scalar":
-            message.set(field, readScalar(reader, field.scalar, field.longType));
+            message.set(field, readScalar(reader, field.scalar));
             break;
         case "enum":
-            message.set(field, readScalar(reader, scalar_js_1.ScalarType.INT32));
+            message.set(field, readScalar(reader, descriptors_js_1.ScalarType.INT32));
             break;
         case "message":
             message.set(field, readMessageField(reader, options, field, message.get(field)));
@@ -102,15 +102,13 @@ function readField(message, reader, field, wireType, options) {
             readListField(message, reader, options, field, wireType);
             break;
         case "map":
-            // eslint-disable-next-line no-case-declarations
-            const [key, val] = readMapEntry(field, reader, options);
-            message.setMapEntry(field, key, val);
+            readMapEntry(message, field, reader, options);
             break;
     }
 }
 exports.readField = readField;
 // Read a map field, expecting key field = 1, value field = 2
-function readMapEntry(field, reader, options) {
+function readMapEntry(message, field, reader, options) {
     let key, val;
     const end = reader.pos + reader.uint32();
     while (reader.pos < end) {
@@ -135,12 +133,12 @@ function readMapEntry(field, reader, options) {
         }
     }
     if (key === undefined) {
-        key = (0, scalar_js_1.scalarZeroValue)(field.mapKey, scalar_js_1.LongType.BIGINT);
+        key = (0, scalar_js_1.scalarZeroValue)(field.mapKey, false);
     }
     if (val === undefined) {
         switch (field.mapKind) {
             case "scalar":
-                val = (0, scalar_js_1.scalarZeroValue)(field.scalar, scalar_js_1.LongType.BIGINT);
+                val = (0, scalar_js_1.scalarZeroValue)(field.scalar, false);
                 break;
             case "enum":
                 val = field.enum.values[0].number;
@@ -150,7 +148,7 @@ function readMapEntry(field, reader, options) {
                 break;
         }
     }
-    return [key, val];
+    message.setMapEntry(field, key, val);
 }
 function readListField(message, reader, options, field, wireType) {
     var _a;
@@ -158,18 +156,17 @@ function readListField(message, reader, options, field, wireType) {
         message.addListItem(field, readMessageField(reader, options, field));
         return;
     }
-    const scalarType = (_a = field.scalar) !== null && _a !== void 0 ? _a : scalar_js_1.ScalarType.INT32;
-    const longType = field.listKind == "scalar" ? field.longType : undefined;
+    const scalarType = (_a = field.scalar) !== null && _a !== void 0 ? _a : descriptors_js_1.ScalarType.INT32;
     const packed = wireType == binary_encoding_js_1.WireType.LengthDelimited &&
-        scalarType != scalar_js_1.ScalarType.STRING &&
-        scalarType != scalar_js_1.ScalarType.BYTES;
+        scalarType != descriptors_js_1.ScalarType.STRING &&
+        scalarType != descriptors_js_1.ScalarType.BYTES;
     if (!packed) {
-        message.addListItem(field, readScalar(reader, scalarType, longType));
+        message.addListItem(field, readScalar(reader, scalarType));
         return;
     }
     const e = reader.uint32() + reader.pos;
     while (reader.pos < e) {
-        message.addListItem(field, readScalar(reader, scalarType, longType));
+        message.addListItem(field, readScalar(reader, scalarType));
     }
 }
 function readMessageField(reader, options, field, mergeMessage) {
@@ -178,44 +175,37 @@ function readMessageField(reader, options, field, mergeMessage) {
     readMessage(message, reader, options, delimited, delimited ? field.number : reader.uint32());
     return message;
 }
-function readScalar(reader, type, longType) {
-    let v = readScalarValue(reader, type);
-    if (longType === scalar_js_1.LongType.STRING) {
-        v = typeof v == "bigint" ? v.toString() : v;
-    }
-    return v;
-}
-function readScalarValue(reader, type) {
+function readScalar(reader, type) {
     switch (type) {
-        case scalar_js_1.ScalarType.STRING:
+        case descriptors_js_1.ScalarType.STRING:
             return reader.string();
-        case scalar_js_1.ScalarType.BOOL:
+        case descriptors_js_1.ScalarType.BOOL:
             return reader.bool();
-        case scalar_js_1.ScalarType.DOUBLE:
+        case descriptors_js_1.ScalarType.DOUBLE:
             return reader.double();
-        case scalar_js_1.ScalarType.FLOAT:
+        case descriptors_js_1.ScalarType.FLOAT:
             return reader.float();
-        case scalar_js_1.ScalarType.INT32:
+        case descriptors_js_1.ScalarType.INT32:
             return reader.int32();
-        case scalar_js_1.ScalarType.INT64:
+        case descriptors_js_1.ScalarType.INT64:
             return reader.int64();
-        case scalar_js_1.ScalarType.UINT64:
+        case descriptors_js_1.ScalarType.UINT64:
             return reader.uint64();
-        case scalar_js_1.ScalarType.FIXED64:
+        case descriptors_js_1.ScalarType.FIXED64:
             return reader.fixed64();
-        case scalar_js_1.ScalarType.BYTES:
+        case descriptors_js_1.ScalarType.BYTES:
             return reader.bytes();
-        case scalar_js_1.ScalarType.FIXED32:
+        case descriptors_js_1.ScalarType.FIXED32:
             return reader.fixed32();
-        case scalar_js_1.ScalarType.SFIXED32:
+        case descriptors_js_1.ScalarType.SFIXED32:
             return reader.sfixed32();
-        case scalar_js_1.ScalarType.SFIXED64:
+        case descriptors_js_1.ScalarType.SFIXED64:
             return reader.sfixed64();
-        case scalar_js_1.ScalarType.SINT64:
+        case descriptors_js_1.ScalarType.SINT64:
             return reader.sint64();
-        case scalar_js_1.ScalarType.UINT32:
+        case descriptors_js_1.ScalarType.UINT32:
             return reader.uint32();
-        case scalar_js_1.ScalarType.SINT32:
+        case descriptors_js_1.ScalarType.SINT32:
             return reader.sint32();
     }
 }

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

@@ -1,6 +1,6 @@
-import type { DescMessage } from "./desc-types.js";
+import { type DescMessage } from "./descriptors.js";
 import type { JsonValue } from "./json-value.js";
-import type { Registry } from "./reflect/registry.js";
+import type { Registry } from "./registry.js";
 import type { MessageShape } from "./types.js";
 /**
  * Options for parsing JSON data.
@@ -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>): MessageShape<Desc>;
+export declare function mergeFromJsonString<Desc extends DescMessage>(messageDesc: Desc, target: MessageShape<Desc>, json: string, options?: Partial<JsonReadOptions>): void;
 /**
  * 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>): MessageShape<Desc>;
+export declare function mergeFromJson<Desc extends DescMessage>(messageDesc: Desc, target: MessageShape<Desc>, json: JsonValue, options?: Partial<JsonReadOptions>): void;