diff --git a/README.md b/README.md index 5a78b3ffc..a29054dc3 100644 --- a/README.md +++ b/README.md @@ -77,7 +77,7 @@ Where bundle size is a factor, there is a suitable distribution for each of thes | light | 15.5kb | [dist/light][dist-light] | `require("protobufjs/light")` | All features except tokenizer, parser and bundled common types. Works with JSON definitions, pure reflection and static code. | minimal | 6.0kb+ | [dist/minimal][dist-minimal] | `require("protobufjs/minimal")` | Just enough to run static code. No reflection. -In case of doubt you can just use the full library. +In case of doubt it is safe to just use the full library. [dist-full]: https://github.com/dcodeIO/protobuf.js/tree/master/dist [dist-light]: https://github.com/dcodeIO/protobuf.js/tree/master/dist/light @@ -88,7 +88,7 @@ Usage Each message type provides a set of methods with each method doing just one thing. This allows to avoid unnecessary operations where [performance](#performance) is a concern but also forces a user to perform verification explicitly where necessary - for example when dealing with user input. -Note that **Message** refers to any message type below. +Note that **Message** below refers to any message type. See the next section for the definition of a [valid message](#valid-message). * **Message.verify**(message: `Object`): `null|string`
explicitly performs verification prior to encoding a plain object. Instead of throwing, it returns the error message as a string, if any. @@ -160,29 +160,30 @@ Note that **Message** refers to any message type below. See also: [ConversionOptions](http://dcode.io/protobuf.js/global.html#ConversionOptions) -**What is a valid message?** +### Valid message A valid message is an object not missing any required fields and exclusively using JS types for its fields that are understood by the wire format writer. -* Calling `Message.verify` with a valid message returns `null` and otherwise the error as a string. -* Calling `Message.create` or `Message.encode` with any object assumes valid types. +* Calling `Message.verify` with any object returns `null` if the object can be encoded as-is and otherwise the error as a string. +* Calling `Message.create` or `Message.encode` must be called with a valid message. * Calling `Message.fromObject` with any object naively converts all values to the optimal JS type. -| Type | Expected JS type (create) | Naive conversion (fromObject) -|--------|-----------------|------------------- -| int32
uint32
sint32
fixed32
sfixed32 | `Number` (32 bit integer) | `value | 0`
`value >>> 0` -| int64
uint64
sint64
fixed64
sfixed64 | `Long`-like (optimal)
`Number` (53 bit integer) | `Long.fromValue(value)`
`parseInt(value, 10)` without long.js +| Field type | Expected JS type (create, encode) | Naive conversion (fromObject) +|------------|-----------------------------------|------------------------------ +| s-/u-/int32
s-/fixed32 | `Number` (32 bit integer) | `value | 0` if signed
`value >>> 0` if unsigned +| s-/u-/int64
s-/fixed64 | `Long`-like (optimal)
`Number` (53 bit integer) | `Long.fromValue(value)` with long.js
`parseInt(value, 10)` otherwise | float
double | `Number` | `Number(value)` | bool | `Boolean` | `Boolean(value)` | string | `String` | `String(value)` -| bytes | `Uint8Array` (optimal)
`Buffer` (optimal)
`Array.` (8 bit integers)
`String` (base64) | `base64.decode(value)` if a String
`Object` with non-zero `.length` is kept +| bytes | `Uint8Array` (optimal)
`Buffer` (optimal under node)
`Array.` (8 bit integers)
`String` (base64) | `base64.decode(value)` if a String
`Object` with non-zero `.length` is kept | enum | `Number` (32 bit integer) | Looks up the numeric id if a string | message | Valid message | `Message.fromObject(value)` * Explicit `undefined` and `null` are considered as not set when optional. * Repeated fields are `Array.`. -* Map fields are `Object.` with the key being the string representation of the respective value or an 8 characters long binary hash string for Long-likes. +* Map fields are `Object.` with the key being the string representation of the respective value or an 8 characters long binary hash string for `Long`-likes. * `String` refers to both objects and values while `Number` refers to values only. +* Types marked as *optimal* provide the best performance because no conversion step (i.e. number to low and high bits or base64 string to buffer) is required. Examples -------- diff --git a/cli/targets/static.js b/cli/targets/static.js index dff87f329..70372aa09 100644 --- a/cli/targets/static.js +++ b/cli/targets/static.js @@ -296,7 +296,9 @@ function buildType(ref, type) { jsType = "Object."; else if (field.repeated) jsType = "Array.<" + jsType + ">"; - typeDef.push("@property {" + jsType + "} " + (field.optional ? "[" + field.name + "]" : field.name) + " " + (field.comment || type.name + " " + field.name + ".")); + var name = util.safeProp(field.name); + name = name.substring(1, name.charAt(0) === "[" ? name.length - 1 : name.length); + typeDef.push("@property {" + jsType + "} " + (field.optional ? "[" + name + "]" : field.name) + " " + (field.comment || type.name + " " + field.name + ".")); }); push(""); pushComment(typeDef); @@ -391,7 +393,7 @@ function buildType(ref, type) { push(""); pushComment([ "Encodes the specified " + type.name + " message, length delimited. Does not implicitly {@link " + fullName + ".verify|verify} messages.", - "@param {" + fullName + "|Object.} message " + type.name + " message or plain object to encode", + "@param {" + fullName + "$Properties} message " + type.name + " message or plain object to encode", "@param {$protobuf.Writer} [writer] Writer to encode to", "@returns {$protobuf.Writer} Writer" ]); diff --git a/debug.js b/debug.js index 6efc2f560..abbc0cf9c 100644 --- a/debug.js +++ b/debug.js @@ -1,2 +1,4 @@ +// experimental - debug library entry point. + "use strict"; -module.exports = require("./src/index-debug"); \ No newline at end of file +module.exports = require("./src/index-debug"); diff --git a/index.d.ts b/index.d.ts index bfd65140c..f65cd6471 100644 --- a/index.d.ts +++ b/index.d.ts @@ -1842,7 +1842,7 @@ export class Type extends NamespaceBase { * @property {boolean} [objects=false] Sets empty objects for missing map fields even if `defaults=false` * @property {boolean} [oneofs=false] Includes virtual oneof properties set to the present field's name, if any */ -interface ConversionOptions { +type ConversionOptions = { longs?: any; enums?: any; bytes?: any; @@ -1850,7 +1850,7 @@ interface ConversionOptions { arrays?: boolean; objects?: boolean; oneofs?: boolean; -} +}; /** * Common type constants. @@ -2016,22 +2016,6 @@ export namespace types { }; } -/** - * Any compatible Long instance. - * - * This is a minimal stand-alone definition of a Long instance. The actual type is that exported by long.js. - * @typedef Long - * @type {Object} - * @property {number} low Low bits - * @property {number} high High bits - * @property {boolean} unsigned Whether unsigned or not - */ -interface Long { - low: number; - high: number; - unsigned: boolean; -} - /** * Various utility functions. * @namespace @@ -2870,10 +2854,10 @@ type FetchCallback = (error: Error, contents?: string) => void; * @property {boolean} [binary=false] Whether expecting a binary response * @property {boolean} [xhr=false] If `true`, forces the use of XMLHttpRequest */ -interface FetchOptions { +type FetchOptions = { binary?: boolean; xhr?: boolean; -} +}; /** * An allocator as used by {@link util.pool}. diff --git a/index.js b/index.js index 395e3d64e..042042ae5 100644 --- a/index.js +++ b/index.js @@ -1,2 +1,4 @@ +// full library entry point. + "use strict"; module.exports = require("./src/index"); diff --git a/lib/tsd-jsdoc/publish.js b/lib/tsd-jsdoc/publish.js index 0d3cc5a0e..c7c156951 100644 --- a/lib/tsd-jsdoc/publish.js +++ b/lib/tsd-jsdoc/publish.js @@ -177,7 +177,7 @@ function isClassLike(element) { // tests if an element is considered to be an interface function isInterface(element) { - return element && (element.kind === "interface" || getTypeOf(element) === "Object" && element.properties && element.properties.length); + return element && element.kind === "interface"; } // tests if an element is considered to be a namespace @@ -296,7 +296,13 @@ function writeFunctionSignature(element, isConstructor, isTypeDef) { // writes (a typedef as) an interface function writeInterface(element) { - writeln("interface ", element.name, " {"); + write("interface ", element.name); + writeInterfaceBody(element); + writeln(); +} + +function writeInterfaceBody(element) { + writeln("{"); ++indent; element.properties.forEach(function(property) { write(property.name); @@ -305,7 +311,7 @@ function writeInterface(element) { writeln(": ", getTypeOf(property), ";"); }); --indent; - writeln("}"); + write("}"); } // @@ -524,7 +530,9 @@ function handleTypeDef(element, parent) { write("type ", element.name, " = "); if (element.type && element.type.names.length === 1 && element.type.names[0] === "function") writeFunctionSignature(element, false, true); - else + else if (getTypeOf(element) === "Object" && element.properties && element.properties.length) { + writeInterfaceBody(element); + } else write(getTypeOf(element)); writeln(";"); } diff --git a/light.js b/light.js index 92720f44f..1209e64c1 100644 --- a/light.js +++ b/light.js @@ -1,2 +1,4 @@ +// light library entry point. + "use strict"; module.exports = require("./src/index-light"); \ No newline at end of file diff --git a/minimal.js b/minimal.js index ee7091b1e..1f35ec99d 100644 --- a/minimal.js +++ b/minimal.js @@ -1,2 +1,4 @@ +// minimal library entry point. + "use strict"; -module.exports = require("./src/index-minimal"); \ No newline at end of file +module.exports = require("./src/index-minimal"); diff --git a/runtime.js b/runtime.js index 69dd4eecf..96b36f84d 100644 --- a/runtime.js +++ b/runtime.js @@ -1,3 +1,4 @@ -// deprecated - compatibility layer for v6.5 and earlier +// deprecated - compatibility layer for v6.5 and earlier (now named "minimal") + "use strict"; -module.exports = require("./src/index-minimal"); \ No newline at end of file +module.exports = require("./src/index-minimal"); diff --git a/src/util/longbits.js b/src/util/longbits.js index dffcf5d5f..11bfb1c00 100644 --- a/src/util/longbits.js +++ b/src/util/longbits.js @@ -3,17 +3,6 @@ module.exports = LongBits; var util = require("../util/minimal"); -/** - * Any compatible Long instance. - * - * This is a minimal stand-alone definition of a Long instance. The actual type is that exported by long.js. - * @typedef Long - * @type {Object} - * @property {number} low Low bits - * @property {number} high High bits - * @property {boolean} unsigned Whether unsigned or not - */ - /** * Constructs new long bits. * @classdesc Helper class for working with the low and high bits of a 64 bit value. diff --git a/src/util/minimal.js b/src/util/minimal.js index 7d1e580b9..9fde30976 100644 --- a/src/util/minimal.js +++ b/src/util/minimal.js @@ -70,6 +70,13 @@ util.isObject = function isObject(value) { return value && typeof value === "object"; }; +/* + * Any compatible Buffer instance. + * This is a minimal stand-alone definition of a Buffer instance. The actual type is that exported by node's typings. + * @typedef Buffer + * @type {Uint8Array} + */ + /** * Node's Buffer class if available. * @type {?function(new: Buffer)} @@ -128,6 +135,16 @@ util.newBuffer = function newBuffer(sizeOrArray) { */ util.Array = typeof Uint8Array !== "undefined" ? Uint8Array /* istanbul ignore next */ : Array; +/* + * Any compatible Long instance. + * This is a minimal stand-alone definition of a Long instance. The actual type is that exported by long.js. + * @typedef Long + * @type {Object} + * @property {number} low Low bits + * @property {number} high High bits + * @property {boolean} unsigned Whether unsigned or not + */ + /** * Long.js's Long class if available. * @type {?function(new: Long)} diff --git a/stub-long.d.ts b/stub-long.d.ts new file mode 100644 index 000000000..7099aaa8a --- /dev/null +++ b/stub-long.d.ts @@ -0,0 +1,9 @@ +// minimal stub for Long instances for reference when not using long.js. + +type Long = LongStub; + +interface LongStub { + lo: number, + hi: number, + unsigned: boolean +} diff --git a/stub-node.d.ts b/stub-node.d.ts new file mode 100644 index 000000000..8e0e231d5 --- /dev/null +++ b/stub-node.d.ts @@ -0,0 +1,6 @@ +// minimal stub for node types for reference when not using node. + +type Buffer = BufferStub; + +interface BufferStub extends Uint8Array { +} diff --git a/tests/comp_typescript.ts b/tests/comp_typescript.ts index 9ad41b10d..ef8636201 100644 --- a/tests/comp_typescript.ts +++ b/tests/comp_typescript.ts @@ -1,3 +1,9 @@ +// uncomment for browser only / non long.js versions +/* +/// +/// +*/ + import * as protobuf from ".."; export const proto = { @@ -30,9 +36,10 @@ protobuf.Class.create(root.lookupType("Hello"), Hello); let hello = new Hello(); -let buf = Hello.encode(hello.foo()).finish(); +let writer = Hello.encode(hello.foo()) as protobuf.BufferWriter; +let buf = writer.finish(); let hello2 = Hello.decode(buf) as Hello; -process.stdout.write(JSON.stringify(hello2.foo().toObject(), null, 2)); +// console.log(JSON.stringify(hello2.foo().toObject(), null, 2)); export const utf8 = protobuf.util.utf8; diff --git a/tests/data/comments.js b/tests/data/comments.js index 1f813b187..41cb7f942 100644 --- a/tests/data/comments.js +++ b/tests/data/comments.js @@ -70,7 +70,7 @@ $root.Test1 = (function() { /** * Encodes the specified Test1 message, length delimited. Does not implicitly {@link Test1.verify|verify} messages. - * @param {Test1|Object.} message Test1 message or plain object to encode + * @param {Test1$Properties} message Test1 message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ @@ -258,7 +258,7 @@ $root.Test2 = (function() { /** * Encodes the specified Test2 message, length delimited. Does not implicitly {@link Test2.verify|verify} messages. - * @param {Test2|Object.} message Test2 message or plain object to encode + * @param {Test2$Properties} message Test2 message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ @@ -373,9 +373,9 @@ $root.Test2 = (function() { */ $root.Test3 = (function() { var valuesById = {}, values = Object.create(valuesById); - values["ONE"] = 1; - values["TWO"] = 2; - values["THREE"] = 3; + values[valuesById[1] = "ONE"] = 1; + values[valuesById[2] = "TWO"] = 2; + values[valuesById[3] = "THREE"] = 3; return values; })(); diff --git a/tests/data/convert.js b/tests/data/convert.js index c69a7f7f4..1abd47158 100644 --- a/tests/data/convert.js +++ b/tests/data/convert.js @@ -106,7 +106,7 @@ $root.Message = (function() { /** * Encodes the specified Message message, length delimited. Does not implicitly {@link Message.verify|verify} messages. - * @param {Message|Object.} message Message message or plain object to encode + * @param {Message$Properties} message Message message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ @@ -479,8 +479,8 @@ $root.Message = (function() { */ Message.SomeEnum = (function() { var valuesById = {}, values = Object.create(valuesById); - values["ONE"] = 1; - values["TWO"] = 2; + values[valuesById[1] = "ONE"] = 1; + values[valuesById[2] = "TWO"] = 2; return values; })(); diff --git a/tests/data/mapbox/vector_tile.js b/tests/data/mapbox/vector_tile.js index 07a919bbd..f9f390bed 100644 --- a/tests/data/mapbox/vector_tile.js +++ b/tests/data/mapbox/vector_tile.js @@ -69,7 +69,7 @@ $root.vector_tile = (function() { /** * Encodes the specified Tile message, length delimited. Does not implicitly {@link vector_tile.Tile.verify|verify} messages. - * @param {vector_tile.Tile|Object.} message Tile message or plain object to encode + * @param {vector_tile.Tile$Properties} message Tile message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ @@ -218,10 +218,10 @@ $root.vector_tile = (function() { */ Tile.GeomType = (function() { var valuesById = {}, values = Object.create(valuesById); - values["UNKNOWN"] = 0; - values["POINT"] = 1; - values["LINESTRING"] = 2; - values["POLYGON"] = 3; + values[valuesById[0] = "UNKNOWN"] = 0; + values[valuesById[1] = "POINT"] = 1; + values[valuesById[2] = "LINESTRING"] = 2; + values[valuesById[3] = "POLYGON"] = 3; return values; })(); @@ -298,7 +298,7 @@ $root.vector_tile = (function() { /** * Encodes the specified Value message, length delimited. Does not implicitly {@link vector_tile.Tile.Value.verify|verify} messages. - * @param {vector_tile.Tile.Value|Object.} message Value message or plain object to encode + * @param {vector_tile.Tile.Value$Properties} message Value message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ @@ -599,7 +599,7 @@ $root.vector_tile = (function() { /** * Encodes the specified Feature message, length delimited. Does not implicitly {@link vector_tile.Tile.Feature.verify|verify} messages. - * @param {vector_tile.Tile.Feature|Object.} message Feature message or plain object to encode + * @param {vector_tile.Tile.Feature$Properties} message Feature message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ @@ -904,7 +904,7 @@ $root.vector_tile = (function() { /** * Encodes the specified Layer message, length delimited. Does not implicitly {@link vector_tile.Tile.Layer.verify|verify} messages. - * @param {vector_tile.Tile.Layer|Object.} message Layer message or plain object to encode + * @param {vector_tile.Tile.Layer$Properties} message Layer message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ diff --git a/tests/data/package.js b/tests/data/package.js index 1146a87c2..e3eb702b9 100644 --- a/tests/data/package.js +++ b/tests/data/package.js @@ -140,7 +140,7 @@ $root.Package = (function() { /** * Encodes the specified Package message, length delimited. Does not implicitly {@link Package.verify|verify} messages. - * @param {Package|Object.} message Package message or plain object to encode + * @param {Package$Properties} message Package message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ @@ -627,7 +627,7 @@ $root.Package = (function() { /** * Encodes the specified Repository message, length delimited. Does not implicitly {@link Package.Repository.verify|verify} messages. - * @param {Package.Repository|Object.} message Repository message or plain object to encode + * @param {Package.Repository$Properties} message Repository message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ diff --git a/tests/data/rpc.d.ts b/tests/data/rpc.d.ts index 4c093454b..d19c66a36 100644 --- a/tests/data/rpc.d.ts +++ b/tests/data/rpc.d.ts @@ -9,15 +9,15 @@ export class MyService extends $protobuf.rpc.Service { type MyService_myMethod_Callback = (error: Error, response?: MyResponse) => void; -interface MyRequest$Properties { +type MyRequest$Properties = { path?: string; -} +}; export class MyRequest implements MyRequest$Properties { constructor(properties?: MyRequest$Properties); public static create(properties?: MyRequest$Properties): MyRequest; public static encode(message: MyRequest$Properties, writer?: $protobuf.Writer): $protobuf.Writer; - public static encodeDelimited(message: (MyRequest|{ [k: string]: any }), writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: MyRequest$Properties, writer?: $protobuf.Writer): $protobuf.Writer; public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): MyRequest; public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): MyRequest; public static verify(message: { [k: string]: any }): string; @@ -28,15 +28,15 @@ export class MyRequest implements MyRequest$Properties { public toJSON(): { [k: string]: any }; } -interface MyResponse$Properties { +type MyResponse$Properties = { status?: number; -} +}; export class MyResponse implements MyResponse$Properties { constructor(properties?: MyResponse$Properties); public static create(properties?: MyResponse$Properties): MyResponse; public static encode(message: MyResponse$Properties, writer?: $protobuf.Writer): $protobuf.Writer; - public static encodeDelimited(message: (MyResponse|{ [k: string]: any }), writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: MyResponse$Properties, writer?: $protobuf.Writer): $protobuf.Writer; public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): MyResponse; public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): MyResponse; public static verify(message: { [k: string]: any }): string; diff --git a/tests/data/rpc.js b/tests/data/rpc.js index 6f1ede887..347e4e3c4 100644 --- a/tests/data/rpc.js +++ b/tests/data/rpc.js @@ -116,7 +116,7 @@ $root.MyRequest = (function() { /** * Encodes the specified MyRequest message, length delimited. Does not implicitly {@link MyRequest.verify|verify} messages. - * @param {MyRequest|Object.} message MyRequest message or plain object to encode + * @param {MyRequest$Properties} message MyRequest message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ @@ -286,7 +286,7 @@ $root.MyResponse = (function() { /** * Encodes the specified MyResponse message, length delimited. Does not implicitly {@link MyResponse.verify|verify} messages. - * @param {MyResponse|Object.} message MyResponse message or plain object to encode + * @param {MyResponse$Properties} message MyResponse message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ diff --git a/tests/data/test.d.ts b/tests/data/test.d.ts index afbfcd87e..b2f387997 100644 --- a/tests/data/test.d.ts +++ b/tests/data/test.d.ts @@ -10,7 +10,7 @@ export namespace jspb { constructor(properties?: jspb.test.Empty$Properties); public static create(properties?: jspb.test.Empty$Properties): jspb.test.Empty; public static encode(message: jspb.test.Empty$Properties, writer?: $protobuf.Writer): $protobuf.Writer; - public static encodeDelimited(message: (jspb.test.Empty|{ [k: string]: any }), writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: jspb.test.Empty$Properties, writer?: $protobuf.Writer): $protobuf.Writer; public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.Empty; public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): jspb.test.Empty; public static verify(message: { [k: string]: any }): string; @@ -26,15 +26,15 @@ export namespace jspb { BAR = 2 } - interface EnumContainer$Properties { + type EnumContainer$Properties = { outerEnum?: number; - } + }; class EnumContainer implements jspb.test.EnumContainer$Properties { constructor(properties?: jspb.test.EnumContainer$Properties); public static create(properties?: jspb.test.EnumContainer$Properties): jspb.test.EnumContainer; public static encode(message: jspb.test.EnumContainer$Properties, writer?: $protobuf.Writer): $protobuf.Writer; - public static encodeDelimited(message: (jspb.test.EnumContainer|{ [k: string]: any }), writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: jspb.test.EnumContainer$Properties, writer?: $protobuf.Writer): $protobuf.Writer; public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.EnumContainer; public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): jspb.test.EnumContainer; public static verify(message: { [k: string]: any }): string; @@ -45,17 +45,17 @@ export namespace jspb { public toJSON(): { [k: string]: any }; } - interface Simple1$Properties { + type Simple1$Properties = { aString: string; aRepeatedString?: string[]; aBoolean?: boolean; - } + }; class Simple1 implements jspb.test.Simple1$Properties { constructor(properties?: jspb.test.Simple1$Properties); public static create(properties?: jspb.test.Simple1$Properties): jspb.test.Simple1; public static encode(message: jspb.test.Simple1$Properties, writer?: $protobuf.Writer): $protobuf.Writer; - public static encodeDelimited(message: (jspb.test.Simple1|{ [k: string]: any }), writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: jspb.test.Simple1$Properties, writer?: $protobuf.Writer): $protobuf.Writer; public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.Simple1; public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): jspb.test.Simple1; public static verify(message: { [k: string]: any }): string; @@ -66,16 +66,16 @@ export namespace jspb { public toJSON(): { [k: string]: any }; } - interface Simple2$Properties { + type Simple2$Properties = { aString: string; aRepeatedString?: string[]; - } + }; class Simple2 implements jspb.test.Simple2$Properties { constructor(properties?: jspb.test.Simple2$Properties); public static create(properties?: jspb.test.Simple2$Properties): jspb.test.Simple2; public static encode(message: jspb.test.Simple2$Properties, writer?: $protobuf.Writer): $protobuf.Writer; - public static encodeDelimited(message: (jspb.test.Simple2|{ [k: string]: any }), writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: jspb.test.Simple2$Properties, writer?: $protobuf.Writer): $protobuf.Writer; public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.Simple2; public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): jspb.test.Simple2; public static verify(message: { [k: string]: any }): string; @@ -86,18 +86,18 @@ export namespace jspb { public toJSON(): { [k: string]: any }; } - interface SpecialCases$Properties { + type SpecialCases$Properties = { normal: string; default: string; function: string; var: string; - } + }; class SpecialCases implements jspb.test.SpecialCases$Properties { constructor(properties?: jspb.test.SpecialCases$Properties); public static create(properties?: jspb.test.SpecialCases$Properties): jspb.test.SpecialCases; public static encode(message: jspb.test.SpecialCases$Properties, writer?: $protobuf.Writer): $protobuf.Writer; - public static encodeDelimited(message: (jspb.test.SpecialCases|{ [k: string]: any }), writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: jspb.test.SpecialCases$Properties, writer?: $protobuf.Writer): $protobuf.Writer; public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.SpecialCases; public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): jspb.test.SpecialCases; public static verify(message: { [k: string]: any }): string; @@ -108,19 +108,19 @@ export namespace jspb { public toJSON(): { [k: string]: any }; } - interface OptionalFields$Properties { + type OptionalFields$Properties = { aString?: string; aBool: boolean; aNestedMessage?: jspb.test.OptionalFields.Nested; aRepeatedMessage?: jspb.test.OptionalFields.Nested[]; aRepeatedString?: string[]; - } + }; class OptionalFields implements jspb.test.OptionalFields$Properties { constructor(properties?: jspb.test.OptionalFields$Properties); public static create(properties?: jspb.test.OptionalFields$Properties): jspb.test.OptionalFields; public static encode(message: jspb.test.OptionalFields$Properties, writer?: $protobuf.Writer): $protobuf.Writer; - public static encodeDelimited(message: (jspb.test.OptionalFields|{ [k: string]: any }), writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: jspb.test.OptionalFields$Properties, writer?: $protobuf.Writer): $protobuf.Writer; public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.OptionalFields; public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): jspb.test.OptionalFields; public static verify(message: { [k: string]: any }): string; @@ -133,11 +133,15 @@ export namespace jspb { namespace OptionalFields { + type Nested$Properties = { + anInt?: number; + }; + class Nested implements jspb.test.OptionalFields.Nested$Properties { constructor(properties?: jspb.test.OptionalFields.Nested$Properties); public static create(properties?: jspb.test.OptionalFields.Nested$Properties): jspb.test.OptionalFields.Nested; public static encode(message: jspb.test.OptionalFields.Nested$Properties, writer?: $protobuf.Writer): $protobuf.Writer; - public static encodeDelimited(message: (jspb.test.OptionalFields.Nested|{ [k: string]: any }), writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: jspb.test.OptionalFields.Nested$Properties, writer?: $protobuf.Writer): $protobuf.Writer; public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.OptionalFields.Nested; public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): jspb.test.OptionalFields.Nested; public static verify(message: { [k: string]: any }): string; @@ -149,23 +153,23 @@ export namespace jspb { } } - interface HasExtensions$Properties { + type HasExtensions$Properties = { str1?: string; str2?: string; str3?: string; - .jspb.test.IsExtension.extField?: jspb.test.IsExtension; - .jspb.test.IndirectExtension.simple?: jspb.test.Simple1; - .jspb.test.IndirectExtension.str?: string; - .jspb.test.IndirectExtension.repeatedStr?: string[]; - .jspb.test.IndirectExtension.repeatedSimple?: jspb.test.Simple1[]; - .jspb.test.simple1?: jspb.test.Simple1; - } + ".jspb.test.IsExtension.extField"?: jspb.test.IsExtension; + ".jspb.test.IndirectExtension.simple"?: jspb.test.Simple1; + ".jspb.test.IndirectExtension.str"?: string; + ".jspb.test.IndirectExtension.repeatedStr"?: string[]; + ".jspb.test.IndirectExtension.repeatedSimple"?: jspb.test.Simple1[]; + ".jspb.test.simple1"?: jspb.test.Simple1; + }; class HasExtensions implements jspb.test.HasExtensions$Properties { constructor(properties?: jspb.test.HasExtensions$Properties); public static create(properties?: jspb.test.HasExtensions$Properties): jspb.test.HasExtensions; public static encode(message: jspb.test.HasExtensions$Properties, writer?: $protobuf.Writer): $protobuf.Writer; - public static encodeDelimited(message: (jspb.test.HasExtensions|{ [k: string]: any }), writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: jspb.test.HasExtensions$Properties, writer?: $protobuf.Writer): $protobuf.Writer; public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.HasExtensions; public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): jspb.test.HasExtensions; public static verify(message: { [k: string]: any }): string; @@ -176,19 +180,19 @@ export namespace jspb { public toJSON(): { [k: string]: any }; } - interface Complex$Properties { + type Complex$Properties = { aString: string; anOutOfOrderBool: boolean; aNestedMessage?: jspb.test.Complex.Nested; aRepeatedMessage?: jspb.test.Complex.Nested[]; aRepeatedString?: string[]; - } + }; class Complex implements jspb.test.Complex$Properties { constructor(properties?: jspb.test.Complex$Properties); public static create(properties?: jspb.test.Complex$Properties): jspb.test.Complex; public static encode(message: jspb.test.Complex$Properties, writer?: $protobuf.Writer): $protobuf.Writer; - public static encodeDelimited(message: (jspb.test.Complex|{ [k: string]: any }), writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: jspb.test.Complex$Properties, writer?: $protobuf.Writer): $protobuf.Writer; public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.Complex; public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): jspb.test.Complex; public static verify(message: { [k: string]: any }): string; @@ -201,11 +205,15 @@ export namespace jspb { namespace Complex { + type Nested$Properties = { + anInt: number; + }; + class Nested implements jspb.test.Complex.Nested$Properties { constructor(properties?: jspb.test.Complex.Nested$Properties); public static create(properties?: jspb.test.Complex.Nested$Properties): jspb.test.Complex.Nested; public static encode(message: jspb.test.Complex.Nested$Properties, writer?: $protobuf.Writer): $protobuf.Writer; - public static encodeDelimited(message: (jspb.test.Complex.Nested|{ [k: string]: any }), writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: jspb.test.Complex.Nested$Properties, writer?: $protobuf.Writer): $protobuf.Writer; public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.Complex.Nested; public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): jspb.test.Complex.Nested; public static verify(message: { [k: string]: any }): string; @@ -223,7 +231,7 @@ export namespace jspb { constructor(properties?: jspb.test.OuterMessage$Properties); public static create(properties?: jspb.test.OuterMessage$Properties): jspb.test.OuterMessage; public static encode(message: jspb.test.OuterMessage$Properties, writer?: $protobuf.Writer): $protobuf.Writer; - public static encodeDelimited(message: (jspb.test.OuterMessage|{ [k: string]: any }), writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: jspb.test.OuterMessage$Properties, writer?: $protobuf.Writer): $protobuf.Writer; public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.OuterMessage; public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): jspb.test.OuterMessage; public static verify(message: { [k: string]: any }): string; @@ -236,11 +244,15 @@ export namespace jspb { namespace OuterMessage { + type Complex$Properties = { + innerComplexField?: number; + }; + class Complex implements jspb.test.OuterMessage.Complex$Properties { constructor(properties?: jspb.test.OuterMessage.Complex$Properties); public static create(properties?: jspb.test.OuterMessage.Complex$Properties): jspb.test.OuterMessage.Complex; public static encode(message: jspb.test.OuterMessage.Complex$Properties, writer?: $protobuf.Writer): $protobuf.Writer; - public static encodeDelimited(message: (jspb.test.OuterMessage.Complex|{ [k: string]: any }), writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: jspb.test.OuterMessage.Complex$Properties, writer?: $protobuf.Writer): $protobuf.Writer; public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.OuterMessage.Complex; public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): jspb.test.OuterMessage.Complex; public static verify(message: { [k: string]: any }): string; @@ -252,15 +264,15 @@ export namespace jspb { } } - interface IsExtension$Properties { + type IsExtension$Properties = { ext1?: string; - } + }; class IsExtension implements jspb.test.IsExtension$Properties { constructor(properties?: jspb.test.IsExtension$Properties); public static create(properties?: jspb.test.IsExtension$Properties): jspb.test.IsExtension; public static encode(message: jspb.test.IsExtension$Properties, writer?: $protobuf.Writer): $protobuf.Writer; - public static encodeDelimited(message: (jspb.test.IsExtension|{ [k: string]: any }), writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: jspb.test.IsExtension$Properties, writer?: $protobuf.Writer): $protobuf.Writer; public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.IsExtension; public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): jspb.test.IsExtension; public static verify(message: { [k: string]: any }): string; @@ -277,7 +289,7 @@ export namespace jspb { constructor(properties?: jspb.test.IndirectExtension$Properties); public static create(properties?: jspb.test.IndirectExtension$Properties): jspb.test.IndirectExtension; public static encode(message: jspb.test.IndirectExtension$Properties, writer?: $protobuf.Writer): $protobuf.Writer; - public static encodeDelimited(message: (jspb.test.IndirectExtension|{ [k: string]: any }), writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: jspb.test.IndirectExtension$Properties, writer?: $protobuf.Writer): $protobuf.Writer; public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.IndirectExtension; public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): jspb.test.IndirectExtension; public static verify(message: { [k: string]: any }): string; @@ -288,20 +300,20 @@ export namespace jspb { public toJSON(): { [k: string]: any }; } - interface DefaultValues$Properties { + type DefaultValues$Properties = { stringField?: string; boolField?: boolean; intField?: (number|$protobuf.Long); enumField?: number; emptyField?: string; bytesField?: Uint8Array; - } + }; class DefaultValues implements jspb.test.DefaultValues$Properties { constructor(properties?: jspb.test.DefaultValues$Properties); public static create(properties?: jspb.test.DefaultValues$Properties): jspb.test.DefaultValues; public static encode(message: jspb.test.DefaultValues$Properties, writer?: $protobuf.Writer): $protobuf.Writer; - public static encodeDelimited(message: (jspb.test.DefaultValues|{ [k: string]: any }), writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: jspb.test.DefaultValues$Properties, writer?: $protobuf.Writer): $protobuf.Writer; public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.DefaultValues; public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): jspb.test.DefaultValues; public static verify(message: { [k: string]: any }): string; @@ -320,7 +332,7 @@ export namespace jspb { } } - interface FloatingPointFields$Properties { + type FloatingPointFields$Properties = { optionalFloatField?: number; requiredFloatField: number; repeatedFloatField?: number[]; @@ -329,13 +341,13 @@ export namespace jspb { requiredDoubleField: number; repeatedDoubleField?: number[]; defaultDoubleField?: number; - } + }; class FloatingPointFields implements jspb.test.FloatingPointFields$Properties { constructor(properties?: jspb.test.FloatingPointFields$Properties); public static create(properties?: jspb.test.FloatingPointFields$Properties): jspb.test.FloatingPointFields; public static encode(message: jspb.test.FloatingPointFields$Properties, writer?: $protobuf.Writer): $protobuf.Writer; - public static encodeDelimited(message: (jspb.test.FloatingPointFields|{ [k: string]: any }), writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: jspb.test.FloatingPointFields$Properties, writer?: $protobuf.Writer): $protobuf.Writer; public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.FloatingPointFields; public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): jspb.test.FloatingPointFields; public static verify(message: { [k: string]: any }): string; @@ -346,20 +358,20 @@ export namespace jspb { public toJSON(): { [k: string]: any }; } - interface TestClone$Properties { + type TestClone$Properties = { str?: string; simple1?: jspb.test.Simple1; simple2?: jspb.test.Simple1[]; bytesField?: Uint8Array; unused?: string; - .jspb.test.CloneExtension.extField?: jspb.test.CloneExtension; - } + ".jspb.test.CloneExtension.extField"?: jspb.test.CloneExtension; + }; class TestClone implements jspb.test.TestClone$Properties { constructor(properties?: jspb.test.TestClone$Properties); public static create(properties?: jspb.test.TestClone$Properties): jspb.test.TestClone; public static encode(message: jspb.test.TestClone$Properties, writer?: $protobuf.Writer): $protobuf.Writer; - public static encodeDelimited(message: (jspb.test.TestClone|{ [k: string]: any }), writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: jspb.test.TestClone$Properties, writer?: $protobuf.Writer): $protobuf.Writer; public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.TestClone; public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): jspb.test.TestClone; public static verify(message: { [k: string]: any }): string; @@ -370,15 +382,15 @@ export namespace jspb { public toJSON(): { [k: string]: any }; } - interface CloneExtension$Properties { + type CloneExtension$Properties = { ext?: string; - } + }; class CloneExtension implements jspb.test.CloneExtension$Properties { constructor(properties?: jspb.test.CloneExtension$Properties); public static create(properties?: jspb.test.CloneExtension$Properties): jspb.test.CloneExtension; public static encode(message: jspb.test.CloneExtension$Properties, writer?: $protobuf.Writer): $protobuf.Writer; - public static encodeDelimited(message: (jspb.test.CloneExtension|{ [k: string]: any }), writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: jspb.test.CloneExtension$Properties, writer?: $protobuf.Writer): $protobuf.Writer; public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.CloneExtension; public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): jspb.test.CloneExtension; public static verify(message: { [k: string]: any }): string; @@ -389,20 +401,20 @@ export namespace jspb { public toJSON(): { [k: string]: any }; } - interface TestGroup$Properties { + type TestGroup$Properties = { repeatedGroup?: jspb.test.TestGroup.RepeatedGroup[]; requiredGroup: jspb.test.TestGroup.RequiredGroup; optionalGroup?: jspb.test.TestGroup.OptionalGroup; id?: string; requiredSimple: jspb.test.Simple2; optionalSimple?: jspb.test.Simple2; - } + }; class TestGroup implements jspb.test.TestGroup$Properties { constructor(properties?: jspb.test.TestGroup$Properties); public static create(properties?: jspb.test.TestGroup$Properties): jspb.test.TestGroup; public static encode(message: jspb.test.TestGroup$Properties, writer?: $protobuf.Writer): $protobuf.Writer; - public static encodeDelimited(message: (jspb.test.TestGroup|{ [k: string]: any }), writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: jspb.test.TestGroup$Properties, writer?: $protobuf.Writer): $protobuf.Writer; public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.TestGroup; public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): jspb.test.TestGroup; public static verify(message: { [k: string]: any }): string; @@ -415,11 +427,16 @@ export namespace jspb { namespace TestGroup { + type RepeatedGroup$Properties = { + id: string; + someBool?: boolean[]; + }; + class RepeatedGroup implements jspb.test.TestGroup.RepeatedGroup$Properties { constructor(properties?: jspb.test.TestGroup.RepeatedGroup$Properties); public static create(properties?: jspb.test.TestGroup.RepeatedGroup$Properties): jspb.test.TestGroup.RepeatedGroup; public static encode(message: jspb.test.TestGroup.RepeatedGroup$Properties, writer?: $protobuf.Writer): $protobuf.Writer; - public static encodeDelimited(message: (jspb.test.TestGroup.RepeatedGroup|{ [k: string]: any }), writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: jspb.test.TestGroup.RepeatedGroup$Properties, writer?: $protobuf.Writer): $protobuf.Writer; public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.TestGroup.RepeatedGroup; public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): jspb.test.TestGroup.RepeatedGroup; public static verify(message: { [k: string]: any }): string; @@ -430,11 +447,15 @@ export namespace jspb { public toJSON(): { [k: string]: any }; } + type RequiredGroup$Properties = { + id: string; + }; + class RequiredGroup implements jspb.test.TestGroup.RequiredGroup$Properties { constructor(properties?: jspb.test.TestGroup.RequiredGroup$Properties); public static create(properties?: jspb.test.TestGroup.RequiredGroup$Properties): jspb.test.TestGroup.RequiredGroup; public static encode(message: jspb.test.TestGroup.RequiredGroup$Properties, writer?: $protobuf.Writer): $protobuf.Writer; - public static encodeDelimited(message: (jspb.test.TestGroup.RequiredGroup|{ [k: string]: any }), writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: jspb.test.TestGroup.RequiredGroup$Properties, writer?: $protobuf.Writer): $protobuf.Writer; public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.TestGroup.RequiredGroup; public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): jspb.test.TestGroup.RequiredGroup; public static verify(message: { [k: string]: any }): string; @@ -445,11 +466,15 @@ export namespace jspb { public toJSON(): { [k: string]: any }; } + type OptionalGroup$Properties = { + id: string; + }; + class OptionalGroup implements jspb.test.TestGroup.OptionalGroup$Properties { constructor(properties?: jspb.test.TestGroup.OptionalGroup$Properties); public static create(properties?: jspb.test.TestGroup.OptionalGroup$Properties): jspb.test.TestGroup.OptionalGroup; public static encode(message: jspb.test.TestGroup.OptionalGroup$Properties, writer?: $protobuf.Writer): $protobuf.Writer; - public static encodeDelimited(message: (jspb.test.TestGroup.OptionalGroup|{ [k: string]: any }), writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: jspb.test.TestGroup.OptionalGroup$Properties, writer?: $protobuf.Writer): $protobuf.Writer; public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.TestGroup.OptionalGroup; public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): jspb.test.TestGroup.OptionalGroup; public static verify(message: { [k: string]: any }): string; @@ -461,15 +486,15 @@ export namespace jspb { } } - interface TestGroup1$Properties { + type TestGroup1$Properties = { group?: jspb.test.TestGroup.RepeatedGroup; - } + }; class TestGroup1 implements jspb.test.TestGroup1$Properties { constructor(properties?: jspb.test.TestGroup1$Properties); public static create(properties?: jspb.test.TestGroup1$Properties): jspb.test.TestGroup1; public static encode(message: jspb.test.TestGroup1$Properties, writer?: $protobuf.Writer): $protobuf.Writer; - public static encodeDelimited(message: (jspb.test.TestGroup1|{ [k: string]: any }), writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: jspb.test.TestGroup1$Properties, writer?: $protobuf.Writer): $protobuf.Writer; public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.TestGroup1; public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): jspb.test.TestGroup1; public static verify(message: { [k: string]: any }): string; @@ -480,16 +505,16 @@ export namespace jspb { public toJSON(): { [k: string]: any }; } - interface TestReservedNames$Properties { + type TestReservedNames$Properties = { extension?: number; - .jspb.test.TestReservedNamesExtension.foo?: number; - } + ".jspb.test.TestReservedNamesExtension.foo"?: number; + }; class TestReservedNames implements jspb.test.TestReservedNames$Properties { constructor(properties?: jspb.test.TestReservedNames$Properties); public static create(properties?: jspb.test.TestReservedNames$Properties): jspb.test.TestReservedNames; public static encode(message: jspb.test.TestReservedNames$Properties, writer?: $protobuf.Writer): $protobuf.Writer; - public static encodeDelimited(message: (jspb.test.TestReservedNames|{ [k: string]: any }), writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: jspb.test.TestReservedNames$Properties, writer?: $protobuf.Writer): $protobuf.Writer; public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.TestReservedNames; public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): jspb.test.TestReservedNames; public static verify(message: { [k: string]: any }): string; @@ -506,7 +531,7 @@ export namespace jspb { constructor(properties?: jspb.test.TestReservedNamesExtension$Properties); public static create(properties?: jspb.test.TestReservedNamesExtension$Properties): jspb.test.TestReservedNamesExtension; public static encode(message: jspb.test.TestReservedNamesExtension$Properties, writer?: $protobuf.Writer): $protobuf.Writer; - public static encodeDelimited(message: (jspb.test.TestReservedNamesExtension|{ [k: string]: any }), writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: jspb.test.TestReservedNamesExtension$Properties, writer?: $protobuf.Writer): $protobuf.Writer; public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.TestReservedNamesExtension; public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): jspb.test.TestReservedNamesExtension; public static verify(message: { [k: string]: any }): string; @@ -517,7 +542,7 @@ export namespace jspb { public toJSON(): { [k: string]: any }; } - interface TestMessageWithOneof$Properties { + type TestMessageWithOneof$Properties = { pone?: string; pthree?: string; rone?: jspb.test.TestMessageWithOneof; @@ -528,7 +553,7 @@ export namespace jspb { atwo?: number; bone?: number; btwo?: number; - } + }; class TestMessageWithOneof implements jspb.test.TestMessageWithOneof$Properties { constructor(properties?: jspb.test.TestMessageWithOneof$Properties); @@ -538,7 +563,7 @@ export namespace jspb { public defaultOneofB?: string; public static create(properties?: jspb.test.TestMessageWithOneof$Properties): jspb.test.TestMessageWithOneof; public static encode(message: jspb.test.TestMessageWithOneof$Properties, writer?: $protobuf.Writer): $protobuf.Writer; - public static encodeDelimited(message: (jspb.test.TestMessageWithOneof|{ [k: string]: any }), writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: jspb.test.TestMessageWithOneof$Properties, writer?: $protobuf.Writer): $protobuf.Writer; public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.TestMessageWithOneof; public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): jspb.test.TestMessageWithOneof; public static verify(message: { [k: string]: any }): string; @@ -549,16 +574,16 @@ export namespace jspb { public toJSON(): { [k: string]: any }; } - interface TestEndsWithBytes$Properties { + type TestEndsWithBytes$Properties = { value?: number; data?: Uint8Array; - } + }; class TestEndsWithBytes implements jspb.test.TestEndsWithBytes$Properties { constructor(properties?: jspb.test.TestEndsWithBytes$Properties); public static create(properties?: jspb.test.TestEndsWithBytes$Properties): jspb.test.TestEndsWithBytes; public static encode(message: jspb.test.TestEndsWithBytes$Properties, writer?: $protobuf.Writer): $protobuf.Writer; - public static encodeDelimited(message: (jspb.test.TestEndsWithBytes|{ [k: string]: any }), writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: jspb.test.TestEndsWithBytes$Properties, writer?: $protobuf.Writer): $protobuf.Writer; public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.TestEndsWithBytes; public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): jspb.test.TestEndsWithBytes; public static verify(message: { [k: string]: any }): string; @@ -569,7 +594,7 @@ export namespace jspb { public toJSON(): { [k: string]: any }; } - interface TestMapFieldsNoBinary$Properties { + type TestMapFieldsNoBinary$Properties = { mapStringString?: { [k: string]: string }; mapStringInt32?: { [k: string]: number }; mapStringInt64?: { [k: string]: (number|$protobuf.Long) }; @@ -582,13 +607,13 @@ export namespace jspb { mapBoolString?: { [k: string]: string }; testMapFields?: jspb.test.TestMapFieldsNoBinary; mapStringTestmapfields?: { [k: string]: jspb.test.TestMapFieldsNoBinary }; - } + }; class TestMapFieldsNoBinary implements jspb.test.TestMapFieldsNoBinary$Properties { constructor(properties?: jspb.test.TestMapFieldsNoBinary$Properties); public static create(properties?: jspb.test.TestMapFieldsNoBinary$Properties): jspb.test.TestMapFieldsNoBinary; public static encode(message: jspb.test.TestMapFieldsNoBinary$Properties, writer?: $protobuf.Writer): $protobuf.Writer; - public static encodeDelimited(message: (jspb.test.TestMapFieldsNoBinary|{ [k: string]: any }), writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: jspb.test.TestMapFieldsNoBinary$Properties, writer?: $protobuf.Writer): $protobuf.Writer; public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.TestMapFieldsNoBinary; public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): jspb.test.TestMapFieldsNoBinary; public static verify(message: { [k: string]: any }): string; @@ -605,15 +630,15 @@ export namespace jspb { MAP_VALUE_BAZ_NOBINARY = 2 } - interface MapValueMessageNoBinary$Properties { + type MapValueMessageNoBinary$Properties = { foo?: number; - } + }; class MapValueMessageNoBinary implements jspb.test.MapValueMessageNoBinary$Properties { constructor(properties?: jspb.test.MapValueMessageNoBinary$Properties); public static create(properties?: jspb.test.MapValueMessageNoBinary$Properties): jspb.test.MapValueMessageNoBinary; public static encode(message: jspb.test.MapValueMessageNoBinary$Properties, writer?: $protobuf.Writer): $protobuf.Writer; - public static encodeDelimited(message: (jspb.test.MapValueMessageNoBinary|{ [k: string]: any }), writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: jspb.test.MapValueMessageNoBinary$Properties, writer?: $protobuf.Writer): $protobuf.Writer; public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.MapValueMessageNoBinary; public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): jspb.test.MapValueMessageNoBinary; public static verify(message: { [k: string]: any }): string; @@ -630,7 +655,7 @@ export namespace jspb { constructor(properties?: jspb.test.Deeply$Properties); public static create(properties?: jspb.test.Deeply$Properties): jspb.test.Deeply; public static encode(message: jspb.test.Deeply$Properties, writer?: $protobuf.Writer): $protobuf.Writer; - public static encodeDelimited(message: (jspb.test.Deeply|{ [k: string]: any }), writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: jspb.test.Deeply$Properties, writer?: $protobuf.Writer): $protobuf.Writer; public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.Deeply; public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): jspb.test.Deeply; public static verify(message: { [k: string]: any }): string; @@ -649,7 +674,7 @@ export namespace jspb { constructor(properties?: jspb.test.Deeply.Nested$Properties); public static create(properties?: jspb.test.Deeply.Nested$Properties): jspb.test.Deeply.Nested; public static encode(message: jspb.test.Deeply.Nested$Properties, writer?: $protobuf.Writer): $protobuf.Writer; - public static encodeDelimited(message: (jspb.test.Deeply.Nested|{ [k: string]: any }), writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: jspb.test.Deeply.Nested$Properties, writer?: $protobuf.Writer): $protobuf.Writer; public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.Deeply.Nested; public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): jspb.test.Deeply.Nested; public static verify(message: { [k: string]: any }): string; @@ -662,11 +687,15 @@ export namespace jspb { namespace Nested { + type Message$Properties = { + count?: number; + }; + class Message implements jspb.test.Deeply.Nested.Message$Properties { constructor(properties?: jspb.test.Deeply.Nested.Message$Properties); public static create(properties?: jspb.test.Deeply.Nested.Message$Properties): jspb.test.Deeply.Nested.Message; public static encode(message: jspb.test.Deeply.Nested.Message$Properties, writer?: $protobuf.Writer): $protobuf.Writer; - public static encodeDelimited(message: (jspb.test.Deeply.Nested.Message|{ [k: string]: any }), writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: jspb.test.Deeply.Nested.Message$Properties, writer?: $protobuf.Writer): $protobuf.Writer; public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): jspb.test.Deeply.Nested.Message; public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): jspb.test.Deeply.Nested.Message; public static verify(message: { [k: string]: any }): string; @@ -685,15 +714,15 @@ export namespace google { namespace protobuf { - interface FileDescriptorSet$Properties { + type FileDescriptorSet$Properties = { file?: google.protobuf.FileDescriptorProto[]; - } + }; class FileDescriptorSet implements google.protobuf.FileDescriptorSet$Properties { constructor(properties?: google.protobuf.FileDescriptorSet$Properties); public static create(properties?: google.protobuf.FileDescriptorSet$Properties): google.protobuf.FileDescriptorSet; public static encode(message: google.protobuf.FileDescriptorSet$Properties, writer?: $protobuf.Writer): $protobuf.Writer; - public static encodeDelimited(message: (google.protobuf.FileDescriptorSet|{ [k: string]: any }), writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.protobuf.FileDescriptorSet$Properties, writer?: $protobuf.Writer): $protobuf.Writer; public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FileDescriptorSet; public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FileDescriptorSet; public static verify(message: { [k: string]: any }): string; @@ -704,9 +733,9 @@ export namespace google { public toJSON(): { [k: string]: any }; } - interface FileDescriptorProto$Properties { + type FileDescriptorProto$Properties = { name?: string; - package?: string; + "package"?: string; dependency?: string[]; publicDependency?: number[]; weakDependency?: number[]; @@ -717,13 +746,13 @@ export namespace google { options?: google.protobuf.FileOptions; sourceCodeInfo?: google.protobuf.SourceCodeInfo; syntax?: string; - } + }; class FileDescriptorProto implements google.protobuf.FileDescriptorProto$Properties { constructor(properties?: google.protobuf.FileDescriptorProto$Properties); public static create(properties?: google.protobuf.FileDescriptorProto$Properties): google.protobuf.FileDescriptorProto; public static encode(message: google.protobuf.FileDescriptorProto$Properties, writer?: $protobuf.Writer): $protobuf.Writer; - public static encodeDelimited(message: (google.protobuf.FileDescriptorProto|{ [k: string]: any }), writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.protobuf.FileDescriptorProto$Properties, writer?: $protobuf.Writer): $protobuf.Writer; public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FileDescriptorProto; public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FileDescriptorProto; public static verify(message: { [k: string]: any }): string; @@ -734,7 +763,7 @@ export namespace google { public toJSON(): { [k: string]: any }; } - interface DescriptorProto$Properties { + type DescriptorProto$Properties = { name?: string; field?: google.protobuf.FieldDescriptorProto[]; extension?: google.protobuf.FieldDescriptorProto[]; @@ -745,13 +774,13 @@ export namespace google { options?: google.protobuf.MessageOptions; reservedRange?: google.protobuf.DescriptorProto.ReservedRange[]; reservedName?: string[]; - } + }; class DescriptorProto implements google.protobuf.DescriptorProto$Properties { constructor(properties?: google.protobuf.DescriptorProto$Properties); public static create(properties?: google.protobuf.DescriptorProto$Properties): google.protobuf.DescriptorProto; public static encode(message: google.protobuf.DescriptorProto$Properties, writer?: $protobuf.Writer): $protobuf.Writer; - public static encodeDelimited(message: (google.protobuf.DescriptorProto|{ [k: string]: any }), writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.protobuf.DescriptorProto$Properties, writer?: $protobuf.Writer): $protobuf.Writer; public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.DescriptorProto; public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.DescriptorProto; public static verify(message: { [k: string]: any }): string; @@ -764,11 +793,16 @@ export namespace google { namespace DescriptorProto { + type ExtensionRange$Properties = { + start?: number; + end?: number; + }; + class ExtensionRange implements google.protobuf.DescriptorProto.ExtensionRange$Properties { constructor(properties?: google.protobuf.DescriptorProto.ExtensionRange$Properties); public static create(properties?: google.protobuf.DescriptorProto.ExtensionRange$Properties): google.protobuf.DescriptorProto.ExtensionRange; public static encode(message: google.protobuf.DescriptorProto.ExtensionRange$Properties, writer?: $protobuf.Writer): $protobuf.Writer; - public static encodeDelimited(message: (google.protobuf.DescriptorProto.ExtensionRange|{ [k: string]: any }), writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.protobuf.DescriptorProto.ExtensionRange$Properties, writer?: $protobuf.Writer): $protobuf.Writer; public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.DescriptorProto.ExtensionRange; public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.DescriptorProto.ExtensionRange; public static verify(message: { [k: string]: any }): string; @@ -779,11 +813,16 @@ export namespace google { public toJSON(): { [k: string]: any }; } + type ReservedRange$Properties = { + start?: number; + end?: number; + }; + class ReservedRange implements google.protobuf.DescriptorProto.ReservedRange$Properties { constructor(properties?: google.protobuf.DescriptorProto.ReservedRange$Properties); public static create(properties?: google.protobuf.DescriptorProto.ReservedRange$Properties): google.protobuf.DescriptorProto.ReservedRange; public static encode(message: google.protobuf.DescriptorProto.ReservedRange$Properties, writer?: $protobuf.Writer): $protobuf.Writer; - public static encodeDelimited(message: (google.protobuf.DescriptorProto.ReservedRange|{ [k: string]: any }), writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.protobuf.DescriptorProto.ReservedRange$Properties, writer?: $protobuf.Writer): $protobuf.Writer; public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.DescriptorProto.ReservedRange; public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.DescriptorProto.ReservedRange; public static verify(message: { [k: string]: any }): string; @@ -795,7 +834,7 @@ export namespace google { } } - interface FieldDescriptorProto$Properties { + type FieldDescriptorProto$Properties = { name?: string; number?: number; label?: number; @@ -806,13 +845,13 @@ export namespace google { oneofIndex?: number; jsonName?: string; options?: google.protobuf.FieldOptions; - } + }; class FieldDescriptorProto implements google.protobuf.FieldDescriptorProto$Properties { constructor(properties?: google.protobuf.FieldDescriptorProto$Properties); public static create(properties?: google.protobuf.FieldDescriptorProto$Properties): google.protobuf.FieldDescriptorProto; public static encode(message: google.protobuf.FieldDescriptorProto$Properties, writer?: $protobuf.Writer): $protobuf.Writer; - public static encodeDelimited(message: (google.protobuf.FieldDescriptorProto|{ [k: string]: any }), writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.protobuf.FieldDescriptorProto$Properties, writer?: $protobuf.Writer): $protobuf.Writer; public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FieldDescriptorProto; public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FieldDescriptorProto; public static verify(message: { [k: string]: any }): string; @@ -853,16 +892,16 @@ export namespace google { } } - interface OneofDescriptorProto$Properties { + type OneofDescriptorProto$Properties = { name?: string; options?: google.protobuf.OneofOptions; - } + }; class OneofDescriptorProto implements google.protobuf.OneofDescriptorProto$Properties { constructor(properties?: google.protobuf.OneofDescriptorProto$Properties); public static create(properties?: google.protobuf.OneofDescriptorProto$Properties): google.protobuf.OneofDescriptorProto; public static encode(message: google.protobuf.OneofDescriptorProto$Properties, writer?: $protobuf.Writer): $protobuf.Writer; - public static encodeDelimited(message: (google.protobuf.OneofDescriptorProto|{ [k: string]: any }), writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.protobuf.OneofDescriptorProto$Properties, writer?: $protobuf.Writer): $protobuf.Writer; public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.OneofDescriptorProto; public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.OneofDescriptorProto; public static verify(message: { [k: string]: any }): string; @@ -873,17 +912,17 @@ export namespace google { public toJSON(): { [k: string]: any }; } - interface EnumDescriptorProto$Properties { + type EnumDescriptorProto$Properties = { name?: string; value?: google.protobuf.EnumValueDescriptorProto[]; options?: google.protobuf.EnumOptions; - } + }; class EnumDescriptorProto implements google.protobuf.EnumDescriptorProto$Properties { constructor(properties?: google.protobuf.EnumDescriptorProto$Properties); public static create(properties?: google.protobuf.EnumDescriptorProto$Properties): google.protobuf.EnumDescriptorProto; public static encode(message: google.protobuf.EnumDescriptorProto$Properties, writer?: $protobuf.Writer): $protobuf.Writer; - public static encodeDelimited(message: (google.protobuf.EnumDescriptorProto|{ [k: string]: any }), writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.protobuf.EnumDescriptorProto$Properties, writer?: $protobuf.Writer): $protobuf.Writer; public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.EnumDescriptorProto; public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.EnumDescriptorProto; public static verify(message: { [k: string]: any }): string; @@ -894,17 +933,17 @@ export namespace google { public toJSON(): { [k: string]: any }; } - interface EnumValueDescriptorProto$Properties { + type EnumValueDescriptorProto$Properties = { name?: string; number?: number; options?: google.protobuf.EnumValueOptions; - } + }; class EnumValueDescriptorProto implements google.protobuf.EnumValueDescriptorProto$Properties { constructor(properties?: google.protobuf.EnumValueDescriptorProto$Properties); public static create(properties?: google.protobuf.EnumValueDescriptorProto$Properties): google.protobuf.EnumValueDescriptorProto; public static encode(message: google.protobuf.EnumValueDescriptorProto$Properties, writer?: $protobuf.Writer): $protobuf.Writer; - public static encodeDelimited(message: (google.protobuf.EnumValueDescriptorProto|{ [k: string]: any }), writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.protobuf.EnumValueDescriptorProto$Properties, writer?: $protobuf.Writer): $protobuf.Writer; public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.EnumValueDescriptorProto; public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.EnumValueDescriptorProto; public static verify(message: { [k: string]: any }): string; @@ -915,17 +954,17 @@ export namespace google { public toJSON(): { [k: string]: any }; } - interface ServiceDescriptorProto$Properties { + type ServiceDescriptorProto$Properties = { name?: string; method?: google.protobuf.MethodDescriptorProto[]; options?: google.protobuf.ServiceOptions; - } + }; class ServiceDescriptorProto implements google.protobuf.ServiceDescriptorProto$Properties { constructor(properties?: google.protobuf.ServiceDescriptorProto$Properties); public static create(properties?: google.protobuf.ServiceDescriptorProto$Properties): google.protobuf.ServiceDescriptorProto; public static encode(message: google.protobuf.ServiceDescriptorProto$Properties, writer?: $protobuf.Writer): $protobuf.Writer; - public static encodeDelimited(message: (google.protobuf.ServiceDescriptorProto|{ [k: string]: any }), writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.protobuf.ServiceDescriptorProto$Properties, writer?: $protobuf.Writer): $protobuf.Writer; public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.ServiceDescriptorProto; public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.ServiceDescriptorProto; public static verify(message: { [k: string]: any }): string; @@ -936,20 +975,20 @@ export namespace google { public toJSON(): { [k: string]: any }; } - interface MethodDescriptorProto$Properties { + type MethodDescriptorProto$Properties = { name?: string; inputType?: string; outputType?: string; options?: google.protobuf.MethodOptions; clientStreaming?: boolean; serverStreaming?: boolean; - } + }; class MethodDescriptorProto implements google.protobuf.MethodDescriptorProto$Properties { constructor(properties?: google.protobuf.MethodDescriptorProto$Properties); public static create(properties?: google.protobuf.MethodDescriptorProto$Properties): google.protobuf.MethodDescriptorProto; public static encode(message: google.protobuf.MethodDescriptorProto$Properties, writer?: $protobuf.Writer): $protobuf.Writer; - public static encodeDelimited(message: (google.protobuf.MethodDescriptorProto|{ [k: string]: any }), writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.protobuf.MethodDescriptorProto$Properties, writer?: $protobuf.Writer): $protobuf.Writer; public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.MethodDescriptorProto; public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.MethodDescriptorProto; public static verify(message: { [k: string]: any }): string; @@ -960,7 +999,7 @@ export namespace google { public toJSON(): { [k: string]: any }; } - interface FileOptions$Properties { + type FileOptions$Properties = { javaPackage?: string; javaOuterClassname?: string; javaMultipleFiles?: boolean; @@ -976,13 +1015,13 @@ export namespace google { objcClassPrefix?: string; csharpNamespace?: string; uninterpretedOption?: google.protobuf.UninterpretedOption[]; - } + }; class FileOptions implements google.protobuf.FileOptions$Properties { constructor(properties?: google.protobuf.FileOptions$Properties); public static create(properties?: google.protobuf.FileOptions$Properties): google.protobuf.FileOptions; public static encode(message: google.protobuf.FileOptions$Properties, writer?: $protobuf.Writer): $protobuf.Writer; - public static encodeDelimited(message: (google.protobuf.FileOptions|{ [k: string]: any }), writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.protobuf.FileOptions$Properties, writer?: $protobuf.Writer): $protobuf.Writer; public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FileOptions; public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FileOptions; public static verify(message: { [k: string]: any }): string; @@ -1002,19 +1041,19 @@ export namespace google { } } - interface MessageOptions$Properties { + type MessageOptions$Properties = { messageSetWireFormat?: boolean; noStandardDescriptorAccessor?: boolean; deprecated?: boolean; mapEntry?: boolean; uninterpretedOption?: google.protobuf.UninterpretedOption[]; - } + }; class MessageOptions implements google.protobuf.MessageOptions$Properties { constructor(properties?: google.protobuf.MessageOptions$Properties); public static create(properties?: google.protobuf.MessageOptions$Properties): google.protobuf.MessageOptions; public static encode(message: google.protobuf.MessageOptions$Properties, writer?: $protobuf.Writer): $protobuf.Writer; - public static encodeDelimited(message: (google.protobuf.MessageOptions|{ [k: string]: any }), writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.protobuf.MessageOptions$Properties, writer?: $protobuf.Writer): $protobuf.Writer; public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.MessageOptions; public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.MessageOptions; public static verify(message: { [k: string]: any }): string; @@ -1025,7 +1064,7 @@ export namespace google { public toJSON(): { [k: string]: any }; } - interface FieldOptions$Properties { + type FieldOptions$Properties = { ctype?: number; packed?: boolean; jstype?: number; @@ -1033,13 +1072,13 @@ export namespace google { deprecated?: boolean; weak?: boolean; uninterpretedOption?: google.protobuf.UninterpretedOption[]; - } + }; class FieldOptions implements google.protobuf.FieldOptions$Properties { constructor(properties?: google.protobuf.FieldOptions$Properties); public static create(properties?: google.protobuf.FieldOptions$Properties): google.protobuf.FieldOptions; public static encode(message: google.protobuf.FieldOptions$Properties, writer?: $protobuf.Writer): $protobuf.Writer; - public static encodeDelimited(message: (google.protobuf.FieldOptions|{ [k: string]: any }), writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.protobuf.FieldOptions$Properties, writer?: $protobuf.Writer): $protobuf.Writer; public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.FieldOptions; public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.FieldOptions; public static verify(message: { [k: string]: any }): string; @@ -1065,15 +1104,15 @@ export namespace google { } } - interface OneofOptions$Properties { + type OneofOptions$Properties = { uninterpretedOption?: google.protobuf.UninterpretedOption[]; - } + }; class OneofOptions implements google.protobuf.OneofOptions$Properties { constructor(properties?: google.protobuf.OneofOptions$Properties); public static create(properties?: google.protobuf.OneofOptions$Properties): google.protobuf.OneofOptions; public static encode(message: google.protobuf.OneofOptions$Properties, writer?: $protobuf.Writer): $protobuf.Writer; - public static encodeDelimited(message: (google.protobuf.OneofOptions|{ [k: string]: any }), writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.protobuf.OneofOptions$Properties, writer?: $protobuf.Writer): $protobuf.Writer; public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.OneofOptions; public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.OneofOptions; public static verify(message: { [k: string]: any }): string; @@ -1084,18 +1123,18 @@ export namespace google { public toJSON(): { [k: string]: any }; } - interface EnumOptions$Properties { + type EnumOptions$Properties = { allowAlias?: boolean; deprecated?: boolean; uninterpretedOption?: google.protobuf.UninterpretedOption[]; - .jspb.test.IsExtension.simpleOption?: string; - } + ".jspb.test.IsExtension.simpleOption"?: string; + }; class EnumOptions implements google.protobuf.EnumOptions$Properties { constructor(properties?: google.protobuf.EnumOptions$Properties); public static create(properties?: google.protobuf.EnumOptions$Properties): google.protobuf.EnumOptions; public static encode(message: google.protobuf.EnumOptions$Properties, writer?: $protobuf.Writer): $protobuf.Writer; - public static encodeDelimited(message: (google.protobuf.EnumOptions|{ [k: string]: any }), writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.protobuf.EnumOptions$Properties, writer?: $protobuf.Writer): $protobuf.Writer; public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.EnumOptions; public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.EnumOptions; public static verify(message: { [k: string]: any }): string; @@ -1106,16 +1145,16 @@ export namespace google { public toJSON(): { [k: string]: any }; } - interface EnumValueOptions$Properties { + type EnumValueOptions$Properties = { deprecated?: boolean; uninterpretedOption?: google.protobuf.UninterpretedOption[]; - } + }; class EnumValueOptions implements google.protobuf.EnumValueOptions$Properties { constructor(properties?: google.protobuf.EnumValueOptions$Properties); public static create(properties?: google.protobuf.EnumValueOptions$Properties): google.protobuf.EnumValueOptions; public static encode(message: google.protobuf.EnumValueOptions$Properties, writer?: $protobuf.Writer): $protobuf.Writer; - public static encodeDelimited(message: (google.protobuf.EnumValueOptions|{ [k: string]: any }), writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.protobuf.EnumValueOptions$Properties, writer?: $protobuf.Writer): $protobuf.Writer; public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.EnumValueOptions; public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.EnumValueOptions; public static verify(message: { [k: string]: any }): string; @@ -1126,16 +1165,16 @@ export namespace google { public toJSON(): { [k: string]: any }; } - interface ServiceOptions$Properties { + type ServiceOptions$Properties = { deprecated?: boolean; uninterpretedOption?: google.protobuf.UninterpretedOption[]; - } + }; class ServiceOptions implements google.protobuf.ServiceOptions$Properties { constructor(properties?: google.protobuf.ServiceOptions$Properties); public static create(properties?: google.protobuf.ServiceOptions$Properties): google.protobuf.ServiceOptions; public static encode(message: google.protobuf.ServiceOptions$Properties, writer?: $protobuf.Writer): $protobuf.Writer; - public static encodeDelimited(message: (google.protobuf.ServiceOptions|{ [k: string]: any }), writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.protobuf.ServiceOptions$Properties, writer?: $protobuf.Writer): $protobuf.Writer; public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.ServiceOptions; public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.ServiceOptions; public static verify(message: { [k: string]: any }): string; @@ -1146,17 +1185,17 @@ export namespace google { public toJSON(): { [k: string]: any }; } - interface MethodOptions$Properties { + type MethodOptions$Properties = { deprecated?: boolean; idempotencyLevel?: number; uninterpretedOption?: google.protobuf.UninterpretedOption[]; - } + }; class MethodOptions implements google.protobuf.MethodOptions$Properties { constructor(properties?: google.protobuf.MethodOptions$Properties); public static create(properties?: google.protobuf.MethodOptions$Properties): google.protobuf.MethodOptions; public static encode(message: google.protobuf.MethodOptions$Properties, writer?: $protobuf.Writer): $protobuf.Writer; - public static encodeDelimited(message: (google.protobuf.MethodOptions|{ [k: string]: any }), writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.protobuf.MethodOptions$Properties, writer?: $protobuf.Writer): $protobuf.Writer; public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.MethodOptions; public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.MethodOptions; public static verify(message: { [k: string]: any }): string; @@ -1176,7 +1215,7 @@ export namespace google { } } - interface UninterpretedOption$Properties { + type UninterpretedOption$Properties = { name?: google.protobuf.UninterpretedOption.NamePart[]; identifierValue?: string; positiveIntValue?: (number|$protobuf.Long); @@ -1184,13 +1223,13 @@ export namespace google { doubleValue?: number; stringValue?: Uint8Array; aggregateValue?: string; - } + }; class UninterpretedOption implements google.protobuf.UninterpretedOption$Properties { constructor(properties?: google.protobuf.UninterpretedOption$Properties); public static create(properties?: google.protobuf.UninterpretedOption$Properties): google.protobuf.UninterpretedOption; public static encode(message: google.protobuf.UninterpretedOption$Properties, writer?: $protobuf.Writer): $protobuf.Writer; - public static encodeDelimited(message: (google.protobuf.UninterpretedOption|{ [k: string]: any }), writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.protobuf.UninterpretedOption$Properties, writer?: $protobuf.Writer): $protobuf.Writer; public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.UninterpretedOption; public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.UninterpretedOption; public static verify(message: { [k: string]: any }): string; @@ -1203,11 +1242,16 @@ export namespace google { namespace UninterpretedOption { + type NamePart$Properties = { + namePart: string; + isExtension: boolean; + }; + class NamePart implements google.protobuf.UninterpretedOption.NamePart$Properties { constructor(properties?: google.protobuf.UninterpretedOption.NamePart$Properties); public static create(properties?: google.protobuf.UninterpretedOption.NamePart$Properties): google.protobuf.UninterpretedOption.NamePart; public static encode(message: google.protobuf.UninterpretedOption.NamePart$Properties, writer?: $protobuf.Writer): $protobuf.Writer; - public static encodeDelimited(message: (google.protobuf.UninterpretedOption.NamePart|{ [k: string]: any }), writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.protobuf.UninterpretedOption.NamePart$Properties, writer?: $protobuf.Writer): $protobuf.Writer; public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.UninterpretedOption.NamePart; public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.UninterpretedOption.NamePart; public static verify(message: { [k: string]: any }): string; @@ -1219,15 +1263,15 @@ export namespace google { } } - interface SourceCodeInfo$Properties { + type SourceCodeInfo$Properties = { location?: google.protobuf.SourceCodeInfo.Location[]; - } + }; class SourceCodeInfo implements google.protobuf.SourceCodeInfo$Properties { constructor(properties?: google.protobuf.SourceCodeInfo$Properties); public static create(properties?: google.protobuf.SourceCodeInfo$Properties): google.protobuf.SourceCodeInfo; public static encode(message: google.protobuf.SourceCodeInfo$Properties, writer?: $protobuf.Writer): $protobuf.Writer; - public static encodeDelimited(message: (google.protobuf.SourceCodeInfo|{ [k: string]: any }), writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.protobuf.SourceCodeInfo$Properties, writer?: $protobuf.Writer): $protobuf.Writer; public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.SourceCodeInfo; public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.SourceCodeInfo; public static verify(message: { [k: string]: any }): string; @@ -1240,11 +1284,19 @@ export namespace google { namespace SourceCodeInfo { + type Location$Properties = { + path?: number[]; + span?: number[]; + leadingComments?: string; + trailingComments?: string; + leadingDetachedComments?: string[]; + }; + class Location implements google.protobuf.SourceCodeInfo.Location$Properties { constructor(properties?: google.protobuf.SourceCodeInfo.Location$Properties); public static create(properties?: google.protobuf.SourceCodeInfo.Location$Properties): google.protobuf.SourceCodeInfo.Location; public static encode(message: google.protobuf.SourceCodeInfo.Location$Properties, writer?: $protobuf.Writer): $protobuf.Writer; - public static encodeDelimited(message: (google.protobuf.SourceCodeInfo.Location|{ [k: string]: any }), writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.protobuf.SourceCodeInfo.Location$Properties, writer?: $protobuf.Writer): $protobuf.Writer; public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.SourceCodeInfo.Location; public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.SourceCodeInfo.Location; public static verify(message: { [k: string]: any }): string; @@ -1256,15 +1308,15 @@ export namespace google { } } - interface GeneratedCodeInfo$Properties { + type GeneratedCodeInfo$Properties = { annotation?: google.protobuf.GeneratedCodeInfo.Annotation[]; - } + }; class GeneratedCodeInfo implements google.protobuf.GeneratedCodeInfo$Properties { constructor(properties?: google.protobuf.GeneratedCodeInfo$Properties); public static create(properties?: google.protobuf.GeneratedCodeInfo$Properties): google.protobuf.GeneratedCodeInfo; public static encode(message: google.protobuf.GeneratedCodeInfo$Properties, writer?: $protobuf.Writer): $protobuf.Writer; - public static encodeDelimited(message: (google.protobuf.GeneratedCodeInfo|{ [k: string]: any }), writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.protobuf.GeneratedCodeInfo$Properties, writer?: $protobuf.Writer): $protobuf.Writer; public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.GeneratedCodeInfo; public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.GeneratedCodeInfo; public static verify(message: { [k: string]: any }): string; @@ -1277,11 +1329,18 @@ export namespace google { namespace GeneratedCodeInfo { + type Annotation$Properties = { + path?: number[]; + sourceFile?: string; + begin?: number; + end?: number; + }; + class Annotation implements google.protobuf.GeneratedCodeInfo.Annotation$Properties { constructor(properties?: google.protobuf.GeneratedCodeInfo.Annotation$Properties); public static create(properties?: google.protobuf.GeneratedCodeInfo.Annotation$Properties): google.protobuf.GeneratedCodeInfo.Annotation; public static encode(message: google.protobuf.GeneratedCodeInfo.Annotation$Properties, writer?: $protobuf.Writer): $protobuf.Writer; - public static encodeDelimited(message: (google.protobuf.GeneratedCodeInfo.Annotation|{ [k: string]: any }), writer?: $protobuf.Writer): $protobuf.Writer; + public static encodeDelimited(message: google.protobuf.GeneratedCodeInfo.Annotation$Properties, writer?: $protobuf.Writer): $protobuf.Writer; public static decode(reader: ($protobuf.Reader|Uint8Array), length?: number): google.protobuf.GeneratedCodeInfo.Annotation; public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): google.protobuf.GeneratedCodeInfo.Annotation; public static verify(message: { [k: string]: any }): string; @@ -1294,74 +1353,3 @@ export namespace google { } } } - -interface Nested$Properties { - anInt?: number; -} -; - -interface Nested$Properties { - anInt: number; -} -; - -interface Complex$Properties { - innerComplexField?: number; -} -; - -interface RepeatedGroup$Properties { - id: string; - someBool?: boolean[]; -} -; - -interface RequiredGroup$Properties { - id: string; -} -; - -interface OptionalGroup$Properties { - id: string; -} -; - -interface Message$Properties { - count?: number; -} -; - -interface ExtensionRange$Properties { - start?: number; - end?: number; -} -; - -interface ReservedRange$Properties { - start?: number; - end?: number; -} -; - -interface NamePart$Properties { - namePart: string; - isExtension: boolean; -} -; - -interface Location$Properties { - path?: number[]; - span?: number[]; - leadingComments?: string; - trailingComments?: string; - leadingDetachedComments?: string[]; -} -; - -interface Annotation$Properties { - path?: number[]; - sourceFile?: string; - begin?: number; - end?: number; -} -; diff --git a/tests/data/test.js b/tests/data/test.js index d58718736..efe2700a6 100644 --- a/tests/data/test.js +++ b/tests/data/test.js @@ -71,7 +71,7 @@ $root.jspb = (function() { /** * Encodes the specified Empty message, length delimited. Does not implicitly {@link jspb.test.Empty.verify|verify} messages. - * @param {jspb.test.Empty|Object.} message Empty message or plain object to encode + * @param {jspb.test.Empty$Properties} message Empty message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ @@ -186,8 +186,8 @@ $root.jspb = (function() { */ test.OuterEnum = (function() { var valuesById = {}, values = Object.create(valuesById); - values["FOO"] = 1; - values["BAR"] = 2; + values[valuesById[1] = "FOO"] = 1; + values[valuesById[2] = "BAR"] = 2; return values; })(); @@ -240,7 +240,7 @@ $root.jspb = (function() { /** * Encodes the specified EnumContainer message, length delimited. Does not implicitly {@link jspb.test.EnumContainer.verify|verify} messages. - * @param {jspb.test.EnumContainer|Object.} message EnumContainer message or plain object to encode + * @param {jspb.test.EnumContainer$Properties} message EnumContainer message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ @@ -432,7 +432,7 @@ $root.jspb = (function() { /** * Encodes the specified Simple1 message, length delimited. Does not implicitly {@link jspb.test.Simple1.verify|verify} messages. - * @param {jspb.test.Simple1|Object.} message Simple1 message or plain object to encode + * @param {jspb.test.Simple1$Properties} message Simple1 message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ @@ -646,7 +646,7 @@ $root.jspb = (function() { /** * Encodes the specified Simple2 message, length delimited. Does not implicitly {@link jspb.test.Simple2.verify|verify} messages. - * @param {jspb.test.Simple2|Object.} message Simple2 message or plain object to encode + * @param {jspb.test.Simple2$Properties} message Simple2 message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ @@ -851,7 +851,7 @@ $root.jspb = (function() { /** * Encodes the specified SpecialCases message, length delimited. Does not implicitly {@link jspb.test.SpecialCases.verify|verify} messages. - * @param {jspb.test.SpecialCases|Object.} message SpecialCases message or plain object to encode + * @param {jspb.test.SpecialCases$Properties} message SpecialCases message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ @@ -1078,7 +1078,7 @@ $root.jspb = (function() { /** * Encodes the specified OptionalFields message, length delimited. Does not implicitly {@link jspb.test.OptionalFields.verify|verify} messages. - * @param {jspb.test.OptionalFields|Object.} message OptionalFields message or plain object to encode + * @param {jspb.test.OptionalFields$Properties} message OptionalFields message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ @@ -1331,7 +1331,7 @@ $root.jspb = (function() { /** * Encodes the specified Nested message, length delimited. Does not implicitly {@link jspb.test.OptionalFields.Nested.verify|verify} messages. - * @param {jspb.test.OptionalFields.Nested|Object.} message Nested message or plain object to encode + * @param {jspb.test.OptionalFields.Nested$Properties} message Nested message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ @@ -1464,12 +1464,12 @@ $root.jspb = (function() { * @property {string} [str1] HasExtensions str1. * @property {string} [str2] HasExtensions str2. * @property {string} [str3] HasExtensions str3. - * @property {jspb.test.IsExtension} [.jspb.test.IsExtension.extField] HasExtensions .jspb.test.IsExtension.extField. - * @property {jspb.test.Simple1} [.jspb.test.IndirectExtension.simple] HasExtensions .jspb.test.IndirectExtension.simple. - * @property {string} [.jspb.test.IndirectExtension.str] HasExtensions .jspb.test.IndirectExtension.str. - * @property {Array.} [.jspb.test.IndirectExtension.repeatedStr] HasExtensions .jspb.test.IndirectExtension.repeatedStr. - * @property {Array.} [.jspb.test.IndirectExtension.repeatedSimple] HasExtensions .jspb.test.IndirectExtension.repeatedSimple. - * @property {jspb.test.Simple1} [.jspb.test.simple1] HasExtensions .jspb.test.simple1. + * @property {jspb.test.IsExtension} [".jspb.test.IsExtension.extField"] HasExtensions .jspb.test.IsExtension.extField. + * @property {jspb.test.Simple1} [".jspb.test.IndirectExtension.simple"] HasExtensions .jspb.test.IndirectExtension.simple. + * @property {string} [".jspb.test.IndirectExtension.str"] HasExtensions .jspb.test.IndirectExtension.str. + * @property {Array.} [".jspb.test.IndirectExtension.repeatedStr"] HasExtensions .jspb.test.IndirectExtension.repeatedStr. + * @property {Array.} [".jspb.test.IndirectExtension.repeatedSimple"] HasExtensions .jspb.test.IndirectExtension.repeatedSimple. + * @property {jspb.test.Simple1} [".jspb.test.simple1"] HasExtensions .jspb.test.simple1. */ /** @@ -1540,7 +1540,7 @@ $root.jspb = (function() { /** * Encodes the specified HasExtensions message, length delimited. Does not implicitly {@link jspb.test.HasExtensions.verify|verify} messages. - * @param {jspb.test.HasExtensions|Object.} message HasExtensions message or plain object to encode + * @param {jspb.test.HasExtensions$Properties} message HasExtensions message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ @@ -1867,7 +1867,7 @@ $root.jspb = (function() { /** * Encodes the specified Complex message, length delimited. Does not implicitly {@link jspb.test.Complex.verify|verify} messages. - * @param {jspb.test.Complex|Object.} message Complex message or plain object to encode + * @param {jspb.test.Complex$Properties} message Complex message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ @@ -2120,7 +2120,7 @@ $root.jspb = (function() { /** * Encodes the specified Nested message, length delimited. Does not implicitly {@link jspb.test.Complex.Nested.verify|verify} messages. - * @param {jspb.test.Complex.Nested|Object.} message Nested message or plain object to encode + * @param {jspb.test.Complex.Nested$Properties} message Nested message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ @@ -2289,7 +2289,7 @@ $root.jspb = (function() { /** * Encodes the specified OuterMessage message, length delimited. Does not implicitly {@link jspb.test.OuterMessage.verify|verify} messages. - * @param {jspb.test.OuterMessage|Object.} message OuterMessage message or plain object to encode + * @param {jspb.test.OuterMessage$Properties} message OuterMessage message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ @@ -2440,7 +2440,7 @@ $root.jspb = (function() { /** * Encodes the specified Complex message, length delimited. Does not implicitly {@link jspb.test.OuterMessage.Complex.verify|verify} messages. - * @param {jspb.test.OuterMessage.Complex|Object.} message Complex message or plain object to encode + * @param {jspb.test.OuterMessage.Complex$Properties} message Complex message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ @@ -2613,7 +2613,7 @@ $root.jspb = (function() { /** * Encodes the specified IsExtension message, length delimited. Does not implicitly {@link jspb.test.IsExtension.verify|verify} messages. - * @param {jspb.test.IsExtension|Object.} message IsExtension message or plain object to encode + * @param {jspb.test.IsExtension$Properties} message IsExtension message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ @@ -2778,7 +2778,7 @@ $root.jspb = (function() { /** * Encodes the specified IndirectExtension message, length delimited. Does not implicitly {@link jspb.test.IndirectExtension.verify|verify} messages. - * @param {jspb.test.IndirectExtension|Object.} message IndirectExtension message or plain object to encode + * @param {jspb.test.IndirectExtension$Properties} message IndirectExtension message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ @@ -2952,7 +2952,7 @@ $root.jspb = (function() { /** * Encodes the specified DefaultValues message, length delimited. Does not implicitly {@link jspb.test.DefaultValues.verify|verify} messages. - * @param {jspb.test.DefaultValues|Object.} message DefaultValues message or plain object to encode + * @param {jspb.test.DefaultValues$Properties} message DefaultValues message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ @@ -3170,8 +3170,8 @@ $root.jspb = (function() { */ DefaultValues.Enum = (function() { var valuesById = {}, values = Object.create(valuesById); - values["E1"] = 13; - values["E2"] = 77; + values[valuesById[13] = "E1"] = 13; + values[valuesById[77] = "E2"] = 77; return values; })(); @@ -3257,7 +3257,7 @@ $root.jspb = (function() { /** * Encodes the specified FloatingPointFields message, length delimited. Does not implicitly {@link jspb.test.FloatingPointFields.verify|verify} messages. - * @param {jspb.test.FloatingPointFields|Object.} message FloatingPointFields message or plain object to encode + * @param {jspb.test.FloatingPointFields$Properties} message FloatingPointFields message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ @@ -3509,7 +3509,7 @@ $root.jspb = (function() { * @property {Array.} [simple2] TestClone simple2. * @property {Uint8Array} [bytesField] TestClone bytesField. * @property {string} [unused] TestClone unused. - * @property {jspb.test.CloneExtension} [.jspb.test.CloneExtension.extField] TestClone .jspb.test.CloneExtension.extField. + * @property {jspb.test.CloneExtension} [".jspb.test.CloneExtension.extField"] TestClone .jspb.test.CloneExtension.extField. */ /** @@ -3569,7 +3569,7 @@ $root.jspb = (function() { /** * Encodes the specified TestClone message, length delimited. Does not implicitly {@link jspb.test.TestClone.verify|verify} messages. - * @param {jspb.test.TestClone|Object.} message TestClone message or plain object to encode + * @param {jspb.test.TestClone$Properties} message TestClone message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ @@ -3828,7 +3828,7 @@ $root.jspb = (function() { /** * Encodes the specified CloneExtension message, length delimited. Does not implicitly {@link jspb.test.CloneExtension.verify|verify} messages. - * @param {jspb.test.CloneExtension|Object.} message CloneExtension message or plain object to encode + * @param {jspb.test.CloneExtension$Properties} message CloneExtension message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ @@ -4018,7 +4018,7 @@ $root.jspb = (function() { /** * Encodes the specified TestGroup message, length delimited. Does not implicitly {@link jspb.test.TestGroup.verify|verify} messages. - * @param {jspb.test.TestGroup|Object.} message TestGroup message or plain object to encode + * @param {jspb.test.TestGroup$Properties} message TestGroup message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ @@ -4286,7 +4286,7 @@ $root.jspb = (function() { /** * Encodes the specified RepeatedGroup message, length delimited. Does not implicitly {@link jspb.test.TestGroup.RepeatedGroup.verify|verify} messages. - * @param {jspb.test.TestGroup.RepeatedGroup|Object.} message RepeatedGroup message or plain object to encode + * @param {jspb.test.TestGroup.RepeatedGroup$Properties} message RepeatedGroup message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ @@ -4489,7 +4489,7 @@ $root.jspb = (function() { /** * Encodes the specified RequiredGroup message, length delimited. Does not implicitly {@link jspb.test.TestGroup.RequiredGroup.verify|verify} messages. - * @param {jspb.test.TestGroup.RequiredGroup|Object.} message RequiredGroup message or plain object to encode + * @param {jspb.test.TestGroup.RequiredGroup$Properties} message RequiredGroup message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ @@ -4661,7 +4661,7 @@ $root.jspb = (function() { /** * Encodes the specified OptionalGroup message, length delimited. Does not implicitly {@link jspb.test.TestGroup.OptionalGroup.verify|verify} messages. - * @param {jspb.test.TestGroup.OptionalGroup|Object.} message OptionalGroup message or plain object to encode + * @param {jspb.test.TestGroup.OptionalGroup$Properties} message OptionalGroup message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ @@ -4837,7 +4837,7 @@ $root.jspb = (function() { /** * Encodes the specified TestGroup1 message, length delimited. Does not implicitly {@link jspb.test.TestGroup1.verify|verify} messages. - * @param {jspb.test.TestGroup1|Object.} message TestGroup1 message or plain object to encode + * @param {jspb.test.TestGroup1$Properties} message TestGroup1 message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ @@ -4970,7 +4970,7 @@ $root.jspb = (function() { * @typedef jspb.test.TestReservedNames$Properties * @type Object * @property {number} [extension] TestReservedNames extension. - * @property {number} [.jspb.test.TestReservedNamesExtension.foo] TestReservedNames .jspb.test.TestReservedNamesExtension.foo. + * @property {number} [".jspb.test.TestReservedNamesExtension.foo"] TestReservedNames .jspb.test.TestReservedNamesExtension.foo. */ /** @@ -5016,7 +5016,7 @@ $root.jspb = (function() { /** * Encodes the specified TestReservedNames message, length delimited. Does not implicitly {@link jspb.test.TestReservedNames.verify|verify} messages. - * @param {jspb.test.TestReservedNames|Object.} message TestReservedNames message or plain object to encode + * @param {jspb.test.TestReservedNames$Properties} message TestReservedNames message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ @@ -5193,7 +5193,7 @@ $root.jspb = (function() { /** * Encodes the specified TestReservedNamesExtension message, length delimited. Does not implicitly {@link jspb.test.TestReservedNamesExtension.verify|verify} messages. - * @param {jspb.test.TestReservedNamesExtension|Object.} message TestReservedNamesExtension message or plain object to encode + * @param {jspb.test.TestReservedNamesExtension$Properties} message TestReservedNamesExtension message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ @@ -5428,7 +5428,7 @@ $root.jspb = (function() { /** * Encodes the specified TestMessageWithOneof message, length delimited. Does not implicitly {@link jspb.test.TestMessageWithOneof.verify|verify} messages. - * @param {jspb.test.TestMessageWithOneof|Object.} message TestMessageWithOneof message or plain object to encode + * @param {jspb.test.TestMessageWithOneof$Properties} message TestMessageWithOneof message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ @@ -5761,7 +5761,7 @@ $root.jspb = (function() { /** * Encodes the specified TestEndsWithBytes message, length delimited. Does not implicitly {@link jspb.test.TestEndsWithBytes.verify|verify} messages. - * @param {jspb.test.TestEndsWithBytes|Object.} message TestEndsWithBytes message or plain object to encode + * @param {jspb.test.TestEndsWithBytes$Properties} message TestEndsWithBytes message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ @@ -6016,7 +6016,7 @@ $root.jspb = (function() { /** * Encodes the specified TestMapFieldsNoBinary message, length delimited. Does not implicitly {@link jspb.test.TestMapFieldsNoBinary.verify|verify} messages. - * @param {jspb.test.TestMapFieldsNoBinary|Object.} message TestMapFieldsNoBinary message or plain object to encode + * @param {jspb.test.TestMapFieldsNoBinary$Properties} message TestMapFieldsNoBinary message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ @@ -6523,9 +6523,9 @@ $root.jspb = (function() { */ test.MapValueEnumNoBinary = (function() { var valuesById = {}, values = Object.create(valuesById); - values["MAP_VALUE_FOO_NOBINARY"] = 0; - values["MAP_VALUE_BAR_NOBINARY"] = 1; - values["MAP_VALUE_BAZ_NOBINARY"] = 2; + values[valuesById[0] = "MAP_VALUE_FOO_NOBINARY"] = 0; + values[valuesById[1] = "MAP_VALUE_BAR_NOBINARY"] = 1; + values[valuesById[2] = "MAP_VALUE_BAZ_NOBINARY"] = 2; return values; })(); @@ -6578,7 +6578,7 @@ $root.jspb = (function() { /** * Encodes the specified MapValueMessageNoBinary message, length delimited. Does not implicitly {@link jspb.test.MapValueMessageNoBinary.verify|verify} messages. - * @param {jspb.test.MapValueMessageNoBinary|Object.} message MapValueMessageNoBinary message or plain object to encode + * @param {jspb.test.MapValueMessageNoBinary$Properties} message MapValueMessageNoBinary message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ @@ -6743,7 +6743,7 @@ $root.jspb = (function() { /** * Encodes the specified Deeply message, length delimited. Does not implicitly {@link jspb.test.Deeply.verify|verify} messages. - * @param {jspb.test.Deeply|Object.} message Deeply message or plain object to encode + * @param {jspb.test.Deeply$Properties} message Deeply message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ @@ -6889,7 +6889,7 @@ $root.jspb = (function() { /** * Encodes the specified Nested message, length delimited. Does not implicitly {@link jspb.test.Deeply.Nested.verify|verify} messages. - * @param {jspb.test.Deeply.Nested|Object.} message Nested message or plain object to encode + * @param {jspb.test.Deeply.Nested$Properties} message Nested message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ @@ -7040,7 +7040,7 @@ $root.jspb = (function() { /** * Encodes the specified Message message, length delimited. Does not implicitly {@link jspb.test.Deeply.Nested.Message.verify|verify} messages. - * @param {jspb.test.Deeply.Nested.Message|Object.} message Message message or plain object to encode + * @param {jspb.test.Deeply.Nested.Message$Properties} message Message message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ @@ -7242,7 +7242,7 @@ $root.google = (function() { /** * Encodes the specified FileDescriptorSet message, length delimited. Does not implicitly {@link google.protobuf.FileDescriptorSet.verify|verify} messages. - * @param {google.protobuf.FileDescriptorSet|Object.} message FileDescriptorSet message or plain object to encode + * @param {google.protobuf.FileDescriptorSet$Properties} message FileDescriptorSet message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ @@ -7389,7 +7389,7 @@ $root.google = (function() { * @typedef google.protobuf.FileDescriptorProto$Properties * @type Object * @property {string} [name] FileDescriptorProto name. - * @property {string} [package] FileDescriptorProto package. + * @property {string} ["package"] FileDescriptorProto package. * @property {Array.} [dependency] FileDescriptorProto dependency. * @property {Array.} [publicDependency] FileDescriptorProto publicDependency. * @property {Array.} [weakDependency] FileDescriptorProto weakDependency. @@ -7489,7 +7489,7 @@ $root.google = (function() { /** * Encodes the specified FileDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.FileDescriptorProto.verify|verify} messages. - * @param {google.protobuf.FileDescriptorProto|Object.} message FileDescriptorProto message or plain object to encode + * @param {google.protobuf.FileDescriptorProto$Properties} message FileDescriptorProto message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ @@ -7973,7 +7973,7 @@ $root.google = (function() { /** * Encodes the specified DescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.DescriptorProto.verify|verify} messages. - * @param {google.protobuf.DescriptorProto|Object.} message DescriptorProto message or plain object to encode + * @param {google.protobuf.DescriptorProto$Properties} message DescriptorProto message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ @@ -8398,7 +8398,7 @@ $root.google = (function() { /** * Encodes the specified ExtensionRange message, length delimited. Does not implicitly {@link google.protobuf.DescriptorProto.ExtensionRange.verify|verify} messages. - * @param {google.protobuf.DescriptorProto.ExtensionRange|Object.} message ExtensionRange message or plain object to encode + * @param {google.protobuf.DescriptorProto.ExtensionRange$Properties} message ExtensionRange message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ @@ -8584,7 +8584,7 @@ $root.google = (function() { /** * Encodes the specified ReservedRange message, length delimited. Does not implicitly {@link google.protobuf.DescriptorProto.ReservedRange.verify|verify} messages. - * @param {google.protobuf.DescriptorProto.ReservedRange|Object.} message ReservedRange message or plain object to encode + * @param {google.protobuf.DescriptorProto.ReservedRange$Properties} message ReservedRange message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ @@ -8805,7 +8805,7 @@ $root.google = (function() { /** * Encodes the specified FieldDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.FieldDescriptorProto.verify|verify} messages. - * @param {google.protobuf.FieldDescriptorProto|Object.} message FieldDescriptorProto message or plain object to encode + * @param {google.protobuf.FieldDescriptorProto$Properties} message FieldDescriptorProto message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ @@ -9165,24 +9165,24 @@ $root.google = (function() { */ FieldDescriptorProto.Type = (function() { var valuesById = {}, values = Object.create(valuesById); - values["TYPE_DOUBLE"] = 1; - values["TYPE_FLOAT"] = 2; - values["TYPE_INT64"] = 3; - values["TYPE_UINT64"] = 4; - values["TYPE_INT32"] = 5; - values["TYPE_FIXED64"] = 6; - values["TYPE_FIXED32"] = 7; - values["TYPE_BOOL"] = 8; - values["TYPE_STRING"] = 9; - values["TYPE_GROUP"] = 10; - values["TYPE_MESSAGE"] = 11; - values["TYPE_BYTES"] = 12; - values["TYPE_UINT32"] = 13; - values["TYPE_ENUM"] = 14; - values["TYPE_SFIXED32"] = 15; - values["TYPE_SFIXED64"] = 16; - values["TYPE_SINT32"] = 17; - values["TYPE_SINT64"] = 18; + values[valuesById[1] = "TYPE_DOUBLE"] = 1; + values[valuesById[2] = "TYPE_FLOAT"] = 2; + values[valuesById[3] = "TYPE_INT64"] = 3; + values[valuesById[4] = "TYPE_UINT64"] = 4; + values[valuesById[5] = "TYPE_INT32"] = 5; + values[valuesById[6] = "TYPE_FIXED64"] = 6; + values[valuesById[7] = "TYPE_FIXED32"] = 7; + values[valuesById[8] = "TYPE_BOOL"] = 8; + values[valuesById[9] = "TYPE_STRING"] = 9; + values[valuesById[10] = "TYPE_GROUP"] = 10; + values[valuesById[11] = "TYPE_MESSAGE"] = 11; + values[valuesById[12] = "TYPE_BYTES"] = 12; + values[valuesById[13] = "TYPE_UINT32"] = 13; + values[valuesById[14] = "TYPE_ENUM"] = 14; + values[valuesById[15] = "TYPE_SFIXED32"] = 15; + values[valuesById[16] = "TYPE_SFIXED64"] = 16; + values[valuesById[17] = "TYPE_SINT32"] = 17; + values[valuesById[18] = "TYPE_SINT64"] = 18; return values; })(); @@ -9197,9 +9197,9 @@ $root.google = (function() { */ FieldDescriptorProto.Label = (function() { var valuesById = {}, values = Object.create(valuesById); - values["LABEL_OPTIONAL"] = 1; - values["LABEL_REQUIRED"] = 2; - values["LABEL_REPEATED"] = 3; + values[valuesById[1] = "LABEL_OPTIONAL"] = 1; + values[valuesById[2] = "LABEL_REQUIRED"] = 2; + values[valuesById[3] = "LABEL_REPEATED"] = 3; return values; })(); @@ -9259,7 +9259,7 @@ $root.google = (function() { /** * Encodes the specified OneofDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.OneofDescriptorProto.verify|verify} messages. - * @param {google.protobuf.OneofDescriptorProto|Object.} message OneofDescriptorProto message or plain object to encode + * @param {google.protobuf.OneofDescriptorProto$Properties} message OneofDescriptorProto message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ @@ -9456,7 +9456,7 @@ $root.google = (function() { /** * Encodes the specified EnumDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.EnumDescriptorProto.verify|verify} messages. - * @param {google.protobuf.EnumDescriptorProto|Object.} message EnumDescriptorProto message or plain object to encode + * @param {google.protobuf.EnumDescriptorProto$Properties} message EnumDescriptorProto message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ @@ -9682,7 +9682,7 @@ $root.google = (function() { /** * Encodes the specified EnumValueDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.EnumValueDescriptorProto.verify|verify} messages. - * @param {google.protobuf.EnumValueDescriptorProto|Object.} message EnumValueDescriptorProto message or plain object to encode + * @param {google.protobuf.EnumValueDescriptorProto$Properties} message EnumValueDescriptorProto message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ @@ -9890,7 +9890,7 @@ $root.google = (function() { /** * Encodes the specified ServiceDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.ServiceDescriptorProto.verify|verify} messages. - * @param {google.protobuf.ServiceDescriptorProto|Object.} message ServiceDescriptorProto message or plain object to encode + * @param {google.protobuf.ServiceDescriptorProto$Properties} message ServiceDescriptorProto message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ @@ -10128,7 +10128,7 @@ $root.google = (function() { /** * Encodes the specified MethodDescriptorProto message, length delimited. Does not implicitly {@link google.protobuf.MethodDescriptorProto.verify|verify} messages. - * @param {google.protobuf.MethodDescriptorProto|Object.} message MethodDescriptorProto message or plain object to encode + * @param {google.protobuf.MethodDescriptorProto$Properties} message MethodDescriptorProto message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ @@ -10417,7 +10417,7 @@ $root.google = (function() { /** * Encodes the specified FileOptions message, length delimited. Does not implicitly {@link google.protobuf.FileOptions.verify|verify} messages. - * @param {google.protobuf.FileOptions|Object.} message FileOptions message or plain object to encode + * @param {google.protobuf.FileOptions$Properties} message FileOptions message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ @@ -10739,9 +10739,9 @@ $root.google = (function() { */ FileOptions.OptimizeMode = (function() { var valuesById = {}, values = Object.create(valuesById); - values["SPEED"] = 1; - values["CODE_SIZE"] = 2; - values["LITE_RUNTIME"] = 3; + values[valuesById[1] = "SPEED"] = 1; + values[valuesById[2] = "CODE_SIZE"] = 2; + values[valuesById[3] = "LITE_RUNTIME"] = 3; return values; })(); @@ -10815,7 +10815,7 @@ $root.google = (function() { /** * Encodes the specified MessageOptions message, length delimited. Does not implicitly {@link google.protobuf.MessageOptions.verify|verify} messages. - * @param {google.protobuf.MessageOptions|Object.} message MessageOptions message or plain object to encode + * @param {google.protobuf.MessageOptions$Properties} message MessageOptions message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ @@ -11076,7 +11076,7 @@ $root.google = (function() { /** * Encodes the specified FieldOptions message, length delimited. Does not implicitly {@link google.protobuf.FieldOptions.verify|verify} messages. - * @param {google.protobuf.FieldOptions|Object.} message FieldOptions message or plain object to encode + * @param {google.protobuf.FieldOptions$Properties} message FieldOptions message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ @@ -11328,9 +11328,9 @@ $root.google = (function() { */ FieldOptions.CType = (function() { var valuesById = {}, values = Object.create(valuesById); - values["STRING"] = 0; - values["CORD"] = 1; - values["STRING_PIECE"] = 2; + values[valuesById[0] = "STRING"] = 0; + values[valuesById[1] = "CORD"] = 1; + values[valuesById[2] = "STRING_PIECE"] = 2; return values; })(); @@ -11345,9 +11345,9 @@ $root.google = (function() { */ FieldOptions.JSType = (function() { var valuesById = {}, values = Object.create(valuesById); - values["JS_NORMAL"] = 0; - values["JS_STRING"] = 1; - values["JS_NUMBER"] = 2; + values[valuesById[0] = "JS_NORMAL"] = 0; + values[valuesById[1] = "JS_STRING"] = 1; + values[valuesById[2] = "JS_NUMBER"] = 2; return values; })(); @@ -11405,7 +11405,7 @@ $root.google = (function() { /** * Encodes the specified OneofOptions message, length delimited. Does not implicitly {@link google.protobuf.OneofOptions.verify|verify} messages. - * @param {google.protobuf.OneofOptions|Object.} message OneofOptions message or plain object to encode + * @param {google.protobuf.OneofOptions$Properties} message OneofOptions message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ @@ -11554,7 +11554,7 @@ $root.google = (function() { * @property {boolean} [allowAlias] EnumOptions allowAlias. * @property {boolean} [deprecated] EnumOptions deprecated. * @property {Array.} [uninterpretedOption] EnumOptions uninterpretedOption. - * @property {string} [.jspb.test.IsExtension.simpleOption] EnumOptions .jspb.test.IsExtension.simpleOption. + * @property {string} [".jspb.test.IsExtension.simpleOption"] EnumOptions .jspb.test.IsExtension.simpleOption. */ /** @@ -11608,7 +11608,7 @@ $root.google = (function() { /** * Encodes the specified EnumOptions message, length delimited. Does not implicitly {@link google.protobuf.EnumOptions.verify|verify} messages. - * @param {google.protobuf.EnumOptions|Object.} message EnumOptions message or plain object to encode + * @param {google.protobuf.EnumOptions$Properties} message EnumOptions message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ @@ -11838,7 +11838,7 @@ $root.google = (function() { /** * Encodes the specified EnumValueOptions message, length delimited. Does not implicitly {@link google.protobuf.EnumValueOptions.verify|verify} messages. - * @param {google.protobuf.EnumValueOptions|Object.} message EnumValueOptions message or plain object to encode + * @param {google.protobuf.EnumValueOptions$Properties} message EnumValueOptions message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ @@ -12045,7 +12045,7 @@ $root.google = (function() { /** * Encodes the specified ServiceOptions message, length delimited. Does not implicitly {@link google.protobuf.ServiceOptions.verify|verify} messages. - * @param {google.protobuf.ServiceOptions|Object.} message ServiceOptions message or plain object to encode + * @param {google.protobuf.ServiceOptions$Properties} message ServiceOptions message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ @@ -12256,7 +12256,7 @@ $root.google = (function() { /** * Encodes the specified MethodOptions message, length delimited. Does not implicitly {@link google.protobuf.MethodOptions.verify|verify} messages. - * @param {google.protobuf.MethodOptions|Object.} message MethodOptions message or plain object to encode + * @param {google.protobuf.MethodOptions$Properties} message MethodOptions message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ @@ -12446,9 +12446,9 @@ $root.google = (function() { */ MethodOptions.IdempotencyLevel = (function() { var valuesById = {}, values = Object.create(valuesById); - values["IDEMPOTENCY_UNKNOWN"] = 0; - values["NO_SIDE_EFFECTS"] = 1; - values["IDEMPOTENT"] = 2; + values[valuesById[0] = "IDEMPOTENCY_UNKNOWN"] = 0; + values[valuesById[1] = "NO_SIDE_EFFECTS"] = 1; + values[valuesById[2] = "IDEMPOTENT"] = 2; return values; })(); @@ -12530,7 +12530,7 @@ $root.google = (function() { /** * Encodes the specified UninterpretedOption message, length delimited. Does not implicitly {@link google.protobuf.UninterpretedOption.verify|verify} messages. - * @param {google.protobuf.UninterpretedOption|Object.} message UninterpretedOption message or plain object to encode + * @param {google.protobuf.UninterpretedOption$Properties} message UninterpretedOption message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ @@ -12817,7 +12817,7 @@ $root.google = (function() { /** * Encodes the specified NamePart message, length delimited. Does not implicitly {@link google.protobuf.UninterpretedOption.NamePart.verify|verify} messages. - * @param {google.protobuf.UninterpretedOption.NamePart|Object.} message NamePart message or plain object to encode + * @param {google.protobuf.UninterpretedOption.NamePart$Properties} message NamePart message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ @@ -13006,7 +13006,7 @@ $root.google = (function() { /** * Encodes the specified SourceCodeInfo message, length delimited. Does not implicitly {@link google.protobuf.SourceCodeInfo.verify|verify} messages. - * @param {google.protobuf.SourceCodeInfo|Object.} message SourceCodeInfo message or plain object to encode + * @param {google.protobuf.SourceCodeInfo$Properties} message SourceCodeInfo message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ @@ -13220,7 +13220,7 @@ $root.google = (function() { /** * Encodes the specified Location message, length delimited. Does not implicitly {@link google.protobuf.SourceCodeInfo.Location.verify|verify} messages. - * @param {google.protobuf.SourceCodeInfo.Location|Object.} message Location message or plain object to encode + * @param {google.protobuf.SourceCodeInfo.Location$Properties} message Location message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ @@ -13494,7 +13494,7 @@ $root.google = (function() { /** * Encodes the specified GeneratedCodeInfo message, length delimited. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.verify|verify} messages. - * @param {google.protobuf.GeneratedCodeInfo|Object.} message GeneratedCodeInfo message or plain object to encode + * @param {google.protobuf.GeneratedCodeInfo$Properties} message GeneratedCodeInfo message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */ @@ -13697,7 +13697,7 @@ $root.google = (function() { /** * Encodes the specified Annotation message, length delimited. Does not implicitly {@link google.protobuf.GeneratedCodeInfo.Annotation.verify|verify} messages. - * @param {google.protobuf.GeneratedCodeInfo.Annotation|Object.} message Annotation message or plain object to encode + * @param {google.protobuf.GeneratedCodeInfo.Annotation$Properties} message Annotation message or plain object to encode * @param {$protobuf.Writer} [writer] Writer to encode to * @returns {$protobuf.Writer} Writer */