protobufjs 8.6.6 → 8.7.1

package/google/protobuf/descriptor.proto

@@ -2,14 +2,6 @@ syntax = "proto2";
 
 package google.protobuf;
 
-option go_package = "google.golang.org/protobuf/types/descriptorpb";
-option java_package = "com.google.protobuf";
-option java_outer_classname = "DescriptorProtos";
-option csharp_namespace = "Google.Protobuf.Reflection";
-option objc_class_prefix = "GPB";
-option cc_enable_arenas = true;
-option optimize_for = "SPEED";
-
 message FileDescriptorSet {
 
     repeated FileDescriptorProto file = 1;

package/google/protobuf/source_context.json

@@ -8,7 +8,8 @@
               "fields": {
                 "fileName": {
                   "type": "string",
-                  "id": 1
+                  "id": 1,
+                  "protoName": "file_name"
                 }
               }
             }

package/google/protobuf/type.json

@@ -27,7 +27,8 @@
                 },
                 "sourceContext": {
                   "type": "SourceContext",
-                  "id": 5
+                  "id": 5,
+                  "protoName": "source_context"
                 },
                 "syntax": {
                   "type": "Syntax",
@@ -55,11 +56,13 @@
                 },
                 "typeUrl": {
                   "type": "string",
-                  "id": 6
+                  "id": 6,
+                  "protoName": "type_url"
                 },
                 "oneofIndex": {
                   "type": "int32",
-                  "id": 7
+                  "id": 7,
+                  "protoName": "oneof_index"
                 },
                 "packed": {
                   "type": "bool",
@@ -72,11 +75,13 @@
                 },
                 "jsonName": {
                   "type": "string",
-                  "id": 10
+                  "id": 10,
+                  "protoName": "json_name"
                 },
                 "defaultValue": {
                   "type": "string",
-                  "id": 11
+                  "id": 11,
+                  "protoName": "default_value"
                 }
               },
               "nested": {
@@ -131,7 +136,8 @@
                 },
                 "sourceContext": {
                   "type": "SourceContext",
-                  "id": 4
+                  "id": 4,
+                  "protoName": "source_context"
                 },
                 "syntax": {
                   "type": "Syntax",
@@ -190,7 +196,8 @@
               "fields": {
                 "fileName": {
                   "type": "string",
-                  "id": 1
+                  "id": 1,
+                  "protoName": "file_name"
                 }
               }
             }

package/index.d.ts

@@ -1212,7 +1212,7 @@ export interface IToJSONOptions {
  */
 export function parse(source: string, root: Root, options?: IParseOptions): IParserResult;
 
-/** Wire format reader using `Uint8Array` if available, otherwise `Array`. */
+/** Wire format reader using `Uint8Array`. */
 export class Reader {
 
     /**
@@ -1230,6 +1230,9 @@ export class Reader {
     /** Read buffer length. */
     len: number;
 
+    /** Cached DataView for packed reads. */
+    view: (DataView|null);
+
     /** Whether to discard unknown fields while decoding. */
     discardUnknown: boolean;
 
@@ -1333,6 +1336,97 @@ export class Reader {
      */
     double(): number;
 
+    /**
+     * Reads a packed repeated field of unsigned 32 bit varints.
+     * @param [array] Array to read into; a new one is created if omitted
+     * @returns Array read into
+     */
+    uint32s(array?: number[]): number[];
+
+    /**
+     * Reads a packed repeated field of signed 32 bit varints.
+     * @param [array] Array to read into; a new one is created if omitted
+     * @returns Array read into
+     */
+    int32s(array?: number[]): number[];
+
+    /**
+     * Reads a packed repeated field of zig-zag encoded signed 32 bit varints.
+     * @param [array] Array to read into; a new one is created if omitted
+     * @returns Array read into
+     */
+    sint32s(array?: number[]): number[];
+
+    /**
+     * Reads a packed repeated field of booleans.
+     * @param [array] Array to read into; a new one is created if omitted
+     * @returns Array read into
+     */
+    bools(array?: boolean[]): boolean[];
+
+    /**
+     * Reads a packed repeated field of unsigned 32 bit fixed values.
+     * @param [array] Array to read into; a new one is created if omitted
+     * @returns Array read into
+     */
+    fixed32s(array?: number[]): number[];
+
+    /**
+     * Reads a packed repeated field of signed 32 bit fixed values.
+     * @param [array] Array to read into; a new one is created if omitted
+     * @returns Array read into
+     */
+    sfixed32s(array?: number[]): number[];
+
+    /**
+     * Reads a packed repeated field of floats (32 bit).
+     * @param [array] Array to read into; a new one is created if omitted
+     * @returns Array read into
+     */
+    floats(array?: number[]): number[];
+
+    /**
+     * Reads a packed repeated field of doubles (64 bit float).
+     * @param [array] Array to read into; a new one is created if omitted
+     * @returns Array read into
+     */
+    doubles(array?: number[]): number[];
+
+    /**
+     * Reads a packed repeated field of unsigned 64 bit varints.
+     * @param [array] Array to read into; a new one is created if omitted
+     * @returns Array read into
+     */
+    uint64s(array?: (Long|number)[]): (Long|number)[];
+
+    /**
+     * Reads a packed repeated field of signed 64 bit varints.
+     * @param [array] Array to read into; a new one is created if omitted
+     * @returns Array read into
+     */
+    int64s(array?: (Long|number)[]): (Long|number)[];
+
+    /**
+     * Reads a packed repeated field of zig-zag encoded signed 64 bit varints.
+     * @param [array] Array to read into; a new one is created if omitted
+     * @returns Array read into
+     */
+    sint64s(array?: (Long|number)[]): (Long|number)[];
+
+    /**
+     * Reads a packed repeated field of unsigned 64 bit fixed values.
+     * @param [array] Array to read into; a new one is created if omitted
+     * @returns Array read into
+     */
+    fixed64s(array?: (Long|number)[]): (Long|number)[];
+
+    /**
+     * Reads a packed repeated field of signed 64 bit fixed values.
+     * @param [array] Array to read into; a new one is created if omitted
+     * @returns Array read into
+     */
+    sfixed64s(array?: (Long|number)[]): (Long|number)[];
+
     /**
      * Reads a sequence of bytes preceeded by its length as a varint.
      * @returns Value read
@@ -2464,7 +2558,10 @@ export namespace util {
      */
     function newBuffer(sizeOrArray?: (number|number[])): (Uint8Array|Buffer);
 
-    /** Array implementation used in the browser. `Uint8Array` if supported, otherwise `Array`. */
+    /**
+     * Array implementation used in the browser.
+     * @deprecated Use `Uint8Array` instead.
+     */
     let Array: Constructor<Uint8Array>;
 
     /** Long.js's Long class if available. */
@@ -2626,7 +2723,7 @@ export namespace util {
      */
     function pool(alloc: PoolAllocator, slice: PoolSlicer, size?: number): PoolAllocator;
 
-    /** A minimal UTF8 implementation for number arrays. */
+    /** A minimal UTF8 implementation. */
     namespace utf8 {
 
         /**
@@ -2803,23 +2900,29 @@ export interface IWrapper {
     toObject?: WrapperToObjectConverter;
 }
 
-/** Wire format writer using `Uint8Array` if available, otherwise `Array`. */
+/** Wire format writer using `Uint8Array`. */
 export class Writer {
 
     /** Constructs a new writer instance. */
     constructor();
 
-    /** Current length. */
-    len: number;
+    /** Write cursor into {@link Writer#buf}. */
+    pos: number;
 
-    /** Operations head. */
-    head: object;
+    /** Backing buffer. */
+    buf: Uint8Array;
 
-    /** Operations tail */
-    tail: object;
+    /** Cached DataView over {@link Writer#buf}. */
+    view: (DataView|null);
 
-    /** Linked forked states. */
-    states: (object|null);
+    /** Stack of forked length-prefix positions. */
+    states: (number[]|null);
+
+    /**
+     * Current write position.
+     * @deprecated Use {@link Writer#pos} instead.
+     */
+    len: number;
 
     /**
      * Creates a new writer.
@@ -2951,9 +3054,99 @@ export class Writer {
      */
     string(value: string): Writer;
 
+    /**
+     * Writes an array of unsigned 32 bit values as a packed repeated field.
+     * @param value Values to write
+     * @returns `this`
+     */
+    uint32s(value: number[]): Writer;
+
+    /**
+     * Writes an array of signed 32 bit values as a packed repeated field.
+     * @param value Values to write
+     * @returns `this`
+     */
+    int32s(value: number[]): Writer;
+
+    /**
+     * Writes an array of 32 bit values as packed, zig-zag encoded varints.
+     * @param value Values to write
+     * @returns `this`
+     */
+    sint32s(value: number[]): Writer;
+
+    /**
+     * Writes an array of unsigned 64 bit values as a packed repeated field.
+     * @param value Values to write
+     * @returns `this`
+     */
+    uint64s(value: (Long|number|string)[]): Writer;
+
+    /**
+     * Writes an array of signed 64 bit values as a packed repeated field.
+     * @param value Values to write
+     * @returns `this`
+     */
+    int64s(value: (Long|number|string)[]): Writer;
+
+    /**
+     * Writes an array of 64 bit values as packed, zig-zag encoded varints.
+     * @param value Values to write
+     * @returns `this`
+     */
+    sint64s(value: (Long|number|string)[]): Writer;
+
+    /**
+     * Writes an array of boolish values as a packed repeated field.
+     * @param value Values to write
+     * @returns `this`
+     */
+    bools(value: boolean[]): Writer;
+
+    /**
+     * Writes an array of unsigned 32 bit values as packed, fixed 32 bits.
+     * @param value Values to write
+     * @returns `this`
+     */
+    fixed32s(value: number[]): Writer;
+
+    /**
+     * Writes an array of signed 32 bit values as packed, fixed 32 bits.
+     * @param value Values to write
+     * @returns `this`
+     */
+    sfixed32s(value: number[]): Writer;
+
+    /**
+     * Writes an array of unsigned 64 bit values as packed, fixed 64 bits.
+     * @param value Values to write
+     * @returns `this`
+     */
+    fixed64s(value: (Long|number|string)[]): Writer;
+
+    /**
+     * Writes an array of signed 64 bit values as packed, fixed 64 bits.
+     * @param value Values to write
+     * @returns `this`
+     */
+    sfixed64s(value: (Long|number|string)[]): Writer;
+
+    /**
+     * Writes an array of floats (32 bit) as a packed repeated field.
+     * @param value Values to write
+     * @returns `this`
+     */
+    floats(value: number[]): Writer;
+
+    /**
+     * Writes an array of doubles (64 bit float) as a packed repeated field.
+     * @param value Values to write
+     * @returns `this`
+     */
+    doubles(value: number[]): 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`
      */
     fork(): Writer;
@@ -2965,21 +3158,23 @@ export class Writer {
     reset(): Writer;
 
     /**
-     * Resets to the last state and appends the fork state's current write length as a varint followed by its operations.
+     * Resets to the last state and prepends the fork state's current write length as a varint.
      * @returns `this`
      */
     ldelim(): Writer;
 
     /**
      * Finishes the write operation.
+     * Returns a buffer sized to the written data by default.
+     * @param [shared=false] Whether to return a shared view instead of a unique copy
      * @returns Finished buffer
      */
-    finish(): Uint8Array;
+    finish(shared?: boolean): Uint8Array;
 
     /**
      * Finishes the write operation, writing into the provided buffer.
      * The caller must ensure that `buf` has enough space starting at `offset`
-     * to hold {@link Writer#len} bytes.
+     * to hold {@link Writer#pos} bytes.
      * @param buf Target buffer
      * @param [offset=0] Offset to start writing at
      * @returns The provided buffer
@@ -3000,13 +3195,6 @@ export class BufferWriter extends Writer {
      */
     static alloc(size: number): Buffer;
 
-    /**
-     * Writes raw bytes without a tag or length prefix.
-     * @param value Raw bytes
-     * @returns `this`
-     */
-    raw(value: Uint8Array): BufferWriter;
-
     /**
      * Finishes the write operation.
      * @returns Finished buffer

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "protobufjs",
-  "version": "8.6.6",
+  "version": "8.7.1",
   "description": "Protocol Buffers for JavaScript & TypeScript.",
   "author": "Daniel Wirtz <dcode+protobufjs@dcode.io>",
   "license": "BSD-3-Clause",
@@ -22,7 +22,7 @@
     "fs": false
   },
   "scripts": {
-    "bench": "node bench",
+    "bench": "npm --prefix bench run bench",
     "build": "npm run build:bundle && npm run build:types",
     "build:bundle": "gulp --gulpfile scripts/gulpfile.js",
     "build:tests": "node ./scripts/gentests.js",
@@ -49,11 +49,11 @@
   },
   "devDependencies": {
     "@eslint/js": "^10.0.0",
-    "@types/node": ">=13.7.0",
+    "@types/node": "^18.19.130",
     "browserify": "^17.0.0",
     "browserify-wrap": "^1.0.2",
     "bundle-collapser": "^1.3.0",
-    "escodegen": "^1.13.0",
+    "escodegen": "^2.0.0",
     "eslint": "^10.0.0",
     "eslint-plugin-jsdoc": "^63.0.0",
     "espree": "^9.0.0",
@@ -71,7 +71,7 @@
     "reflect-metadata": "^0.2.0",
     "tape": "^5.0.0",
     "tslint": "^6.0.0",
-    "typescript": "^3.7.5",
+    "typescript": "^4.9.5",
     "vinyl-buffer": "^1.0.1",
     "vinyl-fs": "^4.0.0",
     "vinyl-source-stream": "^2.0.0"

package/src/common.js

@@ -163,27 +163,33 @@ common("struct", {
         fields: {
             nullValue: {
                 type: "NullValue",
-                id: 1
+                id: 1,
+                protoName: "null_value"
             },
             numberValue: {
                 type: "double",
-                id: 2
+                id: 2,
+                protoName: "number_value"
             },
             stringValue: {
                 type: "string",
-                id: 3
+                id: 3,
+                protoName: "string_value"
             },
             boolValue: {
                 type: "bool",
-                id: 4
+                id: 4,
+                protoName: "bool_value"
             },
             structValue: {
                 type: "Struct",
-                id: 5
+                id: 5,
+                protoName: "struct_value"
             },
             listValue: {
                 type: "ListValue",
-                id: 6
+                id: 6,
+                protoName: "list_value"
             }
         }
     },

package/src/converter.js

@@ -298,7 +298,7 @@ converter.toObject = function toObject(mtype) {
             else if (field.bytes) {
                 var arrayDefault = Array.prototype.slice.call(field.typeDefault);
                 gen
-        ("if(o.bytes===String)d%s=%j", prop, String.fromCharCode.apply(String, field.typeDefault))
+        ("if(o.bytes===String)d%s=%j", prop, util.base64.encode(field.typeDefault, 0, field.typeDefault.length))
         ("else{")
             ("d%s=%j", prop, arrayDefault)
             ("if(o.bytes!==Array)d%s=util.newBuffer(d%s)", prop, prop)

package/src/decoder.js

@@ -102,7 +102,7 @@ function decoder(mtype) {
                                 ("break");
 
             if (types.basic[type] === undefined) gen
-                            ("v=types[%i].decode(r,r.uint32(),undefined,q+1)", i); // can't be groups
+                            ("v=types[%i].decode(r,r.uint32(),undefined,q+1,v)", i); // can't be groups
             else gen
                             ("v=r.%s()", type === "string" ? stringMethod(field) : type);
 
@@ -141,13 +141,9 @@ function decoder(mtype) {
             if (types.packed[type] !== undefined) {
                 gen
                 ("if(u===2){");
-                if (!closed) gen
-                    ("if(!(%s&&%s.length))", ref, ref)
-                        ("%s=[]", ref);
-                gen
-                    ("var c2=r.uint32()+r.pos");
                 if (closed) {
                     gen
+                    ("var c2=r.uint32()+r.pos")
                     ("while(r.pos<c2){")
                         ("s=r.pos")
                         ("v=r.%s()", type)
@@ -159,8 +155,9 @@ function decoder(mtype) {
                             genPreserveUnknown(gen, "util.rawField(" + field.id + ",0,r.raw(s,r.pos))")
                     ("}");
                 } else gen
-                    ("while(r.pos<c2)")
-                        ("%s.push(r.%s())", ref, type);
+                    ("if(!(%s&&%s.length))", ref, ref)
+                        ("%s=[]", ref)
+                    ("r.%ss(%s)", type, ref);
                 gen
                     ("continue")
                 ("}");

package/src/encoder.js

@@ -72,10 +72,7 @@ function encoder(mtype) {
             // Packed repeated
             if (field.packed && types.packed[type] !== undefined) { gen
 
-        ("w.uint32(%i).fork()", (field.id << 3 | 2) >>> 0)
-        ("for(var i=0;i<%s.length;++i)", ref)
-            ("w.%s(%s[i])", type, ref)
-        ("w.ldelim()");
+        ("w.uint32(%i).%ss(%s)", (field.id << 3 | 2) >>> 0, type, ref);
 
             // Non-packed
             } else { gen

package/src/index-minimal.js

@@ -26,7 +26,7 @@ exports.configure    = configure;
  * @returns {undefined}
  */
 function configure() {
-    exports.util._configure();
+    exports.util.LongBits._configure(exports.util.Long);
     exports.Writer._configure(exports.BufferWriter);
     exports.Reader._configure(exports.BufferReader);
 }