ts-proto 1.181.0 → 1.181.2

package/build/enums.d.ts

@@ -7,6 +7,7 @@ type UnrecognizedEnum = {
 } | {
     present: true;
     name: string;
+    originalName: string;
 };
 export declare function generateEnum(ctx: Context, fullName: string, enumDesc: EnumDescriptorProto, sourceInfo: SourceInfo): Code;
 /** Generates a function with a big switch statement to decode JSON -> our enum. */

package/build/enums.js

@@ -23,7 +23,7 @@ function generateEnum(ctx, fullName, enumDesc, sourceInfo) {
         const valueName = getValueName(ctx, fullName, valueDesc);
         const memberName = getMemberName(ctx, enumDesc, valueDesc);
         if (valueDesc.number === options.unrecognizedEnumValue) {
-            unrecognizedEnum = { present: true, name: memberName };
+            unrecognizedEnum = { present: true, name: memberName, originalName: valueName };
         }
         (0, utils_1.maybeAddComment)(options, info, chunks, valueDesc.options?.deprecated, `${memberName} - `);
         chunks.push((0, ts_poet_1.code) `${memberName} ${delimiter} ${options.stringEnums ? `"${valueName}"` : valueDesc.number.toString()},`);
@@ -155,7 +155,7 @@ function generateEnumToJson(ctx, fullName, enumDesc, unrecognizedEnum) {
         else {
             chunks.push((0, ts_poet_1.code) `
       default:
-        return "${unrecognizedEnum.name}";
+        return "${unrecognizedEnum.originalName}";
     `);
         }
     }

package/build/main.js

@@ -1750,14 +1750,14 @@ function generateFromJson(ctx, fullName, fullTypeName, messageDesc) {
             }
             else {
                 const fallback = noDefaultValue ? (0, utils_1.nullOrUndefined)(options) : "[]";
-                const readValueSnippet = readSnippet("e");
-                if (readValueSnippet.toString() === (0, ts_poet_1.code) `e`.toString()) {
+                const needMap = readSnippet("e").toString() !== (0, ts_poet_1.code) `e`.toString();
+                if (!needMap) {
                     chunks.push((0, ts_poet_1.code) `${fieldKey}: ${ctx.utils.globalThis}.Array.isArray(${jsonPropertyOptional}) ? [...${jsonProperty}] : [],`);
                 }
                 else {
                     // Explicit `any` type required to make TS with noImplicitAny happy. `object` is also `any` here.
                     chunks.push((0, ts_poet_1.code) `
-            ${fieldKey}: ${ctx.utils.globalThis}.Array.isArray(${jsonPropertyOptional}) ? ${jsonProperty}.map((e: any) => ${readValueSnippet}): ${fallback},
+            ${fieldKey}: ${ctx.utils.globalThis}.Array.isArray(${jsonPropertyOptional}) ? ${jsonProperty}.map((e: any) => ${readSnippet("e")}): ${fallback},
           `);
                 }
             }
@@ -1969,8 +1969,8 @@ function generateToJson(ctx, fullName, fullProtobufTypeName, messageDesc) {
         }
         else if ((0, types_1.isRepeated)(field)) {
             // Arrays might need their elements transformed
-            const transformElement = readSnippet("e");
-            const maybeMap = transformElement.toCodeString([]) !== "e" ? (0, ts_poet_1.code) `.map(e => ${transformElement})` : "";
+            const needMap = readSnippet("e").toCodeString([]) !== "e";
+            const maybeMap = needMap ? (0, ts_poet_1.code) `.map(e => ${readSnippet("e")})` : "";
             chunks.push((0, ts_poet_1.code) `
         if (${messageProperty}?.length) {
           ${jsonProperty} = ${messageProperty}${maybeMap};

package/package.json

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