protobufjs 8.5.0 → 8.6.1

package/ext/textformat.d.ts

@@ -10,10 +10,10 @@ declare module ".." {
     }
 
     interface Type {
-        /** Parses this type from protobuf text format. */
+        /** Installed by `textformat.install()`. Parses this type from protobuf text format. */
         fromText(text: string): $protobuf.Message<{}>;
 
-        /** Formats a message of this type as protobuf text format. */
+        /** Installed by `textformat.install()`. Formats a message of this type as protobuf text format. */
         toText(message: ($protobuf.Message<{}>|{ [k: string]: any }), options?: ITextFormatOptions): string;
     }
 }

package/ext/textformat.generated.d.ts

@@ -1,5 +1,7 @@
 // DO NOT EDIT! This is a generated file. Edit the source file instead and regenerate.
 
+import * as $protobuf from "..";
+
 /** Maximum recursion depth for formatting length-delimited unknown fields. */
 export let unknownRecursionLimit: number;
 
@@ -9,3 +11,23 @@ export interface ITextFormatOptions {
     /** Also includes and formats unknown fields. */
     unknowns?: boolean;
 }
+
+/**
+ * Parses a message from protobuf text format using the specified reflected type.
+ * @param type Reflected message type
+ * @param text Text format input
+ * @returns Message instance
+ */
+export function fromText(type: $protobuf.Type, text: string): $protobuf.Message<{}>;
+
+/**
+ * Formats a message as protobuf text format using the specified reflected type.
+ * @param type Reflected message type
+ * @param message Message instance or plain object
+ * @param [options] Text format options
+ * @returns Text format output
+ */
+export function toText(type: $protobuf.Type, message: ($protobuf.Message<{}>|{ [k: string]: any }), options?: ITextFormatOptions): string;
+
+/** Installs reflected {@link Type} convenience methods. */
+export function install(): void;

package/ext/textformat.js

@@ -68,40 +68,61 @@ function parseText(type, text) {
  * @property {boolean} [unknowns=false] Also includes and formats unknown fields.
  */
 
+/**
+ * Parses a message from protobuf text format using the specified reflected type.
+ * @function fromText
+ * @name fromText
+ * @param {$protobuf.Type} type Reflected message type
+ * @param {string} text Text format input
+ * @returns {$protobuf.Message<{}>} Message instance
+ */
+textformat.fromText = function fromText(type, text) {
+    return parseText(type, text);
+};
+
 /**
  * Formats a message as protobuf text format using the specified reflected type.
- * @param {Type} type Reflected message type
- * @param {Message<{}>|Object.<string,*>} message Message instance or plain object
+ * @function toText
+ * @name toText
+ * @param {$protobuf.Type} type Reflected message type
+ * @param {$protobuf.Message<{}>|Object.<string,*>} message Message instance or plain object
  * @param {ITextFormatOptions} [options] Text format options
  * @returns {string} Text format output
- * @private
  */
-function formatText(type, message, options) {
+textformat.toText = function toText(type, message, options) {
     if (!(type instanceof Type))
         throw TypeError("type must be a Type");
     type.root.resolveAll();
     var lines = [];
     writeMessage(type, message, lines, 0, options || {}, 0);
     return lines.join("\n");
-}
-
-/**
- * Parses this type from protobuf text format.
- * @param {string} text Text format input
- * @returns {Message<{}>} Message instance
- */
-Type.prototype.fromText = function fromText(text) {
-    return parseText(this, text);
 };
 
 /**
- * Formats a message of this type as protobuf text format.
- * @param {Message<{}>|Object.<string,*>} message Message instance or plain object
- * @param {ITextFormatOptions} [options] Text format options
- * @returns {string} Text format output
+ * Installs reflected {@link Type} convenience methods.
+ * @function install
+ * @name install
+ * @returns {undefined}
  */
-Type.prototype.toText = function toText(message, options) {
-    return formatText(this, message, options);
+textformat.install = function install() {
+    /**
+     * Parses a message of this type from protobuf text format. Convenience for {@link textformat.fromText}.
+     * @param {string} text Text format input
+     * @returns {Message<{}>} Message instance
+     */
+    Type.prototype.fromText = function fromText(text) {
+        return textformat.fromText(this, text);
+    };
+
+    /**
+     * Formats a message of this type as protobuf text format. Convenience for {@link textformat.toText}.
+     * @param {Message<{}>|Object.<string,*>} message Message instance or plain object
+     * @param {ITextFormatOptions} [options] Text format options
+     * @returns {string} Text format output
+     */
+    Type.prototype.toText = function toText(message, options) {
+        return textformat.toText(this, message, options);
+    };
 };
 
 function Tokenizer(source) {

package/index.d.ts

@@ -313,6 +313,18 @@ export class Field extends FieldBase {
     /** Determines whether this field tracks presence. */
     readonly hasPresence: boolean;
 
+    /**
+     * The field name as declared in the .proto source (snake_case). Populated on resolve,
+     * falling back to `name`. Mirrors `FieldDescriptorProto.name`.
+     */
+    readonly protoName: string;
+
+    /**
+     * 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.
+     */
+    readonly jsonName: string;
+
     /**
      * Field decorator (TypeScript).
      * @param fieldId Field id
@@ -388,6 +400,12 @@ export class FieldBase extends ReflectionObject {
     /** Comment for this field. */
     comment: (string|null);
 
+    /** Field name as declared in the .proto source, if different from `name`. */
+    protoName?: string;
+
+    /** JSON name, if different from the derived default. */
+    jsonName?: string;
+
     /**
      * Converts this field to a field descriptor.
      * @param [toJSONOptions] JSON conversion options
@@ -1464,15 +1482,15 @@ export namespace rpc {
 
     /** A service method part of a {@link rpc.Service} as created by {@link Service.create}. */
     type ServiceMethod<TReq extends Message<TReq>, TRes extends Message<TRes>> = {
-  (request: TReq|Properties<TReq>, callback: rpc.ServiceMethodCallback<TRes>): void;
-  (request: TReq|Properties<TReq>): Promise<TRes>;
-  readonly name: string;
-  readonly path: string;
-  readonly requestType: string;
-  readonly responseType: string;
-  readonly requestStream: true|undefined;
-  readonly responseStream: true|undefined;
-};
+      (request: TReq|Properties<TReq>, callback: rpc.ServiceMethodCallback<TRes>): void;
+      (request: TReq|Properties<TReq>): Promise<TRes>;
+      readonly name: string;
+      readonly path: string;
+      readonly requestType: string;
+      readonly responseType: string;
+      readonly requestStream: true|undefined;
+      readonly responseStream: true|undefined;
+    };
 
     /** An RPC service as returned by {@link Service#create}. */
     class Service extends util.EventEmitter {
@@ -2285,14 +2303,6 @@ export namespace util {
         function readDoubleBE(buf: Uint8Array, pos: number): number;
     }
 
-    /**
-     * Requires a module only if available.
-     * @param moduleName Module to require
-     * @returns Required module if available and not empty, otherwise `null`
-     * @deprecated Legacy optional require helper. Will be removed in a future release.
-     */
-    function inquire(moduleName: string): object;
-
     /** Helper class for working with the low and high bits of a 64 bit value. */
     class LongBits {
 
@@ -2675,9 +2685,17 @@ export namespace util {
      * Converts a string to camel case.
      * @param str String to convert
      * @returns Converted string
+     * @deprecated Use {@link util.jsonName} for protobuf field JSON names.
      */
     function camelCase(str: string): string;
 
+    /**
+     * Converts a proto field name to its protoc-compatible JSON name.
+     * @param str Proto field name
+     * @returns JSON name
+     */
+    function jsonName(str: string): string;
+
     /**
      * Compares reflected fields by id.
      * @param a First field

package/package.json

@@ -1,7 +1,6 @@
 {
   "name": "protobufjs",
-  "version": "8.5.0",
-  "versionScheme": "~",
+  "version": "8.6.1",
   "description": "Protocol Buffers for JavaScript & TypeScript.",
   "author": "Daniel Wirtz <dcode+protobufjs@dcode.io>",
   "license": "BSD-3-Clause",
@@ -27,7 +26,7 @@
     "build": "npm run build:bundle && npm run build:types",
     "build:bundle": "gulp --gulpfile scripts/gulpfile.js",
     "build:tests": "node ./scripts/gentests.js",
-    "build:types": "node cli/bin/pbts --main --global protobuf --out index.d.ts src/ && node cli/bin/pbts --main --import \"\\$protobuf=..\" --out ext/descriptor.generated.d.ts ext/descriptor.js && node cli/bin/pbts --main --out ext/textformat.generated.d.ts ext/textformat.js",
+    "build:types": "node cli/bin/pbts --main --global protobuf --out index.d.ts src/ && node cli/bin/pbts --main --import \"\\$protobuf=..\" --out ext/descriptor.generated.d.ts ext/descriptor.js && node cli/bin/pbts --main --import \"\\$protobuf=..\" --out ext/textformat.generated.d.ts ext/textformat.js && node cli/bin/pbts --main --import \"\\$protobuf=..\" --out ext/protojson.generated.d.ts ext/protojson.js",
     "coverage": "npm run coverage:test && npm run coverage:report",
     "coverage:test": "nyc --silent tape -r ./lib/tape-adapter tests/*.js tests/node/*.js",
     "coverage:report": "nyc report --reporter=lcov --reporter=text",
@@ -39,7 +38,6 @@
     "lint:types": "tslint \"**/*.d.ts\" -e \"**/node_modules/**\" -t stylish -c config/tslint.json",
     "prepublish": "cd cli && npm install && cd .. && npm run build",
     "prepublishOnly": "cd cli && npm install && cd .. && npm run build",
-    "postinstall": "node scripts/postinstall",
     "prof": "node bench/prof",
     "test": "npm run test:sources && npm run test:types",
     "test:sources": "tape -r ./lib/tape-adapter tests/*.js tests/node/*.js",
@@ -74,7 +72,6 @@
     "tape": "^5.0.0",
     "tslint": "^6.0.0",
     "typescript": "^3.7.5",
-    "uglify-js": "^3.7.7",
     "vinyl-buffer": "^1.0.1",
     "vinyl-fs": "^4.0.0",
     "vinyl-source-stream": "^2.0.0"
@@ -88,7 +85,6 @@
     "minimal.js",
     "package-lock.json",
     "tsconfig.json",
-    "scripts/postinstall.js",
     "dist/**",
     "ext/**",
     "google/**",

package/src/converter.js

@@ -106,7 +106,7 @@ function genValuePartial_fromObject(gen, field, fieldIndex, prop) {
 converter.fromObject = function fromObject(mtype) {
     /* eslint-disable no-unexpected-multiline, block-scoped-var, no-redeclare */
     var fields = mtype.fieldsArray;
-    var gen = util.codegen(["d", "q"], mtype.name + "$fromObject")
+    var gen = util.codegen(["d", "q"])
     ("if(d instanceof C)")
         ("return d")
     ("if(!util.isObject(d))")
@@ -240,7 +240,7 @@ converter.toObject = function toObject(mtype) {
     var fields = mtype.fieldsArray.slice().sort(util.compareFieldsById);
     if (!fields.length)
         return util.codegen()("return {}");
-    var gen = util.codegen(["m", "o", "q"], mtype.name + "$toObject")
+    var gen = util.codegen(["m", "o", "q"])
     ("if(!o)")
         ("o={}")
     ("if(q===undefined)q=0")
@@ -329,7 +329,7 @@ converter.toObject = function toObject(mtype) {
             genValuePartial_toObject(gen, field, /* sorted */ index, prop + "[j]")
         ("}");
         } else { gen
-    ("if(m%s!=null&&m.hasOwnProperty(%j)){", prop, field.name); // !== undefined && !== null
+    ("if(m%s!=null&&Object.hasOwnProperty.call(m,%j)){", prop, field.name); // !== undefined && !== null
         genValuePartial_toObject(gen, field, /* sorted */ index, prop);
         if (field.partOf && !field.partOf.isProto3Optional) gen
         ("if(o.oneofs)")

package/src/decoder.js

@@ -26,7 +26,7 @@ function decoder(mtype) {
         if (!pfield.repeated && !pfield.map && !pfield.hasPresence)
             hasImplicitPresenceField = true;
     }
-    var gen = util.codegen(["r", "l", "z", "q", "g"], mtype.name + "$decode")
+    var gen = util.codegen(["r", "l", "z", "q", "g"])
     ("if(!(r instanceof Reader))")
         ("r=Reader.create(r)")
     ("if(q===undefined)q=0")
@@ -198,7 +198,7 @@ function decoder(mtype) {
     for (i = 0; i < mtype._fieldsArray.length; ++i) {
         var rfield = mtype._fieldsArray[i];
         if (rfield.required) gen
-    ("if(!m.hasOwnProperty(%j))", rfield.name)
+    ("if(!Object.hasOwnProperty.call(m,%j))", rfield.name)
         ("throw util.ProtocolError(%j,{instance:m})", missing(rfield));
     }
 

package/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"], mtype.name + "$encode")
+    var gen = util.codegen(["m", "w", "q"])
     ("if(!w)")
         ("w=Writer.create()")
     ("if(q===undefined)q=0")

package/src/field.js

@@ -38,6 +38,12 @@ 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;
 };
@@ -177,6 +183,18 @@ 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;
 }
 
 /**
@@ -246,6 +264,22 @@ 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
  */
@@ -279,13 +313,15 @@ 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,
-        "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,
+        "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
     ]);
 };
 
@@ -354,6 +390,12 @@ Field.prototype.resolve = function resolve() {
     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);
+
     return ReflectionObject.prototype.resolve.call(this);
 };
 

package/src/mapfield.js

@@ -65,7 +65,14 @@ function MapField(name, id, keyType, type, options, comment) {
  * @throws {TypeError} If arguments are invalid
  */
 MapField.fromJSON = function fromJSON(name, json) {
-    return new MapField(name, json.id, json.keyType, json.type, json.options, json.comment);
+    var field = new MapField(name, json.id, json.keyType, json.type, json.options, json.comment);
+    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;
+    return field;
 };
 
 /**
@@ -76,12 +83,14 @@ MapField.fromJSON = function fromJSON(name, json) {
 MapField.prototype.toJSON = function toJSON(toJSONOptions) {
     var keepComments = toJSONOptions ? Boolean(toJSONOptions.keepComments) : false;
     return util.toObject([
-        "keyType" , this.keyType,
-        "type"    , this.type,
-        "id"      , this.id,
-        "extend"  , this.extend,
-        "options" , this.options,
-        "comment" , keepComments ? this.comment : undefined
+        "keyType"      , this.keyType,
+        "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
     ]);
 };
 

package/src/parse.js

@@ -482,10 +482,13 @@ function parse(source, root, options) {
         if (!nameRe.test(name))
             throw illegal(name, "name");
 
+        var protoName = name;
         name = applyCase(name);
         skip("=");
 
         var field = new Field(name, parseId(next()), type, rule === "proto3_optional" ? "optional" : rule, extend);
+        if (protoName !== name)
+            field.protoName = protoName;
 
         ifBlock(field, function parseField_block(token) {
 
@@ -627,7 +630,11 @@ function parse(source, root, options) {
             throw illegal(name, "name");
 
         skip("=");
-        var field = new MapField(applyCase(name), parseId(next()), keyType, valueType);
+        var protoName = name;
+        name = applyCase(name);
+        var field = new MapField(name, parseId(next()), keyType, valueType);
+        if (protoName !== name)
+            field.protoName = protoName;
         ifBlock(field, function parseMapField_block(token) {
 
             /* istanbul ignore else */
@@ -839,11 +846,18 @@ function parse(source, root, options) {
             topLevelOptions[name] = value;
             return;
         }
+        // lift json_name onto Field
+        if (name === "json_name" && parent instanceof Field) {
+            parent.jsonName = value;
+            return;
+        }
         if (parent.setOption)
             parent.setOption(name, value);
     }
 
     function setParsedOption(parent, name, value, propName) {
+        if (name === "json_name" && parent instanceof Field)
+            return; // lifted onto Field#jsonName above
         if (parent.setParsedOption)
             parent.setParsedOption(name, value, propName);
     }

package/src/service.js

@@ -9,8 +9,6 @@ var Method = require("./method"),
     util   = require("./util"),
     rpc    = require("./rpc");
 
-var reservedRe = util.patterns.reservedRe;
-
 /**
  * Constructs a new service instance.
  * @classdesc Reflected service.
@@ -190,11 +188,11 @@ Service.prototype.create = function create(rpcImpl, requestDelimited, responseDe
     var rpcService = new rpc.Service(rpcImpl, requestDelimited, responseDelimited);
     for (var i = 0, method; i < /* initializes */ this.methodsArray.length; ++i) {
         var methodName = util.lcFirst((method = this._methodsArray[i]).resolve().name).replace(/[^$\w_]/g, "");
-        rpcService[methodName] = util.codegen(["r","c"], reservedRe.test(methodName) ? methodName + "_" : methodName)("return this.rpcCall(m,q,s,r,c)")({
-            m: method,
-            q: method.resolvedRequestType.ctor,
-            s: method.resolvedResponseType.ctor
-        });
+        rpcService[methodName] = (function(method, requestType, responseType) {
+            return function rpcMethod(request, callback) {
+                return rpc.Service.prototype.rpcCall.call(this, method, requestType, responseType, request, callback);
+            };
+        })(method, method.resolvedRequestType.ctor, method.resolvedResponseType.ctor);
     }
     return rpcService;
 };

package/src/type.js

@@ -89,6 +89,13 @@ function Type(name, options) {
      * @private
      */
     this._ctor = null;
+
+    /**
+     * Cached fields by JSON name.
+     * @type {Object.<string,Field>|null}
+     * @private
+     */
+    this._fieldsByJsonName = null; // used by ext/protojson
 }
 
 Object.defineProperties(Type.prototype, {
@@ -201,7 +208,7 @@ Object.defineProperties(Type.prototype, {
  */
 Type.generateConstructor = function generateConstructor(mtype) {
     /* eslint-disable no-unexpected-multiline */
-    var gen = util.codegen(["p"], mtype.name);
+    var gen = util.codegen(["p"]);
     // explicitly initialize mutable object/array fields so that these aren't just inherited from the prototype
     for (var i = 0, field; i < mtype.fieldsArray.length; ++i)
         if ((field = mtype._fieldsArray[i]).map) gen
@@ -215,7 +222,7 @@ Type.generateConstructor = function generateConstructor(mtype) {
 };
 
 function clearCache(type) {
-    type._fieldsById = type._fieldsArray = type._oneofsArray = null;
+    type._fieldsById = type._fieldsArray = type._oneofsArray = type._fieldsByJsonName = null;
     delete type.encode;
     delete type.decode;
     delete type.verify;
@@ -379,7 +386,7 @@ Type.prototype.add = function add(object) {
             throw Error("duplicate id " + object.id + " in " + this);
         if (this.isReservedId(object.id))
             throw Error("id " + object.id + " is reserved in " + this);
-        if (this.isReservedName(object.name))
+        if (this.isReservedName(object.name) || object.name.charAt(0) === "$")
             throw Error("name '" + object.name + "' is reserved in " + this);
         if (object.name === "__proto__")
             return this;
@@ -392,6 +399,8 @@ Type.prototype.add = function add(object) {
         return clearCache(this);
     }
     if (object instanceof OneOf) {
+        if (object.name.charAt(0) === "$")
+            throw Error("name '" + object.name + "' is reserved in " + this);
         if (object.name === "__proto__")
             return this;
         if (!this.oneofs)

package/src/util/minimal.js

@@ -13,9 +13,6 @@ util.EventEmitter = require("./eventemitter");
 // float handling accross browsers
 util.float = require("./float");
 
-// requires modules optionally and hides the call from bundlers
-util.inquire = require("./inquire");
-
 // converts to / from utf8 encoded strings
 util.utf8 = require("./utf8");
 
@@ -119,7 +116,7 @@ util.isset =
  */
 util.isSet = function isSet(obj, prop) {
     var value = obj[prop];
-    if (value != null && obj.hasOwnProperty(prop)) // eslint-disable-line eqeqeq, no-prototype-builtins
+    if (value != null && Object.hasOwnProperty.call(obj, prop)) // eslint-disable-line eqeqeq
         return typeof value !== "object" || (Array.isArray(value) ? value.length : Object.keys(value).length) > 0;
     return false;
 };

package/src/util.js

@@ -93,6 +93,7 @@ var camelCaseRe = /_([a-z])/g;
  * Converts a string to camel case.
  * @param {string} str String to convert
  * @returns {string} Converted string
+ * @deprecated Use {@link util.jsonName} for protobuf field JSON names.
  */
 util.camelCase = function camelCase(str) {
     return str.substring(0, 1)
@@ -100,6 +101,28 @@ util.camelCase = function camelCase(str) {
                .replace(camelCaseRe, function($0, $1) { return $1.toUpperCase(); });
 };
 
+/**
+ * Converts a proto field name to its protoc-compatible JSON name.
+ * @param {string} str Proto field name
+ * @returns {string} JSON name
+ */
+util.jsonName = function jsonName(str) {
+    var result = "",
+        upperNext = false,
+        i = 0;
+    for (; i < str.length; ++i) {
+        var ch = str.charAt(i);
+        if (ch === "_")
+            upperNext = true;
+        else if (upperNext) {
+            result += ch.toUpperCase();
+            upperNext = false;
+        } else
+            result += ch;
+    }
+    return result;
+};
+
 /**
  * Compares reflected fields by id.
  * @param {Field} a First field

package/src/verifier.js

@@ -122,7 +122,7 @@ function genVerifyKey(gen, field, ref) {
 function verifier(mtype) {
     /* eslint-disable no-unexpected-multiline */
 
-    var gen = util.codegen(["m", "q"], mtype.name + "$verify")
+    var gen = util.codegen(["m", "q"])
     ("if(typeof m!==\"object\"||m===null)")
         ("return%j", "object expected")
     ("if(q===undefined)q=0")
@@ -138,7 +138,7 @@ function verifier(mtype) {
             ref   = "m" + util.safeProp(field.name);
 
         if (field.optional) gen
-        ("if(%s!=null&&m.hasOwnProperty(%j)){", ref, field.name); // !== undefined && !== null
+        ("if(%s!=null&&Object.hasOwnProperty.call(m,%j)){", ref, field.name); // !== undefined && !== null
 
         // map fields
         if (field.map) { gen