@bufbuild/protobuf 0.0.9 → 0.1.1

package/README.md

@@ -1,7 +1,7 @@
 # @bufbuild/protobuf
 
 This package provides the runtime library for the code generator plugin
-[`protoc-gen-es`](https://github.com/bufbuild/packages/protoc-gen-es).
+[protoc-gen-es](https://www.npmjs.com/package/@bufbuild/protoc-gen-es).
 
 ## Protocol Buffers for ECMAScript
 

package/dist/cjs/create-registry-from-desc.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.DescriptorRegistry = exports.createRegistryFromDescriptors = void 0;
+exports.createRegistryFromDescriptors = void 0;
 const assert_js_1 = require("./private/assert.js");
 const proto3_js_1 = require("./proto3.js");
 const proto2_js_1 = require("./proto2.js");
@@ -138,7 +138,7 @@ function createRegistryFromDescriptors(input, replaceWkt = true) {
             const methods = {};
             for (const method of desc.methods) {
                 const I = this.findMessage(method.input.typeName);
-                const O = this.findMessage(method.input.typeName);
+                const O = this.findMessage(method.output.typeName);
                 (0, assert_js_1.assert)(I, `message "${method.input.typeName}" for ${method.toString()} not found`);
                 (0, assert_js_1.assert)(O, `output message "${method.output.typeName}" for ${method.toString()} not found`);
                 const m = {
@@ -160,116 +160,6 @@ function createRegistryFromDescriptors(input, replaceWkt = true) {
     };
 }
 exports.createRegistryFromDescriptors = createRegistryFromDescriptors;
-/**
- * DescriptorRegistry is a type registry that dynamically creates types
- * from a set of google.protobuf.FileDescriptorProto.
- *
- * By default, all well-known types with a specialized JSON representation
- * are replaced with their generated counterpart in this package.
- */
-class DescriptorRegistry {
-    constructor(descriptorSet, replaceWkt = true) {
-        this.enums = {};
-        this.messages = {};
-        this.services = {};
-        this.desc = descriptorSet;
-        if (replaceWkt) {
-            for (const mt of wkMessages) {
-                this.messages[mt.typeName] = mt;
-            }
-            for (const et of wkEnums) {
-                this.enums[et.typeName] = et;
-            }
-        }
-    }
-    /**
-     * Conveniently create a DescriptorRegistry from a FileDescriptorSet,
-     * or a FileDescriptorSet in binary format.
-     */
-    static fromFileDescriptorSet(input) {
-        return new DescriptorRegistry((0, create_descriptor_set_js_1.createDescriptorSet)(input));
-    }
-    /**
-     * May raise an error on invalid descriptors.
-     */
-    findEnum(typeName) {
-        const existing = this.enums[typeName];
-        if (existing) {
-            return existing;
-        }
-        const desc = this.desc.enums.get(typeName);
-        if (!desc) {
-            return undefined;
-        }
-        const runtime = desc.file.syntax == "proto3" ? proto3_js_1.proto3 : proto2_js_1.proto2;
-        const type = runtime.makeEnumType(typeName, desc.values.map((u) => ({
-            no: u.number,
-            name: u.name,
-            localName: (0, names_js_1.localName)(u),
-        })), {});
-        this.enums[typeName] = type;
-        return type;
-    }
-    /**
-     * May raise an error on invalid descriptors.
-     */
-    findMessage(typeName) {
-        const existing = this.messages[typeName];
-        if (existing) {
-            return existing;
-        }
-        const desc = this.desc.messages.get(typeName);
-        if (!desc) {
-            return undefined;
-        }
-        const runtime = desc.file.syntax == "proto3" ? proto3_js_1.proto3 : proto2_js_1.proto2;
-        const fields = [];
-        const type = runtime.makeMessageType(typeName, () => fields, {
-            localName: (0, names_js_1.localName)(desc),
-        });
-        this.messages[typeName] = type;
-        for (const field of desc.fields) {
-            const fieldInfo = makeFieldInfo(field, this);
-            fields.push(fieldInfo);
-        }
-        return type;
-    }
-    /**
-     * May raise an error on invalid descriptors.
-     */
-    findService(typeName) {
-        const existing = this.services[typeName];
-        if (existing) {
-            return existing;
-        }
-        const desc = this.desc.services.get(typeName);
-        if (!desc) {
-            return undefined;
-        }
-        const methods = {};
-        for (const method of desc.methods) {
-            const I = this.findMessage(method.input.typeName);
-            const O = this.findMessage(method.input.typeName);
-            (0, assert_js_1.assert)(I, `message "${method.input.typeName}" for ${method.toString()} not found`);
-            (0, assert_js_1.assert)(O, `output message "${method.output.typeName}" for ${method.toString()} not found`);
-            const m = {
-                name: method.name,
-                localName: (0, names_js_1.localName)(method),
-                I,
-                O,
-                kind: method.methodKind,
-                idempotency: method.idempotency,
-                options: {},
-            };
-            methods[m.localName] = m;
-        }
-        return (this.services[typeName] = {
-            typeName: desc.typeName,
-            methods,
-        });
-    }
-}
-exports.DescriptorRegistry = DescriptorRegistry;
 function makeFieldInfo(desc, resolver) {
     switch (desc.kind) {
         case "map_field":
@@ -291,8 +181,9 @@ function makeFieldInfo(desc, resolver) {
 function makeMapFieldInfo(field, resolver) {
     const base = {
         kind: "map",
-        name: field.name,
         no: field.number,
+        name: field.name,
+        jsonName: field.jsonName,
         K: field.mapKey,
     };
     if (field.mapValue.message) {
@@ -318,9 +209,10 @@ function makeMapFieldInfo(field, resolver) {
 }
 function makeScalarFieldInfo(field) {
     const base = {
+        kind: "scalar",
         no: field.number,
         name: field.name,
-        kind: "scalar",
+        jsonName: field.jsonName,
         T: field.scalar,
     };
     if (field.repeated) {
@@ -338,9 +230,10 @@ function makeMessageFieldInfo(field, resolver) {
     const messageType = resolver.findMessage(field.message.typeName);
     (0, assert_js_1.assert)(messageType, `message "${field.message.typeName}" for ${field.toString()} not found`);
     const base = {
+        kind: "message",
         no: field.number,
         name: field.name,
-        kind: "message",
+        jsonName: field.jsonName,
         T: messageType,
     };
     if (field.repeated) {
@@ -358,9 +251,10 @@ function makeEnumFieldInfo(field, resolver) {
     const enumType = resolver.findEnum(field.enum.typeName);
     (0, assert_js_1.assert)(enumType, `enum "${field.enum.typeName}" for ${field.toString()} not found`);
     const base = {
+        kind: "enum",
         no: field.number,
         name: field.name,
-        kind: "enum",
+        jsonName: field.jsonName,
         T: enumType,
     };
     if (field.repeated) {

package/dist/cjs/create-registry.js

@@ -15,7 +15,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createRegistry = void 0;
 /**
- * Create a new registry from the given types. Note that
+ * Create a new registry from the given types.
  */
 function createRegistry(...types) {
     const messages = {};

package/dist/cjs/google/protobuf/descriptor_pb.js

@@ -1169,8 +1169,8 @@ UninterpretedOption.fields = proto2_js_1.proto2.util.newFieldList(() => [
  * The name of the uninterpreted option.  Each string represents a segment in
  * a dot-separated name.  is_extension is true iff a segment represents an
  * extension (denoted with parentheses in options specs in .proto files).
- * E.g.,{ ["foo", false], ["bar.baz", true], ["qux", false] } represents
- * "foo.(bar.baz).qux".
+ * E.g.,{ ["foo", false], ["bar.baz", true], ["moo", false] } represents
+ * "foo.(bar.baz).moo".
  *
  * @generated from message google.protobuf.UninterpretedOption.NamePart
  */

package/dist/cjs/google/protobuf/empty_pb.js

@@ -25,7 +25,6 @@ const proto3_js_1 = require("../../proto3.js");
  *       rpc Bar(google.protobuf.Empty) returns (google.protobuf.Empty);
  *     }
  *
- * The JSON representation for `Empty` is empty JSON object `{}`.
  *
  * @generated from message google.protobuf.Empty
  */

package/dist/cjs/google/protobuf/struct_pb.js

@@ -14,7 +14,7 @@
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ListValue = exports.Value = exports.Struct = exports.NullValue = void 0;
-// @generated by protoc-gen-es v0.0.9 with parameter "bootstrap_wkt=true,ts_nocheck=false,target=ts"
+// @generated by protoc-gen-es v0.1.1 with parameter "bootstrap_wkt=true,ts_nocheck=false,target=ts"
 // @generated from file google/protobuf/struct.proto (package google.protobuf, syntax proto3)
 /* eslint-disable */
 const proto3_js_1 = require("../../proto3.js");

package/dist/cjs/google/protobuf/type_pb.js

@@ -14,7 +14,7 @@
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Option = exports.EnumValue = exports.Enum = exports.Field_Cardinality = exports.Field_Kind = exports.Field = exports.Type = exports.Syntax = void 0;
-// @generated by protoc-gen-es v0.0.9 with parameter "bootstrap_wkt=true,ts_nocheck=false,target=ts"
+// @generated by protoc-gen-es v0.1.1 with parameter "bootstrap_wkt=true,ts_nocheck=false,target=ts"
 // @generated from file google/protobuf/type.proto (package google.protobuf, syntax proto3)
 /* eslint-disable */
 const proto3_js_1 = require("../../proto3.js");

package/dist/cjs/google/varint.js

@@ -32,7 +32,7 @@
 // standalone and requires a support library to be linked with it.  This
 // support library is itself covered by the above license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.varint32read = exports.varint32write = exports.int64toString = exports.int64fromString = exports.varint64write = exports.varint64read = void 0;
+exports.varint32read = exports.varint32write = exports.uInt64ToString = exports.int64ToString = exports.int64FromString = exports.varint64write = exports.varint64read = void 0;
 /* eslint-disable prefer-const,@typescript-eslint/restrict-plus-operands */
 /**
  * Read a 64 bit varint as two JS numbers.
@@ -112,22 +112,20 @@ function varint64write(lo, hi, bytes) {
 }
 exports.varint64write = varint64write;
 // constants for binary math
-const TWO_PWR_32_DBL = (1 << 16) * (1 << 16);
+const TWO_PWR_32_DBL = 0x100000000;
 /**
  * Parse decimal string of 64 bit integer value as two JS numbers.
  *
- * Returns tuple:
- * [0]: minus sign?
- * [1]: low bits
- * [2]: high bits
+ * Copyright 2008 Google Inc.  All rights reserved.
  *
- * Copyright 2008 Google Inc.
+ * See https://github.com/protocolbuffers/protobuf-javascript/blob/a428c58273abad07c66071d9753bc4d1289de426/experimental/runtime/int64.js#L10
  */
-function int64fromString(dec) {
+function int64FromString(dec) {
     // Check for minus sign.
-    let minus = dec[0] == "-";
-    if (minus)
+    const minus = dec[0] === "-";
+    if (minus) {
         dec = dec.slice(1);
+    }
     // Work 6 decimal digits at a time, acting like we're converting base 1e6
     // digits to binary. This is safe to do with floating point math because
     // Number.isSafeInteger(ALL_32_BITS * 1e6) == true.
@@ -149,19 +147,47 @@ function int64fromString(dec) {
     add1e6digit(-18, -12);
     add1e6digit(-12, -6);
     add1e6digit(-6);
-    return [minus, lowBits, highBits];
+    return minus ? negate(lowBits, highBits) : newBits(lowBits, highBits);
 }
-exports.int64fromString = int64fromString;
+exports.int64FromString = int64FromString;
 /**
- * Format 64 bit integer value (as two JS numbers) to decimal string.
+ * Losslessly converts a 64-bit signed integer in 32:32 split representation
+ * into a decimal string.
+ *
+ * Copyright 2008 Google Inc.  All rights reserved.
+ *
+ * See https://github.com/protocolbuffers/protobuf-javascript/blob/a428c58273abad07c66071d9753bc4d1289de426/experimental/runtime/int64.js#L10
+ */
+function int64ToString(lo, hi) {
+    let bits = newBits(lo, hi);
+    // If we're treating the input as a signed value and the high bit is set, do
+    // a manual two's complement conversion before the decimal conversion.
+    const negative = (bits.hi & 0x80000000);
+    if (negative) {
+        bits = negate(bits.lo, bits.hi);
+    }
+    const result = uInt64ToString(bits.lo, bits.hi);
+    return negative ? "-" + result : result;
+}
+exports.int64ToString = int64ToString;
+/**
+ * Losslessly converts a 64-bit unsigned integer in 32:32 split representation
+ * into a decimal string.
+ *
+ * Copyright 2008 Google Inc.  All rights reserved.
  *
- * Copyright 2008 Google Inc.
+ * See https://github.com/protocolbuffers/protobuf-javascript/blob/a428c58273abad07c66071d9753bc4d1289de426/experimental/runtime/int64.js#L10
  */
-function int64toString(bitsLow, bitsHigh) {
+function uInt64ToString(lo, hi) {
+    ({ lo, hi } = toUnsigned(lo, hi));
     // Skip the expensive conversion if the number is small enough to use the
     // built-in conversions.
-    if (bitsHigh <= 0x1fffff) {
-        return "" + (TWO_PWR_32_DBL * bitsHigh + bitsLow);
+    // Number.MAX_SAFE_INTEGER = 0x001FFFFF FFFFFFFF, thus any number with
+    // highBits <= 0x1FFFFF can be safely expressed with a double and retain
+    // integer precision.
+    // Proven by: Number.isSafeInteger(0x1FFFFF * 2**32 + 0xFFFFFFFF) == true.
+    if (hi <= 0x1FFFFF) {
+        return String(TWO_PWR_32_DBL * hi + lo);
     }
     // What this code is doing is essentially converting the input number from
     // base-2 to base-1e7, which allows us to represent the 64-bit range with
@@ -172,17 +198,17 @@ function int64toString(bitsLow, bitsHigh) {
     // 2^48 = 281474976710656 = (2,8147497,6710656) in base-1e7.
     // Split 32:32 representation into 16:24:24 representation so our
     // intermediate digits don't overflow.
-    let low = bitsLow & 0xffffff;
-    let mid = (((bitsLow >>> 24) | (bitsHigh << 8)) >>> 0) & 0xffffff;
-    let high = (bitsHigh >> 16) & 0xffff;
+    const low = lo & 0xFFFFFF;
+    const mid = ((lo >>> 24) | (hi << 8)) & 0xFFFFFF;
+    const high = (hi >> 16) & 0xFFFF;
     // Assemble our three base-1e7 digits, ignoring carries. The maximum
     // value in a digit at this step is representable as a 48-bit integer, which
     // can be stored in a 64-bit floating point number.
-    let digitA = low + mid * 6777216 + high * 6710656;
-    let digitB = mid + high * 8147497;
-    let digitC = high * 2;
+    let digitA = low + (mid * 6777216) + (high * 6710656);
+    let digitB = mid + (high * 8147497);
+    let digitC = (high * 2);
     // Apply carries from A to B and from B to C.
-    let base = 10000000;
+    const base = 10000000;
     if (digitA >= base) {
         digitB += Math.floor(digitA / base);
         digitA %= base;
@@ -191,21 +217,43 @@ function int64toString(bitsLow, bitsHigh) {
         digitC += Math.floor(digitB / base);
         digitB %= base;
     }
-    // Convert base-1e7 digits to base-10, with optional leading zeroes.
-    function decimalFrom1e7(digit1e7, needLeadingZeros) {
-        let partial = digit1e7 ? String(digit1e7) : "";
-        if (needLeadingZeros) {
-            return "0000000".slice(partial.length) + partial;
-        }
-        return partial;
+    // If digitC is 0, then we should have returned in the trivial code path
+    // at the top for non-safe integers. Given this, we can assume both digitB
+    // and digitA need leading zeros.
+    return digitC.toString() + decimalFrom1e7WithLeadingZeros(digitB) +
+        decimalFrom1e7WithLeadingZeros(digitA);
+}
+exports.uInt64ToString = uInt64ToString;
+function toUnsigned(lo, hi) {
+    return { lo: lo >>> 0, hi: hi >>> 0 };
+}
+function newBits(lo, hi) {
+    return { lo: lo | 0, hi: hi | 0 };
+}
+/**
+ * Returns two's compliment negation of input.
+ * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Bitwise_Operators#Signed_32-bit_integers
+ */
+function negate(lowBits, highBits) {
+    highBits = ~highBits;
+    if (lowBits) {
+        lowBits = ~lowBits + 1;
+    }
+    else {
+        // If lowBits is 0, then bitwise-not is 0xFFFFFFFF,
+        // adding 1 to that, results in 0x100000000, which leaves
+        // the low bits 0x0 and simply adds one to the high bits.
+        highBits += 1;
     }
-    return (decimalFrom1e7(digitC, /*needLeadingZeros=*/ 0) +
-        decimalFrom1e7(digitB, /*needLeadingZeros=*/ digitC) +
-        // If the final 1e7 digit didn't need leading zeros, we would have
-        // returned via the trivial code path at the top.
-        decimalFrom1e7(digitA, /*needLeadingZeros=*/ 1));
+    return newBits(lowBits, highBits);
 }
-exports.int64toString = int64toString;
+/**
+ * Returns decimal representation of digit1e7 with leading zeros.
+ */
+const decimalFrom1e7WithLeadingZeros = (digit1e7) => {
+    const partial = String(digit1e7);
+    return "0000000".slice(partial.length) + partial;
+};
 /**
  * Write a 32 bit varint, signed or unsigned. Same as `varint64write(0, value, bytes)`
  *

package/dist/cjs/index.js

@@ -27,7 +27,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TypeRegistry = exports.LegacyDescriptorSet = exports.LegacyDescriptorRegistry = exports.createRegistryFromDescriptors = exports.createRegistry = exports.createDescriptorSet = exports.BinaryReader = exports.BinaryWriter = exports.WireType = exports.MethodIdempotency = exports.MethodKind = exports.ScalarType = exports.Message = exports.codegenInfo = exports.protoBase64 = exports.protoInt64 = exports.proto2 = exports.proto3 = void 0;
+exports.createRegistryFromDescriptors = exports.createRegistry = exports.createDescriptorSet = exports.BinaryReader = exports.BinaryWriter = exports.WireType = exports.MethodIdempotency = exports.MethodKind = exports.ScalarType = exports.Message = exports.codegenInfo = exports.protoBase64 = exports.protoInt64 = exports.proto2 = exports.proto3 = void 0;
 var proto3_js_1 = require("./proto3.js");
 Object.defineProperty(exports, "proto3", { enumerable: true, get: function () { return proto3_js_1.proto3; } });
 var proto2_js_1 = require("./proto2.js");
@@ -58,12 +58,6 @@ var create_registry_js_1 = require("./create-registry.js");
 Object.defineProperty(exports, "createRegistry", { enumerable: true, get: function () { return create_registry_js_1.createRegistry; } });
 var create_registry_from_desc_js_1 = require("./create-registry-from-desc.js");
 Object.defineProperty(exports, "createRegistryFromDescriptors", { enumerable: true, get: function () { return create_registry_from_desc_js_1.createRegistryFromDescriptors; } });
-var legacy_descriptor_registry_js_1 = require("./legacy-descriptor-registry.js");
-Object.defineProperty(exports, "LegacyDescriptorRegistry", { enumerable: true, get: function () { return legacy_descriptor_registry_js_1.LegacyDescriptorRegistry; } });
-var legacy_descriptor_set_js_1 = require("./legacy-descriptor-set.js");
-Object.defineProperty(exports, "LegacyDescriptorSet", { enumerable: true, get: function () { return legacy_descriptor_set_js_1.LegacyDescriptorSet; } });
-var legacy_type_registry_js_1 = require("./legacy-type-registry.js");
-Object.defineProperty(exports, "TypeRegistry", { enumerable: true, get: function () { return legacy_type_registry_js_1.TypeRegistry; } });
 // ideally, we would export these types with sub-path exports:
 __exportStar(require("./google/protobuf/compiler/plugin_pb.js"), exports);
 __exportStar(require("./google/protobuf/api_pb.js"), exports);

package/dist/cjs/private/binary-format-proto2.js

@@ -37,7 +37,7 @@ function makeBinaryFormatProto2() {
                         // In contrast to proto3, we raise an error if a non-optional (proto2 required)
                         // field is missing a value.
                         if (value === undefined && !field.oneof && !field.opt) {
-                            throw new Error(`cannot encode field ${type.typeName}.${field.name} to JSON: required field not set`);
+                            throw new Error(`cannot encode field ${type.typeName}.${field.name} to binary: required field not set`);
                         }
                     }
                     switch (field.kind) {

package/dist/cjs/private/json-format-common.js

@@ -76,12 +76,12 @@ function makeJsonFormatCommon(makeWriteField) {
                         continue;
                     }
                     if (!Array.isArray(jsonValue)) {
-                        throw new Error(`cannot decode field ${type.typeName}.${field.name} from JSON: "${this.debug(jsonValue)}"`);
+                        throw new Error(`cannot decode field ${type.typeName}.${field.name} from JSON: ${this.debug(jsonValue)}`);
                     }
                     const targetArray = target[localName];
                     for (const jsonItem of jsonValue) {
                         if (jsonItem === null) {
-                            throw new Error(`cannot decode field ${type.typeName}.${field.name} from JSON: "${this.debug(jsonItem)}"`);
+                            throw new Error(`cannot decode field ${type.typeName}.${field.name} from JSON: ${this.debug(jsonItem)}`);
                         }
                         let val;
                         // eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check -- "map" is invalid for repeated fields
@@ -99,7 +99,7 @@ function makeJsonFormatCommon(makeWriteField) {
                                     val = readScalar(field.T, jsonItem);
                                 }
                                 catch (e) {
-                                    let m = `cannot decode field ${type.typeName}.${field.name} from JSON: "${this.debug(jsonItem)}"`;
+                                    let m = `cannot decode field ${type.typeName}.${field.name} from JSON: ${this.debug(jsonItem)}`;
                                     if (e instanceof Error && e.message.length > 0) {
                                         m += `: ${e.message}`;
                                     }
@@ -137,7 +137,7 @@ function makeJsonFormatCommon(makeWriteField) {
                                     val = readScalar(field.V.T, jsonMapValue);
                                 }
                                 catch (e) {
-                                    let m = `cannot decode map value for field ${type.typeName}.${field.name} from JSON: "${this.debug(jsonValue)}"`;
+                                    let m = `cannot decode map value for field ${type.typeName}.${field.name} from JSON: ${this.debug(jsonValue)}`;
                                     if (e instanceof Error && e.message.length > 0) {
                                         m += `: ${e.message}`;
                                     }
@@ -155,7 +155,7 @@ function makeJsonFormatCommon(makeWriteField) {
                                 : jsonMapKey).toString()] = val;
                         }
                         catch (e) {
-                            let m = `cannot decode map key for field ${type.typeName}.${field.name} from JSON: "${this.debug(jsonValue)}"`;
+                            let m = `cannot decode map key for field ${type.typeName}.${field.name} from JSON: ${this.debug(jsonValue)}`;
                             if (e instanceof Error && e.message.length > 0) {
                                 m += `: ${e.message}`;
                             }
@@ -190,7 +190,7 @@ function makeJsonFormatCommon(makeWriteField) {
                                 target[localName] = readScalar(field.T, jsonValue);
                             }
                             catch (e) {
-                                let m = `cannot decode field ${type.typeName}.${field.name} from JSON: "${this.debug(jsonValue)}"`;
+                                let m = `cannot decode field ${type.typeName}.${field.name} from JSON: ${this.debug(jsonValue)}`;
                                 if (e instanceof Error && e.message.length > 0) {
                                     m += `: ${e.message}`;
                                 }

package/dist/cjs/proto-int64.js

@@ -14,6 +14,7 @@
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.protoInt64 = void 0;
+const assert_js_1 = require("./private/assert.js");
 const varint_js_1 = require("./google/varint.js");
 function makeInt64Support() {
     const dv = new DataView(new ArrayBuffer(8));
@@ -22,7 +23,10 @@ function makeInt64Support() {
         typeof dv.getBigInt64 === "function" &&
         typeof dv.getBigUint64 === "function" &&
         typeof dv.setBigInt64 === "function" &&
-        typeof dv.setBigUint64 === "function";
+        typeof dv.setBigUint64 === "function" &&
+        (typeof process != "object" ||
+            typeof process.env != "object" ||
+            process.env.BUF_BIGINT_DISABLE !== "1");
     if (ok) {
         const MIN = BigInt("-9223372036854775808"), MAX = BigInt("9223372036854775807"), UMIN = BigInt("0"), UMAX = BigInt("18446744073709551615");
         return {
@@ -68,65 +72,44 @@ 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,
         parse(value) {
-            if (!/^-?[0-9]+$/.test(value)) {
-                throw new Error(`int64 invalid: ${value}`);
+            if (typeof value != "string") {
+                value = value.toString();
             }
+            assertInt64String(value);
             return value;
         },
         uParse(value) {
-            if (!/^-?[0-9]+$/.test(value)) {
-                throw new Error(`uint64 invalid: ${value}`);
+            if (typeof value != "string") {
+                value = value.toString();
             }
+            assertUInt64String(value);
             return value;
         },
         enc(value) {
-            if (typeof value == "string") {
-                if (!/^-?[0-9]+$/.test(value)) {
-                    throw new Error(`int64 invalid: ${value}`);
-                }
-            }
-            else {
-                value = value.toString(10);
+            if (typeof value != "string") {
+                value = value.toString();
             }
-            const [, lo, hi] = (0, varint_js_1.int64fromString)(value);
-            return { lo, hi };
+            assertInt64String(value);
+            return (0, varint_js_1.int64FromString)(value);
         },
         uEnc(value) {
-            if (typeof value == "string") {
-                if (!/^-?[0-9]+$/.test(value)) {
-                    throw new Error(`uint64 invalid: ${value}`);
-                }
+            if (typeof value != "string") {
+                value = value.toString();
             }
-            else {
-                value = value.toString(10);
-            }
-            const [minus, lo, hi] = (0, varint_js_1.int64fromString)(value);
-            if (minus) {
-                throw new Error(`uint64 invalid: ${value}`);
-            }
-            return { lo, hi };
+            assertUInt64String(value);
+            return (0, varint_js_1.int64FromString)(value);
         },
         dec(lo, hi) {
-            const minus = (hi & 0x80000000) !== 0;
-            if (minus) {
-                // negate
-                hi = ~hi;
-                if (lo) {
-                    lo = ~lo + 1;
-                }
-                else {
-                    hi += 1;
-                }
-                return ("-" + (0, varint_js_1.int64toString)(lo, hi));
-            }
-            return (0, varint_js_1.int64toString)(lo, hi);
+            return (0, varint_js_1.int64ToString)(lo, hi);
         },
         uDec(lo, hi) {
-            return (0, varint_js_1.int64toString)(lo, hi);
+            return (0, varint_js_1.uInt64ToString)(lo, hi);
         },
     };
 }