ts-proto 2.13.1 → 2.13.3

package/build/src/main.d.ts

@@ -16,6 +16,7 @@ declare function makeByteUtils(options: Options): {
     globalThis: ConditionalOutput;
     bytesFromBase64: ConditionalOutput;
     base64FromBytes: ConditionalOutput;
+    floatToJson: ConditionalOutput;
 };
 declare function makeDeepPartial(options: Options, longs: ReturnType<typeof makeLongUtils>): {
     Builtin: ConditionalOutput;

package/build/src/main.js

@@ -473,7 +473,14 @@ function makeByteUtils(options) {
         ${getBase64FromBytesSnippet()}
       }
     `);
-    return { globalThis, bytesFromBase64, base64FromBytes };
+    // JSON numbers can't represent NaN or +/-Infinity, so the proto3 JSON mapping
+    // writes them as the strings "NaN", "Infinity" and "-Infinity".
+    const floatToJson = (0, ts_poet_1.conditionalOutput)("floatToJson", (0, ts_poet_1.code) `
+      function floatToJson(value: number | null | undefined): number | string | null | undefined {
+        return typeof value === "number" && !${globalThis}.Number.isFinite(value) ? ${globalThis}.String(value) : value;
+      }
+    `);
+    return { globalThis, bytesFromBase64, base64FromBytes, floatToJson };
 }
 function makeDeepPartial(options, longs) {
     let oneofCase = "";
@@ -2307,6 +2314,9 @@ function generateToJson(ctx, fullName, fullProtobufTypeName, messageDesc) {
                 else if ((0, types_1.isWholeNumber)(valueType) && !((0, types_1.isLong)(valueType) && options.forceLong === options_1.LongOption.STRING)) {
                     return (0, ts_poet_1.code) `Math.round(${from})`;
                 }
+                else if ((0, types_1.isFloatingPoint)(valueType)) {
+                    return (0, ts_poet_1.code) `${utils.floatToJson}(${from})`;
+                }
                 else if ((0, types_1.isScalar)(valueType) || (0, types_1.isValueType)(ctx, valueType)) {
                     return (0, ts_poet_1.code) `${from}`;
                 }
@@ -2349,6 +2359,9 @@ function generateToJson(ctx, fullName, fullProtobufTypeName, messageDesc) {
             else if ((0, types_1.isWholeNumber)(field) && !((0, types_1.isLong)(field) && options.forceLong === options_1.LongOption.STRING)) {
                 return (0, ts_poet_1.code) `Math.round(${from})`;
             }
+            else if ((0, types_1.isFloatingPoint)(field)) {
+                return (0, ts_poet_1.code) `${utils.floatToJson}(${from})`;
+            }
             else {
                 return (0, ts_poet_1.code) `${from}`;
             }
@@ -2669,10 +2682,9 @@ function convertToObjectKey(ctx, messageDesc, field, variableName) {
         return (0, ts_poet_1.code) `${variableName}`;
     }
     else if ((0, types_1.isLong)(keyField) && (0, types_1.shouldGenerateJSMapType)(ctx, messageDesc, field)) {
-        if (ctx.options.forceLong === options_1.LongOption.LONG) {
-            return (0, ts_poet_1.code) `${ctx.utils.longToNumber}(${variableName})`;
-        }
-        else if (ctx.options.forceLong === options_1.LongOption.BIGINT) {
+        // JSON object keys are strings, and converting a 64-bit key to a JS number
+        // would lose precision (or throw, for Long) above Number.MAX_SAFE_INTEGER.
+        if (ctx.options.forceLong === options_1.LongOption.LONG || ctx.options.forceLong === options_1.LongOption.BIGINT) {
             return (0, ts_poet_1.code) `${variableName}.toString()`;
         }
         else {

package/build/src/types.d.ts

@@ -34,6 +34,8 @@ export declare function isWithinOneOfThatShouldBeUnion(options: Options, field:
 export declare function isRepeated(field: FieldDescriptorProto): boolean;
 export declare function isLong(field: FieldDescriptorProto): boolean;
 export declare function isWholeNumber(field: FieldDescriptorProto): boolean;
+/** Whether `field` holds a JS number that may be non-finite: a double/float or its wrapper type. */
+export declare function isFloatingPoint(field: FieldDescriptorProto): boolean;
 export declare function isMapType(ctx: Context, messageDesc: DescriptorProto, field: FieldDescriptorProto): boolean;
 export declare function isObjectId(field: FieldDescriptorProto): boolean;
 export declare function isTimestamp(field: FieldDescriptorProto): boolean;

package/build/src/types.js

@@ -21,6 +21,7 @@ exports.isWithinOneOfThatShouldBeUnion = isWithinOneOfThatShouldBeUnion;
 exports.isRepeated = isRepeated;
 exports.isLong = isLong;
 exports.isWholeNumber = isWholeNumber;
+exports.isFloatingPoint = isFloatingPoint;
 exports.isMapType = isMapType;
 exports.isObjectId = isObjectId;
 exports.isTimestamp = isTimestamp;
@@ -467,6 +468,13 @@ function isWholeNumber(field) {
         field.type === ts_proto_descriptors_1.FieldDescriptorProto_Type.TYPE_SFIXED32 ||
         field.type === ts_proto_descriptors_1.FieldDescriptorProto_Type.TYPE_SFIXED64);
 }
+/** Whether `field` holds a JS number that may be non-finite: a double/float or its wrapper type. */
+function isFloatingPoint(field) {
+    return (field.type === ts_proto_descriptors_1.FieldDescriptorProto_Type.TYPE_DOUBLE ||
+        field.type === ts_proto_descriptors_1.FieldDescriptorProto_Type.TYPE_FLOAT ||
+        field.typeName === ".google.protobuf.DoubleValue" ||
+        field.typeName === ".google.protobuf.FloatValue");
+}
 function isMapType(ctx, messageDesc, field) {
     return detectMapType(ctx, messageDesc, field) !== undefined;
 }

package/package.json

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