ts-proto 2.13.0 → 2.13.1

package/build/src/main.d.ts

@@ -39,6 +39,7 @@ declare function makeObjectIdMethods(): {
 declare function makeTimestampMethods(options: Options, longs: ReturnType<typeof makeLongUtils>, bytes: ReturnType<typeof makeByteUtils>): {
     toTimestamp: ConditionalOutput;
     fromTimestamp: ConditionalOutput;
+    timestampFractionRegex: ConditionalOutput;
     fromJsonTimestamp: ConditionalOutput;
 };
 declare function makeComparisonUtils(): {

package/build/src/main.js

@@ -773,6 +773,8 @@ function makeTimestampMethods(options, longs, bytes) {
             return new ${bytes.globalThis}.Date(millis);
           }
         `);
+    // Declared once per file, so the regex isn't compiled on each fromJsonTimestamp call
+    const timestampFractionRegex = (0, ts_poet_1.conditionalOutput)("timestampFractionRegex", (0, ts_poet_1.code) `const timestampFractionRegex = /:\\d{2}\\.\\d+/;`);
     const fromJsonTimestamp = (0, ts_poet_1.conditionalOutput)("fromJsonTimestamp", options.useDate === options_1.DateOption.DATE
         ? (0, ts_poet_1.code) `
         function fromJsonTimestamp(o: any): Date {
@@ -802,13 +804,24 @@ function makeTimestampMethods(options, longs, bytes) {
           if (o instanceof ${bytes.globalThis}.Date) {
             return ${toTimestamp}(o);
           } else if (typeof o === "string") {
-            return ${toTimestamp}(new ${bytes.globalThis}.Date(o));
+            // Date only keeps milliseconds, and parses longer fractions in an engine-specific way,
+            // so parse the fractional seconds ourselves and give Date only the whole seconds
+            const fraction = ${timestampFractionRegex}.exec(o);
+            if (fraction === null) {
+              return ${toTimestamp}(new ${bytes.globalThis}.Date(o));
+            }
+            const fractionNanos = Number(fraction[0].slice(4, 13).padEnd(9, "0"));
+            const wholeSeconds = new ${bytes.globalThis}.Date(o.replace(fraction[0], fraction[0].slice(0, 3)));
+            const timestamp = ${toTimestamp}(
+              new ${bytes.globalThis}.Date(wholeSeconds.getTime() + Math.trunc(fractionNanos / 1_000_000)),
+            );
+            return { ...timestamp, nanos: (timestamp.nanos ?? 0) + (fractionNanos % 1_000_000) };
           } else {
             return ${options.typePrefix}Timestamp${options.typeSuffix}.fromJSON(o);
           }
         }
       `);
-    return { toTimestamp, fromTimestamp, fromJsonTimestamp };
+    return { toTimestamp, fromTimestamp, timestampFractionRegex, fromJsonTimestamp };
 }
 function makeComparisonUtils() {
     const isObject = (0, ts_poet_1.conditionalOutput)("isObject", (0, ts_poet_1.code) `
@@ -938,9 +951,7 @@ function generateBaseInstanceFactory(ctx, fullName, messageDesc, fullTypeName) {
             const { oneofIndex } = field;
             if (!processedOneofs.has(oneofIndex)) {
                 processedOneofs.add(oneofIndex);
-                const name = options.useJsonName
-                    ? (0, utils_1.getFieldName)(field, options)
-                    : (0, case_1.maybeSnakeToCamel)(messageDesc.oneofDecl[oneofIndex].name, ctx.options);
+                const name = (0, case_1.maybeSnakeToCamel)(messageDesc.oneofDecl[oneofIndex].name, ctx.options);
                 fields.push((0, ts_poet_1.code) `${(0, utils_1.safeAccessor)(name)}: ${(0, utils_1.nullOrUndefined)(options)}`);
             }
             continue;
@@ -1205,9 +1216,7 @@ function generateDecode(ctx, fullName, messageDesc) {
             }
         }
         else if ((0, types_1.isWithinOneOfThatShouldBeUnion)(options, field)) {
-            const oneofNameWithMessage = options.useJsonName
-                ? messageProperty
-                : (0, utils_1.getPropertyAccessor)("message", (0, case_1.maybeSnakeToCamel)(messageDesc.oneofDecl[field.oneofIndex].name, options));
+            const oneofNameWithMessage = (0, utils_1.getPropertyAccessor)("message", (0, case_1.maybeSnakeToCamel)(messageDesc.oneofDecl[field.oneofIndex].name, options));
             const valueName = (0, utils_1.oneofValueName)(fieldName, options);
             chunks.push((0, ts_poet_1.code) `
         ${tagCheck}
@@ -1509,9 +1518,7 @@ function generateEncode(ctx, fullName, messageDesc) {
         else if ((0, types_1.isWithinOneOfThatShouldBeUnion)(options, field)) {
             if (!processedOneofs.has(field.oneofIndex)) {
                 processedOneofs.add(field.oneofIndex);
-                const oneofNameWithMessage = options.useJsonName
-                    ? messageProperty
-                    : (0, utils_1.getPropertyAccessor)("message", (0, case_1.maybeSnakeToCamel)(messageDesc.oneofDecl[field.oneofIndex].name, options));
+                const oneofNameWithMessage = (0, utils_1.getPropertyAccessor)("message", (0, case_1.maybeSnakeToCamel)(messageDesc.oneofDecl[field.oneofIndex].name, options));
                 chunks.push((0, ts_poet_1.code) `switch (${oneofNameWithMessage}?.$case) {`);
                 for (const oneOfField of oneOfFieldsDict[field.oneofIndex]) {
                     const writeSnippet = getEncodeWriteSnippet(ctx, oneOfField);
@@ -2386,9 +2393,7 @@ function generateToJson(ctx, fullName, fullProtobufTypeName, messageDesc) {
         }
         else if ((0, types_1.isWithinOneOfThatShouldBeUnion)(options, field)) {
             // oneofs in a union are only output as `oneof name = ...`
-            const oneofNameWithMessage = options.useJsonName
-                ? messageProperty
-                : (0, utils_1.getPropertyAccessor)("message", (0, case_1.maybeSnakeToCamel)(messageDesc.oneofDecl[field.oneofIndex].name, options));
+            const oneofNameWithMessage = (0, utils_1.getPropertyAccessor)("message", (0, case_1.maybeSnakeToCamel)(messageDesc.oneofDecl[field.oneofIndex].name, options));
             const valueName = (0, utils_1.oneofValueName)(fieldName, options);
             chunks.push((0, ts_poet_1.code) `
         ${currentIfTarget === oneofNameWithMessage ? "else " : ""}if (${oneofNameWithMessage}?.$case === '${fieldName}') {

package/package.json

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