Fixed: Fixed invalid definition of Field#packed property, also introd…

…uced decoder.compat mode (packed fields, on by default)
protobufjs · Jan 6, 2017 · c2c39fc · c2c39fc
1 parent 11fb1a6
commit c2c39fc
Show file tree

Hide file tree

Showing 17 changed files with 62 additions and 24 deletions.
diff --git a/dist/noparse/protobuf.js b/dist/noparse/protobuf.js
diff --git a/dist/noparse/protobuf.js.map b/dist/noparse/protobuf.js.map
diff --git a/dist/noparse/protobuf.min.js b/dist/noparse/protobuf.min.js
diff --git a/dist/noparse/protobuf.min.js.gz b/dist/noparse/protobuf.min.js.gz
diff --git a/dist/noparse/protobuf.min.js.map b/dist/noparse/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/dist/runtime/protobuf.js b/dist/runtime/protobuf.js
diff --git a/dist/runtime/protobuf.min.js b/dist/runtime/protobuf.min.js
diff --git a/dist/runtime/protobuf.min.js.gz b/dist/runtime/protobuf.min.js.gz
diff --git a/index.d.ts b/index.d.ts
@@ -224,6 +224,7 @@ interface MessageConversionOptions {
  * Generates a decoder specific to the specified message type.
  * @param {Type} mtype Message type
  * @returns {Codegen} Codegen instance
+ * @property {boolean} compat=true Generates backward/forward compatible decoders (packed fields)
  */
 export function decoder(mtype: Type): Codegen;
 

diff --git a/src/decoder.js b/src/decoder.js
@@ -1,6 +1,8 @@
 "use strict";
 module.exports = decoder;
 
+decoder.compat = true;
+
 var Enum    = require("./enum"),
     types   = require("./types"),
     util    = require("./util");
@@ -9,6 +11,7 @@ var Enum    = require("./enum"),
  * Generates a decoder specific to the specified message type.
  * @param {Type} mtype Message type
  * @returns {Codegen} Codegen instance
+ * @property {boolean} compat=true Generates backward/forward compatible decoders (packed fields)
  */
 function decoder(mtype) {
     /* eslint-disable no-unexpected-multiline */
@@ -56,7 +59,7 @@ function decoder(mtype) {
                     ("%s=[]", ref);
 
             // Packable (always check for forward and backward compatiblity)
-            if (/* field.packed && */types.packed[type] !== undefined) gen
+            if ((decoder.compat || field.packed) && types.packed[type] !== undefined) gen
                 ("if((t&7)===2){")
                     ("var c2=r.uint32()+r.pos")
                     ("while(r.pos<c2)")

diff --git a/src/field.js b/src/field.js
@@ -173,7 +173,7 @@ function Field(name, id, type, rule, extend, options) {
  * @type {boolean}
  * @readonly
  */
-Object.defineProperties(FieldPrototype, {
+Object.defineProperty(FieldPrototype, "packed", {
     get: function() {
         // defaults to packed=true if not explicity set to false
         if (this._packed === null)

diff --git a/tests/data/test.js b/tests/data/test.js
@@ -3189,7 +3189,14 @@ $root.jspb = (function() {
                         if (!(message.repeatedFloatField && message.repeatedFloatField.length)) {
                             message.repeatedFloatField = [];
                         }
-                        message.repeatedFloatField.push(reader.float());
+                        if ((tag & 7) === 2) {
+                            var end2 = reader.uint32() + reader.pos;
+                            while (reader.pos < end2) {
+                                message.repeatedFloatField.push(reader.float());
+                            }
+                        } else {
+                            message.repeatedFloatField.push(reader.float());
+                        }
                         break;
 
                     case 4:
@@ -3208,7 +3215,14 @@ $root.jspb = (function() {
                         if (!(message.repeatedDoubleField && message.repeatedDoubleField.length)) {
                             message.repeatedDoubleField = [];
                         }
-                        message.repeatedDoubleField.push(reader.double());
+                        if ((tag & 7) === 2) {
+                            var end2 = reader.uint32() + reader.pos;
+                            while (reader.pos < end2) {
+                                message.repeatedDoubleField.push(reader.double());
+                            }
+                        } else {
+                            message.repeatedDoubleField.push(reader.double());
+                        }
                         break;
 
                     case 8:
@@ -6563,14 +6577,28 @@ $root.google = (function() {
                         if (!(message.publicDependency && message.publicDependency.length)) {
                             message.publicDependency = [];
                         }
-                        message.publicDependency.push(reader.int32());
+                        if ((tag & 7) === 2) {
+                            var end2 = reader.uint32() + reader.pos;
+                            while (reader.pos < end2) {
+                                message.publicDependency.push(reader.int32());
+                            }
+                        } else {
+                            message.publicDependency.push(reader.int32());
+                        }
                         break;
 
                     case 11:
                         if (!(message.weakDependency && message.weakDependency.length)) {
                             message.weakDependency = [];
                         }
-                        message.weakDependency.push(reader.int32());
+                        if ((tag & 7) === 2) {
+                            var end2 = reader.uint32() + reader.pos;
+                            while (reader.pos < end2) {
+                                message.weakDependency.push(reader.int32());
+                            }
+                        } else {
+                            message.weakDependency.push(reader.int32());
+                        }
                         break;
 
                     case 4: