Other: Updated dist files; Other: Added package-lock.json

protobufjs · Jun 9, 2017 · 9726be0 · 9726be0
1 parent 66d149e
commit 9726be0
Show file tree

Hide file tree

Showing 19 changed files with 18,947 additions and 15,129 deletions.
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.js.map b/dist/minimal/protobuf.js.map
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/minimal/protobuf.min.js.map b/dist/minimal/protobuf.min.js.map
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/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -44,7 +44,6 @@
     "release": "npm run make && npm run changelog"
   },
   "dependencies": {
-    "long": "^3.2.0",
     "@protobufjs/aspromise": "^1.1.2",
     "@protobufjs/base64": "^1.1.2",
     "@protobufjs/codegen": "^2.0.3",
@@ -56,30 +55,31 @@
     "@protobufjs/pool": "^1.1.0",
     "@protobufjs/utf8": "^1.1.0",
     "@types/long": "^3.0.31",
-    "@types/node": "7.0.12"
+    "@types/node": "^7.0.29",
+    "long": "^3.2.0"
   },
   "devDependencies": {
     "benchmark": "^2.1.4",
-    "browserify": "^14.3.0",
+    "browserify": "^14.4.0",
     "browserify-wrap": "^1.0.2",
     "bundle-collapser": "^1.2.1",
     "chalk": "^1.1.3",
     "escodegen": "^1.8.1",
     "eslint": "^3.19.0",
-    "espree": "^3.4.1",
+    "espree": "^3.4.3",
     "estraverse": "^4.2.0",
     "gh-pages": "^0.12.0",
     "git-raw-commits": "^1.2.0",
     "git-semver-tags": "^1.2.0",
-    "glob": "^7.1.1",
-    "google-protobuf": "^3.2.0",
+    "glob": "^7.1.2",
+    "google-protobuf": "^3.3.0",
     "gulp": "^3.9.1",
     "gulp-header": "^1.8.8",
     "gulp-if": "^2.0.1",
-    "gulp-sourcemaps": "^2.5.1",
+    "gulp-sourcemaps": "^2.6.0",
     "gulp-uglify": "^2.1.2",
     "istanbul": "^0.4.5",
-    "jaguarjs-jsdoc": "dcodeIO/jaguarjs-jsdoc",
+    "jaguarjs-jsdoc": "github:dcodeIO/jaguarjs-jsdoc",
     "jsdoc": "^3.4.2",
     "minimist": "^1.2.0",
     "node-zopfli": "^2.0.2",
@@ -88,9 +88,9 @@
     "tap-spec": "^4.1.1",
     "tape": "^4.6.3",
     "tmp": "0.0.31",
-    "tslint": "^5.0.0",
-    "typescript": "^2.2.2",
-    "uglify-js": "^2.8.21",
+    "tslint": "^5.4.3",
+    "typescript": "^2.3.4",
+    "uglify-js": "^2.8.28",
     "vinyl-buffer": "^1.0.0",
     "vinyl-fs": "^2.4.4",
     "vinyl-source-stream": "^1.1.0"

diff --git a/src/converter.js b/src/converter.js
@@ -27,7 +27,7 @@ function genValuePartial_fromObject(gen, field, fieldIndex, prop) {
                 ("default:");
                 gen
                 ("case%j:", keys[i])
-                ("case %j:", values[keys[i]])
+                ("case %i:", values[keys[i]])
                     ("m%s=%j", prop, values[keys[i]])
                     ("break");
             } gen

diff --git a/tests/api_converters.js b/tests/api_converters.js
@@ -134,7 +134,7 @@ tape.test("converters", function(test) {
         });
 
         test.test(test.name + " - Message.fromObject", function(test) {
-           
+
             var obj = {
                 uint64Val: 1,
                 uint64Repeated: [1, "2"],
@@ -176,7 +176,7 @@ tape.test("converters", function(test) {
             };
             msg.toJSON();
         });
-        
+
         test.end();
     });