New: Upgrade to codegen 2

protobufjs · Apr 23, 2017 · 17c2797 · 17c2797
1 parent 13bf9c2
commit 17c2797
Show file tree

Hide file tree

Showing 40 changed files with 655 additions and 592 deletions.
diff --git a/cli/lib/tsd-jsdoc/publish.js b/cli/lib/tsd-jsdoc/publish.js
@@ -292,7 +292,7 @@ function getTypeOf(element) {
     });
 
     // Replace functions (there are no signatures) with Function
-    name = name.replace(/\bfunction(?:\(\))?([^\w]|$)/g, "Function");
+    name = name.replace(/\bfunction(?:\(\))?\b/g, "Function");
 
     // Convert plain Object back to just object
     name = name.replace(/\b(Object(?!\.))/g, function($0, $1) {

diff --git a/cli/targets/static.js b/cli/targets/static.js
@@ -224,7 +224,7 @@ var renameVars = {
 };
 
 function buildFunction(type, functionName, gen, scope) {
-    var code = gen.str(functionName)
+    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);
@@ -635,7 +635,8 @@ function buildEnum(ref, enm) {
     push("");
     var comment = [
         enm.comment || enm.name + " enum.",
-        "@enum {number} " + exportName(enm)
+        enm.parent instanceof protobuf.Root ? "@exports " + escapeName(enm.name) : undefined,
+        "@enum {number}",
     ];
     Object.keys(enm.values).forEach(function(key) {
         var val = enm.values[key];

diff --git a/dist/light/protobuf.js b/dist/light/protobuf.js
diff --git a/dist/light/protobuf.js.map b/dist/light/protobuf.js.map
diff --git a/dist/light/protobuf.min.js b/dist/light/protobuf.min.js
diff --git a/dist/light/protobuf.min.js.gz b/dist/light/protobuf.min.js.gz
diff --git a/dist/light/protobuf.min.js.map b/dist/light/protobuf.min.js.map
diff --git a/dist/minimal/protobuf.js b/dist/minimal/protobuf.js