Post-merge, accept custom targets in pbjs, see #512

cli/pbjs.js

@@ -27,13 +27,14 @@ exports.main = function(args) {
         files  = argv._,
         paths  = typeof argv.path === 'string' ? [ argv.path ] : argv.path || [];
 
-    if (!target || !files.length) {
+    if (!files.length) {
         console.log([
             "protobuf.js v" + pkg.version + " cli",
             "",
             "Consolidates imports and converts between file formats.",
             "",
             "  -t, --target    Specifies the target format. [" + Object.keys(targets).filter(function(key) { return !targets[key].private; }).join(', ') + "]",
+            "                  Also accepts a path to require a custom target.",
             "  -p, --path      Adds a directory to the include path.",
             "  -o, --out       Saves to a file instead of writing to stdout.",
             "",
@@ -42,6 +43,9 @@ exports.main = function(args) {
         return 1;
     }
 
+    if (!target)
+        target = require(path.resolve(process.cwd(), argv.target));
+
     // Resolve glob expressions
     for (var i = 0; i < files.length;) {
         if (glob.hasMagic(files[i])) {

cli/targets/static.js

@@ -2,7 +2,9 @@ module.exports = static_target;
 
 static_target.private = true;
 
-// Currently, this file contains initial static code for CommonJS modules.
+// Currently, this target builds single file CommonJS modules.
+// - There is no reflection and no message inheritance from Prototype.
+// - Generated code is tailored for browerify build processes (minimal runtime).
 
 // TBD:
 // - Generate a single file or scaffold an entire project directory? Both?

package.json

@@ -27,14 +27,14 @@
     "build": "gulp",
     "docs": "jsdoc -c jsdoc.docs.json -R README.md",
     "pages": "node scripts/pages",
-    "types": "jsdoc -c jsdoc.types.json && node scripts/types.js && tsc types/protobuf.js-test.ts --lib es2015 --noEmit",
+    "types": "jsdoc -c jsdoc.types.json && node scripts/types.js && tsc types/test.ts --lib es2015 --noEmit",
     "lint": "eslint src",
     "test": "tape tests/*.js | tap-spec",
     "zuul": "zuul --ui tape --no-coverage --concurrency 1 -- tests/*.js",
     "zuul-local": "zuul --ui tape --no-coverage --concurrency 1 --local 8080 --disable-tunnel -- tests/*.js",
     "bench": "node bench",
     "all": "npm run lint && npm run test && npm run build && npm run types && npm run docs && npm run bench",
-    "prepublish": "node scripts/prepublish.js"
+    "prepublish": "node scripts/prepublish"
   },
   "optionalDependencies": {
     "long": "^3.2.0"

src/inherits.js

@@ -18,7 +18,7 @@ var _TypeError = util._TypeError;
 /**
  * Inherits a custom class from the message prototype of the specified message type.
  * @param {Function} clazz Inheriting class
- * @param {Type|ReflectionObject} type Inherited message type
+ * @param {Type} type Inherited message type
  * @param {InheritanceOptions} [options] Inheritance options
  * @returns {Prototype} Created prototype
  */

types/protobuf.js.d.ts

@@ -3,7 +3,7 @@
 
 /*
  * protobuf.js v6.0.1 TypeScript definitions
- * Generated Fri, 02 Dec 2016 15:01:02 UTC
+ * Generated Fri, 02 Dec 2016 16:05:19 UTC
  */
 declare module "protobufjs" {
 
@@ -324,11 +324,11 @@ declare module "protobufjs" {
    /**
     * Inherits a custom class from the message prototype of the specified message type.
     * @param {Function} clazz Inheriting class
-    * @param {Type|ReflectionObject} type Inherited message type
+    * @param {Type} type Inherited message type
     * @param {InheritanceOptions} [options] Inheritance options
     * @returns {Prototype} Created prototype
     */
-   function inherits(clazz: any, type: (Type|ReflectionObject), options?: InheritanceOptions): Prototype;
+   function inherits(clazz: any, type: Type, options?: InheritanceOptions): Prototype;
 
    /**
     * This is not an actual type but stands as a reference for any constructor of a custom message class that you pass to the library.

types/protobuf.js-test.ts → types/test.ts

@@ -1,14 +1,15 @@
-///<reference path="./protobuf.js.d.ts" />
+/// <reference path="./protobuf.js.d.ts" />
+
 import * as protobuf from "protobufjs";
 
 export const proto = {"nested":{"Hello":{"fields":{"value":{"rule":"required","type":"string","id":1}}}}};
 
 const root = protobuf.Root.fromJSON(proto);
 
 export class Hello {
-  constructor (properties: any) {
-    protobuf.Prototype.call(this, properties);
-  }
+    constructor (properties: any) {
+        protobuf.Prototype.call(this, properties);
+    }
 }
 
-protobuf.inherits(Hello, root.lookup("Hello"));
+protobuf.inherits(Hello, root.lookup("Hello") as protobuf.Type);