ts-proto 1.180.0 → 1.181.1

package/README.markdown

@@ -555,6 +555,10 @@ Generated code will be placed in the Gradle build directory.
 
 - With `--ts_proto_opt=useNullAsOptional=true`, `undefined` values will be converted to `null`, and if you use `optional` label in your `.proto` file, the field will have `undefined` type as well. for example:
 
+- With `--ts_proto_opt=typePrefix=MyPrefix`, the generated interfaces, enums, and factories will have a prefix of `MyPrefix` in their names.
+
+- With `--ts_proto_opt=typeSuffix=MySuffix`, the generated interfaces, enums, and factories will have a suffix of `MySuffix` in their names.
+
 ```protobuf
 message ProfileInfo {
     int32 id = 1;
@@ -772,7 +776,7 @@ Will generate a `Foo` type with two fields: `field_a: string | undefined;` and `
 
 With this output, you'll have to check both `if object.field_a` and `if object.field_b`, and if you set one, you'll have to remember to unset the other.
 
-Instead, we recommend using the `oneof=unions-value` option, which will change the output to be an Abstract Data Type/ADT like:
+Instead, we recommend using the `oneof=unions-value` option, which will change the output to be an Algebraic Data Type/ADT like:
 
 ```typescript
 interface YourMessage {

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/build/options.d.ts

@@ -99,6 +99,8 @@ export type Options = {
     annotateFilesWithVersion: boolean;
     noDefaultsForOptionals: boolean;
     bigIntLiteral: boolean;
+    typePrefix: string;
+    typeSuffix: string;
 };
 export declare function defaultOptions(): Options;
 export declare function optionsFromParameter(parameter: string | undefined): Options;

package/build/options.js

@@ -106,6 +106,8 @@ function defaultOptions() {
         annotateFilesWithVersion: true,
         noDefaultsForOptionals: false,
         bigIntLiteral: true,
+        typePrefix: "",
+        typeSuffix: "",
     };
 }
 exports.defaultOptions = defaultOptions;

package/build/visit.js

@@ -11,8 +11,9 @@ function visit(proto, sourceInfo, messageFn, options, enumFn = () => { }, tsPref
         const protoFullName = protoPrefix + enumDesc.name;
         // I.e. FooBar_ZazInner
         const tsFullName = tsPrefix + (0, case_1.maybeSnakeToCamel)(enumDesc.name, options);
+        const tsFullNameWithAffixes = `${options.typePrefix}${tsFullName}${options.typeSuffix}`;
         const nestedSourceInfo = sourceInfo.open(childEnumType, index);
-        enumFn(tsFullName, enumDesc, nestedSourceInfo, protoFullName);
+        enumFn(tsFullNameWithAffixes, enumDesc, nestedSourceInfo, protoFullName);
     });
     const messages = "messageType" in proto ? proto.messageType : proto.nestedType;
     const childType = isRootFile ? sourceInfo_1.Fields.file.message_type : sourceInfo_1.Fields.message.nested_type;
@@ -21,8 +22,9 @@ function visit(proto, sourceInfo, messageFn, options, enumFn = () => { }, tsPref
         const protoFullName = protoPrefix + message.name;
         // I.e. FooBar_ZazInner
         const tsFullName = tsPrefix + (0, case_1.maybeSnakeToCamel)(messageName(message), options);
+        const tsFullNameWithAffixes = `${options.typePrefix}${tsFullName}${options.typeSuffix}`;
         const nestedSourceInfo = sourceInfo.open(childType, index);
-        messageFn(tsFullName, message, nestedSourceInfo, protoFullName);
+        messageFn(tsFullNameWithAffixes, message, nestedSourceInfo, protoFullName);
         const delim = options.useSnakeTypeName ? "_" : "";
         visit(message, nestedSourceInfo, messageFn, options, enumFn, tsFullName + delim, protoFullName + ".");
     });

package/package.json

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