Generate lookupTYPE functions programmatically; Ensure working reflection class names with minified builds

Author: dcodeIO

dist/protobuf.js

@@ -49,7 +49,9 @@ function bundle(compress, runtime) {
     .pipe(sourcemaps.init({ loadMaps: true }))
             .pipe(
                 gulpif(compress, uglify({
-                    mangleProperties: { regex: /^_/ }
+                    mangleProperties: {
+                        regex: /^_/
+                    }
                 }))
             )
             .pipe(header(license, {

dist/protobuf.js.map

@@ -1,6 +1,8 @@
 "use strict";
 module.exports = Enum;
 
+Enum.className = "Enum";
+
 var ReflectionObject = require("./object");
 /** @alias Enum.prototype */
 var EnumPrototype = ReflectionObject.extend(Enum);

dist/protobuf.min.js

@@ -1,6 +1,8 @@
 "use strict";
 module.exports = Field;
 
+Field.className = "Field";
+
 var ReflectionObject = require("./object");
 /** @alias Field.prototype */
 var FieldPrototype = ReflectionObject.extend(Field);

dist/protobuf.min.js.gz

@@ -1,6 +1,8 @@
 "use strict";
 module.exports = MapField;
 
+MapField.className = "MapField";
+
 var Field = require("./field");
 /** @alias Field.prototype */
 var FieldPrototype = Field.prototype;

dist/protobuf.min.js.map

@@ -1,6 +1,8 @@
 "use strict";
 module.exports = Method;
 
+Method.className = "Method";
+
 var ReflectionObject = require("./object");
 /** @alias Method.prototype */
 var MethodPrototype = ReflectionObject.extend(Method);

dist/runtime/protobuf.js

@@ -1,6 +1,8 @@
 "use strict";
 module.exports = Namespace;
 
+Namespace.className = "Namespace";
+
 var ReflectionObject = require("./object");
 /** @alias Namespace.prototype */
 var NamespacePrototype = ReflectionObject.extend(Namespace);
@@ -268,30 +270,29 @@ NamespacePrototype.lookup = function lookup(path, parentAlreadyChecked) {
     return this.parent.lookup(path);
 };
 
+[ Type, Service ].forEach(function(T) {
+    NamespacePrototype['lookup' + T.className] = function lookupT() {
+        var found = this.lookup(path);
+        if (!(found instanceof T))
+            throw Error("no such " + T.className);
+        return found;
+    };
+});
+
 /**
  * Looks up the {@link Type|type} at the specified path, relative to this namespace.
  * Besides its signature, this methods differs from {@link Namespace#lookup} in that it throws instead of returning `null`.
+ * @name Namespace#lookupType
  * @param {string|string[]} path Path to look up
  * @returns {Type} Looked up type
  * @throws {Error} If `path` does not point to a type
  */
-NamespacePrototype.lookupType = function lookupType(path) {
-    var found = this.lookup(path);
-    if (!(found instanceof Type))
-        throw Error("no such type");
-    return found;
-};
 
 /**
  * Looks up the {@link Service|service} at the specified path, relative to this namespace.
  * Besides its signature, this methods differs from {@link Namespace#lookup} in that it throws instead of returning `null`.
+ * @name Namespace#lookupService
  * @param {string|string[]} path Path to look up
  * @returns {Service} Looked up service
  * @throws {Error} If `path` does not point to a service
  */
-NamespacePrototype.lookupService = function lookupService(path) {
-    var found = this.lookup(path);
-    if (!(found instanceof Service))
-        throw Error("no such service");
-    return found;
-};

dist/runtime/protobuf.min.js

@@ -1,6 +1,7 @@
 "use strict";
 module.exports = ReflectionObject;
 
+ReflectionObject.className = "ReflectionObject";
 ReflectionObject.extend = extend;
 
 var Root = require("./root"),
@@ -190,8 +191,12 @@ ReflectionObjectPrototype.setOptions = function setOptions(options, ifNotSet) {
 
 /**
  * Converts this instance to its string representation.
- * @returns {string} Constructor name, space, full name
+ * @returns {string} Class name[, space, full name]
  */
 ReflectionObjectPrototype.toString = function toString() {
-    return this.constructor.name + " " + this.getFullName();
+    var className = this.constructor.className;
+    var fullName = this.getFullName();
+    if (fullName.length)
+        return className + " " + fullName;
+    return className;
 };

dist/runtime/protobuf.min.js.gz

@@ -1,6 +1,8 @@
 "use strict";
 module.exports = OneOf;
 
+OneOf.className = "OneOf";
+
 var ReflectionObject = require("./object");
 /** @alias OneOf.prototype */
 var OneOfPrototype = ReflectionObject.extend(OneOf);

scripts/bundle.js

@@ -1,6 +1,8 @@
 "use strict";
 module.exports = Root;
 
+Root.className = "Root";
+
 var Namespace = require("./namespace");
 /** @alias Root.prototype */
 var RootPrototype = Namespace.extend(Root);
@@ -270,10 +272,3 @@ RootPrototype._handleRemove = function handleRemove(object) {
             this._handleRemove(nested[i]);
     }
 };
-
-/**
- * @override
- */
-RootPrototype.toString = function toString() {
-    return this.constructor.name;
-};

src/enum.js

@@ -1,6 +1,8 @@
 "use strict";
 module.exports = Service;
 
+Service.className = "Service";
+
 var Namespace = require("./namespace");
 /** @alias Namespace.prototype */
 var NamespacePrototype = Namespace.prototype;

src/field.js

@@ -1,6 +1,8 @@
 "use strict";
 module.exports = Type; 
 
+Type.className = "Type";
+
 var Namespace = require("./namespace");
 /** @alias Namespace.prototype */
 var NamespacePrototype = Namespace.prototype;

src/mapfield.js

@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html>
-<head><script src="../dist/protobuf.js"></script></head>
+<head><script src="../dist/protobuf.min.js"></script></head>
 <body>
 <script>
 protobuf.util.fetch("browser.html")
@@ -13,6 +13,12 @@
 .catch(function(err) {
     console.log("error", err);
 });
+
+var root = new protobuf.Root();
+console.log(root.toString());
+var message = new protobuf.Type("Message");
+root.add(message);
+console.log(message.toString());
 </script>
 </body>
 </html>