Add dropOptions when serializing descriptors

pgherveou · Sep 11, 2020 · 09ed37d · 09ed37d
1 parent 78c3e49
commit 09ed37d
Show file tree

Hide file tree

Showing 21 changed files with 97 additions and 44 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.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/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.map b/dist/protobuf.min.js.map
diff --git a/index.d.ts b/index.d.ts
@@ -1070,6 +1070,9 @@ export interface IToJSONOptions {
 
     /** Serializes comments. */
     keepComments?: boolean;
+
+    /** Serializes options. */
+    dropOptions?: boolean;
 }
 
 /**

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pgherveou/protobufjs",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "versionScheme": "~",
   "description": "Protocol Buffers for JavaScript (& TypeScript).",
   "author": "Daniel Wirtz <[email protected]>",

diff --git a/src/enum.js b/src/enum.js
@@ -92,8 +92,10 @@ Enum.fromJSON = function fromJSON(name, json) {
  */
 Enum.prototype.toJSON = function toJSON(toJSONOptions) {
     var keepComments = toJSONOptions ? Boolean(toJSONOptions.keepComments) : false;
+    var dropOptions = toJSONOptions ? Boolean(toJSONOptions.dropOptions) : false;
+
     return util.toObject([
-        "options"  , this.options,
+        "options"  , dropOptions ? undefined  : this.options,
         "values"   , this.values,
         "reserved" , this.reserved && this.reserved.length ? this.reserved : undefined,
         "comment"  , keepComments ? this.comment : undefined,

diff --git a/src/field.js b/src/field.js
@@ -241,12 +241,14 @@ Field.prototype.setOption = function setOption(name, value, ifNotSet) {
  */
 Field.prototype.toJSON = function toJSON(toJSONOptions) {
     var keepComments = toJSONOptions ? Boolean(toJSONOptions.keepComments) : false;
+    var dropOptions = toJSONOptions ? Boolean(toJSONOptions.dropOptions) : false;
+
     return util.toObject([
+        "options"  , dropOptions ? undefined  : this.options,
         "rule"    , this.rule !== "optional" && this.rule || undefined,
         "type"    , this.type,
         "id"      , this.id,
         "extend"  , this.extend,
-        "options" , this.options,
         "comment" , keepComments ? this.comment : undefined
     ]);
 };

diff --git a/src/mapfield.js b/src/mapfield.js
@@ -75,12 +75,14 @@ MapField.fromJSON = function fromJSON(name, json) {
  */
 MapField.prototype.toJSON = function toJSON(toJSONOptions) {
     var keepComments = toJSONOptions ? Boolean(toJSONOptions.keepComments) : false;
+    var dropOptions = toJSONOptions ? Boolean(toJSONOptions.dropOptions) : false;
+
     return util.toObject([
+        "options"  , dropOptions ? undefined  : this.options,
         "keyType" , this.keyType,
         "type"    , this.type,
         "id"      , this.id,
         "extend"  , this.extend,
-        "options" , this.options,
         "comment" , keepComments ? this.comment : undefined
     ]);
 };

diff --git a/src/method.js b/src/method.js
@@ -124,13 +124,15 @@ Method.fromJSON = function fromJSON(name, json) {
  */
 Method.prototype.toJSON = function toJSON(toJSONOptions) {
     var keepComments = toJSONOptions ? Boolean(toJSONOptions.keepComments) : false;
+    var dropOptions = toJSONOptions ? Boolean(toJSONOptions.dropOptions) : false;
+
     return util.toObject([
+        "options"  , dropOptions ? undefined  : this.options,
         "type"           , this.type !== "rpc" && /* istanbul ignore next */ this.type || undefined,
         "requestType"    , this.requestType,
         "requestStream"  , this.requestStream,
         "responseType"   , this.responseType,
         "responseStream" , this.responseStream,
-        "options"        , this.options,
         "comment"        , keepComments ? this.comment : undefined
     ]);
 };

diff --git a/src/namespace.js b/src/namespace.js
@@ -152,8 +152,10 @@ Object.defineProperty(Namespace.prototype, "nestedArray", {
  * @returns {INamespace} Namespace descriptor
  */
 Namespace.prototype.toJSON = function toJSON(toJSONOptions) {
+    var dropOptions = toJSONOptions ? Boolean(toJSONOptions.dropOptions) : false;
+
     return util.toObject([
-        "options" , this.options,
+        "options"  , dropOptions ? undefined  : this.options,
         "nested"  , arrayToJSON(this.nestedArray, toJSONOptions)
     ]);
 };

diff --git a/src/oneof.js b/src/oneof.js
@@ -74,8 +74,10 @@ OneOf.fromJSON = function fromJSON(name, json) {
  */
 OneOf.prototype.toJSON = function toJSON(toJSONOptions) {
     var keepComments = toJSONOptions ? Boolean(toJSONOptions.keepComments) : false;
+    var dropOptions = toJSONOptions ? Boolean(toJSONOptions.dropOptions) : false;
+
     return util.toObject([
-        "options" , this.options,
+        "options"  , dropOptions ? undefined  : this.options,
         "oneof"   , this.oneof,
         "comment" , keepComments ? this.comment : undefined
     ]);

diff --git a/src/parse.js b/src/parse.js
@@ -48,6 +48,7 @@ var base10Re    = /^[1-9][0-9]*$/,
  * Options modifying the behavior of JSON serialization.
  * @interface IToJSONOptions
  * @property {boolean} [keepComments=false] Serializes comments.
+ * @property {boolean} [dropOptions=false] Serializes options.
  */
 
 /**

diff --git a/src/service.js b/src/service.js
@@ -69,8 +69,10 @@ Service.fromJSON = function fromJSON(name, json) {
 Service.prototype.toJSON = function toJSON(toJSONOptions) {
     var inherited = Namespace.prototype.toJSON.call(this, toJSONOptions);
     var keepComments = toJSONOptions ? Boolean(toJSONOptions.keepComments) : false;
+    var dropOptions = toJSONOptions ? Boolean(toJSONOptions.dropOptions) : false;
+
     return util.toObject([
-        "options" , inherited && inherited.options || undefined,
+        "options"  , dropOptions ? undefined  : this.options,
         "methods" , Namespace.arrayToJSON(this.methodsArray, toJSONOptions) || /* istanbul ignore next */ {},
         "nested"  , inherited && inherited.nested || undefined,
         "comment" , keepComments ? this.comment : undefined