ts-proto 1.156.2 → 1.156.4

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");
@@ -171,6 +171,7 @@ function getMemberName(ctx, fullName, valueDesc) {
     }
     return valueDesc.name;
 }
+exports.getMemberName = getMemberName;
 function getValueName(ctx, fullName, valueDesc) {
     return valueDesc.name;
 }

package/build/plugin.js

@@ -20,17 +20,19 @@ async function main() {
     let filesToGenerate;
     if (options.emitImportedFiles) {
         const fileSet = new Set();
-        const addFilesUnlessAliased = (filenames) => {
+        function addFilesUnlessAliased(filenames) {
             filenames
                 .filter((name) => !options.M[name])
                 .forEach((name) => {
+                if (fileSet.has(name))
+                    return;
                 fileSet.add(name);
                 const file = request.protoFile.find((file) => file.name === name);
                 if (file && file.dependency.length > 0) {
                     addFilesUnlessAliased(file.dependency);
                 }
             });
-        };
+        }
         addFilesUnlessAliased(request.fileToGenerate);
         filesToGenerate = request.protoFile.filter((file) => fileSet.has(file.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,13 @@ 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 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}.${zerothValue.name}`;
+                return (0, ts_poet_1.code) `${enumType}.${(0, enums_1.getMemberName)(ctx, enumFullName, zerothValue)}`;
             }
             else {
                 return zerothValue.number;
@@ -254,11 +257,14 @@ 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 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) `${maybeNotUndefinedAnd} ${place} !== ${enumType}.${zerothValue.name}`;
+                const enumValue = (0, enums_1.getMemberName)(ctx, enumFullName, 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.2",
+  "version": "1.156.4",
   "description": "",
   "main": "build/plugin.js",
   "repository": "github:stephenh/ts-proto",