ts-proto 2.8.0 → 2.8.2

package/README.markdown

@@ -392,6 +392,16 @@ Generated code will be placed in the Gradle build directory.
 
   `FooBar.FOO_BAR_BAZ = "FOO_BAR_BAZ"` will generate `FooBar.BAZ = "FOO_BAR_BAZ"`
 
+  If any value in the enum would be made invalid by removing the enum name, the enum name will be present for all the values in the enum.
+
+  `FooBar.FOO_BAR_1 = "FOO_BAR_BAZ"` will generate `FooBar.FOO_BAR_1 = "FOO_BAR_BAZ"`
+
+  `FooBar.FOO_BAR_1A = "FOO_BAR_BAZ"` will generate `FooBar.FOO_BAR_1A = "FOO_BAR_BAZ"`
+
+  `FooBar.FOO_BAR_Infinity = "FOO_BAR_BAZ"` will generate `FooBar.FOO_BAR_Infinity = "FOO_BAR_BAZ"` (this is technically valid but is likely to lead to downstream issues)
+
+  `FooBar.FOO_BAR_INFINITY = "FOO_BAR_BAZ"` will generate `FooBar.INFINITY = "FOO_BAR_BAZ"`
+
 - With `--ts_proto_opt=lowerCaseServiceMethods=true`, the method names of service methods will be lowered/camel-case, i.e. `service.findFoo` instead of `service.FindFoo`.
 
 - With `--ts_proto_opt=snakeToCamel=false`, fields will be kept snake case in both the message keys and the `toJSON` / `fromJSON` methods.

package/build/src/enums.js

@@ -208,9 +208,16 @@ function generateEnumToNumber(ctx, fullName, enumDesc, unrecognizedEnum) {
     chunks.push((0, ts_poet_1.code) `}`);
     return (0, ts_poet_1.joinCode)(chunks, { on: "\n" });
 }
+const withoutEnumPrefix = (valueName, enumName) => valueName.replace(`${(0, case_1.camelToSnake)(enumName)}_`, "");
+const isNumeric = (str) => !isNaN(Number(str));
 function getMemberName(ctx, enumDesc, valueDesc) {
-    if (ctx.options.removeEnumPrefix) {
-        return valueDesc.name.replace(`${(0, case_1.camelToSnake)(enumDesc.name)}_`, "");
+    const areAnyMembersNumericWithoutPrefix = enumDesc.value.some((v) => {
+        const withoutPrefix = withoutEnumPrefix(v.name, enumDesc.name);
+        return isNumeric(withoutPrefix) || isNumeric(withoutPrefix[0]);
+    });
+    const nameWithoutPrefix = withoutEnumPrefix(valueDesc.name, enumDesc.name);
+    if (ctx.options.removeEnumPrefix && !areAnyMembersNumericWithoutPrefix) {
+        return nameWithoutPrefix;
     }
     return valueDesc.name;
 }

package/build/src/main.js

@@ -707,12 +707,10 @@ function makeTimestampMethods(options, longs, bytes) {
                 ? (0, ts_poet_1.code) `
             function toTimestamp(instant: Temporal.Instant): ${Timestamp} {
               const date = {
-                getTime: (): number => Math.trunc(instant.epochMilliseconds / 1_000),
+                getTime: (): number => instant.epochMilliseconds,
               } as const;
               const seconds = ${seconds};
-              const remainder = ${bytes.globalThis}.Temporal.Instant
-                .fromEpochMilliseconds(instant.epochMilliseconds)
-                .until(instant);
+              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 };

package/package.json

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