ts-proto 2.11.6 → 2.11.8

package/build/src/main.js

@@ -72,8 +72,7 @@ function generateFile(ctx, fileDesc) {
             const prefix = (0, case_1.camelToSnake)(fileDesc.package.replace(/\./g, "_"));
             chunks.push((0, ts_poet_1.code) `export const ${prefix}_PACKAGE_NAME = '${fileDesc.package}';`);
         }
-        if (options.useDate === options_1.DateOption.DATE &&
-            fileDesc.messageType.find((message) => message.field.find((field) => field.typeName === ".google.protobuf.Timestamp"))) {
+        if (options.useDate === options_1.DateOption.DATE && fileDesc.messageType.find(hasTimestampField)) {
             chunks.push(makeProtobufTimestampWrapper());
         }
     }
@@ -220,7 +219,7 @@ function generateFile(ctx, fileDesc) {
         }
     }
     if (options.nestJs) {
-        if (fileDesc.messageType.find((message) => message.field.find(types_1.isStructType))) {
+        if (fileDesc.messageType.find(hasStructTypeField)) {
             chunks.push(makeProtobufStructWrapper(options));
         }
     }
@@ -358,6 +357,15 @@ function makeProtobufTimestampWrapper() {
         },
       } as any;`;
 }
+function hasField(message, predicate) {
+    return (message.field.some(predicate) || message.nestedType.some((nestedMessage) => hasField(nestedMessage, predicate)));
+}
+function hasTimestampField(message) {
+    return hasField(message, types_1.isTimestamp);
+}
+function hasStructTypeField(message) {
+    return hasField(message, types_1.isStructType);
+}
 function makeProtobufStructWrapper(options) {
     const wrappers = (0, ts_poet_1.imp)("wrappers@protobufjs");
     const Struct = (0, utils_1.impProto)(options, "google/protobuf/struct", (0, utils_1.wrapTypeName)(options, "Struct"));
@@ -1796,14 +1804,37 @@ function generateFromJson(ctx, fullName, fullTypeName, messageDesc) {
     const chunks = [];
     // Handle Duration string format as a special case
     if (fullTypeName === "google.protobuf.Duration" && ctx.options.useDuration === options_1.DurationOption.STRING) {
+        let parseSeconds;
+        switch (ctx.options.forceLong) {
+            case options_1.LongOption.BIGINT:
+                parseSeconds = (0, ts_poet_1.code) `negative && secondsStr !== "0" ? -BigInt(secondsStr) : BigInt(secondsStr)`;
+                break;
+            case options_1.LongOption.LONG:
+                // Long.fromString handles the sign internally, including the asymmetric i64 min case.
+                parseSeconds = (0, ts_poet_1.code) `${utils.Long}.fromString(negative ? "-" + secondsStr : secondsStr)`;
+                break;
+            case options_1.LongOption.STRING:
+                parseSeconds = (0, ts_poet_1.code) `negative && secondsStr !== "0" ? "-" + secondsStr : secondsStr`;
+                break;
+            case options_1.LongOption.NUMBER:
+            default:
+                parseSeconds = (0, ts_poet_1.code) `negative && secondsStr !== "0" ? -Number(secondsStr) : Number(secondsStr)`;
+                break;
+        }
         return (0, ts_poet_1.code) `
       fromJSON(object: string): ${fullName} {
-        const match = object.match(/^(-?[0-9.]+)s$/);
-        if (!match) throw new Error('Invalid duration string');
-        const seconds = Number(match[1]);
-        const wholeSeconds = Math.trunc(seconds);
-        const nanos = Math.round((seconds - wholeSeconds) * 1e9);
-        return { seconds: wholeSeconds, nanos };
+        if (!object.endsWith("s")) throw new Error("Invalid duration string");
+        const body = object.slice(0, -1);
+        const negative = body.startsWith("-");
+        const unsigned = negative ? body.slice(1) : body;
+        const dot = unsigned.indexOf(".");
+        const secondsStr = dot < 0 ? unsigned : unsigned.slice(0, dot);
+        const fracStr = dot < 0 ? "" : unsigned.slice(dot + 1);
+        if (secondsStr.length === 0) throw new Error("Invalid duration string");
+        const seconds = ${parseSeconds};
+        const nanosAbs = fracStr === "" ? 0 : Number(fracStr.padEnd(9, "0").slice(0, 9));
+        const nanos = negative && nanosAbs !== 0 ? -nanosAbs : nanosAbs;
+        return { seconds, nanos };
       }
     `;
     }
@@ -2120,7 +2151,7 @@ function generateFromJson(ctx, fullName, fullTypeName, messageDesc) {
     chunks.push((0, ts_poet_1.code) `}`);
     return (0, ts_poet_1.joinCode)(chunks, { on: "\n" });
 }
-function generateCanonicalToJson(fullName, fullProtobufTypeName, { useOptionals, useNullAsOptional, useDuration }) {
+function generateCanonicalToJson(fullName, fullProtobufTypeName, { useOptionals, useNullAsOptional, useDuration, forceLong }) {
     if ((0, types_1.isFieldMaskTypeName)(fullProtobufTypeName)) {
         const returnType = useOptionals === "all" ? `string | ${(0, utils_1.nullOrUndefined)({ useNullAsOptional })}` : "string";
         const pathModifier = useOptionals === "all" ? "?" : "";
@@ -2131,11 +2162,38 @@ function generateCanonicalToJson(fullName, fullProtobufTypeName, { useOptionals,
   `;
     }
     if (fullProtobufTypeName === "google.protobuf.Duration" && useDuration === options_1.DurationOption.STRING) {
+        let isNegSeconds;
+        let absSeconds;
+        switch (forceLong) {
+            case options_1.LongOption.BIGINT:
+                isNegSeconds = (0, ts_poet_1.code) `message.seconds < 0n`;
+                absSeconds = (0, ts_poet_1.code) `message.seconds < 0n ? -message.seconds : message.seconds`;
+                break;
+            case options_1.LongOption.LONG:
+                // Format via toString rather than negate(); Long.MIN_VALUE.negate() === Long.MIN_VALUE.
+                isNegSeconds = (0, ts_poet_1.code) `message.seconds.isNegative()`;
+                absSeconds = (0, ts_poet_1.code) `message.seconds.isNegative() ? message.seconds.toString().slice(1) : message.seconds.toString()`;
+                break;
+            case options_1.LongOption.STRING:
+                isNegSeconds = (0, ts_poet_1.code) `message.seconds.startsWith("-")`;
+                absSeconds = (0, ts_poet_1.code) `message.seconds.startsWith("-") ? message.seconds.slice(1) : message.seconds`;
+                break;
+            case options_1.LongOption.NUMBER:
+            default:
+                isNegSeconds = (0, ts_poet_1.code) `message.seconds < 0`;
+                absSeconds = (0, ts_poet_1.code) `message.seconds < 0 ? -message.seconds : message.seconds`;
+                break;
+        }
         return (0, ts_poet_1.code) `
     toJSON(message: ${fullName}): string {
-        const secs = Number(message.seconds);
-        const nanos = message.nanos;
-        return \`\${secs + nanos/1e9}s\`;
+      const negative = ${isNegSeconds} || message.nanos < 0;
+      const sign = negative ? "-" : "";
+      const absSeconds = ${absSeconds};
+      const absNanos = message.nanos < 0 ? -message.nanos : message.nanos;
+      if (absNanos === 0) return \`\${sign}\${absSeconds}s\`;
+      const padded = absNanos.toString().padStart(9, "0");
+      const len = absNanos % 1_000_000 === 0 ? 3 : absNanos % 1_000 === 0 ? 6 : 9;
+      return \`\${sign}\${absSeconds}.\${padded.slice(0, len)}s\`;
     }
     `;
     }

package/package.json

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