ts-proto 1.156.4 → 1.156.6

package/build/enums.js

@@ -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,9 +165,9 @@ 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;
 }

package/build/main.js

@@ -614,9 +614,6 @@ function generateInterfaceDeclaration(ctx, fullName, messageDesc, sourceInfo, fu
         const name = (0, case_1.maybeSnakeToCamel)(fieldDesc.name, options);
         const isOptional = (0, types_1.isOptionalProperty)(fieldDesc, messageDesc.options, options);
         const type = (0, types_1.toTypeName)(ctx, messageDesc, fieldDesc, isOptional);
-        if (isOptional && !type.toString().includes("undefined")) {
-            console.warn(name, type);
-        }
         chunks.push((0, ts_poet_1.code) `${maybeReadonly(options)}${name}${isOptional ? "?" : ""}: ${type}, `);
     });
     if (ctx.options.unknownFields) {

package/build/types.js

@@ -182,11 +182,10 @@ function defaultValue(ctx, field) {
             // and I believe the semantics of those in the proto2 world are generally undefined.
             const typeInfo = typeMap.get(field.typeName);
             const enumProto = typeInfo[2];
-            const enumFullName = typeInfo[1];
             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}.${(0, enums_1.getMemberName)(ctx, enumFullName, zerothValue)}`;
+                return (0, ts_poet_1.code) `${enumType}.${(0, enums_1.getMemberName)(ctx, enumProto, zerothValue)}`;
             }
             else {
                 return zerothValue.number;
@@ -259,11 +258,10 @@ function notDefaultCheck(ctx, field, messageOptions, place) {
             // and I believe the semantics of those in the proto2 world are generally undefined.
             const typeInfo = typeMap.get(field.typeName);
             const enumProto = typeInfo[2];
-            const enumFullName = typeInfo[1];
             const zerothValue = enumProto.value.find((v) => v.number === 0) || enumProto.value[0];
             if (options.stringEnums) {
                 const enumType = messageToTypeName(ctx, field.typeName);
-                const enumValue = (0, enums_1.getMemberName)(ctx, enumFullName, zerothValue);
+                const enumValue = (0, enums_1.getMemberName)(ctx, enumProto, zerothValue);
                 return (0, ts_poet_1.code) `${maybeNotUndefinedAnd} ${place} !== ${enumType}.${enumValue}`;
             }
             else {

package/package.json

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