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

package/dist/cjs/proto-int64.d.ts

@@ -1,3 +1,7 @@
+/**
+ * Int64Support for the current environment.
+ */
+export declare const protoInt64: Int64Support;
 /**
  * We use the `bigint` primitive to represent 64-bit integral types. If bigint
  * is unavailable, we fall back to a string representation, which means that
@@ -91,5 +95,4 @@ interface Int64Support {
      */
     uDec(lo: number, hi: number): bigint;
 }
-export declare const protoInt64: Int64Support;
 export {};

package/dist/cjs/proto-int64.js

@@ -14,8 +14,11 @@
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.protoInt64 = void 0;
-const assert_js_1 = require("./reflect/assert.js");
 const varint_js_1 = require("./wire/varint.js");
+/**
+ * Int64Support for the current environment.
+ */
+exports.protoInt64 = makeInt64Support();
 function makeInt64Support() {
     const dv = new DataView(new ArrayBuffer(8));
     // note that Safari 14 implements BigInt, but not the DataView methods
@@ -35,14 +38,14 @@ function makeInt64Support() {
             parse(value) {
                 const bi = typeof value == "bigint" ? value : BigInt(value);
                 if (bi > MAX || bi < MIN) {
-                    throw new Error(`int64 invalid: ${value}`);
+                    throw new Error(`invalid int64: ${value}`);
                 }
                 return bi;
             },
             uParse(value) {
                 const bi = typeof value == "bigint" ? value : BigInt(value);
                 if (bi > UMAX || bi < UMIN) {
-                    throw new Error(`uint64 invalid: ${value}`);
+                    throw new Error(`invalid uint64: ${value}`);
                 }
                 return bi;
             },
@@ -72,8 +75,6 @@ function makeInt64Support() {
             },
         };
     }
-    const assertInt64String = (value) => (0, assert_js_1.assert)(/^-?[0-9]+$/.test(value), `int64 invalid: ${value}`);
-    const assertUInt64String = (value) => (0, assert_js_1.assert)(/^[0-9]+$/.test(value), `uint64 invalid: ${value}`);
     return {
         zero: "0",
         supported: false,
@@ -113,4 +114,13 @@ function makeInt64Support() {
         },
     };
 }
-exports.protoInt64 = makeInt64Support();
+function assertInt64String(value) {
+    if (!/^-?[0-9]+$/.test(value)) {
+        throw new Error("invalid int64: " + value);
+    }
+}
+function assertUInt64String(value) {
+    if (!/^[0-9]+$/.test(value)) {
+        throw new Error("invalid uint64: " + value);
+    }
+}

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

@@ -1,4 +1,4 @@
-import type { DescField, DescOneof } from "../desc-types.js";
+import type { DescField, DescOneof } from "../descriptors.js";
 declare const errorNames: string[];
 export declare class FieldError extends Error {
     readonly name: (typeof errorNames)[number];

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

@@ -1,7 +1,7 @@
 import type { Message } from "../types.js";
 import type { ScalarValue } from "./scalar.js";
 import type { ReflectList, ReflectMap, ReflectMessage } from "./reflect-types.js";
-import type { DescField, DescMessage } from "../desc-types.js";
+import type { DescField, DescMessage } from "../descriptors.js";
 export declare function isObject(arg: unknown): arg is Record<string, unknown>;
 export declare function isOneofADT(arg: unknown): arg is OneofADT;
 export type OneofADT = {

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/index.d.ts

@@ -3,6 +3,5 @@ export * from "./names.js";
 export * from "./nested-types.js";
 export * from "./reflect.js";
 export * from "./reflect-types.js";
-export * from "./registry.js";
 export * from "./scalar.js";
 export { isReflectList, isReflectMap, isReflectMessage } from "./guard.js";

package/dist/cjs/reflect/index.js

@@ -33,7 +33,6 @@ __exportStar(require("./names.js"), exports);
 __exportStar(require("./nested-types.js"), exports);
 __exportStar(require("./reflect.js"), exports);
 __exportStar(require("./reflect-types.js"), exports);
-__exportStar(require("./registry.js"), exports);
 __exportStar(require("./scalar.js"), exports);
 var guard_js_1 = require("./guard.js");
 Object.defineProperty(exports, "isReflectList", { enumerable: true, get: function () { return guard_js_1.isReflectList; } });

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

@@ -6,6 +6,6 @@ export declare function protoCamelCase(snakeCase: string): string;
 /**
  * Escapes names that are reserved for ECMAScript built-in object properties.
  *
- * Also see safeIdentifier() from @bufbuild/protoplugin/ecmascript.
+ * Also see safeIdentifier() from @bufbuild/protoplugin.
  */
 export declare function safeObjectProperty(name: string): string;

package/dist/cjs/reflect/names.js

@@ -66,7 +66,7 @@ const reservedObjectProperties = new Set([
 /**
  * Escapes names that are reserved for ECMAScript built-in object properties.
  *
- * Also see safeIdentifier() from @bufbuild/protoplugin/ecmascript.
+ * Also see safeIdentifier() from @bufbuild/protoplugin.
  */
 function safeObjectProperty(name) {
     return reservedObjectProperties.has(name) ? name + "$" : name;

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

@@ -1,4 +1,4 @@
-import type { AnyDesc, DescEnum, DescExtension, DescFile, DescMessage, DescService } from "../desc-types.js";
+import type { AnyDesc, DescEnum, DescExtension, DescFile, DescMessage, DescService } from "../descriptors.js";
 /**
  * Iterate over all types - enumerations, extensions, services, messages -
  * and enumerations, extensions and messages nested in messages.

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

@@ -1,9 +1,18 @@
-import type { DescField } from "../desc-types.js";
+import { type DescField } from "../descriptors.js";
 import { FieldError } from "./error.js";
+/**
+ * Check whether the given field value is valid for the reflect API.
+ */
 export declare function checkField(field: DescField, value: unknown): FieldError | undefined;
+/**
+ * Check whether the given list item is valid for the reflect API.
+ */
 export declare function checkListItem(field: DescField & {
     fieldKind: "list";
 }, index: number, value: unknown): FieldError | undefined;
+/**
+ * Check whether the given map key and value are valid for the reflect API.
+ */
 export declare function checkMapEntry(field: DescField & {
     fieldKind: "map";
 }, key: unknown, value: unknown): FieldError | undefined;

package/dist/cjs/reflect/reflect-check.js

@@ -14,11 +14,16 @@
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatVal = exports.checkMapEntry = exports.checkListItem = exports.checkField = void 0;
-const scalar_js_1 = require("./scalar.js");
-const scalar_js_2 = require("./scalar.js");
+const descriptors_js_1 = require("../descriptors.js");
 const is_message_js_1 = require("../is-message.js");
 const error_js_1 = require("./error.js");
 const guard_js_1 = require("./guard.js");
+const binary_encoding_js_1 = require("../wire/binary-encoding.js");
+const text_encoding_js_1 = require("../wire/text-encoding.js");
+const proto_int64_js_1 = require("../proto-int64.js");
+/**
+ * Check whether the given field value is valid for the reflect API.
+ */
 function checkField(field, value) {
     const check = field.fieldKind == "list"
         ? (0, guard_js_1.isReflectList)(value, field)
@@ -43,6 +48,9 @@ function checkField(field, value) {
     return new error_js_1.FieldError(field, reason);
 }
 exports.checkField = checkField;
+/**
+ * Check whether the given list item is valid for the reflect API.
+ */
 function checkListItem(field, index, value) {
     const check = checkSingular(field, value);
     if (check !== true) {
@@ -51,8 +59,11 @@ function checkListItem(field, index, value) {
     return undefined;
 }
 exports.checkListItem = checkListItem;
+/**
+ * Check whether the given map key and value are valid for the reflect API.
+ */
 function checkMapEntry(field, key, value) {
-    const checkKey = (0, scalar_js_2.checkScalarValue)(key, field.mapKey);
+    const checkKey = checkScalarValue(key, field.mapKey);
     if (checkKey !== true) {
         return new error_js_1.FieldError(field, `invalid map key: ${reasonSingular({ scalar: field.mapKey }, key, checkKey)}`);
     }
@@ -65,7 +76,7 @@ function checkMapEntry(field, key, value) {
 exports.checkMapEntry = checkMapEntry;
 function checkSingular(field, value) {
     if (field.scalar !== undefined) {
-        return (0, scalar_js_2.checkScalarValue)(value, field.scalar);
+        return checkScalarValue(value, field.scalar);
     }
     if (field.enum !== undefined) {
         if (field.enum.open) {
@@ -75,11 +86,89 @@ function checkSingular(field, value) {
     }
     return (0, guard_js_1.isReflectMessage)(value, field.message);
 }
+function checkScalarValue(value, scalar) {
+    switch (scalar) {
+        case descriptors_js_1.ScalarType.DOUBLE:
+            return typeof value == "number";
+        case descriptors_js_1.ScalarType.FLOAT:
+            if (typeof value != "number") {
+                return false;
+            }
+            if (Number.isNaN(value) || !Number.isFinite(value)) {
+                return true;
+            }
+            if (value > binary_encoding_js_1.FLOAT32_MAX || value < binary_encoding_js_1.FLOAT32_MIN) {
+                return `${value.toFixed()} out of range`;
+            }
+            return true;
+        case descriptors_js_1.ScalarType.INT32:
+        case descriptors_js_1.ScalarType.SFIXED32:
+        case descriptors_js_1.ScalarType.SINT32:
+            // signed
+            if (typeof value !== "number" || !Number.isInteger(value)) {
+                return false;
+            }
+            if (value > binary_encoding_js_1.INT32_MAX || value < binary_encoding_js_1.INT32_MIN) {
+                return `${value.toFixed()} out of range`;
+            }
+            return true;
+        case descriptors_js_1.ScalarType.FIXED32:
+        case descriptors_js_1.ScalarType.UINT32:
+            // unsigned
+            if (typeof value !== "number" || !Number.isInteger(value)) {
+                return false;
+            }
+            if (value > binary_encoding_js_1.UINT32_MAX || value < 0) {
+                return `${value.toFixed()} out of range`;
+            }
+            return true;
+        case descriptors_js_1.ScalarType.BOOL:
+            return typeof value == "boolean";
+        case descriptors_js_1.ScalarType.STRING:
+            if (typeof value != "string") {
+                return false;
+            }
+            return (0, text_encoding_js_1.getTextEncoding)().checkUtf8(value) || "invalid UTF8";
+        case descriptors_js_1.ScalarType.BYTES:
+            return value instanceof Uint8Array;
+        case descriptors_js_1.ScalarType.INT64:
+        case descriptors_js_1.ScalarType.SFIXED64:
+        case descriptors_js_1.ScalarType.SINT64:
+            // signed
+            if (typeof value != "string" &&
+                typeof value !== "bigint" &&
+                typeof value !== "number") {
+                return false;
+            }
+            try {
+                proto_int64_js_1.protoInt64.parse(value);
+            }
+            catch (e) {
+                return `${value} out of range`;
+            }
+            return true;
+        case descriptors_js_1.ScalarType.FIXED64:
+        case descriptors_js_1.ScalarType.UINT64:
+            // unsigned
+            if (typeof value != "string" &&
+                typeof value !== "bigint" &&
+                typeof value !== "number") {
+                return false;
+            }
+            try {
+                proto_int64_js_1.protoInt64.uParse(value);
+            }
+            catch (e) {
+                return `${value} out of range`;
+            }
+            return true;
+    }
+}
 function reasonSingular(field, val, details) {
     details =
         typeof details == "string" ? `: ${details}` : `, got ${formatVal(val)}`;
     if (field.scalar !== undefined) {
-        return `expected ${(0, scalar_js_1.scalarTypeDescription)(field.scalar)}` + details;
+        return `expected ${scalarTypeDescription(field.scalar)}` + details;
     }
     else if (field.enum !== undefined) {
         return `expected ${field.enum.toString()}` + details;
@@ -135,16 +224,44 @@ function formatReflectList(field) {
         case "enum":
             return `ReflectList (${field.enum.toString()})`;
         case "scalar":
-            return `ReflectList (${scalar_js_1.ScalarType[field.scalar]})`;
+            return `ReflectList (${descriptors_js_1.ScalarType[field.scalar]})`;
     }
 }
 function formatReflectMap(field) {
     switch (field.mapKind) {
         case "message":
-            return `ReflectMap (${scalar_js_1.ScalarType[field.mapKey]}, ${field.message.toString()})`;
+            return `ReflectMap (${descriptors_js_1.ScalarType[field.mapKey]}, ${field.message.toString()})`;
         case "enum":
-            return `ReflectMap (${scalar_js_1.ScalarType[field.mapKey]}, ${field.enum.toString()})`;
+            return `ReflectMap (${descriptors_js_1.ScalarType[field.mapKey]}, ${field.enum.toString()})`;
         case "scalar":
-            return `ReflectMap (${scalar_js_1.ScalarType[field.mapKey]}, ${scalar_js_1.ScalarType[field.scalar]})`;
+            return `ReflectMap (${descriptors_js_1.ScalarType[field.mapKey]}, ${descriptors_js_1.ScalarType[field.scalar]})`;
+    }
+}
+function scalarTypeDescription(scalar) {
+    switch (scalar) {
+        case descriptors_js_1.ScalarType.STRING:
+            return "string";
+        case descriptors_js_1.ScalarType.BOOL:
+            return "boolean";
+        case descriptors_js_1.ScalarType.INT64:
+        case descriptors_js_1.ScalarType.SINT64:
+        case descriptors_js_1.ScalarType.SFIXED64:
+            return "bigint (int64)";
+        case descriptors_js_1.ScalarType.UINT64:
+        case descriptors_js_1.ScalarType.FIXED64:
+            return "bigint (uint64)";
+        case descriptors_js_1.ScalarType.BYTES:
+            return "Uint8Array";
+        case descriptors_js_1.ScalarType.DOUBLE:
+            return "number (float64)";
+        case descriptors_js_1.ScalarType.FLOAT:
+            return "number (float32)";
+        case descriptors_js_1.ScalarType.FIXED32:
+        case descriptors_js_1.ScalarType.UINT32:
+            return "number (uint32)";
+        case descriptors_js_1.ScalarType.INT32:
+        case descriptors_js_1.ScalarType.SFIXED32:
+        case descriptors_js_1.ScalarType.SINT32:
+            return "number (int32)";
     }
 }

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

@@ -1,8 +1,8 @@
-import type { DescField, DescMessage, DescOneof } from "../desc-types.js";
+import { type DescField, type DescMessage, type DescOneof } from "../descriptors.js";
 import { FieldError } from "./error.js";
 import { unsafeLocal } from "./unsafe.js";
 import type { Message, UnknownField } from "../types.js";
-import type { LongType, ScalarValue } from "./scalar.js";
+import type { ScalarValue } from "./scalar.js";
 /**
  * ReflectMessage provides dynamic access and manipulation of a message.
  */
@@ -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.
      */
@@ -230,7 +218,7 @@ export type ReflectGetValue<Field extends DescField = DescField> = (Field extend
 } ? ReflectMap<MapEntryKey, enumVal> : Field extends {
     mapKind: "scalar";
     scalar: infer T;
-} ? ReflectMap<MapEntryKey, ScalarValue<T, LongType.BIGINT>> : never) : Field extends {
+} ? ReflectMap<MapEntryKey, ScalarValue<T>> : never) : Field extends {
     fieldKind: "list";
 } ? ReflectList : Field extends {
     fieldKind: "enum";
@@ -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, LongType.BIGINT> : never);
 export {};

package/dist/cjs/reflect/reflect.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 { MapEntryKey, ReflectList, ReflectMap, ReflectMessage } from "./reflect-types.js";
 /**

package/dist/cjs/reflect/reflect.js

@@ -14,6 +14,7 @@
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.reflectMap = exports.reflectList = exports.reflect = void 0;
+const descriptors_js_1 = require("../descriptors.js");
 const reflect_check_js_1 = require("./reflect-check.js");
 const error_js_1 = require("./error.js");
 const unsafe_js_1 = require("./unsafe.js");
@@ -41,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);
@@ -71,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 &&
@@ -88,7 +99,7 @@ class ReflectMessageImpl {
                 return new ReflectMessageImpl(field.message, value, this.check);
             case "scalar":
                 return (value === undefined
-                    ? (0, scalar_js_1.scalarZeroValue)(field.scalar, scalar_js_1.LongType.BIGINT)
+                    ? (0, scalar_js_1.scalarZeroValue)(field.scalar, false)
                     : longToReflect(field, value));
             case "enum":
                 return (value !== null && value !== void 0 ? value : field.enum.values[0].number);
@@ -102,7 +113,7 @@ class ReflectMessageImpl {
                 return err;
             }
         }
-        let local = value;
+        let local;
         if ((0, guard_js_1.isReflectMap)(value) || (0, guard_js_1.isReflectList)(value)) {
             local = value[unsafe_js_1.unsafeLocal];
         }
@@ -116,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;
     }
@@ -147,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");
@@ -342,20 +324,20 @@ function mapKeyToLocal(key) {
  */
 function mapKeyToReflect(key, type) {
     switch (type) {
-        case scalar_js_1.ScalarType.STRING:
+        case descriptors_js_1.ScalarType.STRING:
             return key;
-        case scalar_js_1.ScalarType.INT32:
-        case scalar_js_1.ScalarType.FIXED32:
-        case scalar_js_1.ScalarType.UINT32:
-        case scalar_js_1.ScalarType.SFIXED32:
-        case scalar_js_1.ScalarType.SINT32: {
+        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: {
             const n = Number.parseInt(key);
             if (Number.isFinite(n)) {
                 return n;
             }
             break;
         }
-        case scalar_js_1.ScalarType.BOOL:
+        case descriptors_js_1.ScalarType.BOOL:
             switch (key) {
                 case "true":
                     return true;
@@ -363,8 +345,8 @@ function mapKeyToReflect(key, type) {
                     return false;
             }
             break;
-        case scalar_js_1.ScalarType.UINT64:
-        case scalar_js_1.ScalarType.FIXED64:
+        case descriptors_js_1.ScalarType.UINT64:
+        case descriptors_js_1.ScalarType.FIXED64:
             try {
                 return proto_int64_js_1.protoInt64.uParse(key);
             }
@@ -387,19 +369,19 @@ function mapKeyToReflect(key, type) {
 function longToReflect(field, value) {
     // eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check
     switch (field.scalar) {
-        case scalar_js_1.ScalarType.INT64:
-        case scalar_js_1.ScalarType.SFIXED64:
-        case scalar_js_1.ScalarType.SINT64:
-            if ("longType" in field &&
-                field.longType == scalar_js_1.LongType.STRING &&
+        case descriptors_js_1.ScalarType.INT64:
+        case descriptors_js_1.ScalarType.SFIXED64:
+        case descriptors_js_1.ScalarType.SINT64:
+            if ("longAsString" in field &&
+                field.longAsString &&
                 typeof value == "string") {
                 value = proto_int64_js_1.protoInt64.parse(value);
             }
             break;
-        case scalar_js_1.ScalarType.FIXED64:
-        case scalar_js_1.ScalarType.UINT64:
-            if ("longType" in field &&
-                field.longType == scalar_js_1.LongType.STRING &&
+        case descriptors_js_1.ScalarType.FIXED64:
+        case descriptors_js_1.ScalarType.UINT64:
+            if ("longAsString" in field &&
+                field.longAsString &&
                 typeof value == "string") {
                 value = proto_int64_js_1.protoInt64.uParse(value);
             }
@@ -410,19 +392,19 @@ function longToReflect(field, value) {
 function longToLocal(field, value) {
     // eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check
     switch (field.scalar) {
-        case scalar_js_1.ScalarType.INT64:
-        case scalar_js_1.ScalarType.SFIXED64:
-        case scalar_js_1.ScalarType.SINT64:
-            if ("longType" in field && field.longType == scalar_js_1.LongType.STRING) {
+        case descriptors_js_1.ScalarType.INT64:
+        case descriptors_js_1.ScalarType.SFIXED64:
+        case descriptors_js_1.ScalarType.SINT64:
+            if ("longAsString" in field && field.longAsString) {
                 value = String(value);
             }
             else if (typeof value == "string" || typeof value == "number") {
                 value = proto_int64_js_1.protoInt64.parse(value);
             }
             break;
-        case scalar_js_1.ScalarType.FIXED64:
-        case scalar_js_1.ScalarType.UINT64:
-            if ("longType" in field && field.longType == scalar_js_1.LongType.STRING) {
+        case descriptors_js_1.ScalarType.FIXED64:
+        case descriptors_js_1.ScalarType.UINT64:
+            if ("longAsString" in field && field.longAsString) {
                 value = String(value);
             }
             else if (typeof value == "string" || typeof value == "number") {