ts-proto 1.156.3 → 1.156.5

package/build/enums.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateEnumToNumber = exports.generateEnumToJson = exports.generateEnumFromJson = exports.generateEnum = void 0;
+exports.getMemberName = exports.generateEnumToNumber = exports.generateEnumToJson = exports.generateEnumFromJson = exports.generateEnum = void 0;
 const ts_poet_1 = require("ts-poet");
 const utils_1 = require("./utils");
 const case_1 = require("./case");
@@ -24,7 +24,7 @@ function generateEnum(ctx, fullName, enumDesc, sourceInfo) {
         var _a;
         const info = sourceInfo.lookup(sourceInfo_1.Fields.enum.value, index);
         const valueName = getValueName(ctx, fullName, valueDesc);
-        const memberName = getMemberName(ctx, fullName, valueDesc);
+        const memberName = getMemberName(ctx, enumDesc, valueDesc);
         (0, utils_1.maybeAddComment)(info, chunks, (_a = valueDesc.options) === null || _a === void 0 ? void 0 : _a.deprecated, `${memberName} - `);
         chunks.push((0, ts_poet_1.code) `${memberName} ${delimiter} ${options.stringEnums ? `"${valueName}"` : valueDesc.number.toString()},`);
     });
@@ -62,7 +62,7 @@ function generateEnumFromJson(ctx, fullName, enumDesc) {
     chunks.push((0, ts_poet_1.code) `export function ${(0, ts_poet_1.def)(functionName)}(object: any): ${fullName} {`);
     chunks.push((0, ts_poet_1.code) `switch (object) {`);
     for (const valueDesc of enumDesc.value) {
-        const memberName = getMemberName(ctx, fullName, valueDesc);
+        const memberName = getMemberName(ctx, enumDesc, valueDesc);
         const valueName = getValueName(ctx, fullName, valueDesc);
         chunks.push((0, ts_poet_1.code) `
       case ${valueDesc.number}:
@@ -99,11 +99,11 @@ function generateEnumToJson(ctx, fullName, enumDesc) {
     chunks.push((0, ts_poet_1.code) `switch (object) {`);
     for (const valueDesc of enumDesc.value) {
         if (ctx.options.useNumericEnumForJson) {
-            const memberName = getMemberName(ctx, fullName, valueDesc);
+            const memberName = getMemberName(ctx, enumDesc, valueDesc);
             chunks.push((0, ts_poet_1.code) `case ${fullName}.${memberName}: return ${valueDesc.number};`);
         }
         else {
-            const memberName = getMemberName(ctx, fullName, valueDesc);
+            const memberName = getMemberName(ctx, enumDesc, valueDesc);
             const valueName = getValueName(ctx, fullName, valueDesc);
             chunks.push((0, ts_poet_1.code) `case ${fullName}.${memberName}: return "${valueName}";`);
         }
@@ -144,7 +144,7 @@ function generateEnumToNumber(ctx, fullName, enumDesc) {
     chunks.push((0, ts_poet_1.code) `export function ${(0, ts_poet_1.def)(functionName)}(object: ${fullName}): number {`);
     chunks.push((0, ts_poet_1.code) `switch (object) {`);
     for (const valueDesc of enumDesc.value) {
-        chunks.push((0, ts_poet_1.code) `case ${fullName}.${getMemberName(ctx, fullName, valueDesc)}: return ${valueDesc.number};`);
+        chunks.push((0, ts_poet_1.code) `case ${fullName}.${getMemberName(ctx, enumDesc, valueDesc)}: return ${valueDesc.number};`);
     }
     if (options.unrecognizedEnum) {
         chunks.push((0, ts_poet_1.code) `
@@ -165,12 +165,13 @@ function generateEnumToNumber(ctx, fullName, enumDesc) {
     return (0, ts_poet_1.joinCode)(chunks, { on: "\n" });
 }
 exports.generateEnumToNumber = generateEnumToNumber;
-function getMemberName(ctx, fullName, valueDesc) {
+function getMemberName(ctx, enumDesc, valueDesc) {
     if (ctx.options.removeEnumPrefix) {
-        return valueDesc.name.replace(`${(0, case_1.camelToSnake)(fullName)}_`, "");
+        return valueDesc.name.replace(`${(0, case_1.camelToSnake)(enumDesc.name)}_`, "");
     }
     return valueDesc.name;
 }
+exports.getMemberName = getMemberName;
 function getValueName(ctx, fullName, valueDesc) {
     return valueDesc.name;
 }

package/build/types.js

@@ -8,6 +8,7 @@ const visit_1 = require("./visit");
 const utils_1 = require("./utils");
 const sourceInfo_1 = require("./sourceInfo");
 const case_1 = require("./case");
+const enums_1 = require("./enums");
 /** Based on https://github.com/dcodeIO/protobuf.js/blob/master/src/types.js#L37. */
 function basicWireType(type) {
     switch (type) {
@@ -179,11 +180,12 @@ function defaultValue(ctx, field) {
             // to probe and see if zero is an allowed value. If it's not, pick the first one.
             // This is probably not great, but it's only used in fromJSON and fromPartial,
             // and I believe the semantics of those in the proto2 world are generally undefined.
-            const enumProto = typeMap.get(field.typeName)[2];
+            const typeInfo = typeMap.get(field.typeName);
+            const enumProto = typeInfo[2];
             const zerothValue = enumProto.value.find((v) => v.number === 0) || enumProto.value[0];
             if (options.stringEnums) {
                 const enumType = messageToTypeName(ctx, field.typeName);
-                return (0, ts_poet_1.code) `${enumType}.${zerothValue.name}`;
+                return (0, ts_poet_1.code) `${enumType}.${(0, enums_1.getMemberName)(ctx, enumProto, zerothValue)}`;
             }
             else {
                 return zerothValue.number;
@@ -254,11 +256,13 @@ function notDefaultCheck(ctx, field, messageOptions, place) {
             // to probe and see if zero is an allowed value. If it's not, pick the first one.
             // This is probably not great, but it's only used in fromJSON and fromPartial,
             // and I believe the semantics of those in the proto2 world are generally undefined.
-            const enumProto = typeMap.get(field.typeName)[2];
+            const typeInfo = typeMap.get(field.typeName);
+            const enumProto = typeInfo[2];
             const zerothValue = enumProto.value.find((v) => v.number === 0) || enumProto.value[0];
             if (options.stringEnums) {
                 const enumType = messageToTypeName(ctx, field.typeName);
-                return (0, ts_poet_1.code) `${maybeNotUndefinedAnd} ${place} !== ${enumType}.${zerothValue.name}`;
+                const enumValue = (0, enums_1.getMemberName)(ctx, enumProto, zerothValue);
+                return (0, ts_poet_1.code) `${maybeNotUndefinedAnd} ${place} !== ${enumType}.${enumValue}`;
             }
             else {
                 return (0, ts_poet_1.code) `${maybeNotUndefinedAnd} ${place} !== ${zerothValue.number}`;

package/package.json

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