ts-proto 2.15.2 → 2.15.3

package/build/src/main.js

@@ -1900,6 +1900,27 @@ function generateExtension(ctx, message, extension) {
         extensionInfo: (0, ts_poet_1.joinCode)(chunks, { on: "\n" }),
     };
 }
+/** Converts the JSON of a wrapper type, such as `google.protobuf.Int64Value`, to the unwrapped value. */
+function valueTypeFromJson(ctx, field, from) {
+    const { options } = ctx;
+    const valueType = (0, types_1.valueTypeName)(ctx, field.typeName);
+    if ((0, types_1.isLongValueType)(field) && options.forceLong === options_1.LongOption.LONG) {
+        return (0, ts_poet_1.code) `${(0, case_1.capitalize)(valueType.toCodeString([]))}.fromValue(${from})`;
+    }
+    else if ((0, types_1.isLongValueType)(field) && options.forceLong === options_1.LongOption.BIGINT) {
+        return (0, ts_poet_1.code) `BigInt(${from})`;
+    }
+    else if ((0, types_1.isBytesValueType)(field)) {
+        return (0, ts_poet_1.code) `new ${(0, case_1.capitalize)(valueType.toCodeString([]))}(${from})`;
+    }
+    else {
+        return (0, ts_poet_1.code) `${(0, case_1.capitalize)(valueType.toCodeString([]))}(${from})`;
+    }
+}
+/** Whether `field` is a 64-bit wrapper type unwrapped to a `Long` or `bigint`, which JSON writes as a string. */
+function isLongValueTypeAsObject(options, field) {
+    return (0, types_1.isLongValueType)(field) && (options.forceLong === options_1.LongOption.LONG || options.forceLong === options_1.LongOption.BIGINT);
+}
 /**
  * Creates a function to decode a message from JSON.
  *
@@ -2042,19 +2063,7 @@ function generateFromJson(ctx, fullName, fullTypeName, messageDesc) {
                 return (0, ts_poet_1.code) `[...${from}]`;
             }
             else if ((0, types_1.isValueType)(ctx, field)) {
-                const valueType = (0, types_1.valueTypeName)(ctx, field.typeName);
-                if ((0, types_1.isLongValueType)(field) && options.forceLong === options_1.LongOption.LONG) {
-                    return (0, ts_poet_1.code) `${(0, case_1.capitalize)(valueType.toCodeString([]))}.fromValue(${from})`;
-                }
-                else if ((0, types_1.isLongValueType)(field) && options.forceLong === options_1.LongOption.BIGINT) {
-                    return (0, ts_poet_1.code) `BigInt(${from})`;
-                }
-                else if ((0, types_1.isBytesValueType)(field)) {
-                    return (0, ts_poet_1.code) `new ${(0, case_1.capitalize)(valueType.toCodeString([]))}(${from})`;
-                }
-                else {
-                    return (0, ts_poet_1.code) `${(0, case_1.capitalize)(valueType.toCodeString([]))}(${from})`;
-                }
+                return valueTypeFromJson(ctx, field, from);
             }
             else if ((0, types_1.isMessage)(field)) {
                 if ((0, types_1.isRepeated)(field) && (0, types_1.isMapType)(ctx, messageDesc, field)) {
@@ -2097,6 +2106,9 @@ function generateFromJson(ctx, fullName, fullTypeName, messageDesc) {
                             options.useDate === options_1.DateOption.TIMESTAMP)) {
                         return (0, ts_poet_1.code) `${utils.fromJsonTimestamp}(${from})`;
                     }
+                    else if ((0, types_1.isLongValueType)(valueField)) {
+                        return valueTypeFromJson(ctx, valueField, from);
+                    }
                     else if ((0, types_1.isValueType)(ctx, valueField)) {
                         return (0, ts_poet_1.code) `${from} as ${valueType}`;
                     }
@@ -2496,6 +2508,10 @@ function generateToJson(ctx, fullName, fullProtobufTypeName, messageDesc) {
                 else if ((0, types_1.isFloatingPoint)(valueType)) {
                     return (0, ts_poet_1.code) `${utils.floatToJson}(${from})`;
                 }
+                else if (isLongValueTypeAsObject(options, valueType)) {
+                    // Map values of wrapper types are declared `| undefined`.
+                    return (0, ts_poet_1.code) `${from}?.toString()`;
+                }
                 else if ((0, types_1.isScalar)(valueType) || (0, types_1.isValueType)(ctx, valueType)) {
                     return (0, ts_poet_1.code) `${from}`;
                 }
@@ -2521,6 +2537,9 @@ function generateToJson(ctx, fullName, fullProtobufTypeName, messageDesc) {
             else if ((0, types_1.isBytes)(field)) {
                 return (0, ts_poet_1.code) `${utils.base64FromBytes}(${from})`;
             }
+            else if (isLongValueTypeAsObject(options, field)) {
+                return (0, ts_poet_1.code) `${from}.toString()`;
+            }
             else if ((0, types_1.isLong)(field) && (0, types_1.isJsTypeFieldOption)(options, field)) {
                 const fieldType = (0, types_1.getFieldOptionsJsType)(field, ctx.options) ?? field.type;
                 if (!fieldType) {

package/package.json

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