@openclaw/whatsapp 2026.7.2-beta.7 → 2026.7.33

package/node_modules/baileys/node_modules/protobufjs/src/decoder.js

@@ -9,20 +9,6 @@ function missing(field) {
     return "missing required '" + field.name + "'";
 }
 
-function stringMethod(field) {
-    return field._features.utf8_validation === "VERIFY" ? "stringVerify" : "string";
-}
-
-function genPreserveUnknown(gen, ref) {
-    /* eslint-disable no-unexpected-multiline */
-    return gen
-        ("if(!r.discardUnknown){")
-            ("util.makeProp(m,\"$unknowns\",false);")
-            ("(m.$unknowns||(m.$unknowns=[])).push(%s)", ref)
-        ("}");
-    /* eslint-enable no-unexpected-multiline */
-}
-
 /**
  * Generates a decoder specific to the specified message type.
  * @param {Type} mtype Message type
@@ -30,246 +16,116 @@ function genPreserveUnknown(gen, ref) {
  */
 function decoder(mtype) {
     /* eslint-disable no-unexpected-multiline */
-    var hasMapField = false,
-        needsValueVar = false,
-        i = 0;
-    for (; i < mtype.fieldsArray.length; ++i) {
-        var pfield = mtype._fieldsArray[i];
-        if (pfield.map)
-            hasMapField = true;
-        if (pfield.resolvedType instanceof Enum || !pfield.repeated && !pfield.map && !pfield.hasPresence)
-            needsValueVar = true;
-    }
-    var gen = util.codegen(["r", "l", "z", "q", "g"])
+    var gen = util.codegen(["r", "l", "e", "n"], mtype.name + "$decode")
     ("if(!(r instanceof Reader))")
         ("r=Reader.create(r)")
-    ("if(q===undefined)q=0")
-    ("if(q>Reader.recursionLimit)")
-        ("throw Error(\"max depth exceeded\")")
-    ("var c=l===undefined?r.len:r.pos+l,m=g||new C" + (hasMapField ? ",k,v" : needsValueVar ? ",v" : ""))
+    ("if(n===undefined)n=0")
+    ("if(n>Reader.recursionLimit)")
+        ("throw Error(\"maximum nesting depth exceeded\")")
+    ("var c=l===undefined?r.len:r.pos+l,m=new this.ctor" + (mtype.fieldsArray.filter(function(field) { return field.map; }).length ? ",k,value" : ""))
     ("while(r.pos<c){")
-        ("var s=r.pos")
-        ("var t=r.tag()")
-        ("if(t===z){")
-            ("z=undefined")
+        ("var t=r.uint32()")
+        ("if(t===e)")
             ("break")
-        ("}");
-    if (mtype.fieldsArray.length) gen
-        ("var u=t&7")
-        ("switch(t>>>=3){");
-    for (i = 0; i < /* initializes */ mtype.fieldsArray.length; ++i) {
-        var field  = mtype._fieldsArray[i].resolve(),
-            type   = field.resolvedType instanceof Enum ? "int32" : field.type,
-            ref    = "m" + util.safeProp(field.name),
-            closed = field.resolvedType instanceof Enum && field.resolvedType._features.enum_type === "CLOSED";
+        ("switch(t>>>3){");
+
+    var i = 0;
+    for (; i < /* initializes */ mtype.fieldsArray.length; ++i) {
+        var field = mtype._fieldsArray[i].resolve(),
+            type  = field.resolvedType instanceof Enum ? "int32" : field.type,
+            ref   = "m" + util.safeProp(field.name); gen
+            ("case %i: {", field.id);
 
         // Map fields
-        if (field.map) {
-            gen
-            ("case %i:{", field.id)
-                ("if(u!==2)")
-                    ("break");
-            if (!closed) gen
+        if (field.map) { gen
                 ("if(%s===util.emptyObject)", ref)
-                    ("%s={}", ref);
-            gen
-                ("var c2=r.uint32()+r.pos");
+                    ("%s={}", ref)
+                ("var c2 = r.uint32()+r.pos");
 
             if (types.defaults[field.keyType] !== undefined) gen
                 ("k=%j", types.defaults[field.keyType]);
             else gen
                 ("k=null");
 
-            if (types.long[type] !== undefined) gen
-                ("v=util.Long?util.Long.fromNumber(0,%j):0", type === "uint64" || type === "fixed64");
-            else if (types.defaults[type] !== undefined) gen
-                ("v=%j", types.defaults[type]);
+            if (types.defaults[type] !== undefined) gen
+                ("value=%j", types.defaults[type]);
             else gen
-                ("v=null");
+                ("value=null");
 
             gen
                 ("while(r.pos<c2){")
-                    ("var t2=r.tag()")
-                    ("u=t2&7")
-                    ("switch(t2>>>=3){")
-                        ("case 1:")
-                            ("if(u!==%i)", types.mapKey[field.keyType])
-                                ("break")
-                            ("k=r.%s()", field.keyType === "string" ? stringMethod(field) : field.keyType)
-                            ("continue")
-                        ("case 2:")
-                            ("if(u!==%i)", types.basic[type] === undefined ? 2 : types.basic[type])
-                                ("break");
+                    ("var tag2=r.uint32()")
+                    ("switch(tag2>>>3){")
+                        ("case 1: k=r.%s(); break", field.keyType)
+                        ("case 2:");
 
             if (types.basic[type] === undefined) gen
-                            ("v=types[%i].decode(r,r.uint32(),undefined,q+1,v)", i); // can't be groups
+                            ("value=types[%i].decode(r,r.uint32(),undefined,n+1)", i); // can't be groups
             else gen
-                            ("v=r.%s()", type === "string" ? stringMethod(field) : type);
+                            ("value=r.%s()", type);
 
             gen
-                            ("continue")
+                            ("break")
+                        ("default:")
+                            ("r.skipType(tag2&7,n)")
+                            ("break")
                     ("}")
-                    ("r.skipType(u,q,t2)")
                 ("}");
 
-            if (closed) { gen
-                ("if(types[%i].valuesById[v]===undefined){", i);
-                    genPreserveUnknown(gen, "r.raw(s,r.pos)")
-                    ("continue")
-                ("}")
-                ("if(%s===util.emptyObject)", ref)
-                    ("%s={}", ref);
-            }
-
-            var val = types.basic[type] === undefined ? "v||new types[" + i + "].ctor" : "v";
             if (types.long[field.keyType] !== undefined) gen
-                ("%s[typeof k===\"object\"?util.longToHash(k):k]=%s", ref, val);
+                ("%s[typeof k===\"object\"?util.longToHash(k):k]=value", ref);
             else {
                 if (field.keyType === "string") gen
                 ("if(k===\"__proto__\")")
                     ("util.makeProp(%s,k)", ref);
                 gen
-                ("%s[k]=%s", ref, val);
+                ("%s[k]=value", ref);
             }
 
         // Repeated fields
         } else if (field.repeated) { gen
-            ("case %i:", field.id)
-            ("{");
+
+                ("if(!(%s&&%s.length))", ref, ref)
+                    ("%s=[]", ref);
 
             // Packable (always check for forward and backward compatiblity)
-            if (types.packed[type] !== undefined) {
-                gen
-                ("if(u===2){");
-                if (closed) {
-                    gen
+            if (types.packed[type] !== undefined) gen
+                ("if((t&7)===2){")
                     ("var c2=r.uint32()+r.pos")
-                    ("while(r.pos<c2){")
-                        ("s=r.pos")
-                        ("v=r.%s()", type)
-                        ("if(types[%i].valuesById[v]!==undefined){", i)
-                            ("if(!(%s&&%s.length))", ref, ref)
-                                ("%s=[]", ref)
-                            ("%s.push(v)", ref)
-                        ("}else");
-                            genPreserveUnknown(gen, "util.rawField(" + field.id + ",0,r.raw(s,r.pos))")
-                    ("}");
-                } else gen
-                    ("if(!(%s&&%s.length))", ref, ref)
-                        ("%s=[]", ref)
-                    ("r.%ss(%s)", type, ref);
-                gen
-                    ("continue")
-                ("}");
-            }
+                    ("while(r.pos<c2)")
+                        ("%s.push(r.%s())", ref, type)
+                ("}else");
 
             // Non-packed
-            gen
-                ("if(u!==%i)", types.basic[type] === undefined ? field.delimited ? 3 : 2 : types.basic[type])
-                    ("break");
-            if (!closed) gen
-                ("if(!(%s&&%s.length))", ref, ref)
-                    ("%s=[]", ref);
-            if (types.basic[type] === undefined) {
-                if (field.delimited) gen
-                    ("%s.push(types[%i].decode(r,undefined,%i,q+1))", ref, i, field.id * 8 + 4);
-                else gen
-                    ("%s.push(types[%i].decode(r,r.uint32(),undefined,q+1))", ref, i);
-            } else if (closed) { gen
-                    ("v=r.%s()", type)
-                    ("if(types[%i].valuesById[v]!==undefined){", i)
-                        ("if(!(%s&&%s.length))", ref, ref)
-                            ("%s=[]", ref)
-                        ("%s.push(v)", ref)
-                    ("}else");
-                        genPreserveUnknown(gen, "r.raw(s,r.pos)");
-            } else gen
-                    ("%s.push(r.%s())", ref, type === "string" ? stringMethod(field) : type);
+            if (types.basic[type] === undefined) gen(field.delimited
+                    ? "%s.push(types[%i].decode(r,undefined,((t&~7)|4),n+1))"
+                    : "%s.push(types[%i].decode(r,r.uint32(),undefined,n+1))", ref, i);
+            else gen
+                    ("%s.push(r.%s())", ref, type);
 
         // Non-repeated
-        } else if (types.basic[type] === undefined) {
-            gen
-            ("case %i:{", field.id)
-                ("if(u!==%i)", field.delimited ? 3 : 2)
-                    ("break");
-            if (field.delimited) gen
-                ("%s=types[%i].decode(r,undefined,%i,q+1,%s)", ref, i, field.id * 8 + 4, ref);
-            else gen
-                ("%s=types[%i].decode(r,r.uint32(),undefined,q+1,%s)", ref, i, ref);
-        }
-        else if (field.hasPresence) {
-            gen
-            ("case %i:{", field.id)
-                ("if(u!==%i)", types.basic[type])
-                    ("break");
-            if (closed) { gen
-                ("v=r.%s()", type)
-                ("if(types[%i].valuesById[v]!==undefined){", i)
-                    ("%s=v", ref);
-                if (field.partOf) gen
-                    ("m%s=%j", util.safeProp(field.partOf.name), field.name);
-                gen
-                ("}else");
-                    genPreserveUnknown(gen, "r.raw(s,r.pos)");
-            } else gen
-                ("%s=r.%s()", ref, type === "string" ? stringMethod(field) : type);
-        } else {
-            gen
-            ("case %i:{", field.id)
-                ("if(u!==%i)", types.basic[type])
-                    ("break");
-            if (closed) { gen
-                ("v=r.%s()", type)
-                ("if(types[%i].valuesById[v]!==undefined){", i)
-                    ("if(v!==%j)", field.typeDefault)
-                        ("%s=v", ref)
-                    ("else")
-                        ("delete %s", ref)
-                ("}else{");
-                    genPreserveUnknown(gen, "r.raw(s,r.pos)")
-                ("}");
-            } else {
-                if (field.resolvedType instanceof Enum && field.typeDefault !== 0) gen
-                    // TODO: Protoc rejects open enums whose first value is not zero.
-                    // We should do the same, but for v8 this would be a regression.
-                    ("if((v=r.%s())!==%j)", type, field.typeDefault);
-                else if (type === "string") gen
-                    ("if((v=r.%s()).length)", stringMethod(field));
-                else if (type === "bytes") gen
-                    ("if((v=r.%s()).length)", type);
-                else if (types.long[type] !== undefined) gen
-                    ("if(typeof(v=r.%s())===\"object\"?v.low||v.high:v!==0)", type);
-                else if (type === "double" || type === "float") gen
-                    ("if(!Object.is(v=r.%s(),0))", type);
-                else gen
-                    ("if(v=r.%s())", type);
-                gen
-                        ("%s=v", ref)
-                    ("else")
-                        ("delete %s", ref); // rare/odd case: later default clears earlier non-default
-            }
-        }
-        if (field.partOf && !closed) gen
-                ("m%s=%j", util.safeProp(field.partOf.name), field.name);
+        } else if (types.basic[type] === undefined) gen(field.delimited
+                ? "%s=types[%i].decode(r,undefined,((t&~7)|4),n+1)"
+                : "%s=types[%i].decode(r,r.uint32(),undefined,n+1)", ref, i);
+        else gen
+                ("%s=r.%s()", ref, type);
         gen
-                ("continue")
+                ("break")
             ("}");
-    }
-    if (i) gen
-        ("}");
-    // Unknown fields
-    gen
-        ("r.skipType(%s,q,t)", i ? "u" : "t&7");
-    genPreserveUnknown(gen, "r.raw(s,r.pos)")
-    ("}")
-    ("if(z!==undefined)")
-        ("throw Error(\"missing end group\")");
+        // Unknown fields
+    } gen
+            ("default:")
+                ("r.skipType(t&7,n)")
+                ("break")
+
+        ("}")
+    ("}");
 
     // Field presence
     for (i = 0; i < mtype._fieldsArray.length; ++i) {
         var rfield = mtype._fieldsArray[i];
         if (rfield.required) gen
-    ("if(!Object.hasOwnProperty.call(m,%j))", rfield.name)
+            ("if(!Object.hasOwnProperty.call(m,%j))", rfield.name)
         ("throw util.ProtocolError(%j,{instance:m})", missing(rfield));
     }
 

package/node_modules/baileys/node_modules/protobufjs/src/encoder.js

@@ -27,7 +27,7 @@ function genTypePartial(gen, field, fieldIndex, ref) {
  */
 function encoder(mtype) {
     /* eslint-disable no-unexpected-multiline, block-scoped-var, no-redeclare */
-    var gen = util.codegen(["m", "w", "q"])
+    var gen = util.codegen(["m", "w", "q"], mtype.name + "$encode")
     ("if(!w)")
         ("w=Writer.create()")
     ("if(q===undefined)q=0")
@@ -50,12 +50,7 @@ function encoder(mtype) {
         if (field.map) {
             gen
     ("if(%s!=null&&Object.hasOwnProperty.call(m,%j)){", ref, field.name) // !== undefined && !== null
-        ("for(var ks=Object.keys(%s),i=0;i<ks.length;++i){", ref);
-            if (field.keyType === "bool") gen
-            ("w.uint32(%i).fork().uint32(%i).bool(util.boolFromKey(ks[i]))", (field.id << 3 | 2) >>> 0, 8 | types.mapKey[field.keyType]);
-            else if (types.long[field.keyType] !== undefined) gen
-            ("w.uint32(%i).fork().uint32(%i).%s(util.longFromKey(ks[i],%j))", (field.id << 3 | 2) >>> 0, 8 | types.mapKey[field.keyType], field.keyType, field.keyType === "uint64" || field.keyType === "fixed64");
-            else gen
+        ("for(var ks=Object.keys(%s),i=0;i<ks.length;++i){", ref)
             ("w.uint32(%i).fork().uint32(%i).%s(ks[i])", (field.id << 3 | 2) >>> 0, 8 | types.mapKey[field.keyType], field.keyType);
             if (wireType === undefined) gen
             ("types[%i].encode(%s[ks[i]],w.uint32(18).fork(),q+1).ldelim().ldelim()", index, ref); // can't be groups
@@ -72,7 +67,10 @@ function encoder(mtype) {
             // Packed repeated
             if (field.packed && types.packed[type] !== undefined) { gen
 
-        ("w.uint32(%i).%ss(%s)", (field.id << 3 | 2) >>> 0, type, ref);
+        ("w.uint32(%i).fork()", (field.id << 3 | 2) >>> 0)
+        ("for(var i=0;i<%s.length;++i)", ref)
+            ("w.%s(%s[i])", type, ref)
+        ("w.ldelim()");
 
             // Non-packed
             } else { gen
@@ -88,23 +86,8 @@ function encoder(mtype) {
 
         // Non-repeated
         } else {
-            if (!field.required)
-                if (field.hasPresence || !(field.resolvedType instanceof Enum || types.basic[type] !== undefined)) gen
+            if (field.optional) gen
     ("if(%s!=null&&Object.hasOwnProperty.call(m,%j))", ref, field.name); // !== undefined && !== null
-                else if (field.resolvedType instanceof Enum) gen
-    ("if(%s!=null&&Object.hasOwnProperty.call(m,%j)&&%s!==%j)", ref, field.name, ref, field.typeDefault);
-                else if (type === "bool") gen
-    ("if(%s!=null&&Object.hasOwnProperty.call(m,%j)&&%s!==false)", ref, field.name, ref);
-                else if (type === "string") gen
-    ("if(%s!=null&&Object.hasOwnProperty.call(m,%j)&&%s!==\"\")", ref, field.name, ref);
-                else if (type === "bytes") gen
-    ("if(%s!=null&&Object.hasOwnProperty.call(m,%j)&&%s.length)", ref, field.name, ref);
-                else if (type === "double" || type === "float") gen
-    ("if(%s!=null&&Object.hasOwnProperty.call(m,%j)&&!Object.is(%s,0))", ref, field.name, ref);
-                else if (types.long[type] !== undefined) gen
-    ("if(%s!=null&&Object.hasOwnProperty.call(m,%j)&&(typeof %s===\"object\"?%s.low||%s.high:%s!==0))", ref, field.name, ref, ref, ref, ref);
-                else gen
-    ("if(%s!=null&&Object.hasOwnProperty.call(m,%j)&&%s!==0)", ref, field.name, ref);
 
             if (wireType === undefined)
         genTypePartial(gen, field, index, ref);
@@ -115,9 +98,6 @@ function encoder(mtype) {
     }
 
     return gen
-    ("if(m.$unknowns!=null&&Object.hasOwnProperty.call(m,\"$unknowns\"))")
-        ("for(var i=0;i<m.$unknowns.length;++i)")
-            ("w.raw(m.$unknowns[i])")
     ("return w");
     /* eslint-enable no-unexpected-multiline, block-scoped-var, no-redeclare */
 }

package/node_modules/baileys/node_modules/protobufjs/src/enum.js

@@ -3,15 +3,7 @@ module.exports = Enum;
 
 // extends ReflectionObject
 var ReflectionObject = require("./object");
-Enum.prototype = Object.create(ReflectionObject.prototype, {
-    constructor: {
-        value: Enum,
-        writable: true,
-        enumerable: false,
-        configurable: true
-    }
-});
-Enum.className = "Enum";
+((Enum.prototype = Object.create(ReflectionObject.prototype)).constructor = Enum).className = "Enum";
 
 var Namespace = require("./namespace"),
     util = require("./util");
@@ -25,7 +17,7 @@ var Namespace = require("./namespace"),
  * @param {Object.<string,number>} [values] Enum values as an object, by name
  * @param {Object.<string,*>} [options] Declared options
  * @param {string} [comment] The comment for this enum
- * @param {Object.<string,string|null>} [comments] The value comments for this enum
+ * @param {Object.<string,string>} [comments] The value comments for this enum
  * @param {Object.<string,Object<string,*>>|undefined} [valuesOptions] The value options for this enum
  */
 function Enum(name, values, options, comment, comments, valuesOptions) {
@@ -38,7 +30,7 @@ function Enum(name, values, options, comment, comments, valuesOptions) {
      * Enum values by id.
      * @type {Object.<number,string>}
      */
-    this.valuesById = Object.create(null);
+    this.valuesById = {};
 
     /**
      * Enum values by name.
@@ -54,7 +46,7 @@ function Enum(name, values, options, comment, comments, valuesOptions) {
 
     /**
      * Value comment texts, if any.
-     * @type {Object.<string,string|null>}
+     * @type {Object.<string,string>}
      */
     this.comments = comments || {};
 
@@ -104,13 +96,8 @@ Enum.prototype._resolveFeatures = function _resolveFeatures(edition) {
 /**
  * Enum descriptor.
  * @interface IEnum
- * @property {string} [edition] Edition
  * @property {Object.<string,number>} values Enum values
  * @property {Object.<string,*>} [options] Enum options
- * @property {Object.<string,Object.<string,*>>} [valuesOptions] Enum value options
- * @property {Array.<number[]|string>} [reserved] Reserved ranges
- * @property {string|null} [comment] Enum comment
- * @property {Object.<string,string|null>} [comments] Value comments
  */
 
 /**
@@ -121,7 +108,7 @@ Enum.prototype._resolveFeatures = function _resolveFeatures(edition) {
  * @throws {TypeError} If arguments are invalid
  */
 Enum.fromJSON = function fromJSON(name, json) {
-    var enm = new Enum(name, json.values, json.options, json.comment, json.comments, json.valuesOptions);
+    var enm = new Enum(name, json.values, json.options, json.comment, json.comments);
     enm.reserved = json.reserved;
     if (json.edition)
         enm._edition = json.edition;

package/node_modules/baileys/node_modules/protobufjs/src/field.js

@@ -3,15 +3,7 @@ module.exports = Field;
 
 // extends ReflectionObject
 var ReflectionObject = require("./object");
-Field.prototype = Object.create(ReflectionObject.prototype, {
-    constructor: {
-        value: Field,
-        writable: true,
-        enumerable: false,
-        configurable: true
-    }
-});
-Field.className = "Field";
+((Field.prototype = Object.create(ReflectionObject.prototype)).constructor = Field).className = "Field";
 
 var Enum  = require("./enum"),
     types = require("./types"),
@@ -19,7 +11,7 @@ var Enum  = require("./enum"),
 
 var Type; // cyclic
 
-var ruleRe = /^(?:required|optional|repeated)$/;
+var ruleRe = /^required|optional|repeated$/;
 
 /**
  * Constructs a new message field instance. Note that {@link MapField|map fields} have their own class.
@@ -46,12 +38,6 @@ Field.fromJSON = function fromJSON(name, json) {
     var field = new Field(name, json.id, json.type, json.rule, json.extend, json.options, json.comment);
     if (json.edition)
         field._edition = json.edition;
-    if (json.protoName)
-        field.protoName = json.protoName;
-    if (json.jsonName !== undefined)
-        field.jsonName = json.jsonName;
-    else if (json.options && json.options.json_name !== undefined)
-        field.jsonName = json.options.json_name;
     field._defaultEdition = "proto3";  // For backwards-compatibility.
     return field;
 };
@@ -100,6 +86,9 @@ function Field(name, id, type, rule, extend, options, comment) {
      * Field rule, if any.
      * @type {string|undefined}
      */
+    if (rule === "proto3_optional") {
+        rule = "optional";
+    }
     this.rule = rule && rule !== "optional" ? rule : undefined; // toJSON
 
     /**
@@ -191,18 +180,6 @@ function Field(name, id, type, rule, extend, options, comment) {
      * @type {string|null}
      */
     this.comment = comment;
-
-    /**
-     * Field name as declared in the .proto source, if different from `name`.
-     * @type {string|undefined}
-     */
-    this.protoName = undefined;
-
-    /**
-     * JSON name, if different from the derived default.
-     * @type {string|undefined}
-     */
-    this.jsonName = undefined;
 }
 
 /**
@@ -272,22 +249,6 @@ Object.defineProperty(Field.prototype, "hasPresence", {
     }
 });
 
-/**
- * The field name as declared in the .proto source (snake_case). Populated on resolve,
- * falling back to `name`. Mirrors `FieldDescriptorProto.name`.
- * @name Field#protoName
- * @type {string}
- * @readonly
- */
-
-/**
- * The JSON name of this field (lowerCamelCase per protoc's `ToJsonName`, or an
- * explicit `[json_name]`). Populated on resolve. This is the key used on ProtoJSON output.
- * @name Field#jsonName
- * @type {string}
- * @readonly
- */
-
 /**
  * @override
  */
@@ -298,12 +259,10 @@ Field.prototype.setOption = function setOption(name, value, ifNotSet) {
 /**
  * Field descriptor.
  * @interface IField
- * @property {string} [edition] Edition
  * @property {string} [rule="optional"] Field rule
  * @property {string} type Field type
  * @property {number} id Field id
  * @property {Object.<string,*>} [options] Field options
- * @property {string|null} [comment] Field comment
  */
 
 /**
@@ -321,15 +280,13 @@ Field.prototype.setOption = function setOption(name, value, ifNotSet) {
 Field.prototype.toJSON = function toJSON(toJSONOptions) {
     var keepComments = toJSONOptions ? Boolean(toJSONOptions.keepComments) : false;
     return util.toObject([
-        "edition"      , this._editionToJSON(),
-        "rule"         , this.rule !== "optional" && this.rule || undefined,
-        "type"         , this.type,
-        "id"           , this.id,
-        "extend"       , this.extend,
-        "protoName"    , this.protoName !== this.name ? this.protoName : undefined,
-        "jsonName"     , this.jsonName !== util.jsonName(this.protoName || this.name) ? this.jsonName : undefined,
-        "options"      , this.options,
-        "comment"      , keepComments ? this.comment : undefined
+        "edition" , this._editionToJSON(),
+        "rule"    , this.rule !== "optional" && this.rule || undefined,
+        "type"    , this.type,
+        "id"      , this.id,
+        "extend"  , this.extend,
+        "options" , this.options,
+        "comment" , keepComments ? this.comment : undefined
     ]);
 };
 
@@ -395,14 +352,8 @@ Field.prototype.resolve = function resolve() {
         this.defaultValue = this.typeDefault;
 
     // ensure proper value on prototype
-    if (this.parent instanceof Type && this.parent._ctor)
-        this.parent._ctor.prototype[this.name] = this.defaultValue;
-
-    // derive the proto/JSON names
-    if (this.protoName === undefined)
-        this.protoName = this.name;
-    if (this.jsonName === undefined)
-        this.jsonName = util.jsonName(this.protoName);
+    if (this.parent instanceof Type)
+        this.parent.ctor.prototype[this.name] = this.defaultValue;
 
     return ReflectionObject.prototype.resolve.call(this);
 };
@@ -454,7 +405,6 @@ Field.prototype._resolveFeatures = function _resolveFeatures(edition) {
  * @param {Object} prototype Target prototype
  * @param {string} fieldName Field name
  * @returns {undefined}
- * @deprecated Legacy TypeScript decorator support. Will be removed in a future release.
  */
 
 /**
@@ -467,7 +417,6 @@ Field.prototype._resolveFeatures = function _resolveFeatures(edition) {
  * @param {T} [defaultValue] Default value
  * @returns {FieldDecorator} Decorator function
  * @template T extends number | number[] | Long | Long[] | string | string[] | boolean | boolean[] | Uint8Array | Uint8Array[] | Buffer | Buffer[]
- * @deprecated Legacy TypeScript decorator support. Will be removed in a future release.
  */
 Field.d = function decorateField(fieldId, fieldType, fieldRule, defaultValue) {
 
@@ -485,11 +434,6 @@ Field.d = function decorateField(fieldId, fieldType, fieldRule, defaultValue) {
     };
 };
 
-// Sets up cyclic dependencies (called in index-light)
-Field._configure = function configure(Type_) {
-    Type = Type_;
-};
-
 /**
  * Field decorator (TypeScript).
  * @name Field.d
@@ -500,6 +444,10 @@ Field._configure = function configure(Type_) {
  * @returns {FieldDecorator} Decorator function
  * @template T extends Message<T>
  * @variation 2
- * @deprecated Legacy TypeScript decorator support. Will be removed in a future release.
  */
 // like Field.d but without a default value
+
+// Sets up cyclic dependencies (called in index-light)
+Field._configure = function configure(Type_) {
+    Type = Type_;
+};