mirror of
https://github.com/protobufjs/protobuf.js.git
synced 2025-12-08 20:58:55 +00:00
Stripped out fallback encoder/decoder/verifier completely (even IE8 supports codegen), significantly reduces bundle size, can use static codegen elsewhere
This commit is contained in:
dcodeIO
parent
c234de7f05
commit
bfac0ea9af
@ -402,7 +402,7 @@ While .proto and JSON files require the full library (about 18kb gzipped), prett
|
||||
|
||||
Static code, on the other hand, requires just the minimal runtime (about 5.5kb gzipped), but generates additional, albeit editable, source code without any reflection features.
|
||||
|
||||
Where `new Function(...)` is supported (it usually is), there is no difference performance-wise as the code generated statically is pretty much the same as generated at runtime.
|
||||
There is no difference performance-wise as the code generated statically is pretty much the same as generated at runtime.
|
||||
|
||||
Building
|
||||
--------
|
||||
@ -493,8 +493,6 @@ Note that JSON is a native binding nowadays and as such is about as fast as it p
|
||||
* For entirely bogus values encoders intentionally rely on runtime errors to be thrown somewhere down the road.
|
||||
* Quite a bit of V8-specific profiling is accountable for everything else.
|
||||
|
||||
Note that code generation requires `new Function(...)` (basically `eval`) support and that an equivalent but slower fallback will be used where unsupported.
|
||||
|
||||
You can also run [the benchmark](https://github.com/dcodeIO/protobuf.js/blob/master/bench/index.js) ...
|
||||
|
||||
```
|
||||
|
||||
@ -282,7 +282,7 @@ function buildType(ref, type) {
|
||||
"@param {Writer} [writer] Writer to encode to",
|
||||
"@returns {Writer} Writer"
|
||||
]);
|
||||
buildFunction(type, "encode", protobuf.encode.generate(type), {
|
||||
buildFunction(type, "encode", protobuf.encoder(type), {
|
||||
Writer : "$protobuf.Writer",
|
||||
util : "$protobuf.util"
|
||||
});
|
||||
@ -318,7 +318,7 @@ function buildType(ref, type) {
|
||||
"@param {number} [length] Message length if known beforehand",
|
||||
"@returns {" + fullName + "} " + type.name
|
||||
]);
|
||||
buildFunction(type, "decode", protobuf.decode.generate(type), {
|
||||
buildFunction(type, "decode", protobuf.decoder(type), {
|
||||
Reader : "$protobuf.Reader",
|
||||
util : "$protobuf.util"
|
||||
});
|
||||
@ -351,7 +351,7 @@ function buildType(ref, type) {
|
||||
"@param {" + fullName + "|Object} message " + type.name + " or plain object to verify",
|
||||
"@returns {?string} `null` if valid, otherwise the reason why it is not"
|
||||
]);
|
||||
buildFunction(type, "verify", protobuf.verify.generate(type), {
|
||||
buildFunction(type, "verify", protobuf.verifier(type), {
|
||||
util : "$protobuf.util"
|
||||
});
|
||||
|
||||
|
||||
395
dist/protobuf.js
vendored
395
dist/protobuf.js
vendored
@ -1,6 +1,6 @@
|
||||
/*!
|
||||
* protobuf.js v6.2.1 (c) 2016 Daniel Wirtz
|
||||
* Compiled Sun, 18 Dec 2016 12:27:11 UTC
|
||||
* protobuf.js v6.3.0 (c) 2016 Daniel Wirtz
|
||||
* Compiled Sun, 18 Dec 2016 12:57:35 UTC
|
||||
* Licensed under the Apache License, Version 2.0
|
||||
* see: https://github.com/dcodeIO/protobuf.js for details
|
||||
*/
|
||||
@ -1087,96 +1087,18 @@ common("struct", {
|
||||
|
||||
},{}],14:[function(require,module,exports){
|
||||
"use strict";
|
||||
module.exports = decode;
|
||||
module.exports = decoder;
|
||||
|
||||
var Enum = require(16),
|
||||
Reader = require(25),
|
||||
types = require(32),
|
||||
util = require(33);
|
||||
|
||||
/**
|
||||
* General purpose message decoder.
|
||||
* @param {Reader|Uint8Array} readerOrBuffer Reader or buffer to decode from
|
||||
* @param {number} [length] Length of the message, if known beforehand
|
||||
* @returns {Message} Populated runtime message
|
||||
* @this Type
|
||||
* @property {GenerateDecoder} generate Generates a type specific decoder
|
||||
*/
|
||||
function decode(readerOrBuffer, length) {
|
||||
/* eslint-disable no-invalid-this, block-scoped-var, no-redeclare */
|
||||
var fields = this.getFieldsById(),
|
||||
reader = readerOrBuffer instanceof Reader ? readerOrBuffer : Reader.create(readerOrBuffer),
|
||||
limit = length === undefined ? reader.len : reader.pos + length,
|
||||
message = new (this.getCtor())();
|
||||
while (reader.pos < limit) {
|
||||
var tag = reader.uint32(),
|
||||
wireType = tag & 7;
|
||||
|
||||
// End group
|
||||
if (wireType === 4)
|
||||
break;
|
||||
|
||||
var field = fields[tag >>> 3].resolve(),
|
||||
type = field.resolvedType instanceof Enum ? "uint32" : field.type,
|
||||
resolvedType = field.resolvedType;
|
||||
|
||||
// Known fields
|
||||
if (field) {
|
||||
|
||||
// Map fields
|
||||
if (field.map) {
|
||||
var keyType = field.resolvedKeyType /* only valid is enum */ ? "uint32" : field.keyType;
|
||||
reader.skip();
|
||||
reader.pos++; // assumes id 1
|
||||
if (message[field.name] === util.emptyObject)
|
||||
message[field.name] = {};
|
||||
var key = reader[keyType]();
|
||||
if (typeof key === "object")
|
||||
key = util.longToHash(key);
|
||||
reader.pos++; // assumes id 2
|
||||
message[field.name][key] = types.basic[type] === undefined
|
||||
? resolvedType.decode(reader, reader.uint32())
|
||||
: reader[type]();
|
||||
|
||||
// Repeated fields
|
||||
} else if (field.repeated) {
|
||||
var values = message[field.name] && message[field.name].length ? message[field.name] : message[field.name] = [];
|
||||
|
||||
// Packed
|
||||
if (field.packed && types.packed[type] !== undefined && wireType === 2) {
|
||||
var plimit = reader.uint32() + reader.pos;
|
||||
while (reader.pos < plimit)
|
||||
values.push(reader[type]());
|
||||
|
||||
// Non-packed
|
||||
} else if (types.basic[type] === undefined)
|
||||
values.push(resolvedType.decode(reader, resolvedType.group ? undefined : reader.uint32()));
|
||||
else
|
||||
values.push(reader[type]());
|
||||
|
||||
// Non-repeated
|
||||
} else if (types.basic[type] === undefined)
|
||||
message[field.name] = resolvedType.decode(reader, resolvedType.group ? undefined : reader.uint32());
|
||||
else
|
||||
message[field.name] = reader[type]();
|
||||
|
||||
// Unknown fields
|
||||
} else
|
||||
reader.skipType(wireType);
|
||||
}
|
||||
return message;
|
||||
/* eslint-enable no-invalid-this, block-scoped-var, no-redeclare */
|
||||
}
|
||||
|
||||
/**
|
||||
* Generates a decoder specific to the specified message type.
|
||||
* @typedef GenerateDecoder
|
||||
* @type {function}
|
||||
* @param {Type} mtype Message type
|
||||
* @returns {Codegen} Codegen instance
|
||||
*/
|
||||
/**/
|
||||
decode.generate = function generate(mtype) {
|
||||
function decoder(mtype) {
|
||||
/* eslint-disable no-unexpected-multiline */
|
||||
var fields = mtype.getFieldsArray();
|
||||
var gen = util.codegen("r", "l")
|
||||
@ -1253,107 +1175,18 @@ decode.generate = function generate(mtype) {
|
||||
("}")
|
||||
("return m");
|
||||
/* eslint-enable no-unexpected-multiline */
|
||||
};
|
||||
}
|
||||
|
||||
},{"16":16,"25":25,"32":32,"33":33}],15:[function(require,module,exports){
|
||||
},{"16":16,"32":32,"33":33}],15:[function(require,module,exports){
|
||||
"use strict";
|
||||
module.exports = encode;
|
||||
module.exports = encoder;
|
||||
|
||||
var Enum = require(16),
|
||||
Writer = require(37),
|
||||
types = require(32),
|
||||
util = require(33);
|
||||
|
||||
var safeProp = util.safeProp;
|
||||
|
||||
function encodeType(field, value, writer) {
|
||||
if (field.resolvedType.group)
|
||||
field.resolvedType.encode(value, writer.uint32((field.id << 3 | 3) >>> 0)).uint32((field.id << 3 | 4) >>> 0);
|
||||
else if (field.resolvedType.encode(value, writer.fork()).len || field.required)
|
||||
writer.ldelim(field.id);
|
||||
else
|
||||
writer.reset();
|
||||
}
|
||||
|
||||
/**
|
||||
* General purpose message encoder.
|
||||
* @param {Message|Object} message Runtime message or plain object to encode
|
||||
* @param {Writer} [writer] Writer to encode to
|
||||
* @returns {Writer} writer
|
||||
* @this Type
|
||||
* @property {GenerateEncoder} generate Generates a type specific encoder
|
||||
*/
|
||||
function encode(message, writer) {
|
||||
/* eslint-disable block-scoped-var, no-redeclare */
|
||||
if (!writer)
|
||||
writer = Writer.create();
|
||||
var fields = this.getFieldsArray(), fi = 0;
|
||||
while (fi < fields.length) {
|
||||
var field = fields[fi++].resolve(),
|
||||
type = field.resolvedType instanceof Enum ? "uint32" : field.type,
|
||||
wireType = types.basic[type];
|
||||
|
||||
// Map fields
|
||||
if (field.map) {
|
||||
var keyType = field.resolvedKeyType /* only valid is enum */ ? "uint32" : field.keyType;
|
||||
if (message[field.name] && message[field.name] !== util.emptyObject) {
|
||||
for (var keys = Object.keys(message[field.name]), i = 0; i < keys.length; ++i) {
|
||||
writer.uint32((field.id << 3 | 2) >>> 0).fork()
|
||||
.uint32(/*1*/8 | types.mapKey[keyType])[keyType](keys[i]);
|
||||
if (wireType === undefined)
|
||||
field.resolvedType.encode(message[field.name][keys[i]], writer.uint32(/*2,2*/18).fork()).ldelim();
|
||||
else
|
||||
writer.uint32(/*2*/16 | wireType)[type](message[field.name][keys[i]]);
|
||||
writer.ldelim();
|
||||
}
|
||||
}
|
||||
|
||||
// Repeated fields
|
||||
} else if (field.repeated) {
|
||||
var values = message[field.name];
|
||||
if (values && values.length) {
|
||||
|
||||
// Packed repeated
|
||||
if (field.packed && types.packed[type] !== undefined) {
|
||||
if (values.length) {
|
||||
writer.uint32((field.id << 3 | 2) >>> 0).fork();
|
||||
var i = 0;
|
||||
while (i < values.length)
|
||||
writer[type](values[i++]);
|
||||
writer.ldelim();
|
||||
}
|
||||
|
||||
// Non-packed
|
||||
} else {
|
||||
var i = 0;
|
||||
if (wireType === undefined)
|
||||
while (i < values.length)
|
||||
encodeType(field, values[i++], writer);
|
||||
else
|
||||
while (i < values.length)
|
||||
writer.uint32((field.id << 3 | wireType) >>> 0)[type](values[i++]);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// Non-repeated
|
||||
} else {
|
||||
var value = message[field.name];
|
||||
if (
|
||||
field.partOf && message[field.partOf.name] === field.name
|
||||
||
|
||||
(field.required || value !== undefined) && (field.long ? util.longNe(value, field.defaultValue.low, field.defaultValue.high) : value !== field.defaultValue)
|
||||
) {
|
||||
if (wireType === undefined)
|
||||
encodeType(field, value, writer);
|
||||
else
|
||||
writer.uint32((field.id << 3 | wireType) >>> 0)[type](value);
|
||||
}
|
||||
}
|
||||
}
|
||||
return writer;
|
||||
/* eslint-enable block-scoped-var, no-redeclare */
|
||||
}
|
||||
|
||||
function genEncodeType(gen, field, fieldIndex, ref, alwaysRequired) {
|
||||
if (field.resolvedType.group)
|
||||
return gen("types[%d].encode(%s,w.uint32(%d)).uint32(%d)", fieldIndex, ref, (field.id << 3 | 3) >>> 0, (field.id << 3 | 4) >>> 0);
|
||||
@ -1363,14 +1196,11 @@ function genEncodeType(gen, field, fieldIndex, ref, alwaysRequired) {
|
||||
}
|
||||
|
||||
/**
|
||||
* Generates an {@link Encoder|encoder} specific to the specified message type.
|
||||
* @typedef GenerateEncoder
|
||||
* @type {function}
|
||||
* Generates an encoder specific to the specified message type.
|
||||
* @param {Type} mtype Message type
|
||||
* @returns {Codegen} Codegen instance
|
||||
*/
|
||||
/**/
|
||||
encode.generate = function generate(mtype) {
|
||||
function encoder(mtype) {
|
||||
/* eslint-disable no-unexpected-multiline, block-scoped-var, no-redeclare */
|
||||
var fields = mtype.getFieldsArray();
|
||||
var oneofs = mtype.getOneofsArray();
|
||||
@ -1473,9 +1303,8 @@ encode.generate = function generate(mtype) {
|
||||
return gen
|
||||
("return w");
|
||||
/* eslint-enable no-unexpected-multiline, block-scoped-var, no-redeclare */
|
||||
};
|
||||
|
||||
},{"16":16,"32":32,"33":33,"37":37}],16:[function(require,module,exports){
|
||||
}
|
||||
},{"16":16,"32":32,"33":33}],16:[function(require,module,exports){
|
||||
"use strict";
|
||||
module.exports = Enum;
|
||||
|
||||
@ -2578,9 +2407,8 @@ NamespacePrototype.lookup = function lookup(path, filterType, parentAlreadyCheck
|
||||
return this.getRoot().lookup(path.slice(1), filterType);
|
||||
// Test if the first part matches any nested object, and if so, traverse if path contains more
|
||||
var found = this.get(path[0]);
|
||||
if (found && path.length === 1 || found instanceof Namespace && (found = found.lookup(path.slice(1), true)))
|
||||
if (!filterType || found instanceof filterType)
|
||||
return found;
|
||||
if (found && path.length === 1 && (!filterType || found instanceof filterType) || found instanceof Namespace && (found = found.lookup(path.slice(1), filterType, true)))
|
||||
return found;
|
||||
// If there hasn't been a match, try again at the parent
|
||||
if (this.parent === null || parentAlreadyChecked)
|
||||
return null;
|
||||
@ -4990,9 +4818,9 @@ var Enum = require(16),
|
||||
Writer = require(37),
|
||||
util = require(33);
|
||||
|
||||
var encode, // might become cyclic
|
||||
decode, // might become cyclic
|
||||
verify; // cyclic
|
||||
var encoder, // might become cyclic
|
||||
decoder, // might become cyclic
|
||||
verifier; // cyclic
|
||||
|
||||
/**
|
||||
* Constructs a new reflected message type instance.
|
||||
@ -5153,6 +4981,7 @@ function clearCache(type) {
|
||||
type._fieldsById = type._fieldsArray = type._oneofsArray = type._ctor = null;
|
||||
delete type.encode;
|
||||
delete type.decode;
|
||||
delete type.verify;
|
||||
return type;
|
||||
}
|
||||
|
||||
@ -5309,32 +5138,25 @@ TypePrototype.create = function create(properties) {
|
||||
TypePrototype.setup = function setup() {
|
||||
// Sets up everything at once so that the prototype chain does not have to be re-evaluated
|
||||
// multiple times (V8, soft-deopt prototype-check).
|
||||
if (!encode) {
|
||||
encode = require(15);
|
||||
decode = require(14);
|
||||
verify = require(36);
|
||||
if (!encoder) {
|
||||
encoder = require(15);
|
||||
decoder = require(14);
|
||||
verifier = require(36);
|
||||
}
|
||||
var codegen_supported = util.codegen.supported;
|
||||
this.encode = codegen_supported
|
||||
? encode.generate(this).eof(this.getFullName() + "$encode", {
|
||||
Writer : Writer,
|
||||
types : this.getFieldsArray().map(function(fld) { return fld.resolvedType; }),
|
||||
util : util
|
||||
})
|
||||
: encode;
|
||||
this.decode = codegen_supported
|
||||
? decode.generate(this).eof(this.getFullName() + "$decode", {
|
||||
Reader : Reader,
|
||||
types : this.getFieldsArray().map(function(fld) { return fld.resolvedType; }),
|
||||
util : util
|
||||
})
|
||||
: decode;
|
||||
this.verify = codegen_supported
|
||||
? verify.generate(this).eof(this.getFullName() + "$verify", {
|
||||
types : this.getFieldsArray().map(function(fld) { return fld.resolvedType; }),
|
||||
util : util
|
||||
})
|
||||
: verify;
|
||||
this.encode = encoder(this).eof(this.getFullName() + "$encode", {
|
||||
Writer : Writer,
|
||||
types : this.getFieldsArray().map(function(fld) { return fld.resolvedType; }),
|
||||
util : util
|
||||
});
|
||||
this.decode = decoder(this).eof(this.getFullName() + "$decode", {
|
||||
Reader : Reader,
|
||||
types : this.getFieldsArray().map(function(fld) { return fld.resolvedType; }),
|
||||
util : util
|
||||
});
|
||||
this.verify = verifier(this).eof(this.getFullName() + "$verify", {
|
||||
types : this.getFieldsArray().map(function(fld) { return fld.resolvedType; }),
|
||||
util : util
|
||||
});
|
||||
return this;
|
||||
};
|
||||
|
||||
@ -6082,7 +5904,7 @@ util.emptyObject = Object.freeze({});
|
||||
|
||||
},{"10":10,"11":11,"3":3,"34":34,"buffer":"buffer","long":"long"}],36:[function(require,module,exports){
|
||||
"use strict";
|
||||
module.exports = verify;
|
||||
module.exports = verifier;
|
||||
|
||||
var Enum = require(16),
|
||||
Type = require(31),
|
||||
@ -6092,135 +5914,6 @@ function invalid(field, expected) {
|
||||
return "invalid value for field " + field.getFullName() + " (" + expected + (field.repeated && expected !== "array" ? "[]" : field.map && expected !== "object" ? "{k:"+field.keyType+"}" : "") + " expected)";
|
||||
}
|
||||
|
||||
function verifyValue(field, value) {
|
||||
switch (field.type) {
|
||||
case "double":
|
||||
case "float":
|
||||
if (typeof value !== "number")
|
||||
return invalid(field, "number");
|
||||
break;
|
||||
case "int32":
|
||||
case "uint32":
|
||||
case "sint32":
|
||||
case "fixed32":
|
||||
case "sfixed32":
|
||||
if (!util.isInteger(value))
|
||||
return invalid(field, "integer");
|
||||
break;
|
||||
case "int64":
|
||||
case "uint64":
|
||||
case "sint64":
|
||||
case "fixed64":
|
||||
case "sfixed64":
|
||||
if (!util.isInteger(value) && !(value && util.isInteger(value.low) && util.isInteger(value.high)))
|
||||
return invalid(field, "integer|Long");
|
||||
break;
|
||||
case "bool":
|
||||
if (typeof value !== "boolean")
|
||||
return invalid(field, "boolean");
|
||||
break;
|
||||
case "string":
|
||||
if (!util.isString(value))
|
||||
return invalid(field, "string");
|
||||
break;
|
||||
case "bytes":
|
||||
if (!(value && typeof value.length === "number" || util.isString(value)))
|
||||
return invalid(field, "buffer");
|
||||
break;
|
||||
default:
|
||||
if (field.resolvedType instanceof Enum) {
|
||||
if (typeof field.resolvedType.getValuesById()[value] !== "number")
|
||||
return invalid(field, "enum value");
|
||||
} else if (field.resolvedType instanceof Type) {
|
||||
var reason = field.resolvedType.verify(value);
|
||||
if (reason)
|
||||
return reason;
|
||||
}
|
||||
break;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
function verifyKey(field, value) {
|
||||
switch (field.keyType) {
|
||||
case "int64":
|
||||
case "uint64":
|
||||
case "sint64":
|
||||
case "fixed64":
|
||||
case "sfixed64":
|
||||
if (/^[\x00-\xff]{8}$/.test(value)) // eslint-disable-line no-control-regex
|
||||
return null;
|
||||
// fallthrough
|
||||
case "int32":
|
||||
case "uint32":
|
||||
case "sint32":
|
||||
case "fixed32":
|
||||
case "sfixed32":
|
||||
if (/^-?(?:0|[1-9]\d*)$/.test(value))
|
||||
return invalid(field, "integer key");
|
||||
break;
|
||||
case "bool":
|
||||
if (/^true|false|0|1$/.test(value))
|
||||
return invalid(field, "boolean key");
|
||||
break;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* General purpose message verifier.
|
||||
* @param {Message|Object} message Runtime message or plain object to verify
|
||||
* @returns {?string} `null` if valid, otherwise the reason why it is not
|
||||
* @this {Type}
|
||||
* @property {GenerateVerifier} generate Generates a type specific verifier
|
||||
*/
|
||||
function verify(message) {
|
||||
/* eslint-disable block-scoped-var, no-redeclare */
|
||||
var fields = this.getFieldsArray(),
|
||||
i = 0,
|
||||
reason;
|
||||
while (i < fields.length) {
|
||||
var field = fields[i++].resolve(),
|
||||
value = message[field.name];
|
||||
|
||||
// map fields
|
||||
if (field.map) {
|
||||
|
||||
if (value !== undefined) {
|
||||
if (!util.isObject(value))
|
||||
return invalid(field, "object");
|
||||
var keys = Object.keys(value);
|
||||
for (var j = 0; j < keys.length; ++j) {
|
||||
if (reason = verifyKey(field, keys[j])) // eslint-disable-line no-cond-assign
|
||||
return reason;
|
||||
if (reason = verifyValue(field, value[keys[j]])) // eslint-disable-line no-cond-assign
|
||||
return reason;
|
||||
}
|
||||
}
|
||||
|
||||
// repeated fields
|
||||
} else if (field.repeated) {
|
||||
|
||||
if (value !== undefined) {
|
||||
if (!Array.isArray(value))
|
||||
return invalid(field, "array");
|
||||
for (var j = 0; j < value.length; ++j)
|
||||
if (reason = verifyValue(field, value[j])) // eslint-disable-line no-cond-assign
|
||||
return reason;
|
||||
}
|
||||
|
||||
// required or present fields
|
||||
} else if (field.required || value !== undefined) {
|
||||
|
||||
if (reason = verifyValue(field, value)) // eslint-disable-line no-cond-assign
|
||||
return reason;
|
||||
}
|
||||
|
||||
}
|
||||
return null;
|
||||
/* eslint-enable block-scoped-var, no-redeclare */
|
||||
}
|
||||
|
||||
function genVerifyValue(gen, field, fieldIndex, ref) {
|
||||
/* eslint-disable no-unexpected-multiline */
|
||||
var type = field.type,
|
||||
@ -6278,13 +5971,10 @@ function genVerifyKey(gen, field, ref) {
|
||||
|
||||
/**
|
||||
* Generates a verifier specific to the specified message type.
|
||||
* @typedef GenerateVerifier
|
||||
* @type {function}
|
||||
* @param {Type} mtype Message type
|
||||
* @returns {Codegen} Codegen instance
|
||||
*/
|
||||
/**/
|
||||
verify.generate = function generate(mtype) {
|
||||
function verifier(mtype) {
|
||||
/* eslint-disable no-unexpected-multiline */
|
||||
var fields = mtype.getFieldsArray();
|
||||
var gen = util.codegen("m");
|
||||
@ -6332,8 +6022,7 @@ verify.generate = function generate(mtype) {
|
||||
return gen
|
||||
("return null");
|
||||
/* eslint-enable no-unexpected-multiline */
|
||||
};
|
||||
|
||||
}
|
||||
},{"16":16,"31":31,"33":33}],37:[function(require,module,exports){
|
||||
"use strict";
|
||||
module.exports = Writer;
|
||||
@ -7019,9 +6708,9 @@ protobuf.BufferWriter = (
|
||||
protobuf.Writer = require(37)).BufferWriter;
|
||||
protobuf.BufferReader = (
|
||||
protobuf.Reader = require(25)).BufferReader;
|
||||
protobuf.encode = require(15);
|
||||
protobuf.decode = require(14);
|
||||
protobuf.verify = require(36);
|
||||
protobuf.encoder = require(15);
|
||||
protobuf.decoder = require(14);
|
||||
protobuf.verifier = require(36);
|
||||
|
||||
// Reflection
|
||||
protobuf.ReflectionObject = require(22);
|
||||
|
||||
2
dist/protobuf.js.map
vendored
2
dist/protobuf.js.map
vendored
File diff suppressed because one or more lines are too long
8
dist/protobuf.min.js
vendored
8
dist/protobuf.min.js
vendored
File diff suppressed because one or more lines are too long
BIN
dist/protobuf.min.js.gz
vendored
BIN
dist/protobuf.min.js.gz
vendored
Binary file not shown.
2
dist/protobuf.min.js.map
vendored
2
dist/protobuf.min.js.map
vendored
File diff suppressed because one or more lines are too long
4
dist/runtime/protobuf.js
vendored
4
dist/runtime/protobuf.js
vendored
@ -1,6 +1,6 @@
|
||||
/*!
|
||||
* protobuf.js v6.2.1 (c) 2016 Daniel Wirtz
|
||||
* Compiled Sun, 18 Dec 2016 12:27:11 UTC
|
||||
* protobuf.js v6.3.0 (c) 2016 Daniel Wirtz
|
||||
* Compiled Sun, 18 Dec 2016 12:57:35 UTC
|
||||
* Licensed under the Apache License, Version 2.0
|
||||
* see: https://github.com/dcodeIO/protobuf.js for details
|
||||
*/
|
||||
|
||||
4
dist/runtime/protobuf.min.js
vendored
4
dist/runtime/protobuf.min.js
vendored
@ -1,6 +1,6 @@
|
||||
/*!
|
||||
* protobuf.js v6.2.1 (c) 2016 Daniel Wirtz
|
||||
* Compiled Sun, 18 Dec 2016 12:27:11 UTC
|
||||
* protobuf.js v6.3.0 (c) 2016 Daniel Wirtz
|
||||
* Compiled Sun, 18 Dec 2016 12:57:35 UTC
|
||||
* Licensed under the Apache License, Version 2.0
|
||||
* see: https://github.com/dcodeIO/protobuf.js for details
|
||||
*/
|
||||
|
||||
BIN
dist/runtime/protobuf.min.js.gz
vendored
BIN
dist/runtime/protobuf.min.js.gz
vendored
Binary file not shown.
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "protobufjs",
|
||||
"version": "6.2.1",
|
||||
"version": "6.3.0",
|
||||
"description": "Protocol Buffers for JavaScript (& TypeScript).",
|
||||
"author": "Daniel Wirtz <dcode+protobufjs@dcode.io>",
|
||||
"license": "Apache-2.0",
|
||||
|
||||
168
src/decode.js
168
src/decode.js
@ -1,168 +0,0 @@
|
||||
"use strict";
|
||||
module.exports = decode;
|
||||
|
||||
var Enum = require("./enum"),
|
||||
Reader = require("./reader"),
|
||||
types = require("./types"),
|
||||
util = require("./util");
|
||||
|
||||
/**
|
||||
* General purpose message decoder.
|
||||
* @param {Reader|Uint8Array} readerOrBuffer Reader or buffer to decode from
|
||||
* @param {number} [length] Length of the message, if known beforehand
|
||||
* @returns {Message} Populated runtime message
|
||||
* @this Type
|
||||
* @property {GenerateDecoder} generate Generates a type specific decoder
|
||||
*/
|
||||
function decode(readerOrBuffer, length) {
|
||||
/* eslint-disable no-invalid-this, block-scoped-var, no-redeclare */
|
||||
var fields = this.getFieldsById(),
|
||||
reader = readerOrBuffer instanceof Reader ? readerOrBuffer : Reader.create(readerOrBuffer),
|
||||
limit = length === undefined ? reader.len : reader.pos + length,
|
||||
message = new (this.getCtor())();
|
||||
while (reader.pos < limit) {
|
||||
var tag = reader.uint32(),
|
||||
wireType = tag & 7;
|
||||
|
||||
// End group
|
||||
if (wireType === 4)
|
||||
break;
|
||||
|
||||
var field = fields[tag >>> 3].resolve(),
|
||||
type = field.resolvedType instanceof Enum ? "uint32" : field.type,
|
||||
resolvedType = field.resolvedType;
|
||||
|
||||
// Known fields
|
||||
if (field) {
|
||||
|
||||
// Map fields
|
||||
if (field.map) {
|
||||
var keyType = field.resolvedKeyType /* only valid is enum */ ? "uint32" : field.keyType;
|
||||
reader.skip();
|
||||
reader.pos++; // assumes id 1
|
||||
if (message[field.name] === util.emptyObject)
|
||||
message[field.name] = {};
|
||||
var key = reader[keyType]();
|
||||
if (typeof key === "object")
|
||||
key = util.longToHash(key);
|
||||
reader.pos++; // assumes id 2
|
||||
message[field.name][key] = types.basic[type] === undefined
|
||||
? resolvedType.decode(reader, reader.uint32())
|
||||
: reader[type]();
|
||||
|
||||
// Repeated fields
|
||||
} else if (field.repeated) {
|
||||
var values = message[field.name] && message[field.name].length ? message[field.name] : message[field.name] = [];
|
||||
|
||||
// Packed
|
||||
if (field.packed && types.packed[type] !== undefined && wireType === 2) {
|
||||
var plimit = reader.uint32() + reader.pos;
|
||||
while (reader.pos < plimit)
|
||||
values.push(reader[type]());
|
||||
|
||||
// Non-packed
|
||||
} else if (types.basic[type] === undefined)
|
||||
values.push(resolvedType.decode(reader, resolvedType.group ? undefined : reader.uint32()));
|
||||
else
|
||||
values.push(reader[type]());
|
||||
|
||||
// Non-repeated
|
||||
} else if (types.basic[type] === undefined)
|
||||
message[field.name] = resolvedType.decode(reader, resolvedType.group ? undefined : reader.uint32());
|
||||
else
|
||||
message[field.name] = reader[type]();
|
||||
|
||||
// Unknown fields
|
||||
} else
|
||||
reader.skipType(wireType);
|
||||
}
|
||||
return message;
|
||||
/* eslint-enable no-invalid-this, block-scoped-var, no-redeclare */
|
||||
}
|
||||
|
||||
/**
|
||||
* Generates a decoder specific to the specified message type.
|
||||
* @typedef GenerateDecoder
|
||||
* @type {function}
|
||||
* @param {Type} mtype Message type
|
||||
* @returns {Codegen} Codegen instance
|
||||
*/
|
||||
/**/
|
||||
decode.generate = function generate(mtype) {
|
||||
/* eslint-disable no-unexpected-multiline */
|
||||
var fields = mtype.getFieldsArray();
|
||||
var gen = util.codegen("r", "l")
|
||||
|
||||
("r instanceof Reader||(r=Reader.create(r))")
|
||||
("var c=l===undefined?r.len:r.pos+l,m=new(this.getCtor())")
|
||||
("while(r.pos<c){")
|
||||
("var t=r.int32()");
|
||||
if (mtype.group) gen
|
||||
("if((t&7)===4)")
|
||||
("break");
|
||||
gen
|
||||
("switch(t>>>3){");
|
||||
|
||||
for (var i = 0; i < fields.length; ++i) {
|
||||
var field = fields[i].resolve(),
|
||||
type = field.resolvedType instanceof Enum ? "uint32" : field.type,
|
||||
prop = util.safeProp(field.name);
|
||||
gen
|
||||
("case %d:", field.id);
|
||||
|
||||
// Map fields
|
||||
if (field.map) {
|
||||
|
||||
var keyType = field.resolvedKeyType /* only valid is enum */ ? "uint32" : field.keyType;
|
||||
gen
|
||||
("r.skip().pos++")
|
||||
("if(m%s===util.emptyObject)", prop)
|
||||
("m%s={}", prop)
|
||||
("var k=r.%s()", keyType)
|
||||
("if(typeof k===\"object\")")
|
||||
("k=util.longToHash(k)")
|
||||
("r.pos++");
|
||||
if (types.basic[type] === undefined) gen
|
||||
("m%s[k]=types[%d].decode(r,r.uint32())", prop, i); // can't be groups
|
||||
else gen
|
||||
("m%s[k]=r.%s()", prop, type);
|
||||
|
||||
// Repeated fields
|
||||
} else if (field.repeated) { gen
|
||||
|
||||
("m%s&&m%s.length?m%s:m%s=[]", prop, prop, prop, prop);
|
||||
|
||||
// Packed
|
||||
if (field.packed && types.packed[type] !== undefined) gen
|
||||
("if((t&7)===2){")
|
||||
("var e=r.uint32()+r.pos")
|
||||
("while(r.pos<e)")
|
||||
("m%s.push(r.%s())", prop, type)
|
||||
("}else");
|
||||
|
||||
// Non-packed
|
||||
if (types.basic[type] === undefined) gen(field.resolvedType.group
|
||||
? "m%s.push(types[%d].decode(r))"
|
||||
: "m%s.push(types[%d].decode(r,r.uint32()))", prop, i);
|
||||
else gen
|
||||
("m%s.push(r.%s())", prop, type);
|
||||
|
||||
// Non-repeated
|
||||
} else if (types.basic[type] === undefined) gen(field.resolvedType.group
|
||||
? "m%s=types[%d].decode(r)"
|
||||
: "m%s=types[%d].decode(r,r.uint32())", prop, i);
|
||||
else gen
|
||||
("m%s=r.%s()", prop, type);
|
||||
gen
|
||||
("break");
|
||||
|
||||
// Unknown fields
|
||||
} return gen
|
||||
("default:")
|
||||
("r.skipType(t&7)")
|
||||
("break")
|
||||
("}")
|
||||
("}")
|
||||
("return m");
|
||||
/* eslint-enable no-unexpected-multiline */
|
||||
};
|
||||
90
src/decoder.js
Normal file
90
src/decoder.js
Normal file
@ -0,0 +1,90 @@
|
||||
"use strict";
|
||||
module.exports = decoder;
|
||||
|
||||
var Enum = require("./enum"),
|
||||
types = require("./types"),
|
||||
util = require("./util");
|
||||
|
||||
/**
|
||||
* Generates a decoder specific to the specified message type.
|
||||
* @param {Type} mtype Message type
|
||||
* @returns {Codegen} Codegen instance
|
||||
*/
|
||||
function decoder(mtype) {
|
||||
/* eslint-disable no-unexpected-multiline */
|
||||
var fields = mtype.getFieldsArray();
|
||||
var gen = util.codegen("r", "l")
|
||||
|
||||
("r instanceof Reader||(r=Reader.create(r))")
|
||||
("var c=l===undefined?r.len:r.pos+l,m=new(this.getCtor())")
|
||||
("while(r.pos<c){")
|
||||
("var t=r.int32()");
|
||||
if (mtype.group) gen
|
||||
("if((t&7)===4)")
|
||||
("break");
|
||||
gen
|
||||
("switch(t>>>3){");
|
||||
|
||||
for (var i = 0; i < fields.length; ++i) {
|
||||
var field = fields[i].resolve(),
|
||||
type = field.resolvedType instanceof Enum ? "uint32" : field.type,
|
||||
prop = util.safeProp(field.name);
|
||||
gen
|
||||
("case %d:", field.id);
|
||||
|
||||
// Map fields
|
||||
if (field.map) {
|
||||
|
||||
var keyType = field.resolvedKeyType /* only valid is enum */ ? "uint32" : field.keyType;
|
||||
gen
|
||||
("r.skip().pos++")
|
||||
("if(m%s===util.emptyObject)", prop)
|
||||
("m%s={}", prop)
|
||||
("var k=r.%s()", keyType)
|
||||
("if(typeof k===\"object\")")
|
||||
("k=util.longToHash(k)")
|
||||
("r.pos++");
|
||||
if (types.basic[type] === undefined) gen
|
||||
("m%s[k]=types[%d].decode(r,r.uint32())", prop, i); // can't be groups
|
||||
else gen
|
||||
("m%s[k]=r.%s()", prop, type);
|
||||
|
||||
// Repeated fields
|
||||
} else if (field.repeated) { gen
|
||||
|
||||
("m%s&&m%s.length?m%s:m%s=[]", prop, prop, prop, prop);
|
||||
|
||||
// Packed
|
||||
if (field.packed && types.packed[type] !== undefined) gen
|
||||
("if((t&7)===2){")
|
||||
("var e=r.uint32()+r.pos")
|
||||
("while(r.pos<e)")
|
||||
("m%s.push(r.%s())", prop, type)
|
||||
("}else");
|
||||
|
||||
// Non-packed
|
||||
if (types.basic[type] === undefined) gen(field.resolvedType.group
|
||||
? "m%s.push(types[%d].decode(r))"
|
||||
: "m%s.push(types[%d].decode(r,r.uint32()))", prop, i);
|
||||
else gen
|
||||
("m%s.push(r.%s())", prop, type);
|
||||
|
||||
// Non-repeated
|
||||
} else if (types.basic[type] === undefined) gen(field.resolvedType.group
|
||||
? "m%s=types[%d].decode(r)"
|
||||
: "m%s=types[%d].decode(r,r.uint32())", prop, i);
|
||||
else gen
|
||||
("m%s=r.%s()", prop, type);
|
||||
gen
|
||||
("break");
|
||||
|
||||
// Unknown fields
|
||||
} return gen
|
||||
("default:")
|
||||
("r.skipType(t&7)")
|
||||
("break")
|
||||
("}")
|
||||
("}")
|
||||
("return m");
|
||||
/* eslint-enable no-unexpected-multiline */
|
||||
}
|
||||
@ -1,101 +1,12 @@
|
||||
"use strict";
|
||||
module.exports = encode;
|
||||
module.exports = encoder;
|
||||
|
||||
var Enum = require("./enum"),
|
||||
Writer = require("./writer"),
|
||||
types = require("./types"),
|
||||
util = require("./util");
|
||||
|
||||
var safeProp = util.safeProp;
|
||||
|
||||
function encodeType(field, value, writer) {
|
||||
if (field.resolvedType.group)
|
||||
field.resolvedType.encode(value, writer.uint32((field.id << 3 | 3) >>> 0)).uint32((field.id << 3 | 4) >>> 0);
|
||||
else if (field.resolvedType.encode(value, writer.fork()).len || field.required)
|
||||
writer.ldelim(field.id);
|
||||
else
|
||||
writer.reset();
|
||||
}
|
||||
|
||||
/**
|
||||
* General purpose message encoder.
|
||||
* @param {Message|Object} message Runtime message or plain object to encode
|
||||
* @param {Writer} [writer] Writer to encode to
|
||||
* @returns {Writer} writer
|
||||
* @this Type
|
||||
* @property {GenerateEncoder} generate Generates a type specific encoder
|
||||
*/
|
||||
function encode(message, writer) {
|
||||
/* eslint-disable block-scoped-var, no-redeclare */
|
||||
if (!writer)
|
||||
writer = Writer.create();
|
||||
var fields = this.getFieldsArray(), fi = 0;
|
||||
while (fi < fields.length) {
|
||||
var field = fields[fi++].resolve(),
|
||||
type = field.resolvedType instanceof Enum ? "uint32" : field.type,
|
||||
wireType = types.basic[type];
|
||||
|
||||
// Map fields
|
||||
if (field.map) {
|
||||
var keyType = field.resolvedKeyType /* only valid is enum */ ? "uint32" : field.keyType;
|
||||
if (message[field.name] && message[field.name] !== util.emptyObject) {
|
||||
for (var keys = Object.keys(message[field.name]), i = 0; i < keys.length; ++i) {
|
||||
writer.uint32((field.id << 3 | 2) >>> 0).fork()
|
||||
.uint32(/*1*/8 | types.mapKey[keyType])[keyType](keys[i]);
|
||||
if (wireType === undefined)
|
||||
field.resolvedType.encode(message[field.name][keys[i]], writer.uint32(/*2,2*/18).fork()).ldelim();
|
||||
else
|
||||
writer.uint32(/*2*/16 | wireType)[type](message[field.name][keys[i]]);
|
||||
writer.ldelim();
|
||||
}
|
||||
}
|
||||
|
||||
// Repeated fields
|
||||
} else if (field.repeated) {
|
||||
var values = message[field.name];
|
||||
if (values && values.length) {
|
||||
|
||||
// Packed repeated
|
||||
if (field.packed && types.packed[type] !== undefined) {
|
||||
if (values.length) {
|
||||
writer.uint32((field.id << 3 | 2) >>> 0).fork();
|
||||
var i = 0;
|
||||
while (i < values.length)
|
||||
writer[type](values[i++]);
|
||||
writer.ldelim();
|
||||
}
|
||||
|
||||
// Non-packed
|
||||
} else {
|
||||
var i = 0;
|
||||
if (wireType === undefined)
|
||||
while (i < values.length)
|
||||
encodeType(field, values[i++], writer);
|
||||
else
|
||||
while (i < values.length)
|
||||
writer.uint32((field.id << 3 | wireType) >>> 0)[type](values[i++]);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// Non-repeated
|
||||
} else {
|
||||
var value = message[field.name];
|
||||
if (
|
||||
field.partOf && message[field.partOf.name] === field.name
|
||||
||
|
||||
(field.required || value !== undefined) && (field.long ? util.longNe(value, field.defaultValue.low, field.defaultValue.high) : value !== field.defaultValue)
|
||||
) {
|
||||
if (wireType === undefined)
|
||||
encodeType(field, value, writer);
|
||||
else
|
||||
writer.uint32((field.id << 3 | wireType) >>> 0)[type](value);
|
||||
}
|
||||
}
|
||||
}
|
||||
return writer;
|
||||
/* eslint-enable block-scoped-var, no-redeclare */
|
||||
}
|
||||
|
||||
function genEncodeType(gen, field, fieldIndex, ref, alwaysRequired) {
|
||||
if (field.resolvedType.group)
|
||||
return gen("types[%d].encode(%s,w.uint32(%d)).uint32(%d)", fieldIndex, ref, (field.id << 3 | 3) >>> 0, (field.id << 3 | 4) >>> 0);
|
||||
@ -105,14 +16,11 @@ function genEncodeType(gen, field, fieldIndex, ref, alwaysRequired) {
|
||||
}
|
||||
|
||||
/**
|
||||
* Generates an {@link Encoder|encoder} specific to the specified message type.
|
||||
* @typedef GenerateEncoder
|
||||
* @type {function}
|
||||
* Generates an encoder specific to the specified message type.
|
||||
* @param {Type} mtype Message type
|
||||
* @returns {Codegen} Codegen instance
|
||||
*/
|
||||
/**/
|
||||
encode.generate = function generate(mtype) {
|
||||
function encoder(mtype) {
|
||||
/* eslint-disable no-unexpected-multiline, block-scoped-var, no-redeclare */
|
||||
var fields = mtype.getFieldsArray();
|
||||
var oneofs = mtype.getOneofsArray();
|
||||
@ -215,4 +123,4 @@ encode.generate = function generate(mtype) {
|
||||
return gen
|
||||
("return w");
|
||||
/* eslint-enable no-unexpected-multiline, block-scoped-var, no-redeclare */
|
||||
};
|
||||
}
|
||||
@ -82,9 +82,9 @@ protobuf.BufferWriter = (
|
||||
protobuf.Writer = require("./writer")).BufferWriter;
|
||||
protobuf.BufferReader = (
|
||||
protobuf.Reader = require("./reader")).BufferReader;
|
||||
protobuf.encode = require("./encode");
|
||||
protobuf.decode = require("./decode");
|
||||
protobuf.verify = require("./verify");
|
||||
protobuf.encoder = require("./encoder");
|
||||
protobuf.decoder = require("./decoder");
|
||||
protobuf.verifier = require("./verifier");
|
||||
|
||||
// Reflection
|
||||
protobuf.ReflectionObject = require("./object");
|
||||
|
||||
50
src/type.js
50
src/type.js
@ -19,9 +19,9 @@ var Enum = require("./enum"),
|
||||
Writer = require("./writer"),
|
||||
util = require("./util");
|
||||
|
||||
var encode, // might become cyclic
|
||||
decode, // might become cyclic
|
||||
verify; // cyclic
|
||||
var encoder, // might become cyclic
|
||||
decoder, // might become cyclic
|
||||
verifier; // cyclic
|
||||
|
||||
/**
|
||||
* Constructs a new reflected message type instance.
|
||||
@ -182,6 +182,7 @@ function clearCache(type) {
|
||||
type._fieldsById = type._fieldsArray = type._oneofsArray = type._ctor = null;
|
||||
delete type.encode;
|
||||
delete type.decode;
|
||||
delete type.verify;
|
||||
return type;
|
||||
}
|
||||
|
||||
@ -338,32 +339,25 @@ TypePrototype.create = function create(properties) {
|
||||
TypePrototype.setup = function setup() {
|
||||
// Sets up everything at once so that the prototype chain does not have to be re-evaluated
|
||||
// multiple times (V8, soft-deopt prototype-check).
|
||||
if (!encode) {
|
||||
encode = require("./encode");
|
||||
decode = require("./decode");
|
||||
verify = require("./verify");
|
||||
if (!encoder) {
|
||||
encoder = require("./encoder");
|
||||
decoder = require("./decoder");
|
||||
verifier = require("./verifier");
|
||||
}
|
||||
var codegen_supported = util.codegen.supported;
|
||||
this.encode = codegen_supported
|
||||
? encode.generate(this).eof(this.getFullName() + "$encode", {
|
||||
Writer : Writer,
|
||||
types : this.getFieldsArray().map(function(fld) { return fld.resolvedType; }),
|
||||
util : util
|
||||
})
|
||||
: encode;
|
||||
this.decode = codegen_supported
|
||||
? decode.generate(this).eof(this.getFullName() + "$decode", {
|
||||
Reader : Reader,
|
||||
types : this.getFieldsArray().map(function(fld) { return fld.resolvedType; }),
|
||||
util : util
|
||||
})
|
||||
: decode;
|
||||
this.verify = codegen_supported
|
||||
? verify.generate(this).eof(this.getFullName() + "$verify", {
|
||||
types : this.getFieldsArray().map(function(fld) { return fld.resolvedType; }),
|
||||
util : util
|
||||
})
|
||||
: verify;
|
||||
this.encode = encoder(this).eof(this.getFullName() + "$encode", {
|
||||
Writer : Writer,
|
||||
types : this.getFieldsArray().map(function(fld) { return fld.resolvedType; }),
|
||||
util : util
|
||||
});
|
||||
this.decode = decoder(this).eof(this.getFullName() + "$decode", {
|
||||
Reader : Reader,
|
||||
types : this.getFieldsArray().map(function(fld) { return fld.resolvedType; }),
|
||||
util : util
|
||||
});
|
||||
this.verify = verifier(this).eof(this.getFullName() + "$verify", {
|
||||
types : this.getFieldsArray().map(function(fld) { return fld.resolvedType; }),
|
||||
util : util
|
||||
});
|
||||
return this;
|
||||
};
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
"use strict";
|
||||
module.exports = verify;
|
||||
module.exports = verifier;
|
||||
|
||||
var Enum = require("./enum"),
|
||||
Type = require("./type"),
|
||||
@ -9,135 +9,6 @@ function invalid(field, expected) {
|
||||
return "invalid value for field " + field.getFullName() + " (" + expected + (field.repeated && expected !== "array" ? "[]" : field.map && expected !== "object" ? "{k:"+field.keyType+"}" : "") + " expected)";
|
||||
}
|
||||
|
||||
function verifyValue(field, value) {
|
||||
switch (field.type) {
|
||||
case "double":
|
||||
case "float":
|
||||
if (typeof value !== "number")
|
||||
return invalid(field, "number");
|
||||
break;
|
||||
case "int32":
|
||||
case "uint32":
|
||||
case "sint32":
|
||||
case "fixed32":
|
||||
case "sfixed32":
|
||||
if (!util.isInteger(value))
|
||||
return invalid(field, "integer");
|
||||
break;
|
||||
case "int64":
|
||||
case "uint64":
|
||||
case "sint64":
|
||||
case "fixed64":
|
||||
case "sfixed64":
|
||||
if (!util.isInteger(value) && !(value && util.isInteger(value.low) && util.isInteger(value.high)))
|
||||
return invalid(field, "integer|Long");
|
||||
break;
|
||||
case "bool":
|
||||
if (typeof value !== "boolean")
|
||||
return invalid(field, "boolean");
|
||||
break;
|
||||
case "string":
|
||||
if (!util.isString(value))
|
||||
return invalid(field, "string");
|
||||
break;
|
||||
case "bytes":
|
||||
if (!(value && typeof value.length === "number" || util.isString(value)))
|
||||
return invalid(field, "buffer");
|
||||
break;
|
||||
default:
|
||||
if (field.resolvedType instanceof Enum) {
|
||||
if (typeof field.resolvedType.getValuesById()[value] !== "number")
|
||||
return invalid(field, "enum value");
|
||||
} else if (field.resolvedType instanceof Type) {
|
||||
var reason = field.resolvedType.verify(value);
|
||||
if (reason)
|
||||
return reason;
|
||||
}
|
||||
break;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
function verifyKey(field, value) {
|
||||
switch (field.keyType) {
|
||||
case "int64":
|
||||
case "uint64":
|
||||
case "sint64":
|
||||
case "fixed64":
|
||||
case "sfixed64":
|
||||
if (/^[\x00-\xff]{8}$/.test(value)) // eslint-disable-line no-control-regex
|
||||
return null;
|
||||
// fallthrough
|
||||
case "int32":
|
||||
case "uint32":
|
||||
case "sint32":
|
||||
case "fixed32":
|
||||
case "sfixed32":
|
||||
if (/^-?(?:0|[1-9]\d*)$/.test(value))
|
||||
return invalid(field, "integer key");
|
||||
break;
|
||||
case "bool":
|
||||
if (/^true|false|0|1$/.test(value))
|
||||
return invalid(field, "boolean key");
|
||||
break;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* General purpose message verifier.
|
||||
* @param {Message|Object} message Runtime message or plain object to verify
|
||||
* @returns {?string} `null` if valid, otherwise the reason why it is not
|
||||
* @this {Type}
|
||||
* @property {GenerateVerifier} generate Generates a type specific verifier
|
||||
*/
|
||||
function verify(message) {
|
||||
/* eslint-disable block-scoped-var, no-redeclare */
|
||||
var fields = this.getFieldsArray(),
|
||||
i = 0,
|
||||
reason;
|
||||
while (i < fields.length) {
|
||||
var field = fields[i++].resolve(),
|
||||
value = message[field.name];
|
||||
|
||||
// map fields
|
||||
if (field.map) {
|
||||
|
||||
if (value !== undefined) {
|
||||
if (!util.isObject(value))
|
||||
return invalid(field, "object");
|
||||
var keys = Object.keys(value);
|
||||
for (var j = 0; j < keys.length; ++j) {
|
||||
if (reason = verifyKey(field, keys[j])) // eslint-disable-line no-cond-assign
|
||||
return reason;
|
||||
if (reason = verifyValue(field, value[keys[j]])) // eslint-disable-line no-cond-assign
|
||||
return reason;
|
||||
}
|
||||
}
|
||||
|
||||
// repeated fields
|
||||
} else if (field.repeated) {
|
||||
|
||||
if (value !== undefined) {
|
||||
if (!Array.isArray(value))
|
||||
return invalid(field, "array");
|
||||
for (var j = 0; j < value.length; ++j)
|
||||
if (reason = verifyValue(field, value[j])) // eslint-disable-line no-cond-assign
|
||||
return reason;
|
||||
}
|
||||
|
||||
// required or present fields
|
||||
} else if (field.required || value !== undefined) {
|
||||
|
||||
if (reason = verifyValue(field, value)) // eslint-disable-line no-cond-assign
|
||||
return reason;
|
||||
}
|
||||
|
||||
}
|
||||
return null;
|
||||
/* eslint-enable block-scoped-var, no-redeclare */
|
||||
}
|
||||
|
||||
function genVerifyValue(gen, field, fieldIndex, ref) {
|
||||
/* eslint-disable no-unexpected-multiline */
|
||||
var type = field.type,
|
||||
@ -195,13 +66,10 @@ function genVerifyKey(gen, field, ref) {
|
||||
|
||||
/**
|
||||
* Generates a verifier specific to the specified message type.
|
||||
* @typedef GenerateVerifier
|
||||
* @type {function}
|
||||
* @param {Type} mtype Message type
|
||||
* @returns {Codegen} Codegen instance
|
||||
*/
|
||||
/**/
|
||||
verify.generate = function generate(mtype) {
|
||||
function verifier(mtype) {
|
||||
/* eslint-disable no-unexpected-multiline */
|
||||
var fields = mtype.getFieldsArray();
|
||||
var gen = util.codegen("m");
|
||||
@ -249,4 +117,4 @@ verify.generate = function generate(mtype) {
|
||||
return gen
|
||||
("return null");
|
||||
/* eslint-enable no-unexpected-multiline */
|
||||
};
|
||||
}
|
||||
@ -47,16 +47,6 @@ tape.test("google.protobuf.Any type", function(test) {
|
||||
test.end();
|
||||
});
|
||||
|
||||
test.test("should encode (fallback)", function(test) {
|
||||
|
||||
writer = protobuf.encode.call(Any, any);
|
||||
buf = writer.finish();
|
||||
|
||||
verifyEncode(test, buf);
|
||||
|
||||
test.end();
|
||||
});
|
||||
|
||||
test.test("should decode", function(test) {
|
||||
|
||||
msg = Any.decode(buf);
|
||||
@ -66,15 +56,6 @@ tape.test("google.protobuf.Any type", function(test) {
|
||||
test.end();
|
||||
});
|
||||
|
||||
test.test("should decode (fallback)", function(test) {
|
||||
|
||||
msg = protobuf.decode.call(Any, buf);
|
||||
|
||||
test.deepEqual(msg, any, "an equal message");
|
||||
|
||||
test.end();
|
||||
});
|
||||
|
||||
test.test("should encodeDelimited", function(test) {
|
||||
|
||||
writer = Any.encodeDelimited(any);
|
||||
|
||||
@ -28,13 +28,6 @@ tape.test("legacy groups", function(test) {
|
||||
test.end();
|
||||
});
|
||||
|
||||
test.test("should encode (fallback)", function(test) {
|
||||
var buf = protobuf.encode.call(Test, msg).finish();
|
||||
verifyEncode(test, buf);
|
||||
test.deepEqual(protobuf.decode.call(Test, buf), msg, "and decode back the original message");
|
||||
test.end();
|
||||
});
|
||||
|
||||
var json = MyGroupType.toJSON();
|
||||
test.equal(json.group, true, "should export group=true to JSON");
|
||||
|
||||
|
||||
12
tests/map.js
12
tests/map.js
@ -65,11 +65,6 @@ tape.test("maps", function(test) {
|
||||
|
||||
test.deepEqual(dec, outer, "should decode back the original random map");
|
||||
|
||||
var buf = protobuf.encode.call(Outer, outer).finish();
|
||||
var dec = protobuf.decode.call(Outer, buf);
|
||||
|
||||
test.deepEqual(dec, outer, "should decode back the original random map (fallback)");
|
||||
|
||||
test.end();
|
||||
});
|
||||
|
||||
@ -94,13 +89,6 @@ tape.test("maps", function(test) {
|
||||
var dec = Outer.decode(buf);
|
||||
test.deepEqual(dec, outer, "should decode back the original map");
|
||||
|
||||
var buf = protobuf.encode.call(Outer, outer).finish();
|
||||
verifyEncode(test, buf);
|
||||
|
||||
var dec = protobuf.decode.call(Outer, buf);
|
||||
|
||||
test.deepEqual(dec, outer, "should decode back the original map (fallback)");
|
||||
|
||||
test.end();
|
||||
});
|
||||
|
||||
|
||||
@ -40,11 +40,6 @@ tape.test("oneofs", function(test) {
|
||||
test.equal(buf[0], 16, "should write id 1, wireType 0");
|
||||
test.equal(buf[1], 0, "should write a value of 0");
|
||||
|
||||
buf = protobuf.encode.call(Message, message).finish();
|
||||
test.equal(buf.length, 2, "should write a total of 2 bytes (fallback)");
|
||||
test.equal(buf[0], 16, "should write id 1, wireType 0 (fallback)");
|
||||
test.equal(buf[1], 0, "should write a value of 0 (fallback)");
|
||||
|
||||
test.end();
|
||||
});
|
||||
|
||||
|
||||
45
types/protobuf.js.d.ts
vendored
45
types/protobuf.js.d.ts
vendored
@ -1,5 +1,5 @@
|
||||
// $> pbts --name protobufjs --out types/protobuf.js.d.ts src
|
||||
// Generated Sun, 18 Dec 2016 12:27:17 UTC
|
||||
// Generated Sun, 18 Dec 2016 12:57:48 UTC
|
||||
declare module "protobufjs" {
|
||||
|
||||
/**
|
||||
@ -89,43 +89,19 @@ declare module "protobufjs" {
|
||||
*/
|
||||
function common(name: string, json: Object): void;
|
||||
|
||||
/**
|
||||
* General purpose message decoder.
|
||||
* @param {Reader|Uint8Array} readerOrBuffer Reader or buffer to decode from
|
||||
* @param {number} [length] Length of the message, if known beforehand
|
||||
* @returns {Message} Populated runtime message
|
||||
* @this Type
|
||||
* @property {GenerateDecoder} generate Generates a type specific decoder
|
||||
*/
|
||||
function decode(this: Type, readerOrBuffer: (Reader|Uint8Array), length?: number): Message;
|
||||
|
||||
/**
|
||||
* Generates a decoder specific to the specified message type.
|
||||
* @typedef GenerateDecoder
|
||||
* @type {function}
|
||||
* @param {Type} mtype Message type
|
||||
* @returns {Codegen} Codegen instance
|
||||
*/
|
||||
type GenerateDecoder = (mtype: Type) => Codegen;
|
||||
function decoder(mtype: Type): Codegen;
|
||||
|
||||
/**
|
||||
* General purpose message encoder.
|
||||
* @param {Message|Object} message Runtime message or plain object to encode
|
||||
* @param {Writer} [writer] Writer to encode to
|
||||
* @returns {Writer} writer
|
||||
* @this Type
|
||||
* @property {GenerateEncoder} generate Generates a type specific encoder
|
||||
*/
|
||||
function encode(this: Type, message: (Message|Object), writer?: Writer): Writer;
|
||||
|
||||
/**
|
||||
* Generates an {@link Encoder|encoder} specific to the specified message type.
|
||||
* @typedef GenerateEncoder
|
||||
* @type {function}
|
||||
* Generates an encoder specific to the specified message type.
|
||||
* @param {Type} mtype Message type
|
||||
* @returns {Codegen} Codegen instance
|
||||
*/
|
||||
type GenerateEncoder = (mtype: Type) => Codegen;
|
||||
function encoder(mtype: Type): Codegen;
|
||||
|
||||
/**
|
||||
* Constructs a new enum instance.
|
||||
@ -2335,23 +2311,12 @@ declare module "protobufjs" {
|
||||
function newBuffer(size?: number): Uint8Array;
|
||||
}
|
||||
|
||||
/**
|
||||
* General purpose message verifier.
|
||||
* @param {Message|Object} message Runtime message or plain object to verify
|
||||
* @returns {?string} `null` if valid, otherwise the reason why it is not
|
||||
* @this {Type}
|
||||
* @property {GenerateVerifier} generate Generates a type specific verifier
|
||||
*/
|
||||
function verify(this: Type, message: (Message|Object)): string;
|
||||
|
||||
/**
|
||||
* Generates a verifier specific to the specified message type.
|
||||
* @typedef GenerateVerifier
|
||||
* @type {function}
|
||||
* @param {Type} mtype Message type
|
||||
* @returns {Codegen} Codegen instance
|
||||
*/
|
||||
type GenerateVerifier = (mtype: Type) => Codegen;
|
||||
function verifier(mtype: Type): Codegen;
|
||||
|
||||
/**
|
||||
* Constructs a new writer instance.
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user