1.0.8

cli/package.json

@@ -1 +1,7 @@
-{"version": "1.0.3"}
+{
+  "version": "1.0.8",
+  "dependencies": {
+    "espree": "^7.1.0",
+    "tmp": "^0.2.1"
+  }
+}

cli/package.standalone.json

@@ -1,7 +1,7 @@
 {
   "name": "protobufjs-cli",
   "description": "Translates between file formats and generates static code as well as TypeScript definitions.",
-  "version": "1.0.3",
+  "version": "1.0.8",
   "author": "Daniel Wirtz <[email protected]>",
   "repository": {
     "type": "git",
@@ -15,7 +15,7 @@
     "pbts": "bin/pbts"
   },
   "peerDependencies": {
-    "@pgherveou/protobufjs": "~1.0.3"
+    "@pgherveou/protobufjs": "~1.0.8"
   },
   "dependencies": {
     "chalk": "^3.0.0",

cli/pbjs.js

@@ -194,9 +194,8 @@ exports.main = function main(args, callback) {
         return resolved;
     };
 
-    // Use es6 syntax if not explicitly specified on the command line and the es6 wrapper is used
-    if (argv.wrap === "es6" || argv.es6) {
-        argv.wrap = "es6";
+    // `--wrap es6` implies `--es6` but not the other way around. You can still use e.g. `--es6 --wrap commonjs`
+    if (argv.wrap === "es6") {
         argv.es6 = true;
     }
 

cli/targets/static.js

@@ -682,7 +682,10 @@ function buildEnum(ref, enm) {
         comment.push((config.forceEnumString ? "@property {string} " : "@property {number} ") + key + "=" + val + " " + (enm.comments[key] || key + " value"));
     });
     pushComment(comment);
-    push(escapeName(ref) + "." + escapeName(enm.name) + " = (function() {");
+    if (!ref && config.es6)
+        push("export const " + escapeName(enm.name) + " = " + escapeName(ref) + "." + escapeName(enm.name) + " = (() => {");
+    else
+        push(escapeName(ref) + "." + escapeName(enm.name) + " = (function() {");
     ++indent;
         push((config.es6 ? "const" : "var") + " valuesById = {}, values = Object.create(valuesById);");
         var aliased = [];