fix bigint deserialization and update readme

Author: itsfolf

README.md

@@ -2,9 +2,9 @@
 <p align="center">
   <a href="https://github.com/protobufjs/protobuf.js/actions/workflows/test.yml"><img src="https://img.shields.io/github/actions/workflow/status/protobufjs/protobuf.js/test.yml?branch=master&label=build&logo=github" alt=""></a>
   <a href="https://github.com/protobufjs/protobuf.js/actions/workflows/release.yaml"><img src="https://img.shields.io/github/actions/workflow/status/protobufjs/protobuf.js/release.yaml?branch=master&label=release&logo=github" alt=""></a>
-  <a href="https://npmjs.org/package/protobufjs"><img src="https://img.shields.io/npm/v/protobufjs.svg?logo=npm" alt=""></a>
-  <a href="https://npmjs.org/package/protobufjs"><img src="https://img.shields.io/npm/dm/protobufjs.svg?label=downloads&logo=npm" alt=""></a>
-  <a href="https://www.jsdelivr.com/package/npm/protobufjs"><img src="https://img.shields.io/jsdelivr/npm/hm/protobufjs?label=requests&logo=jsdelivr" alt=""></a>
+  <a href="https://npmjs.org/package/@tanglechat/protobufjs"><img src="https://img.shields.io/npm/v/@tanglechat/protobufjs.svg?logo=npm" alt=""></a>
+  <a href="https://npmjs.org/package/@tanglechat/protobufjs"><img src="https://img.shields.io/npm/dm/@tanglechat/protobufjs.svg?label=downloads&logo=npm" alt=""></a>
+  <a href="https://www.jsdelivr.com/package/npm/@tanglechat/protobufjs"><img src="https://img.shields.io/jsdelivr/npm/hm/@tanglechat/protobufjs?label=requests&logo=jsdelivr" alt=""></a>
 </p>
 
 **Protocol Buffers** are a language-neutral, platform-neutral, extensible way of serializing structured data for use in communications protocols, data storage, and more, originally designed at Google ([see](https://protobuf.dev/)).
@@ -51,39 +51,39 @@ Installation
 ### Node.js
 
 ```sh
-npm install protobufjs --save
+npm install @tanglechat/protobufjs --save
 ```
 
 ```js
 // Static code + Reflection + .proto parser
-var protobuf = require("protobufjs");
+var protobuf = require("@tanglechat/protobufjs");
 
 // Static code + Reflection
-var protobuf = require("protobufjs/light");
+var protobuf = require("@tanglechat/protobufjs/light");
 
 // Static code only
-var protobuf = require("protobufjs/minimal");
+var protobuf = require("@tanglechat/protobufjs/minimal");
 ```
 
-The optional [command line utility](./cli/) to generate static code and reflection bundles lives in the `protobufjs-cli` package and can be installed separately:
+The optional [command line utility](./cli/) to generate static code and reflection bundles lives in the `@tanglechat/protobufjs-cli` package and can be installed separately:
 
 ```sh
-npm install protobufjs-cli --save-dev
+npm install @tanglechat/protobufjs-cli --save-dev
 ```
 
 ### Browsers
 
 Pick the variant matching your needs and replace the version tag with the exact [release](https://github.com/protobufjs/protobuf.js/tags) your project depends upon. For example, to use the minified full variant:
 
 ```html
-<script src="//cdn.jsdelivr.net/npm/[email protected]/dist/protobuf.min.js"></script>
+<script src="//cdn.jsdelivr.net/npm/@tanglechat/[email protected]/dist/protobuf.min.js"></script>
 ```
 
 | Distribution | Location
 |--------------|--------------------------------------------------------
-| Full         | <https://cdn.jsdelivr.net/npm/protobufjs/dist/>
-| Light        | <https://cdn.jsdelivr.net/npm/protobufjs/dist/light/>
-| Minimal      | <https://cdn.jsdelivr.net/npm/protobufjs/dist/minimal/>
+| Full         | <https://cdn.jsdelivr.net/npm/@tanglechat/protobufjs/dist/>
+| Light        | <https://cdn.jsdelivr.net/npm/@tanglechat/protobufjs/dist/light/>
+| Minimal      | <https://cdn.jsdelivr.net/npm/@tanglechat/protobufjs/dist/minimal/>
 
 All variants support CommonJS and AMD loaders and export globally as `window.protobuf`.
 

cli/README.md

@@ -67,6 +67,7 @@ Translates between file formats and generates static code.
 
   --force-long     Enforces the use of 'Long' for s-/u-/int64 and s-/fixed64 fields.
   --force-number   Enforces the use of 'number' for s-/u-/int64 and s-/fixed64 fields.
+  --force-bigint   Enforces the use of 'bigint' for s-/u-/int64 and s-/fixed64 fields.
   --force-message  Enforces the use of message instances instead of plain objects.
   
   --null-defaults  Default value for optional fields is null instead of zero value.

cli/package-lock.json

@@ -1,5 +1,5 @@
 {
-  "name": "protobufjs-cli",
+  "name": "@tanglechat/protobufjs-cli",
   "description": "Translates between file formats and generates static code as well as TypeScript definitions.",
   "version": "1.1.4",
   "author": "Daniel Wirtz <[email protected]>",
@@ -18,7 +18,7 @@
     "pbts": "bin/pbts"
   },
   "peerDependencies": {
-    "protobufjs": "^7.0.0"
+    "@tanglechat/protobufjs": "^7.0.0"
   },
   "dependencies": {
     "chalk": "^4.0.0",

cli/package.json

@@ -41,7 +41,7 @@ exports.main = function main(args, callback) {
             "force-message": "strict-message"
         },
         string: [ "target", "out", "path", "wrap", "dependency", "root", "lint", "filter" ],
-        boolean: [ "create", "encode", "decode", "verify", "convert", "delimited", "typeurl", "beautify", "comments", "service", "es6", "sparse", "keep-case", "alt-comment", "force-long", "force-number", "force-enum-string", "force-message", "null-defaults", "null-semantics"],
+        boolean: [ "create", "encode", "decode", "verify", "convert", "delimited", "typeurl", "beautify", "comments", "service", "es6", "sparse", "keep-case", "alt-comment", "force-long", "force-number", "force-bigint", "force-enum-string", "force-message", "null-defaults", "null-semantics"],
         default: {
             target: "json",
             create: true,
@@ -60,6 +60,7 @@ exports.main = function main(args, callback) {
             "alt-comment": false,
             "force-long": false,
             "force-number": false,
+            "force-bigint": false,
             "force-enum-string": false,
             "force-message": false,
             "null-defaults": false,
@@ -146,6 +147,7 @@ exports.main = function main(args, callback) {
                 "",
                 "  --force-long     Enforces the use of 'Long' for s-/u-/int64 and s-/fixed64 fields.",
                 "  --force-number   Enforces the use of 'number' for s-/u-/int64 and s-/fixed64 fields.",
+                "  --force-bigint   Enforces the use of 'bigint' for s-/u-/int64 and s-/fixed64 fields.",
                 "  --force-message  Enforces the use of message instances instead of plain objects.",
                 "",
                 "  --null-defaults  Default value for optional fields is null instead of zero value.",

cli/pbjs.js

@@ -18,7 +18,7 @@ function static_module_target(root, options, callback) {
             return;
         }
         try {
-            output = util.wrap(output, protobuf.util.merge({ dependency: "protobufjs/minimal" }, options));
+            output = util.wrap(output, protobuf.util.merge({ dependency: "@tanglechat/protobufjs/minimal" }, options));
         } catch (e) {
             callback(e);
             return;

cli/targets/static-module.js

@@ -335,7 +335,7 @@ function toJsType(field, parentIsInterface = false) {
         case "sint64":
         case "fixed64":
         case "sfixed64":
-            type = config.forceLong ? "Long" : config.forceNumber ? "number" : "number|Long";
+            type = config.forceBigint ? "bigint" : config.forceLong ? "Long" : config.forceNumber ? "number" : "number|Long|bigint";
             break;
         case "bool":
             type = "boolean";

cli/targets/static.js

@@ -68,7 +68,7 @@ function genValuePartial_fromObject(gen, field, fieldIndex, prop) {
             case "sint64":
             case "sfixed64": gen
                 ("if(typeof BigInt!==\"undefined\")")
-                    ("m%s=(typeof d%s===\"number\"||typeof d%s===\"string\")?BigInt(d%s):util._toBigInt(d%s.low,d%s.high,%j)", prop, prop, prop, prop, prop, prop, isUnsigned)
+                    ("m%s=typeof d%s===\"bigint\"?d%s:(typeof d%s===\"number\"||typeof d%s===\"string\")?BigInt(d%s):util._toBigInt(d%s.low,d%s.high,%j)", prop, prop, prop, prop, prop, prop, prop, prop, isUnsigned)
                 ("else if(util.Long)")
                     ("(m%s=util.Long.fromValue(d%s)).unsigned=%j", prop, prop, isUnsigned)
                 ("else if(typeof d%s===\"string\")", prop)
@@ -185,6 +185,8 @@ function genValuePartial_toObject(gen, field, fieldIndex, prop) {
             case "sfixed64": gen
             ("if(typeof m%s===\"number\")", prop)
                 ("d%s=o.longs===String?String(m%s):m%s", prop, prop, prop)
+            ("else if(typeof m%s===\"bigint\")", prop)
+                ("d%s=o.longs===String?m%s.toString():o.longs===Number?util.LongBits.fromBigInt(m%s).toNumber(%s):m%s", prop, prop, prop, isUnsigned ? "true": "", prop)
             ("else") // Long-like
                 ("d%s=o.longs===String?util.Long.prototype.toString.call(m%s):o.longs===Number?new util.LongBits(m%s.low>>>0,m%s.high>>>0).toNumber(%s):o.longs===BigInt?new util.LongBits(m%s.low>>>0,m%s.high>>>0).toBigInt(%s):m%s", prop, prop, prop, prop, isUnsigned ? "true": "", prop, prop, isUnsigned ? "true": "", prop);
                 break;