CLI: Added closure wrapper

protobufjs · Apr 24, 2017 · 3a95945 · 3a95945
1 parent 7445da0
commit 3a95945
Show file tree

Hide file tree

Showing 17 changed files with 74 additions and 48 deletions.
diff --git a/cli/pbjs.js b/cli/pbjs.js
@@ -97,6 +97,7 @@ exports.main = function main(args, callback) {
                 "                   commonjs  CommonJS wrapper",
                 "                   amd       AMD wrapper",
                 "                   es6       ES6 wrapper (implies --es6)",
+                "                   closure   Just a closure adding to protobuf.roots (see -r)",
                 "",
                 "  -r, --root       Specifies an alternative protobuf.roots name.",
                 "",

diff --git a/cli/wrappers/closure.js b/cli/wrappers/closure.js
@@ -0,0 +1,7 @@
+(function($protobuf) {
+    "use strict";
+
+    $OUTPUT;
+
+    return $root;
+})(protobuf);
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
diff --git a/dist/minimal/protobuf.min.js b/dist/minimal/protobuf.min.js
diff --git a/dist/minimal/protobuf.min.js.gz b/dist/minimal/protobuf.min.js.gz
diff --git a/dist/protobuf.js b/dist/protobuf.js
diff --git a/dist/protobuf.js.map b/dist/protobuf.js.map
diff --git a/dist/protobuf.min.js b/dist/protobuf.min.js
diff --git a/dist/protobuf.min.js.gz b/dist/protobuf.min.js.gz
diff --git a/dist/protobuf.min.js.map b/dist/protobuf.min.js.map
diff --git a/src/oneof.js b/src/oneof.js
@@ -178,9 +178,10 @@ OneOf.prototype.onRemove = function onRemove(parent) {
  * @template T extends string
  */
 OneOf.d = function decorateOneOf() {
-    var fieldNames = [];
-    for (var i = 0; i < arguments.length; ++i)
-        fieldNames.push(arguments[i]);
+    var fieldNames = new Array(arguments.length),
+        index = 0;
+    while (index < arguments.length)
+        fieldNames[index] = arguments[index++];
     return function oneOfDecorator(prototype, oneofName) {
         util.decorateType(prototype.constructor)
             .add(new OneOf(oneofName, fieldNames));

diff --git a/src/util.js b/src/util.js
@@ -27,11 +27,15 @@ util.fs = util.inquire("fs");
  * @returns {Array.<*>} Converted array
  */
 util.toArray = function toArray(object) {
-    var array = [];
-    if (object)
-        for (var keys = Object.keys(object), i = 0; i < keys.length; ++i)
-            array.push(object[keys[i]]);
-    return array;
+    if (object) {
+        var keys  = Object.keys(object),
+            array = new Array(keys.length),
+            index = 0;
+        while (index < keys.length)
+            array[index] = object[keys[index++]];
+        return array;
+    }
+    return [];
 };
 
 /**
@@ -40,10 +44,11 @@ util.toArray = function toArray(object) {
  * @returns {Object.<string,*>} Converted object
  */
 util.toObject = function toObject(array) {
-    var object = {};
-    for (var i = 0; i < array.length; i += 2) {
-        var key = array[i    ],
-            val = array[i + 1];
+    var object = {},
+        index  = 0;
+    while (index < array.length) {
+        var key = array[index++],
+            val = array[index++];
         if (val !== undefined)
             object[key] = val;
     }