ts-proto 2.8.1 → 2.8.3

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/generate-struct-wrappers.js

@@ -201,7 +201,7 @@ function generateWrapShallow(ctx, fullProtoTypeName, fieldNames) {
             chunks.push((0, ts_poet_1.code) `wrap(value: any): ${(0, utils_1.wrapTypeName)(ctx.options, "Value")} {
         const result = createBase${(0, utils_1.wrapTypeName)(ctx.options, "Value")}()${maybeAsAny(ctx.options)};
         if (value === null) {
-          result.kind = {$case: '${fieldNames.nullValue}', value };
+          result.kind = {$case: '${fieldNames.nullValue}', value: ${(0, utils_1.wrapTypeName)(ctx.options, "NullValue")}.NULL_VALUE};
         } else if (typeof value === 'boolean') {
           result.kind = {$case: '${fieldNames.boolValue}', value };
         } else if (typeof value === 'number') {
@@ -310,7 +310,7 @@ function generateUnwrapShallow(ctx, fullProtoTypeName, fieldNames) {
         }
         else if (ctx.options.oneof === options_1.OneofOption.UNIONS_VALUE) {
             chunks.push((0, ts_poet_1.code) `unwrap(message: ${(0, utils_1.wrapTypeName)(ctx.options, "Value")}): string | number | boolean | Object | null | Array<any> | undefined {
-        return message.kind?.value;
+        return (message.kind?.$case === '${fieldNames.nullValue}') ? null : message.kind?.value;
       }`);
         }
         else {

package/package.json

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