protobufjs 8.2.0 → 8.3.0

package/index.d.ts

@@ -1,4 +1,4 @@
-// DO NOT EDIT! This is a generated file. Edit the JSDoc in src/*.js instead and run 'npm run build:types'.
+// DO NOT EDIT! This is a generated file. Edit the source file instead and regenerate.
 
 export as namespace protobuf;
 
@@ -162,28 +162,28 @@ export class Enum extends ReflectionObject {
      * @param [comments] The value comments for this enum
      * @param [valuesOptions] The value options for this enum
      */
-    constructor(name: string, values?: { [k: string]: number }, options?: { [k: string]: any }, comment?: string, comments?: { [k: string]: string }, valuesOptions?: ({ [k: string]: { [k: string]: any } }|undefined));
+    constructor(name: string, values?: { [k: string]: number }, options?: { [k: string]: any }, comment?: string, comments?: { [k: string]: (string|null) }, valuesOptions?: ({ [k: string]: { [k: string]: any } }|undefined));
 
     /** Enum values by id. */
-    public valuesById: { [k: number]: string };
+    valuesById: { [k: number]: string };
 
     /** Enum values by name. */
-    public values: { [k: string]: number };
+    values: { [k: string]: number };
 
     /** Enum comment text. */
-    public comment: (string|null);
+    comment: (string|null);
 
     /** Value comment texts, if any. */
-    public comments: { [k: string]: string };
+    comments: { [k: string]: (string|null) };
 
     /** Values options, if any */
-    public valuesOptions?: { [k: string]: { [k: string]: any } };
+    valuesOptions?: { [k: string]: { [k: string]: any } };
 
     /** Resolved values features, if any */
-    public _valuesFeatures?: { [k: string]: { [k: string]: any } };
+    _valuesFeatures?: { [k: string]: { [k: string]: any } };
 
     /** Reserved ranges, if any. */
-    public reserved: (number[]|string)[];
+    reserved: (number[]|string)[];
 
     /**
      * Constructs an enum from an enum descriptor.
@@ -192,14 +192,14 @@ export class Enum extends ReflectionObject {
      * @returns Created enum
      * @throws {TypeError} If arguments are invalid
      */
-    public static fromJSON(name: string, json: IEnum): Enum;
+    static fromJSON(name: string, json: IEnum): Enum;
 
     /**
      * Converts this enum to an enum descriptor.
      * @param [toJSONOptions] JSON conversion options
      * @returns Enum descriptor
      */
-    public toJSON(toJSONOptions?: IToJSONOptions): IEnum;
+    toJSON(toJSONOptions?: IToJSONOptions): IEnum;
 
     /**
      * Adds a value to this enum.
@@ -211,7 +211,7 @@ export class Enum extends ReflectionObject {
      * @throws {TypeError} If arguments are invalid
      * @throws {Error} If there is already a value with this name or id
      */
-    public add(name: string, id: number, comment?: string, options?: ({ [k: string]: any }|undefined)): Enum;
+    add(name: string, id: number, comment?: string, options?: ({ [k: string]: any }|undefined)): Enum;
 
     /**
      * Removes a value from this enum
@@ -220,31 +220,46 @@ export class Enum extends ReflectionObject {
      * @throws {TypeError} If arguments are invalid
      * @throws {Error} If `name` is not a name of this enum
      */
-    public remove(name: string): Enum;
+    remove(name: string): Enum;
 
     /**
      * Tests if the specified id is reserved.
      * @param id Id to test
      * @returns `true` if reserved, otherwise `false`
      */
-    public isReservedId(id: number): boolean;
+    isReservedId(id: number): boolean;
 
     /**
      * Tests if the specified name is reserved.
      * @param name Name to test
      * @returns `true` if reserved, otherwise `false`
      */
-    public isReservedName(name: string): boolean;
+    isReservedName(name: string): boolean;
 }
 
 /** Enum descriptor. */
 export interface IEnum {
 
+    /** Edition */
+    edition?: string;
+
     /** Enum values */
     values: { [k: string]: number };
 
     /** Enum options */
     options?: { [k: string]: any };
+
+    /** Enum value options */
+    valuesOptions?: { [k: string]: { [k: string]: any } };
+
+    /** Reserved ranges */
+    reserved?: (number[]|string)[];
+
+    /** Enum comment */
+    comment?: (string|null);
+
+    /** Value comments */
+    comments?: { [k: string]: (string|null) };
 }
 
 /** Reflected message field. */
@@ -269,7 +284,7 @@ export class Field extends FieldBase {
      * @returns Decorator function
      * @deprecated Legacy TypeScript decorator support. Will be removed in a future release.
      */
-    public static d<T extends Message<T>>(fieldId: number, fieldType: (Constructor<T>|string), fieldRule?: ("optional"|"required"|"repeated")): FieldDecorator;
+    static d<T extends Message<T>>(fieldId: number, fieldType: (Constructor<T>|string), fieldRule?: ("optional"|"required"|"repeated")): FieldDecorator;
 
     /**
      * Constructs a field from a field descriptor.
@@ -278,25 +293,25 @@ export class Field extends FieldBase {
      * @returns Created field
      * @throws {TypeError} If arguments are invalid
      */
-    public static fromJSON(name: string, json: IField): Field;
+    static fromJSON(name: string, json: IField): Field;
 
     /** Determines whether this field is required. */
-    public readonly required: boolean;
+    readonly required: boolean;
 
     /** Determines whether this field is not required. */
-    public readonly optional: boolean;
+    readonly optional: boolean;
 
     /**
      * Determines whether this field uses tag-delimited encoding.  In proto2 this
      * corresponded to group syntax.
      */
-    public readonly delimited: boolean;
+    readonly delimited: boolean;
 
     /** Determines whether this field is packed. Only relevant when repeated. */
-    public readonly packed: boolean;
+    readonly packed: boolean;
 
     /** Determines whether this field tracks presence. */
-    public readonly hasPresence: boolean;
+    readonly hasPresence: boolean;
 
     /**
      * Field decorator (TypeScript).
@@ -307,7 +322,7 @@ export class Field extends FieldBase {
      * @returns Decorator function
      * @deprecated Legacy TypeScript decorator support. Will be removed in a future release.
      */
-    public static d<T extends number | number[] | Long | Long[] | string | string[] | boolean | boolean[] | Uint8Array | Uint8Array[] | Buffer | Buffer[]>(fieldId: number, fieldType: ("double"|"float"|"int32"|"uint32"|"sint32"|"fixed32"|"sfixed32"|"int64"|"uint64"|"sint64"|"fixed64"|"sfixed64"|"string"|"bool"|"bytes"|object), fieldRule?: ("optional"|"required"|"repeated"), defaultValue?: T): FieldDecorator;
+    static d<T extends number | number[] | Long | Long[] | string | string[] | boolean | boolean[] | Uint8Array | Uint8Array[] | Buffer | Buffer[]>(fieldId: number, fieldType: ("double"|"float"|"int32"|"uint32"|"sint32"|"fixed32"|"sfixed32"|"int64"|"uint64"|"sint64"|"fixed64"|"sfixed64"|"string"|"bool"|"bytes"|object), fieldRule?: ("optional"|"required"|"repeated"), defaultValue?: T): FieldDecorator;
 }
 
 /** Base class of all reflected message fields. This is not an actual class but here for the sake of having consistent type definitions. */
@@ -326,63 +341,63 @@ export class FieldBase extends ReflectionObject {
     constructor(name: string, id: number, type: string, rule?: (string|{ [k: string]: any }), extend?: (string|{ [k: string]: any }), options?: { [k: string]: any }, comment?: string);
 
     /** Field type. */
-    public type: string;
+    type: string;
 
     /** Unique field id. */
-    public id: number;
+    id: number;
 
     /** Extended type if different from parent. */
-    public extend?: string;
+    extend?: string;
 
     /** Whether this field is repeated. */
-    public repeated: boolean;
+    repeated: boolean;
 
     /** Whether this field is a map or not. */
-    public map: boolean;
+    map: boolean;
 
     /** Message this field belongs to. */
-    public message: (Type|null);
+    message: (Type|null);
 
     /** OneOf this field belongs to, if any, */
-    public partOf: (OneOf|null);
+    partOf: (OneOf|null);
 
     /** The field type's default value. */
-    public typeDefault: any;
+    typeDefault: any;
 
     /** The field's default value on prototypes. */
-    public defaultValue: any;
+    defaultValue: any;
 
     /** Whether this field's value should be treated as a long. */
-    public long: boolean;
+    long: boolean;
 
     /** Whether this field's value is a buffer. */
-    public bytes: boolean;
+    bytes: boolean;
 
     /** Resolved type if not a basic type. */
-    public resolvedType: (Type|Enum|null);
+    resolvedType: (Type|Enum|null);
 
     /** Sister-field within the extended type if a declaring extension field. */
-    public extensionField: (Field|null);
+    extensionField: (Field|null);
 
     /** Sister-field within the declaring namespace if an extended field. */
-    public declaringField: (Field|null);
+    declaringField: (Field|null);
 
     /** Comment for this field. */
-    public comment: (string|null);
+    comment: (string|null);
 
     /**
      * Converts this field to a field descriptor.
      * @param [toJSONOptions] JSON conversion options
      * @returns Field descriptor
      */
-    public toJSON(toJSONOptions?: IToJSONOptions): IField;
+    toJSON(toJSONOptions?: IToJSONOptions): IField;
 
     /**
      * Resolves this field's type references.
      * @returns `this`
      * @throws {Error} If any reference cannot be resolved
      */
-    public resolve(): Field;
+    resolve(): Field;
 
     /**
      * Infers field features from legacy syntax that may have been specified differently.
@@ -390,12 +405,15 @@ export class FieldBase extends ReflectionObject {
      * @param edition The edition this proto is on, or undefined if pre-editions
      * @returns The feature values to override
      */
-    public _inferLegacyProtoFeatures(edition: (string|undefined)): object;
+    _inferLegacyProtoFeatures(edition: (string|undefined)): object;
 }
 
 /** Field descriptor. */
 export interface IField {
 
+    /** Edition */
+    edition?: string;
+
     /** Field rule */
     rule?: string;
 
@@ -407,6 +425,9 @@ export interface IField {
 
     /** Field options */
     options?: { [k: string]: any };
+
+    /** Field comment */
+    comment?: (string|null);
 }
 
 /** Extension field descriptor. */
@@ -422,14 +443,14 @@ export interface IExtensionField extends IField {
  * @param fieldName Field name
  * @deprecated Legacy TypeScript decorator support. Will be removed in a future release.
  */
-type FieldDecorator = (prototype: object, fieldName: string) => void;
+export type FieldDecorator = (prototype: object, fieldName: string) => void;
 
 /**
  * A node-style callback as used by {@link load} and {@link Root#load}.
  * @param error Error, if any, otherwise `null`
  * @param [root] Root, if there hasn't been an error
  */
-type LoadCallback = (error: (Error|null), root?: Root) => void;
+export type LoadCallback = (error: (Error|null), root?: Root) => void;
 
 /**
  * Loads one or multiple .proto or preprocessed .json files into a common root namespace and calls the callback.
@@ -488,10 +509,10 @@ export class MapField extends FieldBase {
     constructor(name: string, id: number, keyType: string, type: string, options?: { [k: string]: any }, comment?: string);
 
     /** Key type. */
-    public keyType: string;
+    keyType: string;
 
     /** Resolved key type if not a basic type. */
-    public resolvedKeyType: (ReflectionObject|null);
+    resolvedKeyType: (ReflectionObject|null);
 
     /**
      * Constructs a map field from a map field descriptor.
@@ -500,14 +521,14 @@ export class MapField extends FieldBase {
      * @returns Created map field
      * @throws {TypeError} If arguments are invalid
      */
-    public static fromJSON(name: string, json: IMapField): MapField;
+    static fromJSON(name: string, json: IMapField): MapField;
 
     /**
      * Converts this map field to a map field descriptor.
      * @param [toJSONOptions] JSON conversion options
      * @returns Map field descriptor
      */
-    public toJSON(toJSONOptions?: IToJSONOptions): IMapField;
+    toJSON(toJSONOptions?: IToJSONOptions): IMapField;
 
     /**
      * Map field decorator (TypeScript).
@@ -517,7 +538,7 @@ export class MapField extends FieldBase {
      * @returns Decorator function
      * @deprecated Legacy TypeScript decorator support. Will be removed in a future release.
      */
-    public static d<T extends { [key: string]: number | Long | string | boolean | Uint8Array | Buffer | number[] | Message<{}> }>(fieldId: number, fieldKeyType: ("int32"|"uint32"|"sint32"|"fixed32"|"sfixed32"|"int64"|"uint64"|"sint64"|"fixed64"|"sfixed64"|"bool"|"string"), fieldValueType: ("double"|"float"|"int32"|"uint32"|"sint32"|"fixed32"|"sfixed32"|"int64"|"uint64"|"sint64"|"fixed64"|"sfixed64"|"bool"|"string"|"bytes"|object|Constructor<{}>)): FieldDecorator;
+    static d<T extends { [key: string]: number | Long | string | boolean | Uint8Array | Buffer | number[] | Message<{}> }>(fieldId: number, fieldKeyType: ("int32"|"uint32"|"sint32"|"fixed32"|"sfixed32"|"int64"|"uint64"|"sint64"|"fixed64"|"sfixed64"|"bool"|"string"), fieldValueType: ("double"|"float"|"int32"|"uint32"|"sint32"|"fixed32"|"sfixed32"|"int64"|"uint64"|"sint64"|"fixed64"|"sfixed64"|"bool"|"string"|"bytes"|object|Constructor<{}>)): FieldDecorator;
 }
 
 /** Map field descriptor. */
@@ -544,20 +565,20 @@ export class Message<T extends object = object> {
     constructor(properties?: Properties<T>);
 
     /** Unknown fields preserved while decoding */
-    public $unknowns?: Uint8Array[];
+    $unknowns?: Uint8Array[];
 
     /** Reference to the reflected type. */
-    public static readonly $type: Type;
+    static readonly $type: Type;
 
     /** Reference to the reflected type. */
-    public readonly $type: Type;
+    readonly $type: Type;
 
     /**
      * Creates a new message of this type using the specified properties.
      * @param [properties] Properties to set
      * @returns Message instance
      */
-    public static create<T extends Message<T>>(this: Constructor<T>, properties?: { [k: string]: any }): Message<T>;
+    static create<T extends Message<T>>(this: Constructor<T>, properties?: { [k: string]: any }): Message<T>;
 
     /**
      * Encodes a message of this type.
@@ -565,7 +586,7 @@ export class Message<T extends object = object> {
      * @param [writer] Writer to use
      * @returns Writer
      */
-    public static encode<T extends Message<T>>(this: Constructor<T>, message: (T|{ [k: string]: any }), writer?: Writer): Writer;
+    static encode<T extends Message<T>>(this: Constructor<T>, message: (T|{ [k: string]: any }), writer?: Writer): Writer;
 
     /**
      * Encodes a message of this type preceeded by its length as a varint.
@@ -573,35 +594,35 @@ export class Message<T extends object = object> {
      * @param [writer] Writer to use
      * @returns Writer
      */
-    public static encodeDelimited<T extends Message<T>>(this: Constructor<T>, message: (T|{ [k: string]: any }), writer?: Writer): Writer;
+    static encodeDelimited<T extends Message<T>>(this: Constructor<T>, message: (T|{ [k: string]: any }), writer?: Writer): Writer;
 
     /**
      * Decodes a message of this type.
      * @param reader Reader or buffer to decode
      * @returns Decoded message
      */
-    public static decode<T extends Message<T>>(this: Constructor<T>, reader: (Reader|Uint8Array)): T;
+    static decode<T extends Message<T>>(this: Constructor<T>, reader: (Reader|Uint8Array)): T;
 
     /**
      * Decodes a message of this type preceeded by its length as a varint.
      * @param reader Reader or buffer to decode
      * @returns Decoded message
      */
-    public static decodeDelimited<T extends Message<T>>(this: Constructor<T>, reader: (Reader|Uint8Array)): T;
+    static decodeDelimited<T extends Message<T>>(this: Constructor<T>, reader: (Reader|Uint8Array)): T;
 
     /**
      * Verifies a message of this type.
      * @param message Plain object to verify
      * @returns `null` if valid, otherwise the reason why it is not
      */
-    public static verify(message: { [k: string]: any }): (string|null);
+    static verify(message: { [k: string]: any }): (string|null);
 
     /**
      * Creates a new message of this type from a plain object. Also converts values to their respective internal types.
      * @param object Plain object
      * @returns Message instance
      */
-    public static fromObject<T extends Message<T>>(this: Constructor<T>, object: { [k: string]: any }): T;
+    static fromObject<T extends Message<T>>(this: Constructor<T>, object: { [k: string]: any }): T;
 
     /**
      * Creates a plain object from a message of this type. Also converts values to other types if specified.
@@ -609,13 +630,13 @@ export class Message<T extends object = object> {
      * @param [options] Conversion options
      * @returns Plain object
      */
-    public static toObject<T extends Message<T>>(this: Constructor<T>, message: T, options?: IConversionOptions): { [k: string]: any };
+    static toObject<T extends Message<T>>(this: Constructor<T>, message: T, options?: IConversionOptions): { [k: string]: any };
 
     /**
      * Converts this message to JSON.
      * @returns JSON object
      */
-    public toJSON(): { [k: string]: any };
+    toJSON(): { [k: string]: any };
 }
 
 /** Reflected service method. */
@@ -636,31 +657,31 @@ export class Method extends ReflectionObject {
     constructor(name: string, type: (string|undefined), requestType: string, responseType: string, requestStream?: (boolean|{ [k: string]: any }), responseStream?: (boolean|{ [k: string]: any }), options?: { [k: string]: any }, comment?: string, parsedOptions?: { [k: string]: any }[]);
 
     /** Method type. */
-    public type: string;
+    type: string;
 
     /** Request type. */
-    public requestType: string;
+    requestType: string;
 
     /** Whether requests are streamed or not. */
-    public requestStream?: boolean;
+    requestStream?: boolean;
 
     /** Response type. */
-    public responseType: string;
+    responseType: string;
 
     /** Whether responses are streamed or not. */
-    public responseStream?: boolean;
+    responseStream?: boolean;
 
     /** Resolved request type. */
-    public resolvedRequestType: (Type|null);
+    resolvedRequestType: (Type|null);
 
     /** Resolved response type. */
-    public resolvedResponseType: (Type|null);
+    resolvedResponseType: (Type|null);
 
     /** Comment for this method */
-    public comment: (string|null);
+    comment: (string|null);
 
     /** Options properly parsed into objects */
-    public parsedOptions?: { [k: string]: any }[];
+    parsedOptions?: { [k: string]: any }[];
 
     /**
      * Constructs a method from a method descriptor.
@@ -669,14 +690,14 @@ export class Method extends ReflectionObject {
      * @returns Created method
      * @throws {TypeError} If arguments are invalid
      */
-    public static fromJSON(name: string, json: IMethod): Method;
+    static fromJSON(name: string, json: IMethod): Method;
 
     /**
      * Converts this method to a method descriptor.
      * @param [toJSONOptions] JSON conversion options
      * @returns Method descriptor
      */
-    public toJSON(toJSONOptions?: IToJSONOptions): IMethod;
+    toJSON(toJSONOptions?: IToJSONOptions): IMethod;
 }
 
 /** Method descriptor. */
@@ -700,8 +721,8 @@ export interface IMethod {
     /** Method options */
     options?: { [k: string]: any };
 
-    /** Method comments */
-    comment: string;
+    /** Method comment */
+    comment?: (string|null);
 
     /** Method options properly parsed into objects */
     parsedOptions?: { [k: string]: any }[];
@@ -725,7 +746,7 @@ export class Namespace extends NamespaceBase {
      * @returns Created namespace
      * @throws {TypeError} If arguments are invalid
      */
-    public static fromJSON(name: string, json: { [k: string]: any }, depth?: number): Namespace;
+    static fromJSON(name: string, json: { [k: string]: any }, depth?: number): Namespace;
 
     /**
      * Converts an array of reflection objects to JSON.
@@ -733,7 +754,7 @@ export class Namespace extends NamespaceBase {
      * @param [toJSONOptions] JSON conversion options
      * @returns JSON object or `undefined` when array is empty
      */
-    public static arrayToJSON(array: ReflectionObject[], toJSONOptions?: IToJSONOptions): ({ [k: string]: any }|undefined);
+    static arrayToJSON(array: ReflectionObject[], toJSONOptions?: IToJSONOptions): ({ [k: string]: any }|undefined);
 
     /**
      * Tests if the specified id is reserved.
@@ -741,7 +762,7 @@ export class Namespace extends NamespaceBase {
      * @param id Id to test
      * @returns `true` if reserved, otherwise `false`
      */
-    public static isReservedId(reserved: ((number[]|string)[]|undefined), id: number): boolean;
+    static isReservedId(reserved: ((number[]|string)[]|undefined), id: number): boolean;
 
     /**
      * Tests if the specified name is reserved.
@@ -749,14 +770,14 @@ export class Namespace extends NamespaceBase {
      * @param name Name to test
      * @returns `true` if reserved, otherwise `false`
      */
-    public static isReservedName(reserved: ((number[]|string)[]|undefined), name: string): boolean;
+    static isReservedName(reserved: ((number[]|string)[]|undefined), name: string): boolean;
 }
 
 /** Base class of all reflection objects containing nested objects. This is not an actual class but here for the sake of having consistent type definitions. */
 export abstract class NamespaceBase extends ReflectionObject {
 
     /** Nested objects by name. */
-    public nested?: { [k: string]: ReflectionObject };
+    nested?: { [k: string]: ReflectionObject };
 
     /** Whether or not objects contained in this namespace need feature resolution. */
     protected _needsRecursiveFeatureResolution: boolean;
@@ -765,14 +786,14 @@ export abstract class NamespaceBase extends ReflectionObject {
     protected _needsRecursiveResolve: boolean;
 
     /** Nested objects of this namespace as an array for iteration. */
-    public readonly nestedArray: ReflectionObject[];
+    readonly nestedArray: ReflectionObject[];
 
     /**
      * Converts this namespace to a namespace descriptor.
      * @param [toJSONOptions] JSON conversion options
      * @returns Namespace descriptor
      */
-    public toJSON(toJSONOptions?: IToJSONOptions): INamespace;
+    toJSON(toJSONOptions?: IToJSONOptions): INamespace;
 
     /**
      * Adds nested objects to this namespace from nested object descriptors.
@@ -780,14 +801,14 @@ export abstract class NamespaceBase extends ReflectionObject {
      * @param [depth] Current nesting depth, defaults to `0`
      * @returns `this`
      */
-    public addJSON(nestedJson: { [k: string]: AnyNestedObject }, depth?: number): Namespace;
+    addJSON(nestedJson: { [k: string]: AnyNestedObject }, depth?: number): Namespace;
 
     /**
      * Gets the nested object of the specified name.
      * @param name Nested object name
      * @returns The reflection object or `null` if it doesn't exist
      */
-    public get(name: string): (ReflectionObject|null);
+    get(name: string): (ReflectionObject|null);
 
     /**
      * Gets the values of the nested {@link Enum|enum} of the specified name.
@@ -796,7 +817,7 @@ export abstract class NamespaceBase extends ReflectionObject {
      * @returns Enum values
      * @throws {Error} If there is no such enum
      */
-    public getEnum(name: string): { [k: string]: number };
+    getEnum(name: string): { [k: string]: number };
 
     /**
      * Adds a nested object to this namespace.
@@ -805,7 +826,7 @@ export abstract class NamespaceBase extends ReflectionObject {
      * @throws {TypeError} If arguments are invalid
      * @throws {Error} If there is already a nested object with this name
      */
-    public add(object: ReflectionObject): Namespace;
+    add(object: ReflectionObject): Namespace;
 
     /**
      * Removes a nested object from this namespace.
@@ -814,7 +835,7 @@ export abstract class NamespaceBase extends ReflectionObject {
      * @throws {TypeError} If arguments are invalid
      * @throws {Error} If `object` is not a member of this namespace
      */
-    public remove(object: ReflectionObject): Namespace;
+    remove(object: ReflectionObject): Namespace;
 
     /**
      * Defines additial namespaces within this one if not yet existing.
@@ -822,13 +843,13 @@ export abstract class NamespaceBase extends ReflectionObject {
      * @param [json] Nested types to create from JSON
      * @returns Pointer to the last namespace created or `this` if path is empty
      */
-    public define(path: (string|string[]), json?: any): Namespace;
+    define(path: (string|string[]), json?: any): Namespace;
 
     /**
      * Resolves this namespace's and all its nested objects' type references. Useful to validate a reflection tree, but comes at a cost.
      * @returns `this`
      */
-    public resolveAll(): Namespace;
+    resolveAll(): Namespace;
 
     /**
      * Recursively looks up the reflection object matching the specified path in the scope of this namespace.
@@ -837,7 +858,7 @@ export abstract class NamespaceBase extends ReflectionObject {
      * @param [parentAlreadyChecked=false] If known, whether the parent has already been checked
      * @returns Looked up object or `null` if none could be found
      */
-    public lookup(path: (string|string[]), filterTypes: (any|any[]), parentAlreadyChecked?: boolean): (ReflectionObject|null);
+    lookup(path: (string|string[]), filterTypes: (any|any[]), parentAlreadyChecked?: boolean): (ReflectionObject|null);
 
     /**
      * Looks up the reflection object at the specified path, relative to this namespace.
@@ -845,7 +866,7 @@ export abstract class NamespaceBase extends ReflectionObject {
      * @param [parentAlreadyChecked=false] Whether the parent has already been checked
      * @returns Looked up object or `null` if none could be found
      */
-    public lookup(path: (string|string[]), parentAlreadyChecked?: boolean): (ReflectionObject|null);
+    lookup(path: (string|string[]), parentAlreadyChecked?: boolean): (ReflectionObject|null);
 
     /**
      * Looks up the {@link Type|type} at the specified path, relative to this namespace.
@@ -854,7 +875,7 @@ export abstract class NamespaceBase extends ReflectionObject {
      * @returns Looked up type
      * @throws {Error} If `path` does not point to a type
      */
-    public lookupType(path: (string|string[])): Type;
+    lookupType(path: (string|string[])): Type;
 
     /**
      * Looks up the values of the {@link Enum|enum} at the specified path, relative to this namespace.
@@ -863,7 +884,7 @@ export abstract class NamespaceBase extends ReflectionObject {
      * @returns Looked up enum
      * @throws {Error} If `path` does not point to an enum
      */
-    public lookupEnum(path: (string|string[])): Enum;
+    lookupEnum(path: (string|string[])): Enum;
 
     /**
      * Looks up the {@link Type|type} or {@link Enum|enum} at the specified path, relative to this namespace.
@@ -872,7 +893,7 @@ export abstract class NamespaceBase extends ReflectionObject {
      * @returns Looked up type or enum
      * @throws {Error} If `path` does not point to a type or enum
      */
-    public lookupTypeOrEnum(path: (string|string[])): Type;
+    lookupTypeOrEnum(path: (string|string[])): Type;
 
     /**
      * Looks up the {@link Service|service} at the specified path, relative to this namespace.
@@ -881,7 +902,7 @@ export abstract class NamespaceBase extends ReflectionObject {
      * @returns Looked up service
      * @throws {Error} If `path` does not point to a service
      */
-    public lookupService(path: (string|string[])): Service;
+    lookupService(path: (string|string[])): Service;
 }
 
 /** Namespace descriptor. */
@@ -895,77 +916,77 @@ export interface INamespace {
 }
 
 /** Any extension field descriptor. */
-type AnyExtensionField = (IExtensionField|IExtensionMapField);
+export type AnyExtensionField = (IExtensionField|IExtensionMapField);
 
 /** Any nested object descriptor. */
-type AnyNestedObject = (IEnum|IType|IService|AnyExtensionField|INamespace|IOneOf);
+export type AnyNestedObject = (IEnum|IType|IService|AnyExtensionField|INamespace|IOneOf);
 
 /** Base class of all reflection objects. */
 export abstract class ReflectionObject {
 
     /** Options. */
-    public options?: { [k: string]: any };
+    options?: { [k: string]: any };
 
     /** Parsed Options. */
-    public parsedOptions?: { [k: string]: any }[];
+    parsedOptions?: { [k: string]: any }[];
 
     /** Unique name within its namespace. */
-    public name: string;
+    name: string;
 
     /** Parent namespace. */
-    public parent: (Namespace|null);
+    parent: (Namespace|null);
 
     /** Whether already resolved or not. */
-    public resolved: boolean;
+    resolved: boolean;
 
     /** Comment text, if any. */
-    public comment: (string|null);
+    comment: (string|null);
 
     /** Defining file name. */
-    public filename: (string|null);
+    filename: (string|null);
 
     /** Reference to the root namespace. */
-    public readonly root: Root;
+    readonly root: Root;
 
     /** Full name including leading dot. */
-    public readonly fullName: string;
+    readonly fullName: string;
 
     /**
      * Converts this reflection object to its descriptor representation.
      * @returns Descriptor
      */
-    public toJSON(): { [k: string]: any };
+    toJSON(): { [k: string]: any };
 
     /**
      * Called when this object is added to a parent.
      * @param parent Parent added to
      */
-    public onAdd(parent: ReflectionObject): void;
+    onAdd(parent: ReflectionObject): void;
 
     /**
      * Called when this object is removed from a parent.
      * @param parent Parent removed from
      */
-    public onRemove(parent: ReflectionObject): void;
+    onRemove(parent: ReflectionObject): void;
 
     /**
      * Resolves this objects type references.
      * @returns `this`
      */
-    public resolve(): ReflectionObject;
+    resolve(): ReflectionObject;
 
     /**
      * Resolves this objects editions features.
      * @param edition The edition we're currently resolving for.
      * @returns `this`
      */
-    public _resolveFeaturesRecursive(edition: string): ReflectionObject;
+    _resolveFeaturesRecursive(edition: string): ReflectionObject;
 
     /**
      * Resolves child features from parent features
      * @param edition The edition we're currently resolving for.
      */
-    public _resolveFeatures(edition: string): void;
+    _resolveFeatures(edition: string): void;
 
     /**
      * Infers features from legacy syntax that may have been specified differently.
@@ -973,14 +994,14 @@ export abstract class ReflectionObject {
      * @param edition The edition this proto is on, or undefined if pre-editions
      * @returns The feature values to override
      */
-    public _inferLegacyProtoFeatures(edition: (string|undefined)): object;
+    _inferLegacyProtoFeatures(edition: (string|undefined)): object;
 
     /**
      * Gets an option value.
      * @param name Option name
      * @returns Option value or `undefined` if not set
      */
-    public getOption(name: string): any;
+    getOption(name: string): any;
 
     /**
      * Sets an option.
@@ -989,7 +1010,7 @@ export abstract class ReflectionObject {
      * @param [ifNotSet] Sets the option only if it isn't currently set
      * @returns `this`
      */
-    public setOption(name: string, value: any, ifNotSet?: (boolean|undefined)): ReflectionObject;
+    setOption(name: string, value: any, ifNotSet?: (boolean|undefined)): ReflectionObject;
 
     /**
      * Sets a parsed option.
@@ -998,7 +1019,7 @@ export abstract class ReflectionObject {
      * @param propName dot '.' delimited full path of property within the option to set. if undefined\empty, will add a new option with that value
      * @returns `this`
      */
-    public setParsedOption(name: string, value: any, propName: string): ReflectionObject;
+    setParsedOption(name: string, value: any, propName: string): ReflectionObject;
 
     /**
      * Sets multiple options.
@@ -1006,19 +1027,19 @@ export abstract class ReflectionObject {
      * @param [ifNotSet] Sets an option only if it isn't currently set
      * @returns `this`
      */
-    public setOptions(options: { [k: string]: any }, ifNotSet?: boolean): ReflectionObject;
+    setOptions(options: { [k: string]: any }, ifNotSet?: boolean): ReflectionObject;
 
     /**
      * Converts this instance to its string representation.
      * @returns Class name[, space, full name]
      */
-    public toString(): string;
+    toString(): string;
 
     /**
      * Converts the edition this object is pinned to for JSON format.
      * @returns The edition string for JSON representation
      */
-    public _editionToJSON(): (string|undefined);
+    _editionToJSON(): (string|undefined);
 }
 
 /** Reflected oneof. */
@@ -1034,13 +1055,13 @@ export class OneOf extends ReflectionObject {
     constructor(name: string, fieldNames?: (string[]|{ [k: string]: any }), options?: { [k: string]: any }, comment?: string);
 
     /** Field names that belong to this oneof. */
-    public oneof: string[];
+    oneof: string[];
 
     /** Fields that belong to this oneof as an array for iteration. */
-    public readonly fieldsArray: Field[];
+    readonly fieldsArray: Field[];
 
     /** Comment for this field. */
-    public comment: (string|null);
+    comment: (string|null);
 
     /**
      * Constructs a oneof from a oneof descriptor.
@@ -1049,35 +1070,35 @@ export class OneOf extends ReflectionObject {
      * @returns Created oneof
      * @throws {TypeError} If arguments are invalid
      */
-    public static fromJSON(name: string, json: IOneOf): OneOf;
+    static fromJSON(name: string, json: IOneOf): OneOf;
 
     /**
      * Converts this oneof to a oneof descriptor.
      * @param [toJSONOptions] JSON conversion options
      * @returns Oneof descriptor
      */
-    public toJSON(toJSONOptions?: IToJSONOptions): IOneOf;
+    toJSON(toJSONOptions?: IToJSONOptions): IOneOf;
 
     /**
      * Adds a field to this oneof and removes it from its current parent, if any.
      * @param field Field to add
      * @returns `this`
      */
-    public add(field: Field): OneOf;
+    add(field: Field): OneOf;
 
     /**
      * Removes a field from this oneof and puts it back to the oneof's parent.
      * @param field Field to remove
      * @returns `this`
      */
-    public remove(field: Field): OneOf;
+    remove(field: Field): OneOf;
 
     /**
      * Determines whether this field corresponds to a synthetic oneof created for
      * a proto3 optional field.  No behavioral logic should depend on this, but it
      * can be relevant for reflection.
      */
-    public readonly isProto3Optional: boolean;
+    readonly isProto3Optional: boolean;
 
     /**
      * OneOf decorator (TypeScript).
@@ -1085,7 +1106,7 @@ export class OneOf extends ReflectionObject {
      * @returns Decorator function
      * @deprecated Legacy TypeScript decorator support. Will be removed in a future release.
      */
-    public static d<T extends string>(...fieldNames: string[]): OneOfDecorator;
+    static d<T extends string>(...fieldNames: string[]): OneOfDecorator;
 }
 
 /** Oneof descriptor. */
@@ -1096,6 +1117,9 @@ export interface IOneOf {
 
     /** Oneof options */
     options?: { [k: string]: any };
+
+    /** Oneof comment */
+    comment?: (string|null);
 }
 
 /**
@@ -1104,7 +1128,7 @@ export interface IOneOf {
  * @param oneofName OneOf name
  * @deprecated Legacy TypeScript decorator support. Will be removed in a future release.
  */
-type OneOfDecorator = (prototype: object, oneofName: string) => void;
+export type OneOfDecorator = (prototype: object, oneofName: string) => void;
 
 /**
  * Parses the given .proto source and returns an object with the parsed contents.
@@ -1169,13 +1193,13 @@ export class Reader {
     constructor(buffer: Uint8Array);
 
     /** Read buffer. */
-    public buf: Uint8Array;
+    buf: Uint8Array;
 
     /** Read buffer position. */
-    public pos: number;
+    pos: number;
 
     /** Read buffer length. */
-    public len: number;
+    len: number;
 
     /**
      * Creates a new reader using the specified buffer.
@@ -1183,7 +1207,7 @@ export class Reader {
      * @returns A {@link BufferReader} if `buffer` is a Buffer, otherwise a {@link Reader}
      * @throws {Error} If `buffer` is not a valid buffer
      */
-    public static create(buffer: (Uint8Array|Buffer)): (Reader|BufferReader);
+    static create(buffer: (Uint8Array|Buffer)): (Reader|BufferReader);
 
     /**
      * Returns raw bytes from the backing buffer without advancing the reader.
@@ -1191,113 +1215,113 @@ export class Reader {
      * @param end End offset
      * @returns Raw bytes
      */
-    public raw(start: number, end: number): Uint8Array;
+    raw(start: number, end: number): Uint8Array;
 
     /**
      * Reads a varint as an unsigned 32 bit value.
      * @returns Value read
      */
-    public uint32(): number;
+    uint32(): number;
 
     /**
      * Reads a field tag.
      * @returns Tag read
      */
-    public tag(): number;
+    tag(): number;
 
     /**
      * Reads a varint as a signed 32 bit value.
      * @returns Value read
      */
-    public int32(): number;
+    int32(): number;
 
     /**
      * Reads a zig-zag encoded varint as a signed 32 bit value.
      * @returns Value read
      */
-    public sint32(): number;
+    sint32(): number;
 
     /**
      * Reads a varint as a signed 64 bit value.
      * @returns Value read
      */
-    public int64(): Long;
+    int64(): Long;
 
     /**
      * Reads a varint as an unsigned 64 bit value.
      * @returns Value read
      */
-    public uint64(): Long;
+    uint64(): Long;
 
     /**
      * Reads a zig-zag encoded varint as a signed 64 bit value.
      * @returns Value read
      */
-    public sint64(): Long;
+    sint64(): Long;
 
     /**
      * Reads a varint as a boolean.
      * @returns Value read
      */
-    public bool(): boolean;
+    bool(): boolean;
 
     /**
      * Reads fixed 32 bits as an unsigned 32 bit integer.
      * @returns Value read
      */
-    public fixed32(): number;
+    fixed32(): number;
 
     /**
      * Reads fixed 32 bits as a signed 32 bit integer.
      * @returns Value read
      */
-    public sfixed32(): number;
+    sfixed32(): number;
 
     /**
      * Reads fixed 64 bits.
      * @returns Value read
      */
-    public fixed64(): Long;
+    fixed64(): Long;
 
     /**
      * Reads zig-zag encoded fixed 64 bits.
      * @returns Value read
      */
-    public sfixed64(): Long;
+    sfixed64(): Long;
 
     /**
      * Reads a float (32 bit) as a number.
      * @returns Value read
      */
-    public float(): number;
+    float(): number;
 
     /**
      * Reads a double (64 bit float) as a number.
      * @returns Value read
      */
-    public double(): number;
+    double(): number;
 
     /**
      * Reads a sequence of bytes preceeded by its length as a varint.
      * @returns Value read
      */
-    public bytes(): Uint8Array;
+    bytes(): Uint8Array;
 
     /**
      * Reads a string preceeded by its byte length as a varint.
      * @returns Value read
      */
-    public string(): string;
+    string(): string;
 
     /**
      * Skips the specified number of bytes if specified, otherwise skips a varint.
      * @param [length] Length if known, otherwise a varint is assumed
      * @returns `this`
      */
-    public skip(length?: number): Reader;
+    skip(length?: number): Reader;
 
     /** Recursion limit. */
-    public static recursionLimit: number;
+    static recursionLimit: number;
 
     /**
      * Skips the next element of the specified wire type.
@@ -1306,7 +1330,7 @@ export class Reader {
      * @param [fieldNumber] Field number for validating group end tags
      * @returns `this`
      */
-    public skipType(wireType: number, depth?: number, fieldNumber?: number): Reader;
+    skipType(wireType: number, depth?: number, fieldNumber?: number): Reader;
 }
 
 /** Wire format reader using node buffers. */
@@ -1324,13 +1348,13 @@ export class BufferReader extends Reader {
      * @param end End offset
      * @returns Raw bytes
      */
-    public raw(start: number, end: number): Buffer;
+    raw(start: number, end: number): Buffer;
 
     /**
      * Reads a sequence of bytes preceeded by its length as a varint.
      * @returns Value read
      */
-    public bytes(): Buffer;
+    bytes(): Buffer;
 }
 
 /** Root namespace wrapping all types, enums, services, sub-namespaces etc. that belong together. */
@@ -1343,10 +1367,10 @@ export class Root extends NamespaceBase {
     constructor(options?: { [k: string]: any });
 
     /** Deferred extension fields. */
-    public deferred: Field[];
+    deferred: Field[];
 
     /** Resolved file names of loaded files. */
-    public files: string[];
+    files: string[];
 
     /**
      * Loads a namespace descriptor into a root namespace.
@@ -1355,7 +1379,7 @@ export class Root extends NamespaceBase {
      * @param [depth] Current nesting depth, defaults to `0`
      * @returns Root namespace
      */
-    public static fromJSON(json: INamespace, root?: Root, depth?: number): Root;
+    static fromJSON(json: INamespace, root?: Root, depth?: number): Root;
 
     /**
      * Resolves the path of an imported file, relative to the importing origin.
@@ -1364,7 +1388,7 @@ export class Root extends NamespaceBase {
      * @param target The file name being imported
      * @returns Resolved path to `target` or `null` to skip the file
      */
-    public resolvePath(origin: string, target: string): (string|null);
+    resolvePath(origin: string, target: string): (string|null);
 
     /**
      * Fetch content from file path or url
@@ -1372,7 +1396,7 @@ export class Root extends NamespaceBase {
      * @param path File path or url
      * @param callback Callback function
      */
-    public fetch(path: string, callback: FetchCallback): void;
+    fetch(path: string, callback: FetchCallback): void;
 
     /**
      * Loads one or multiple .proto or preprocessed .json files into this root namespace and calls the callback.
@@ -1380,14 +1404,14 @@ export class Root extends NamespaceBase {
      * @param options Parse options
      * @param callback Callback function
      */
-    public load(filename: (string|string[]), options: IParseOptions, callback: LoadCallback): void;
+    load(filename: (string|string[]), options: IParseOptions, callback: LoadCallback): void;
 
     /**
      * Loads one or multiple .proto or preprocessed .json files into this root namespace and calls the callback.
      * @param filename Names of one or multiple files to load
      * @param callback Callback function
      */
-    public load(filename: (string|string[]), callback: LoadCallback): void;
+    load(filename: (string|string[]), callback: LoadCallback): void;
 
     /**
      * Loads one or multiple .proto or preprocessed .json files into this root namespace and returns a promise.
@@ -1395,7 +1419,7 @@ export class Root extends NamespaceBase {
      * @param [options] Parse options. Defaults to {@link parse.defaults} when omitted.
      * @returns Promise
      */
-    public load(filename: (string|string[]), options?: IParseOptions): Promise<Root>;
+    load(filename: (string|string[]), options?: IParseOptions): Promise<Root>;
 
     /**
      * Synchronously loads one or multiple .proto or preprocessed .json files into this root namespace (node only).
@@ -1404,7 +1428,7 @@ export class Root extends NamespaceBase {
      * @returns Root namespace
      * @throws {Error} If synchronous fetching is not supported (i.e. in browsers) or if a file's syntax is invalid
      */
-    public loadSync(filename: (string|string[]), options?: IParseOptions): Root;
+    loadSync(filename: (string|string[]), options?: IParseOptions): Root;
 }
 
 /**
@@ -1446,13 +1470,13 @@ export namespace rpc {
         constructor(rpcImpl: RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean);
 
         /** RPC implementation. Becomes `null` once the service is ended. */
-        public rpcImpl: (RPCImpl|null);
+        rpcImpl: (RPCImpl|null);
 
         /** Whether requests are length-delimited. */
-        public requestDelimited: boolean;
+        requestDelimited: boolean;
 
         /** Whether responses are length-delimited. */
-        public responseDelimited: boolean;
+        responseDelimited: boolean;
 
         /**
          * Calls a service method through {@link rpc.Service#rpcImpl|rpcImpl}.
@@ -1462,14 +1486,14 @@ export namespace rpc {
          * @param request Request message or plain object
          * @param callback Service callback
          */
-        public rpcCall<TReq extends Message<TReq>, TRes extends Message<TRes>>(method: (Method|rpc.ServiceMethod<TReq, TRes>), requestCtor: Constructor<TReq>, responseCtor: Constructor<TRes>, request: (TReq|Properties<TReq>), callback: rpc.ServiceMethodCallback<TRes>): void;
+        rpcCall<TReq extends Message<TReq>, TRes extends Message<TRes>>(method: (Method|rpc.ServiceMethod<TReq, TRes>), requestCtor: Constructor<TReq>, responseCtor: Constructor<TRes>, request: (TReq|Properties<TReq>), callback: rpc.ServiceMethodCallback<TRes>): void;
 
         /**
          * Ends this service and emits the `end` event.
          * @param [endedByRPC=false] Whether the service has been ended by the RPC implementation.
          * @returns `this`
          */
-        public end(endedByRPC?: boolean): rpc.Service;
+        end(endedByRPC?: boolean): rpc.Service;
     }
 }
 
@@ -1479,14 +1503,14 @@ export namespace rpc {
  * @param requestData Request data
  * @param callback Callback function
  */
-type RPCImpl = (method: (Method|rpc.ServiceMethod<Message<{}>, Message<{}>>), requestData: Uint8Array, callback: RPCImplCallback) => void;
+export type RPCImpl = (method: (Method|rpc.ServiceMethod<Message<{}>, Message<{}>>), requestData: Uint8Array, callback: RPCImplCallback) => void;
 
 /**
  * Node-style callback as used by {@link RPCImpl}.
  * @param error Error, if any, otherwise `null`
  * @param [response] Response data or `null` to signal end of stream, if there hasn't been an error
  */
-type RPCImplCallback = (error: (Error|null), response?: (Uint8Array|null)) => void;
+export type RPCImplCallback = (error: (Error|null), response?: (Uint8Array|null)) => void;
 
 /** Reflected service. */
 export class Service extends NamespaceBase {
@@ -1500,7 +1524,7 @@ export class Service extends NamespaceBase {
     constructor(name: string, options?: { [k: string]: any });
 
     /** Service methods. */
-    public methods: { [k: string]: Method };
+    methods: { [k: string]: Method };
 
     /**
      * Constructs a service from a service descriptor.
@@ -1510,17 +1534,17 @@ export class Service extends NamespaceBase {
      * @returns Created service
      * @throws {TypeError} If arguments are invalid
      */
-    public static fromJSON(name: string, json: IService, depth?: number): Service;
+    static fromJSON(name: string, json: IService, depth?: number): Service;
 
     /**
      * Converts this service to a service descriptor.
      * @param [toJSONOptions] JSON conversion options
      * @returns Service descriptor
      */
-    public toJSON(toJSONOptions?: IToJSONOptions): IService;
+    toJSON(toJSONOptions?: IToJSONOptions): IService;
 
     /** Methods of this service as an array for iteration. */
-    public readonly methodsArray: Method[];
+    readonly methodsArray: Method[];
 
     /**
      * Creates a runtime service using the specified rpc implementation.
@@ -1529,33 +1553,39 @@ export class Service extends NamespaceBase {
      * @param [responseDelimited=false] Whether responses are length-delimited
      * @returns RPC service. Useful where requests and/or responses are streamed.
      */
-    public create(rpcImpl: RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean): rpc.Service;
+    create(rpcImpl: RPCImpl, requestDelimited?: boolean, responseDelimited?: boolean): rpc.Service;
 }
 
 /** Service descriptor. */
 export interface IService extends INamespace {
 
+    /** Edition */
+    edition?: string;
+
     /** Method descriptors */
     methods: { [k: string]: IMethod };
+
+    /** Service comment */
+    comment?: (string|null);
 }
 
 /**
  * Gets the next token and advances.
  * @returns Next token or `null` on eof
  */
-type TokenizerHandleNext = () => (string|null);
+export type TokenizerHandleNext = () => (string|null);
 
 /**
  * Peeks for the next token.
  * @returns Next token or `null` on eof
  */
-type TokenizerHandlePeek = () => (string|null);
+export type TokenizerHandlePeek = () => (string|null);
 
 /**
  * Pushes a token back to the stack.
  * @param token Token
  */
-type TokenizerHandlePush = (token: string) => void;
+export type TokenizerHandlePush = (token: string) => void;
 
 /**
  * Skips the next token.
@@ -1564,14 +1594,14 @@ type TokenizerHandlePush = (token: string) => void;
  * @returns Whether the token matched
  * @throws {Error} If the token didn't match and is not optional
  */
-type TokenizerHandleSkip = (expected: string, optional?: boolean) => boolean;
+export type TokenizerHandleSkip = (expected: string, optional?: boolean) => boolean;
 
 /**
  * Gets the comment on the previous line or, alternatively, the line comment on the specified line.
  * @param [line] Line number
  * @returns Comment text or `null` if none
  */
-type TokenizerHandleCmnt = (line?: number) => (string|null);
+export type TokenizerHandleCmnt = (line?: number) => (string|null);
 
 /** Handle object returned from {@link tokenize}. */
 export interface ITokenizerHandle {
@@ -1624,38 +1654,38 @@ export class Type extends NamespaceBase {
     constructor(name: string, options?: { [k: string]: any });
 
     /** Message fields. */
-    public fields: { [k: string]: Field };
+    fields: { [k: string]: Field };
 
     /** Oneofs declared within this namespace, if any. */
-    public oneofs: { [k: string]: OneOf };
+    oneofs: { [k: string]: OneOf };
 
     /** Extension ranges, if any. */
-    public extensions: number[][];
+    extensions: number[][];
 
     /** Reserved ranges, if any. */
-    public reserved: (number[]|string)[];
+    reserved: (number[]|string)[];
 
     /** Message fields by id. */
-    public readonly fieldsById: { [k: number]: Field };
+    readonly fieldsById: { [k: number]: Field };
 
     /** Fields of this message as an array for iteration. */
-    public readonly fieldsArray: Field[];
+    readonly fieldsArray: Field[];
 
     /** Oneofs of this message as an array for iteration. */
-    public readonly oneofsArray: OneOf[];
+    readonly oneofsArray: OneOf[];
 
     /**
      * The registered constructor, if any registered, otherwise a generic constructor.
      * Assigning a function replaces the internal constructor. If the function does not extend {@link Message} yet, its prototype will be setup accordingly and static methods will be populated. If it already extends {@link Message}, it will just replace the internal constructor.
      */
-    public ctor: Constructor<{}>;
+    ctor: Constructor<{}>;
 
     /**
      * Generates a constructor function for the specified type.
      * @param mtype Message type
      * @returns Codegen instance
      */
-    public static generateConstructor(mtype: Type): Codegen;
+    static generateConstructor(mtype: Type): Codegen;
 
     /**
      * Creates a message type from a message type descriptor.
@@ -1664,14 +1694,14 @@ export class Type extends NamespaceBase {
      * @param [depth] Current nesting depth, defaults to `0`
      * @returns Created message type
      */
-    public static fromJSON(name: string, json: IType, depth?: number): Type;
+    static fromJSON(name: string, json: IType, depth?: number): Type;
 
     /**
      * Converts this message type to a message type descriptor.
      * @param [toJSONOptions] JSON conversion options
      * @returns Message type descriptor
      */
-    public toJSON(toJSONOptions?: IToJSONOptions): IType;
+    toJSON(toJSONOptions?: IToJSONOptions): IType;
 
     /**
      * Adds a nested object to this type.
@@ -1680,7 +1710,7 @@ export class Type extends NamespaceBase {
      * @throws {TypeError} If arguments are invalid
      * @throws {Error} If there is already a nested object with this name or, if a field, when there is already a field with this id
      */
-    public add(object: ReflectionObject): Type;
+    add(object: ReflectionObject): Type;
 
     /**
      * Removes a nested object from this type.
@@ -1689,34 +1719,34 @@ export class Type extends NamespaceBase {
      * @throws {TypeError} If arguments are invalid
      * @throws {Error} If `object` is not a member of this type
      */
-    public remove(object: ReflectionObject): Type;
+    remove(object: ReflectionObject): Type;
 
     /**
      * Tests if the specified id is reserved.
      * @param id Id to test
      * @returns `true` if reserved, otherwise `false`
      */
-    public isReservedId(id: number): boolean;
+    isReservedId(id: number): boolean;
 
     /**
      * Tests if the specified name is reserved.
      * @param name Name to test
      * @returns `true` if reserved, otherwise `false`
      */
-    public isReservedName(name: string): boolean;
+    isReservedName(name: string): boolean;
 
     /**
      * Creates a new message of this type using the specified properties.
      * @param [properties] Properties to set
      * @returns Message instance
      */
-    public create(properties?: { [k: string]: any }): Message<{}>;
+    create(properties?: { [k: string]: any }): Message<{}>;
 
     /**
      * Sets up {@link Type#encode|encode}, {@link Type#decode|decode} and {@link Type#verify|verify}.
      * @returns `this`
      */
-    public setup(): Type;
+    setup(): Type;
 
     /**
      * Encodes a message of this type. Does not implicitly {@link Type#verify|verify} messages.
@@ -1724,7 +1754,7 @@ export class Type extends NamespaceBase {
      * @param [writer] Writer to encode to
      * @returns writer
      */
-    public encode(message: (Message<{}>|{ [k: string]: any }), writer?: Writer): Writer;
+    encode(message: (Message<{}>|{ [k: string]: any }), writer?: Writer): Writer;
 
     /**
      * Encodes a message of this type preceeded by its byte length as a varint. Does not implicitly {@link Type#verify|verify} messages.
@@ -1732,7 +1762,7 @@ export class Type extends NamespaceBase {
      * @param [writer] Writer to encode to
      * @returns writer
      */
-    public encodeDelimited(message: (Message<{}>|{ [k: string]: any }), writer?: Writer): Writer;
+    encodeDelimited(message: (Message<{}>|{ [k: string]: any }), writer?: Writer): Writer;
 
     /**
      * Decodes a message of this type.
@@ -1742,7 +1772,7 @@ export class Type extends NamespaceBase {
      * @throws {Error} If the payload is not a reader or valid buffer
      * @throws {util.ProtocolError<{}>} If required fields are missing
      */
-    public decode(reader: (Reader|Uint8Array), length?: number): Message<{}>;
+    decode(reader: (Reader|Uint8Array), length?: number): Message<{}>;
 
     /**
      * Decodes a message of this type preceeded by its byte length as a varint.
@@ -1751,21 +1781,21 @@ export class Type extends NamespaceBase {
      * @throws {Error} If the payload is not a reader or valid buffer
      * @throws {util.ProtocolError} If required fields are missing
      */
-    public decodeDelimited(reader: (Reader|Uint8Array)): Message<{}>;
+    decodeDelimited(reader: (Reader|Uint8Array)): Message<{}>;
 
     /**
      * Verifies that field values are valid and that required fields are present.
      * @param message Plain object to verify
      * @returns `null` if valid, otherwise the reason why it is not
      */
-    public verify(message: { [k: string]: any }): (null|string);
+    verify(message: { [k: string]: any }): (null|string);
 
     /**
      * Creates a new message of this type from a plain object. Also converts values to their respective internal types.
      * @param object Plain object to convert
      * @returns Message instance
      */
-    public fromObject(object: { [k: string]: any }): Message<{}>;
+    fromObject(object: { [k: string]: any }): Message<{}>;
 
     /**
      * Creates a plain object from a message of this type. Also converts values to other types if specified.
@@ -1773,14 +1803,14 @@ export class Type extends NamespaceBase {
      * @param [options] Conversion options
      * @returns Plain object
      */
-    public toObject(message: Message<{}>, options?: IConversionOptions): { [k: string]: any };
+    toObject(message: Message<{}>, options?: IConversionOptions): { [k: string]: any };
 
     /**
      * Gets the type url for this type.
      * @param [prefix] Custom type url prefix, defaults to `"type.googleapis.com"`
      * @returns The type url
      */
-    public getTypeUrl(prefix?: string): string;
+    getTypeUrl(prefix?: string): string;
 
     /**
      * Type decorator (TypeScript).
@@ -1788,12 +1818,15 @@ export class Type extends NamespaceBase {
      * @returns Decorator function
      * @deprecated Legacy TypeScript decorator support. Will be removed in a future release.
      */
-    public static d<T extends Message<T>>(typeName?: string): TypeDecorator<T>;
+    static d<T extends Message<T>>(typeName?: string): TypeDecorator<T>;
 }
 
 /** Message type descriptor. */
 export interface IType extends INamespace {
 
+    /** Edition */
+    edition?: string;
+
     /** Oneof descriptors */
     oneofs?: { [k: string]: IOneOf };
 
@@ -1808,6 +1841,9 @@ export interface IType extends INamespace {
 
     /** Whether a legacy group or not */
     group?: boolean;
+
+    /** Message type comment */
+    comment?: (string|null);
 }
 
 /** Conversion options as used by {@link Type#toObject} and {@link Message.toObject}. */
@@ -1855,7 +1891,7 @@ export interface IConversionOptions {
  * @param target Target constructor
  * @deprecated Legacy TypeScript decorator support. Will be removed in a future release.
  */
-type TypeDecorator<T extends Message<T>> = (target: Constructor<T>) => void;
+export type TypeDecorator<T extends Message<T>> = (target: Constructor<T>) => void;
 
 /** Common type constants. */
 export namespace types {
@@ -1943,19 +1979,17 @@ export namespace types {
 }
 
 /** Constructor type. */
-export interface Constructor<T> extends Function {
-    new(...params: any[]): T; prototype: T;
-}
+export type Constructor<T> = Function & { new(...params: any[]): T; prototype: T };
 
 /** Properties type. */
-type Properties<T> = { [P in keyof T]?: T[P] };
+export type Properties<T> = { [P in keyof T]?: T[P] };
 
 /**
  * Callback as used by {@link util.asPromise}.
  * @param error Error, if any
  * @param params Additional arguments
  */
-type asPromiseCallback = (error: (Error|null), ...params: any[]) => void;
+export type asPromiseCallback = (error: (Error|null), ...params: any[]) => void;
 
 /**
  * Appends code to the function's body or finishes generation.
@@ -1964,20 +1998,20 @@ type asPromiseCallback = (error: (Error|null), ...params: any[]) => void;
  * @returns Itself or the generated function if finished
  * @throws {Error} If format parameter counts do not match
  */
-type Codegen = (formatStringOrScope?: (string|{ [k: string]: any }), ...formatParams: any[]) => (Codegen|Function);
+export type Codegen = (formatStringOrScope?: (string|{ [k: string]: any }), ...formatParams: any[]) => (Codegen|Function);
 
 /**
  * Event listener as used by {@link util.EventEmitter}.
  * @param args Arguments
  */
-type EventEmitterListener = (...args: any[]) => void;
+export type EventEmitterListener = (...args: any[]) => void;
 
 /**
  * Node-style callback as used by {@link util.fetch}.
  * @param error Error, if any, otherwise `null`
  * @param [contents] File contents, if there hasn't been an error
  */
-type FetchCallback = (error: Error, contents?: string) => void;
+export type FetchCallback = (error: Error, contents?: string) => void;
 
 /** Options as used by {@link util.fetch}. */
 export interface IFetchOptions {
@@ -2016,20 +2050,20 @@ export interface Long {
  * A OneOf getter as returned by {@link util.oneOfGetter}.
  * @returns Set field name, if any
  */
-type OneOfGetter = () => (string|undefined);
+export type OneOfGetter = () => (string|undefined);
 
 /**
  * A OneOf setter as returned by {@link util.oneOfSetter}.
  * @param value Field name
  */
-type OneOfSetter = (value: (string|undefined)) => void;
+export type OneOfSetter = (value: (string|undefined)) => void;
 
 /**
  * An allocator as used by {@link util.pool}.
  * @param size Buffer size
  * @returns Buffer
  */
-type PoolAllocator = (size: number) => Uint8Array;
+export type PoolAllocator = (size: number) => Uint8Array;
 
 /**
  * A slicer as used by {@link util.pool}.
@@ -2037,7 +2071,7 @@ type PoolAllocator = (size: number) => Uint8Array;
  * @param end End offset
  * @returns Buffer slice
  */
-type PoolSlicer = (this: Uint8Array, start: number, end: number) => Uint8Array;
+export type PoolSlicer = (this: Uint8Array, start: number, end: number) => Uint8Array;
 
 /** Various utility functions. */
 export namespace util {
@@ -2122,7 +2156,7 @@ export namespace util {
          * @param [ctx] Listener context
          * @returns `this`
          */
-        public on(evt: string, fn: EventEmitterListener, ctx?: any): this;
+        on(evt: string, fn: EventEmitterListener, ctx?: any): this;
 
         /**
          * Removes an event listener or any matching listeners if arguments are omitted.
@@ -2130,7 +2164,7 @@ export namespace util {
          * @param [fn] Listener to remove. Removes all listeners of `evt` if omitted.
          * @returns `this`
          */
-        public off(evt?: string, fn?: EventEmitterListener): this;
+        off(evt?: string, fn?: EventEmitterListener): this;
 
         /**
          * Emits an event by calling its listeners with the specified arguments.
@@ -2138,7 +2172,7 @@ export namespace util {
          * @param args Arguments
          * @returns `this`
          */
-        public emit(evt: string, ...args: any[]): this;
+        emit(evt: string, ...args: any[]): this;
     }
 
     /**
@@ -2251,75 +2285,75 @@ export namespace util {
         constructor(lo: number, hi: number);
 
         /** Low bits. */
-        public lo: number;
+        lo: number;
 
         /** High bits. */
-        public hi: number;
+        hi: number;
 
         /** Zero bits. */
-        public static zero: util.LongBits;
+        static zero: util.LongBits;
 
         /** Zero hash. */
-        public static zeroHash: string;
+        static zeroHash: string;
 
         /**
          * Constructs new long bits from the specified number.
          * @param value Value
          * @returns Instance
          */
-        public static fromNumber(value: number): util.LongBits;
+        static fromNumber(value: number): util.LongBits;
 
         /**
          * Constructs new long bits from a number, long or string.
          * @param value Value
          * @returns Instance
          */
-        public static from(value: (Long|number|string)): util.LongBits;
+        static from(value: (Long|number|string)): util.LongBits;
 
         /**
          * Converts this long bits to a possibly unsafe JavaScript number.
          * @param [unsigned=false] Whether unsigned or not
          * @returns Possibly unsafe number
          */
-        public toNumber(unsigned?: boolean): number;
+        toNumber(unsigned?: boolean): number;
 
         /**
          * Converts this long bits to a long.
          * @param [unsigned=false] Whether unsigned or not
          * @returns Long
          */
-        public toLong(unsigned?: boolean): Long;
+        toLong(unsigned?: boolean): Long;
 
         /**
          * Constructs new long bits from the specified 8 characters long hash.
          * @param hash Hash
          * @returns Bits
          */
-        public static fromHash(hash: string): util.LongBits;
+        static fromHash(hash: string): util.LongBits;
 
         /**
          * Converts this long bits to a 8 characters long hash.
          * @returns Hash
          */
-        public toHash(): string;
+        toHash(): string;
 
         /**
          * Zig-zag encodes this long bits.
          * @returns `this`
          */
-        public zzEncode(): util.LongBits;
+        zzEncode(): util.LongBits;
 
         /**
          * Zig-zag decodes this long bits.
          * @returns `this`
          */
-        public zzDecode(): util.LongBits;
+        zzDecode(): util.LongBits;
 
         /**
          * Calculates the length of this longbits when encoded as a varint.
          * @returns Length
          */
-        public length(): number;
+        length(): number;
     }
 
     /** Whether running within node or not. */
@@ -2436,6 +2470,9 @@ export namespace util {
      */
     function merge(dst: { [k: string]: any }, src: { [k: string]: any }, ifNotSet?: boolean): { [k: string]: any };
 
+    /** Schema declaration nesting limit. */
+    let nestingLimit: number;
+
     /** Recursion limit. */
     let recursionLimit: number;
 
@@ -2472,7 +2509,7 @@ export namespace util {
         constructor(message: string, properties?: { [k: string]: any });
 
         /** So far decoded message instance. */
-        public instance: Message<T>;
+        instance: Message<T>;
     }
 
     /**
@@ -2574,14 +2611,6 @@ export namespace util {
     /** Node's fs module if available. */
     let fs: { [k: string]: any };
 
-    /**
-     * Checks a recursion depth.
-     * @param depth Depth of recursion
-     * @returns Depth of recursion
-     * @throws {Error} If depth exceeds util.recursionLimit
-     */
-    function checkDepth(depth: (number|undefined)): number;
-
     /**
      * Converts an object's values to an array.
      * @param object Object to convert
@@ -2681,7 +2710,7 @@ export const wrappers: { [k: string]: IWrapper };
  * @param object Plain object
  * @returns Message instance
  */
-type WrapperFromObjectConverter = (this: Type, object: { [k: string]: any }) => Message<{}>;
+export type WrapperFromObjectConverter = (this: Type, object: { [k: string]: any }) => Message<{}>;
 
 /**
  * To object converter part of an {@link IWrapper}.
@@ -2689,7 +2718,7 @@ type WrapperFromObjectConverter = (this: Type, object: { [k: string]: any }) =>
  * @param [options] Conversion options
  * @returns Plain object
  */
-type WrapperToObjectConverter = (this: Type, message: Message<{}>, options?: IConversionOptions) => { [k: string]: any };
+export type WrapperToObjectConverter = (this: Type, message: Message<{}>, options?: IConversionOptions) => { [k: string]: any };
 
 /** Common type wrapper part of {@link wrappers}. */
 export interface IWrapper {
@@ -2708,50 +2737,50 @@ export class Writer {
     constructor();
 
     /** Current length. */
-    public len: number;
+    len: number;
 
     /** Operations head. */
-    public head: object;
+    head: object;
 
     /** Operations tail */
-    public tail: object;
+    tail: object;
 
     /** Linked forked states. */
-    public states: (object|null);
+    states: (object|null);
 
     /**
      * Creates a new writer.
      * @returns A {@link BufferWriter} when Buffers are supported, otherwise a {@link Writer}
      */
-    public static create(): (BufferWriter|Writer);
+    static create(): (BufferWriter|Writer);
 
     /**
      * Allocates a buffer of the specified size.
      * @param size Buffer size
      * @returns Buffer
      */
-    public static alloc(size: number): Uint8Array;
+    static alloc(size: number): Uint8Array;
 
     /**
      * Writes an unsigned 32 bit value as a varint.
      * @param value Value to write
      * @returns `this`
      */
-    public uint32(value: number): Writer;
+    uint32(value: number): Writer;
 
     /**
      * Writes a signed 32 bit value as a varint.
      * @param value Value to write
      * @returns `this`
      */
-    public int32(value: number): Writer;
+    int32(value: number): Writer;
 
     /**
      * Writes a 32 bit value as a varint, zig-zag encoded.
      * @param value Value to write
      * @returns `this`
      */
-    public sint32(value: number): Writer;
+    sint32(value: number): Writer;
 
     /**
      * Writes an unsigned 64 bit value as a varint.
@@ -2759,7 +2788,7 @@ export class Writer {
      * @returns `this`
      * @throws {TypeError} If `value` is a string and no long library is present.
      */
-    public uint64(value: (Long|number|string)): Writer;
+    uint64(value: (Long|number|string)): Writer;
 
     /**
      * Writes a signed 64 bit value as a varint.
@@ -2767,7 +2796,7 @@ export class Writer {
      * @returns `this`
      * @throws {TypeError} If `value` is a string and no long library is present.
      */
-    public int64(value: (Long|number|string)): Writer;
+    int64(value: (Long|number|string)): Writer;
 
     /**
      * Writes a signed 64 bit value as a varint, zig-zag encoded.
@@ -2775,28 +2804,28 @@ export class Writer {
      * @returns `this`
      * @throws {TypeError} If `value` is a string and no long library is present.
      */
-    public sint64(value: (Long|number|string)): Writer;
+    sint64(value: (Long|number|string)): Writer;
 
     /**
      * Writes a boolish value as a varint.
      * @param value Value to write
      * @returns `this`
      */
-    public bool(value: boolean): Writer;
+    bool(value: boolean): Writer;
 
     /**
      * Writes an unsigned 32 bit value as fixed 32 bits.
      * @param value Value to write
      * @returns `this`
      */
-    public fixed32(value: number): Writer;
+    fixed32(value: number): Writer;
 
     /**
      * Writes a signed 32 bit value as fixed 32 bits.
      * @param value Value to write
      * @returns `this`
      */
-    public sfixed32(value: number): Writer;
+    sfixed32(value: number): Writer;
 
     /**
      * Writes an unsigned 64 bit value as fixed 64 bits.
@@ -2804,7 +2833,7 @@ export class Writer {
      * @returns `this`
      * @throws {TypeError} If `value` is a string and no long library is present.
      */
-    public fixed64(value: (Long|number|string)): Writer;
+    fixed64(value: (Long|number|string)): Writer;
 
     /**
      * Writes a signed 64 bit value as fixed 64 bits.
@@ -2812,67 +2841,67 @@ export class Writer {
      * @returns `this`
      * @throws {TypeError} If `value` is a string and no long library is present.
      */
-    public sfixed64(value: (Long|number|string)): Writer;
+    sfixed64(value: (Long|number|string)): Writer;
 
     /**
      * Writes a float (32 bit).
      * @param value Value to write
      * @returns `this`
      */
-    public float(value: number): Writer;
+    float(value: number): Writer;
 
     /**
      * Writes a double (64 bit float).
      * @param value Value to write
      * @returns `this`
      */
-    public double(value: number): Writer;
+    double(value: number): Writer;
 
     /**
      * Writes a sequence of bytes.
      * @param value Buffer or base64 encoded string to write
      * @returns `this`
      */
-    public bytes(value: (Uint8Array|string)): Writer;
+    bytes(value: (Uint8Array|string)): Writer;
 
     /**
      * Writes raw bytes without a tag or length prefix.
      * @param value Raw bytes
      * @returns `this`
      */
-    public raw(value: Uint8Array): Writer;
+    raw(value: Uint8Array): Writer;
 
     /**
      * Writes a string.
      * @param value Value to write
      * @returns `this`
      */
-    public string(value: string): Writer;
+    string(value: string): Writer;
 
     /**
      * Forks this writer's state by pushing it to a stack.
      * Calling {@link Writer#reset|reset} or {@link Writer#ldelim|ldelim} resets the writer to the previous state.
      * @returns `this`
      */
-    public fork(): Writer;
+    fork(): Writer;
 
     /**
      * Resets this instance to the last state.
      * @returns `this`
      */
-    public reset(): Writer;
+    reset(): Writer;
 
     /**
      * Resets to the last state and appends the fork state's current write length as a varint followed by its operations.
      * @returns `this`
      */
-    public ldelim(): Writer;
+    ldelim(): Writer;
 
     /**
      * Finishes the write operation.
      * @returns Finished buffer
      */
-    public finish(): Uint8Array;
+    finish(): Uint8Array;
 
     /**
      * Finishes the write operation, writing into the provided buffer.
@@ -2882,7 +2911,7 @@ export class Writer {
      * @param [offset=0] Offset to start writing at
      * @returns The provided buffer
      */
-    public finishInto<T extends Uint8Array>(buf: T, offset?: number): T;
+    finishInto<T extends Uint8Array>(buf: T, offset?: number): T;
 }
 
 /** Wire format writer using node buffers. */
@@ -2896,18 +2925,18 @@ export class BufferWriter extends Writer {
      * @param size Buffer size
      * @returns Buffer
      */
-    public static alloc(size: number): Buffer;
+    static alloc(size: number): Buffer;
 
     /**
      * Writes raw bytes without a tag or length prefix.
      * @param value Raw bytes
      * @returns `this`
      */
-    public raw(value: Uint8Array): BufferWriter;
+    raw(value: Uint8Array): BufferWriter;
 
     /**
      * Finishes the write operation.
      * @returns Finished buffer
      */
-    public finish(): Buffer;
+    finish(): Buffer;
 }