ts-proto 2.11.10 → 2.12.0

package/README.markdown

@@ -7,7 +7,7 @@
 
 ## ts-proto 2.x Release Notes
 
-The 2.x release of ts-proto migrated the low-level Protobuf serializing that its `encode` and `decode` method use from the venerable, but aging & stagnant, `protobufjs` package to `@bufbuild/protobuf`.
+The 2.x release of ts-proto migrated the low-level Protobuf serializing that its `encode` and `decode` method use from the venerable `protobufjs` package to `@bufbuild/protobuf`.
 
 If you only used the `encode` and `decode` methods, this should largely be a non-breaking change.
 
@@ -321,7 +321,7 @@ Generated code will be placed in the Gradle build directory.
 
   With `--ts_proto_opt=forceLong=string`, all 64-bit numbers will be output as strings.
 
-  With `--ts_proto_opt=forceLong=bigint`, all 64-bit numbers will be output as `BigInt`s. This option still uses the `long` library to encode/decode internally within `protobuf.js`, but then converts to/from `BigInt`s in the ts-proto-generated code.
+  With `--ts_proto_opt=forceLong=bigint`, all 64-bit numbers will be output as `BigInt`s. This option still uses the `long` library to encode/decode internally within `protobuf.js`, but then converts to/from `BigInt`s in the ts-proto-generated code. As with `forceLong=long`, `DeepPartial` widens 64-bit fields to `string | number | bigint`, and `fromPartial`/`create` coerce those inputs to `BigInt` (matching what `fromJSON` already does), so you can pass a string or number and get a `BigInt` back.
 
   The default behavior is `forceLong=number`, which will internally still use the `long` library to encode/decode values on the wire (so you will still see a `util.Long = Long` line in your output), but will convert the `long` values to `number` automatically for you. Note that a runtime error is thrown if, while doing this conversion, a 64-bit value is larger than can be correctly stored as a `number`.
 

package/build/src/main.js

@@ -492,6 +492,8 @@ function makeDeepPartial(options, longs) {
     const maybeExport = options.exportCommonSymbols ? "export" : "";
     // Allow passing longs as numbers or strings, nad we'll convert them
     const maybeLong = options.forceLong === options_1.LongOption.LONG ? (0, ts_poet_1.code) ` : T extends ${longs.Long} ? string | number | Long ` : "";
+    // Allow passing bigints as numbers or strings; fromPartial coerces them via BigInt()
+    const maybeBigInt = options.forceLong === options_1.LongOption.BIGINT ? (0, ts_poet_1.code) `T extends bigint ? string | number | bigint : ` : "";
     const optionalBuiltins = [];
     if (options.forceLong === options_1.LongOption.BIGINT) {
         optionalBuiltins.push("bigint");
@@ -512,7 +514,7 @@ function makeDeepPartial(options, longs) {
     // Based on the type from ts-essentials
     const keys = (0, options_1.addTypeToMessages)(options) ? (0, ts_poet_1.code) `Exclude<keyof T, '$type'>` : (0, ts_poet_1.code) `keyof T`;
     const DeepPartial = (0, ts_poet_1.conditionalOutput)("DeepPartial", (0, ts_poet_1.code) `
-      ${maybeExport} type DeepPartial<T> =  T extends ${Builtin}
+      ${maybeExport} type DeepPartial<T> = ${maybeBigInt} T extends ${Builtin}
         ? T
         ${maybeLong}
         : T extends globalThis.Array<infer U>
@@ -720,7 +722,7 @@ function makeTimestampMethods(options, longs, bytes) {
               const seconds = ${seconds};
               const remainder = instant.round({ smallestUnit: "seconds",  roundingMode: "floor" }).until(instant);
               const nanos = (remainder.milliseconds * 1_000_000) + (remainder.microseconds * 1_000) + remainder.nanoseconds;
-            
+
               return { ${maybeTypeField} seconds, nanos };
             }
           `
@@ -2443,6 +2445,11 @@ function generateFromPartial(ctx, fullName, messageDesc) {
                 !(0, types_1.isJsTypeFieldOption)(options, field)) {
                 return (0, ts_poet_1.code) `Long.fromValue(${from})`;
             }
+            else if (((0, types_1.isLong)(field) || (0, types_1.isLongValueType)(field)) &&
+                options.forceLong === options_1.LongOption.BIGINT &&
+                !(0, types_1.isJsTypeFieldOption)(options, field)) {
+                return (0, ts_poet_1.code) `BigInt(${from})`;
+            }
             else if ((0, types_1.isObjectId)(field) && options.useMongoObjectId) {
                 return (0, ts_poet_1.code) `${from} as mongodb.ObjectId`;
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-proto",
-  "version": "2.11.10",
+  "version": "2.12.0",
   "description": "",
   "main": "build/src/plugin.js",
   "repository": "github:stephenh/ts-proto",