Other: Various jsdoc improvements and a workaround for d.ts generatio…

…n, see #592
protobufjs · Dec 29, 2016 · 31da56c · 31da56c
1 parent 39a2ea3
commit 31da56c
Show file tree

Hide file tree

Showing 46 changed files with 5,183 additions and 321 deletions.
diff --git a/cli/targets/json-module.js b/cli/targets/json-module.js
@@ -1,11 +1,7 @@
 "use strict";
 module.exports = json_module;
 
-var path = require("path"),
-    fs   = require("fs"),
-    util = require("../util");
-
-var protobuf = require("../..");
+var util = require("../util");
 
 json_module.description = "JSON representation as a module"
 
@@ -17,6 +13,7 @@ function json_module(root, options, callback) {
             callback(null, output);
         });
     } catch (e) {
-        callback(e);
+        return callback(e);
     }
+    return undefined;
 }
diff --git a/cli/targets/static.js b/cli/targets/static.js
@@ -238,7 +238,7 @@ function buildType(ref, type) {
         var prop = util.safeProp(field.name);
         pushComment([
             type.name + " " + field.name + ".",
-            prop.charAt(0) !== "." ? "@name " + fullName + "#" + name(field.name) : null,
+            prop.charAt(0) !== "." ? "@name " + fullName + "#" + field.name : null,
             "@type {" + jsType + "}"
         ]);
         if (Array.isArray(field.defaultValue)) {