@bufbuild/protobuf 1.2.1 → 1.3.1

package/dist/esm/google/protobuf/struct_pb.js

@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// @generated by protoc-gen-es v1.2.1 with parameter "bootstrap_wkt=true,ts_nocheck=false,target=ts"
+// @generated by protoc-gen-es v1.3.1 with parameter "bootstrap_wkt=true,ts_nocheck=false,target=ts"
 // @generated from file google/protobuf/struct.proto (package google.protobuf, syntax proto3)
 /* eslint-disable */
 import { proto3 } from "../../proto3.js";
@@ -49,7 +49,7 @@ proto3.util.setEnumType(NullValue, "google.protobuf.NullValue", [
  *
  * @generated from message google.protobuf.Struct
  */
-class Struct extends Message {
+export class Struct extends Message {
     constructor(data) {
         super();
         /**
@@ -94,7 +94,6 @@ Struct.typeName = "google.protobuf.Struct";
 Struct.fields = proto3.util.newFieldList(() => [
     { no: 1, name: "fields", kind: "map", K: 9 /* ScalarType.STRING */, V: { kind: "message", T: Value } },
 ]);
-export { Struct };
 /**
  * `Value` represents a dynamically typed value which can be either
  * null, a number, a string, a boolean, a recursive struct value, or a
@@ -105,7 +104,7 @@ export { Struct };
  *
  * @generated from message google.protobuf.Value
  */
-class Value extends Message {
+export class Value extends Message {
     constructor(data) {
         super();
         /**
@@ -185,7 +184,6 @@ Value.fields = proto3.util.newFieldList(() => [
     { no: 5, name: "struct_value", kind: "message", T: Struct, oneof: "kind" },
     { no: 6, name: "list_value", kind: "message", T: ListValue, oneof: "kind" },
 ]);
-export { Value };
 /**
  * `ListValue` is a wrapper around a repeated field of values.
  *
@@ -193,7 +191,7 @@ export { Value };
  *
  * @generated from message google.protobuf.ListValue
  */
-class ListValue extends Message {
+export class ListValue extends Message {
     constructor(data) {
         super();
         /**
@@ -234,4 +232,3 @@ ListValue.typeName = "google.protobuf.ListValue";
 ListValue.fields = proto3.util.newFieldList(() => [
     { no: 1, name: "values", kind: "message", T: Value, repeated: true },
 ]);
-export { ListValue };

package/dist/esm/google/protobuf/timestamp_pb.js

@@ -108,7 +108,7 @@ import { proto3 } from "../../proto3.js";
  *
  * @generated from message google.protobuf.Timestamp
  */
-class Timestamp extends Message {
+export class Timestamp extends Message {
     constructor(data) {
         super();
         /**
@@ -207,4 +207,3 @@ Timestamp.fields = proto3.util.newFieldList(() => [
     { no: 1, name: "seconds", kind: "scalar", T: 3 /* ScalarType.INT64 */ },
     { no: 2, name: "nanos", kind: "scalar", T: 5 /* ScalarType.INT32 */ },
 ]);
-export { Timestamp };

package/dist/esm/google/protobuf/type_pb.js

@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// @generated by protoc-gen-es v1.2.1 with parameter "bootstrap_wkt=true,ts_nocheck=false,target=ts"
+// @generated by protoc-gen-es v1.3.1 with parameter "bootstrap_wkt=true,ts_nocheck=false,target=ts"
 // @generated from file google/protobuf/type.proto (package google.protobuf, syntax proto3)
 /* eslint-disable */
 import { proto3 } from "../../proto3.js";
@@ -55,7 +55,7 @@ proto3.util.setEnumType(Syntax, "google.protobuf.Syntax", [
  *
  * @generated from message google.protobuf.Type
  */
-class Type extends Message {
+export class Type extends Message {
     constructor(data) {
         super();
         /**
@@ -120,13 +120,12 @@ Type.fields = proto3.util.newFieldList(() => [
     { no: 6, name: "syntax", kind: "enum", T: proto3.getEnumType(Syntax) },
     { no: 7, name: "edition", kind: "scalar", T: 9 /* ScalarType.STRING */ },
 ]);
-export { Type };
 /**
  * A single field of a message type.
  *
  * @generated from message google.protobuf.Field
  */
-class Field extends Message {
+export class Field extends Message {
     constructor(data) {
         super();
         /**
@@ -220,7 +219,6 @@ Field.fields = proto3.util.newFieldList(() => [
     { no: 10, name: "json_name", kind: "scalar", T: 9 /* ScalarType.STRING */ },
     { no: 11, name: "default_value", kind: "scalar", T: 9 /* ScalarType.STRING */ },
 ]);
-export { Field };
 /**
  * Basic field types.
  *
@@ -409,7 +407,7 @@ proto3.util.setEnumType(Field_Cardinality, "google.protobuf.Field.Cardinality",
  *
  * @generated from message google.protobuf.Enum
  */
-class Enum extends Message {
+export class Enum extends Message {
     constructor(data) {
         super();
         /**
@@ -467,13 +465,12 @@ Enum.fields = proto3.util.newFieldList(() => [
     { no: 5, name: "syntax", kind: "enum", T: proto3.getEnumType(Syntax) },
     { no: 6, name: "edition", kind: "scalar", T: 9 /* ScalarType.STRING */ },
 ]);
-export { Enum };
 /**
  * Enum value definition.
  *
  * @generated from message google.protobuf.EnumValue
  */
-class EnumValue extends Message {
+export class EnumValue extends Message {
     constructor(data) {
         super();
         /**
@@ -516,14 +513,13 @@ EnumValue.fields = proto3.util.newFieldList(() => [
     { no: 2, name: "number", kind: "scalar", T: 5 /* ScalarType.INT32 */ },
     { no: 3, name: "options", kind: "message", T: Option, repeated: true },
 ]);
-export { EnumValue };
 /**
  * A protocol buffer option, which can be attached to a message, field,
  * enumeration, etc.
  *
  * @generated from message google.protobuf.Option
  */
-class Option extends Message {
+export class Option extends Message {
     constructor(data) {
         super();
         /**
@@ -556,4 +552,3 @@ Option.fields = proto3.util.newFieldList(() => [
     { no: 1, name: "name", kind: "scalar", T: 9 /* ScalarType.STRING */ },
     { no: 2, name: "value", kind: "message", T: Any },
 ]);
-export { Option };

package/dist/esm/google/protobuf/wrappers_pb.js

@@ -22,7 +22,7 @@ import { protoInt64 } from "../../proto-int64.js";
  *
  * @generated from message google.protobuf.DoubleValue
  */
-class DoubleValue extends Message {
+export class DoubleValue extends Message {
     constructor(data) {
         super();
         /**
@@ -75,7 +75,6 @@ DoubleValue.fieldWrapper = {
         return value.value;
     }
 };
-export { DoubleValue };
 /**
  * Wrapper message for `float`.
  *
@@ -83,7 +82,7 @@ export { DoubleValue };
  *
  * @generated from message google.protobuf.FloatValue
  */
-class FloatValue extends Message {
+export class FloatValue extends Message {
     constructor(data) {
         super();
         /**
@@ -136,7 +135,6 @@ FloatValue.fieldWrapper = {
         return value.value;
     }
 };
-export { FloatValue };
 /**
  * Wrapper message for `int64`.
  *
@@ -144,7 +142,7 @@ export { FloatValue };
  *
  * @generated from message google.protobuf.Int64Value
  */
-class Int64Value extends Message {
+export class Int64Value extends Message {
     constructor(data) {
         super();
         /**
@@ -197,7 +195,6 @@ Int64Value.fieldWrapper = {
         return value.value;
     }
 };
-export { Int64Value };
 /**
  * Wrapper message for `uint64`.
  *
@@ -205,7 +202,7 @@ export { Int64Value };
  *
  * @generated from message google.protobuf.UInt64Value
  */
-class UInt64Value extends Message {
+export class UInt64Value extends Message {
     constructor(data) {
         super();
         /**
@@ -258,7 +255,6 @@ UInt64Value.fieldWrapper = {
         return value.value;
     }
 };
-export { UInt64Value };
 /**
  * Wrapper message for `int32`.
  *
@@ -266,7 +262,7 @@ export { UInt64Value };
  *
  * @generated from message google.protobuf.Int32Value
  */
-class Int32Value extends Message {
+export class Int32Value extends Message {
     constructor(data) {
         super();
         /**
@@ -319,7 +315,6 @@ Int32Value.fieldWrapper = {
         return value.value;
     }
 };
-export { Int32Value };
 /**
  * Wrapper message for `uint32`.
  *
@@ -327,7 +322,7 @@ export { Int32Value };
  *
  * @generated from message google.protobuf.UInt32Value
  */
-class UInt32Value extends Message {
+export class UInt32Value extends Message {
     constructor(data) {
         super();
         /**
@@ -380,7 +375,6 @@ UInt32Value.fieldWrapper = {
         return value.value;
     }
 };
-export { UInt32Value };
 /**
  * Wrapper message for `bool`.
  *
@@ -388,7 +382,7 @@ export { UInt32Value };
  *
  * @generated from message google.protobuf.BoolValue
  */
-class BoolValue extends Message {
+export class BoolValue extends Message {
     constructor(data) {
         super();
         /**
@@ -441,7 +435,6 @@ BoolValue.fieldWrapper = {
         return value.value;
     }
 };
-export { BoolValue };
 /**
  * Wrapper message for `string`.
  *
@@ -449,7 +442,7 @@ export { BoolValue };
  *
  * @generated from message google.protobuf.StringValue
  */
-class StringValue extends Message {
+export class StringValue extends Message {
     constructor(data) {
         super();
         /**
@@ -502,7 +495,6 @@ StringValue.fieldWrapper = {
         return value.value;
     }
 };
-export { StringValue };
 /**
  * Wrapper message for `bytes`.
  *
@@ -510,7 +502,7 @@ export { StringValue };
  *
  * @generated from message google.protobuf.BytesValue
  */
-class BytesValue extends Message {
+export class BytesValue extends Message {
     constructor(data) {
         super();
         /**
@@ -563,4 +555,3 @@ BytesValue.fieldWrapper = {
         return value.value;
     }
 };
-export { BytesValue };

package/dist/esm/index.js

@@ -13,6 +13,7 @@
 // limitations under the License.
 export { proto3 } from "./proto3.js";
 export { proto2 } from "./proto2.js";
+export { protoDouble } from "./proto-double.js";
 export { protoInt64 } from "./proto-int64.js";
 export { protoBase64 } from "./proto-base64.js";
 export { protoDelimited } from "./proto-delimited.js";
@@ -24,6 +25,7 @@ export { WireType, BinaryWriter, BinaryReader } from "./binary-encoding.js";
 export { createDescriptorSet } from "./create-descriptor-set.js";
 export { createRegistry } from "./create-registry.js";
 export { createRegistryFromDescriptors } from "./create-registry-from-desc.js";
+export { toPlainMessage } from "./to-plain-message.js";
 // ideally, we would export these types with sub-path exports:
 export * from "./google/protobuf/compiler/plugin_pb.js";
 export * from "./google/protobuf/api_pb.js";

package/dist/esm/private/json-format-common.js

@@ -256,7 +256,7 @@ function debugJsonValue(json) {
         case "string":
             return json.length > 100 ? "string" : `"${json.split('"').join('\\"')}"`;
         default:
-            return json.toString();
+            return String(json);
     }
 }
 // May throw an error. If the error message is non-blank, it should be shown.
@@ -386,6 +386,7 @@ function readEnum(type, json, ignoreUnknownFields) {
             break;
         case "string":
             const value = type.findName(json);
+            // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
             if (value || ignoreUnknownFields) {
                 return value === null || value === void 0 ? void 0 : value.no;
             }

package/dist/esm/private/util-common.js

@@ -42,17 +42,35 @@ export function makeUtilCommon() {
                             !(val instanceof sourceField.T)) {
                             val = new sourceField.T(val);
                         }
+                        else if (sourceField &&
+                            sourceField.kind === "scalar" &&
+                            sourceField.T === ScalarType.BYTES) {
+                            val = toU8Arr(val);
+                        }
                         t[localName] = { case: sk, value: val };
                         break;
                     case "scalar":
                     case "enum":
-                        t[localName] = s[localName];
+                        let copy = s[localName];
+                        if (member.T === ScalarType.BYTES) {
+                            copy = member.repeated
+                                ? copy.map(toU8Arr)
+                                : toU8Arr(copy);
+                        }
+                        t[localName] = copy;
                         break;
                     case "map":
                         switch (member.V.kind) {
                             case "scalar":
                             case "enum":
-                                Object.assign(t[localName], s[localName]);
+                                if (member.V.T === ScalarType.BYTES) {
+                                    for (const [k, v] of Object.entries(s[localName])) {
+                                        t[localName][k] = toU8Arr(v);
+                                    }
+                                }
+                                else {
+                                    Object.assign(t[localName], s[localName]);
+                                }
                                 break;
                             case "message":
                                 const messageType = member.V.T;
@@ -76,7 +94,14 @@ export function makeUtilCommon() {
                         else if (s[localName] !== undefined) {
                             const val = s[localName];
                             if (mt.fieldWrapper) {
-                                t[localName] = val;
+                                if (
+                                // We can't use BytesValue.typeName as that will create a circular import
+                                mt.typeName === "google.protobuf.BytesValue") {
+                                    t[localName] = toU8Arr(val);
+                                }
+                                else {
+                                    t[localName] = val;
+                                }
                             }
                             else {
                                 t[localName] = val instanceof mt ? val : new mt(val);
@@ -158,22 +183,22 @@ export function makeUtilCommon() {
                 const source = message[member.localName];
                 let copy;
                 if (member.repeated) {
-                    copy = source.map((e) => cloneSingularField(member, e));
+                    copy = source.map(cloneSingularField);
                 }
                 else if (member.kind == "map") {
                     copy = any[member.localName];
                     for (const [key, v] of Object.entries(source)) {
-                        copy[key] = cloneSingularField(member.V, v);
+                        copy[key] = cloneSingularField(v);
                     }
                 }
                 else if (member.kind == "oneof") {
                     const f = member.findField(source.case);
                     copy = f
-                        ? { case: source.case, value: cloneSingularField(f, source.value) }
+                        ? { case: source.case, value: cloneSingularField(source.value) }
                         : { case: undefined };
                 }
                 else {
-                    copy = cloneSingularField(member, source);
+                    copy = cloneSingularField(source);
                 }
                 any[member.localName] = copy;
             }
@@ -182,7 +207,7 @@ export function makeUtilCommon() {
     };
 }
 // clone a single field value - i.e. the element type of repeated fields, the value type of maps
-function cloneSingularField(field, value) {
+function cloneSingularField(value) {
     if (value === undefined) {
         return value;
     }
@@ -196,3 +221,7 @@ function cloneSingularField(field, value) {
     }
     return value;
 }
+// converts any ArrayLike<number> to Uint8Array if necessary.
+function toU8Arr(input) {
+    return input instanceof Uint8Array ? input : new Uint8Array(input);
+}

package/dist/esm/proto-delimited.js

@@ -72,28 +72,23 @@ export const protoDelimited = {
             }
             let buffer = new Uint8Array(0);
             try {
-                for (var _d = true, iterable_1 = __asyncValues(iterable), iterable_1_1; iterable_1_1 = yield __await(iterable_1.next()), _a = iterable_1_1.done, !_a;) {
+                for (var _d = true, iterable_1 = __asyncValues(iterable), iterable_1_1; iterable_1_1 = yield __await(iterable_1.next()), _a = iterable_1_1.done, !_a; _d = true) {
                     _c = iterable_1_1.value;
                     _d = false;
-                    try {
-                        const chunk = _c;
-                        buffer = append(buffer, chunk);
-                        for (;;) {
-                            const size = protoDelimited.peekSize(buffer);
-                            if (size.eof) {
-                                // size is incomplete, buffer more data
-                                break;
-                            }
-                            if (size.offset + size.size > buffer.byteLength) {
-                                // message is incomplete, buffer more data
-                                break;
-                            }
-                            yield yield __await(protoDelimited.dec(type, buffer));
-                            buffer = buffer.subarray(size.offset + size.size);
+                    const chunk = _c;
+                    buffer = append(buffer, chunk);
+                    for (;;) {
+                        const size = protoDelimited.peekSize(buffer);
+                        if (size.eof) {
+                            // size is incomplete, buffer more data
+                            break;
                         }
-                    }
-                    finally {
-                        _d = true;
+                        if (size.offset + size.size > buffer.byteLength) {
+                            // message is incomplete, buffer more data
+                            break;
+                        }
+                        yield yield __await(protoDelimited.dec(type, buffer));
+                        buffer = buffer.subarray(size.offset + size.size);
                     }
                 }
             }

package/dist/esm/proto-double.js

@@ -0,0 +1,26 @@
+// Copyright 2021-2023 Buf Technologies, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// Export global Number constants. This is done so that we can safely use
+// these global constants when generating code and be assured we're using
+// the correct values. We cannot rely on globalThis since we support ES2017
+// and globalThis was introduced in ES2020. We also don't want to explicitly
+// generate code using, for example, Number.NaN, since this could clash with
+// a message name of Number. Instead we can export them here since this will
+// be in a different scope as the generated code and we are guaranteed to use
+// the intended global values.
+export const protoDouble = {
+    NaN: Number.NaN,
+    POSITIVE_INFINITY: Number.POSITIVE_INFINITY,
+    NEGATIVE_INFINITY: Number.NEGATIVE_INFINITY,
+};

package/dist/esm/proto-int64.js

@@ -16,7 +16,7 @@ import { int64FromString, int64ToString, uInt64ToString, } from "./google/varint
 function makeInt64Support() {
     const dv = new DataView(new ArrayBuffer(8));
     // note that Safari 14 implements BigInt, but not the DataView methods
-    const ok = globalThis.BigInt !== undefined &&
+    const ok = typeof BigInt === "function" &&
         typeof dv.getBigInt64 === "function" &&
         typeof dv.getBigUint64 === "function" &&
         typeof dv.setBigInt64 === "function" &&

package/dist/esm/to-plain-message.js

@@ -0,0 +1,63 @@
+// Copyright 2021-2023 Buf Technologies, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+/* eslint-disable @typescript-eslint/no-explicit-any,@typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-return,@typescript-eslint/no-unsafe-argument,no-case-declarations */
+import { Message } from "./message.js";
+/**
+ * toPlainMessage returns a new object by striping
+ * all methods from a message, leaving only fields and
+ * oneof groups. It is recursive, meaning it applies this
+ * same logic to all nested message fields as well.
+ */
+export function toPlainMessage(message) {
+    const type = message.getType();
+    const target = {};
+    for (const member of type.fields.byMember()) {
+        const source = message[member.localName];
+        let copy;
+        if (member.repeated) {
+            copy = source.map((e) => toPlainValue(e));
+        }
+        else if (member.kind == "map") {
+            copy = {};
+            for (const [key, v] of Object.entries(source)) {
+                copy[key] = toPlainValue(v);
+            }
+        }
+        else if (member.kind == "oneof") {
+            const f = member.findField(source.case);
+            copy = f
+                ? { case: source.case, value: toPlainValue(source.value) }
+                : { case: undefined };
+        }
+        else {
+            copy = toPlainValue(source);
+        }
+        target[member.localName] = copy;
+    }
+    return target;
+}
+function toPlainValue(value) {
+    if (value === undefined) {
+        return value;
+    }
+    if (value instanceof Message) {
+        return toPlainMessage(value);
+    }
+    if (value instanceof Uint8Array) {
+        const c = new Uint8Array(value.byteLength);
+        c.set(value);
+        return c;
+    }
+    return value;
+}

package/dist/types/codegen-info.d.ts

@@ -13,7 +13,7 @@ interface CodegenInfo {
     readonly safeIdentifier: typeof safeIdentifier;
     readonly safeObjectProperty: typeof safeObjectProperty;
 }
-type RuntimeSymbolName = "proto2" | "proto3" | "Message" | "PartialMessage" | "PlainMessage" | "FieldList" | "MessageType" | "BinaryReadOptions" | "BinaryWriteOptions" | "JsonReadOptions" | "JsonWriteOptions" | "JsonValue" | "JsonObject" | "protoInt64" | "ScalarType" | "MethodKind" | "MethodIdempotency" | "IMessageTypeRegistry";
+type RuntimeSymbolName = "proto2" | "proto3" | "Message" | "PartialMessage" | "PlainMessage" | "FieldList" | "MessageType" | "BinaryReadOptions" | "BinaryWriteOptions" | "JsonReadOptions" | "JsonWriteOptions" | "JsonValue" | "JsonObject" | "protoDouble" | "protoInt64" | "ScalarType" | "MethodKind" | "MethodIdempotency" | "IMessageTypeRegistry";
 type RuntimeSymbolInfo = {
     typeOnly: boolean;
     publicImportPath: string;

package/dist/types/index.d.ts

@@ -1,5 +1,6 @@
 export { proto3 } from "./proto3.js";
 export { proto2 } from "./proto2.js";
+export { protoDouble } from "./proto-double.js";
 export { protoInt64 } from "./proto-int64.js";
 export { protoBase64 } from "./proto-base64.js";
 export { protoDelimited } from "./proto-delimited.js";
@@ -22,6 +23,7 @@ export { createDescriptorSet } from "./create-descriptor-set.js";
 export type { IMessageTypeRegistry } from "./type-registry.js";
 export { createRegistry } from "./create-registry.js";
 export { createRegistryFromDescriptors } from "./create-registry-from-desc.js";
+export { toPlainMessage } from "./to-plain-message.js";
 export * from "./google/protobuf/compiler/plugin_pb.js";
 export * from "./google/protobuf/api_pb.js";
 export * from "./google/protobuf/any_pb.js";

package/dist/types/proto-double.d.ts

@@ -0,0 +1,5 @@
+export declare const protoDouble: {
+    readonly NaN: number;
+    readonly POSITIVE_INFINITY: number;
+    readonly NEGATIVE_INFINITY: number;
+};

package/dist/types/to-plain-message.d.ts

@@ -0,0 +1,9 @@
+import { Message } from "./message.js";
+import type { PlainMessage } from "./message.js";
+/**
+ * toPlainMessage returns a new object by striping
+ * all methods from a message, leaving only fields and
+ * oneof groups. It is recursive, meaning it applies this
+ * same logic to all nested message fields as well.
+ */
+export declare function toPlainMessage<T extends Message<T>>(message: T): PlainMessage<T>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bufbuild/protobuf",
-  "version": "1.2.1",
+  "version": "1.3.1",
   "license": "(Apache-2.0 AND BSD-3-Clause)",
   "description": "A complete implementation of Protocol Buffers in TypeScript, suitable for web browsers and Node.js.",
   "repository": {