fix: declare long only once

Author: seo-rii

cli/targets/static.js

@@ -181,7 +181,7 @@ function beautifyCode(code) {
         output: { beautify: true }
     }).code;
     // Properly beautify
-    var ast = espree.parse(code);
+    var ast = espree.parse(code, { ecmaVersion: 2020 });
     estraverse.replace(ast, {
         enter: function(node, parent) {
             // rename short vars
@@ -227,7 +227,7 @@ function buildFunction(type, functionName, gen, scope) {
     var code = gen.toString(functionName)
         .replace(/((?!\.)types\[\d+])(\.values)/g, "$1"); // enums: use types[N] instead of reflected types[N].values
 
-    var ast = espree.parse(code);
+    var ast = espree.parse(code, { ecmaVersion: 2020 });
     /* eslint-disable no-extra-parens */
     estraverse.replace(ast, {
         enter: function(node, parent) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seorii/protobufjs",
-  "version": "7.2.2",
+  "version": "7.2.3",
   "versionScheme": "~",
   "description": "Protocol Buffers for JavaScript (& TypeScript).",
   "author": "Daniel Wirtz <dcode+protobufjs@dcode.io>",

src/converter.js

@@ -232,6 +232,7 @@ converter.toObject = function toObject(mtype) {
         gen
     ("}");
     }
+    let hasLong = false;
 
     if (normalFields.length) { gen
     ("if(o.defaults){");
@@ -240,9 +241,13 @@ converter.toObject = function toObject(mtype) {
                 prop  = util.safeProp(field.name);
             if (field.resolvedType instanceof Enum) gen
         ("d%s=o.enums===String?%j:%j", prop, field.resolvedType.valuesById[field.typeDefault], field.typeDefault);
-            else if (field.long) gen
-            ("var n=new util.LongBits(%i,%i,%j)", field.typeDefault.low, field.typeDefault.high, field.typeDefault.unsigned)
-            ("d%s=o.longs===String?n.toBigInt().toString():o.longs===BigInt?n.toBigInt().toString():n", prop);
+            else if (field.long) {
+                if(!hasLong) {
+                    gen("var n=new util.LongBits(%i,%i,%j)", field.typeDefault.low, field.typeDefault.high, field.typeDefault.unsigned)
+                    hasLong = true;
+                }
+                gen("d%s=o.longs===String?n.toBigInt().toString():o.longs===BigInt?n.toBigInt().toString():n", prop);
+            }
             else if (field.bytes) {
                 var arrayDefault = "[" + Array.prototype.slice.call(field.typeDefault).join(",") + "]";
                 gen

tests/data/test.js

@@ -16440,7 +16440,7 @@ $root.google = (function() {
                     object.identifierValue = "";
                     var long = new $util.LongBits(NaN, NaN, undefined);
                     object.positiveIntValue = options.longs === String ? long.toBigInt().toString() : options.longs === BigInt ? long.toBigInt().toString() : long;
-                    long = new $util.LongBits(NaN, NaN, undefined);
+                    var long = new $util.LongBits(NaN, NaN, undefined);
                     object.negativeIntValue = options.longs === String ? long.toBigInt().toString() : options.longs === BigInt ? long.toBigInt().toString() : long;
                     object.doubleValue = 0;
                     if (options.bytes === String)