@bufbuild/protobuf 1.3.3 → 1.4.0

package/dist/esm/proto2.js

@@ -18,6 +18,7 @@ import { InternalFieldList } from "./private/field-list.js";
 import { InternalOneofInfo } from "./private/field.js";
 import { localFieldName, fieldJsonName } from "./private/names.js";
 import { makeJsonFormatProto2 } from "./private/json-format-proto2.js";
+import { LongType } from "./field.js";
 /**
  * Provides functionality for messages defined with the proto2 syntax.
  */
@@ -53,7 +54,7 @@ export const proto2 = makeProtoRuntime("proto2", makeJsonFormatProto2(), makeBin
     } }));
 /* eslint-disable @typescript-eslint/no-explicit-any,@typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-argument */
 function normalizeFieldInfosProto2(fieldInfos) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     const r = [];
     let o;
     for (const field of typeof fieldInfos == "function"
@@ -63,8 +64,11 @@ function normalizeFieldInfosProto2(fieldInfos) {
         f.localName = localFieldName(field.name, field.oneof !== undefined);
         f.jsonName = (_a = field.jsonName) !== null && _a !== void 0 ? _a : fieldJsonName(field.name);
         f.repeated = (_b = field.repeated) !== null && _b !== void 0 ? _b : false;
+        if (field.kind == "scalar") {
+            f.L = (_c = field.L) !== null && _c !== void 0 ? _c : LongType.BIGINT;
+        }
         // In contrast to proto3, repeated fields are unpacked except when explicitly specified.
-        f.packed = (_c = field.packed) !== null && _c !== void 0 ? _c : false;
+        f.packed = (_d = field.packed) !== null && _d !== void 0 ? _d : false;
         // We do not surface options at this time
         // f.options = field.options ?? emptyReadonlyObject;
         if (field.oneof !== undefined) {

package/dist/esm/proto3.js

@@ -17,7 +17,7 @@ import { makeJsonFormatProto3 } from "./private/json-format-proto3.js";
 import { makeUtilCommon } from "./private/util-common.js";
 import { InternalFieldList } from "./private/field-list.js";
 import { scalarDefaultValue } from "./private/scalars.js";
-import { ScalarType } from "./field.js";
+import { LongType, ScalarType } from "./field.js";
 import { InternalOneofInfo } from "./private/field.js";
 import { localFieldName, fieldJsonName } from "./private/names.js";
 /**
@@ -47,7 +47,7 @@ export const proto3 = makeProtoRuntime("proto3", makeJsonFormatProto3(), makeBin
                     t[name] = {};
                     break;
                 case "scalar":
-                    t[name] = scalarDefaultValue(member.T); // eslint-disable-line @typescript-eslint/no-unsafe-assignment
+                    t[name] = scalarDefaultValue(member.T, member.L); // eslint-disable-line @typescript-eslint/no-unsafe-assignment
                     break;
                 case "message":
                     // message fields are always optional in proto3
@@ -57,7 +57,7 @@ export const proto3 = makeProtoRuntime("proto3", makeJsonFormatProto3(), makeBin
     } }));
 /* eslint-disable @typescript-eslint/no-explicit-any,@typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-argument */
 function normalizeFieldInfosProto3(fieldInfos) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     const r = [];
     let o;
     for (const field of typeof fieldInfos == "function"
@@ -67,13 +67,16 @@ function normalizeFieldInfosProto3(fieldInfos) {
         f.localName = localFieldName(field.name, field.oneof !== undefined);
         f.jsonName = (_a = field.jsonName) !== null && _a !== void 0 ? _a : fieldJsonName(field.name);
         f.repeated = (_b = field.repeated) !== null && _b !== void 0 ? _b : false;
+        if (field.kind == "scalar") {
+            f.L = (_c = field.L) !== null && _c !== void 0 ? _c : LongType.BIGINT;
+        }
         // From the proto3 language guide:
         // > In proto3, repeated fields of scalar numeric types are packed by default.
         // This information is incomplete - according to the conformance tests, BOOL
         // and ENUM are packed by default as well. This means only STRING and BYTES
         // are not packed by default, which makes sense because they are length-delimited.
         f.packed =
-            (_c = field.packed) !== null && _c !== void 0 ? _c : (field.kind == "enum" ||
+            (_d = field.packed) !== null && _d !== void 0 ? _d : (field.kind == "enum" ||
                 (field.kind == "scalar" &&
                     field.T != ScalarType.BYTES &&
                     field.T != ScalarType.STRING));

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

@@ -1,9 +1,12 @@
 import { Message } from "./message.js";
 import type { PlainMessage } from "./message.js";
 /**
- * toPlainMessage returns a new object by striping
+ * toPlainMessage returns a new object by stripping
  * 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.
+ *
+ * If the argument is already a plain message, it is
+ * returned as-is.
  */
-export declare function toPlainMessage<T extends Message<T>>(message: T): PlainMessage<T>;
+export declare function toPlainMessage<T extends Message<T>>(message: T | PlainMessage<T>): PlainMessage<T>;

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

@@ -14,12 +14,18 @@
 /* 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
+ * toPlainMessage returns a new object by stripping
  * 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.
+ *
+ * If the argument is already a plain message, it is
+ * returned as-is.
  */
 export function toPlainMessage(message) {
+    if (!(message instanceof Message)) {
+        return message;
+    }
     const type = message.getType();
     const target = {};
     for (const member of type.fields.byMember()) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bufbuild/protobuf",
-  "version": "1.3.3",
+  "version": "1.4.0",
   "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": {
@@ -14,6 +14,10 @@
     "build:cjs": "../../node_modules/typescript/bin/tsc --project tsconfig.json --module commonjs --outDir ./dist/cjs --declaration --declarationDir ./dist/cjs && echo >./dist/cjs/package.json '{\"type\":\"commonjs\"}'",
     "build:esm": "../../node_modules/typescript/bin/tsc --project tsconfig.json --module ES2015 --verbatimModuleSyntax --outDir ./dist/esm --declaration --declarationDir ./dist/esm",
     "build:proxy": "node ../../scripts/gen-esm-proxy.mjs .",
+    "prebootstrap": "rm -rf .tmp && mkdir -p .tmp/google/protobuf && cp -rp src/google/protobuf/* .tmp/google/protobuf",
+    "bootstrap": "protoc --es_out=src --es_opt=bootstrap_wkt=true,ts_nocheck=false,target=ts --proto_path $(upstream-include wkt) $(upstream-files wkt)",
+    "postbootstrap": "license-header src/google/protobuf",
+    "bootstrap-diff": "diff >/dev/null -r .tmp/google/protobuf src/google/protobuf && cp -rp .tmp/google/protobuf/* src/google/protobuf",
     "attw": "attw --pack"
   },
   "type": "module",
@@ -26,6 +30,9 @@
       "import": "./dist/proxy/index.js"
     }
   },
+  "devDependencies": {
+    "upstream-protobuf": "*"
+  },
   "files": [
     "dist/**"
   ]