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

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

@@ -1,4 +1,4 @@
-import type { DescField, DescMessage } from "./desc-types.js";
+import { type DescField, type DescMessage } from "./descriptors.js";
 import type { MessageShape } from "./types.js";
 import type { ReflectMessage } from "./reflect/index.js";
 import { BinaryReader, WireType } from "./wire/binary-encoding.js";

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");
@@ -93,22 +94,23 @@ function readField(message, reader, field, wireType, options) {
             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)));
             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) {
@@ -133,12 +135,12 @@ function readMapEntry(message, 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;
@@ -148,25 +150,26 @@ 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 : scalar_js_1.ScalarType.INT32;
+    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));
+        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) {
@@ -177,35 +180,35 @@ function readMessageField(reader, options, field, mergeMessage) {
 }
 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.