ts-proto 2.2.7 → 2.4.0

package/build/src/main.js

@@ -836,36 +836,27 @@ function generateInterfaceDeclaration(ctx, fullName, messageDesc, sourceInfo, fu
 }
 function generateOneofProperty(ctx, messageDesc, oneofIndex, sourceInfo) {
     const { options } = ctx;
-    const fields = messageDesc.field.filter((field) => (0, types_1.isWithinOneOf)(field) && field.oneofIndex === oneofIndex);
+    const fields = messageDesc.field
+        .map((field, index) => ({ index, field }))
+        .filter((item) => (0, types_1.isWithinOneOf)(item.field) && item.field.oneofIndex === oneofIndex);
     const mbReadonly = maybeReadonly(options);
-    const unionType = (0, ts_poet_1.joinCode)(fields.map((f) => {
-        let fieldName = (0, case_1.maybeSnakeToCamel)(f.name, options);
-        let typeName = (0, types_1.toTypeName)(ctx, messageDesc, f);
+    const info = sourceInfo.lookup(sourceInfo_1.Fields.message.oneof_decl, oneofIndex);
+    let outerComments = [];
+    (0, utils_1.maybeAddComment)(options, info, outerComments);
+    const unionType = (0, ts_poet_1.joinCode)(fields.flatMap((f) => {
+        const fieldInfo = sourceInfo.lookup(sourceInfo_1.Fields.message.field, f.index);
+        let fieldName = (0, case_1.maybeSnakeToCamel)(f.field.name, options);
+        let typeName = (0, types_1.toTypeName)(ctx, messageDesc, f.field);
         let valueName = (0, utils_1.oneofValueName)(fieldName, options);
-        return (0, ts_poet_1.code) `{ ${mbReadonly}$case: '${fieldName}', ${mbReadonly}${valueName}: ${typeName} }`;
-    }), { on: " | " });
+        let fieldComments = [];
+        (0, utils_1.maybeAddComment)(options, fieldInfo, fieldComments);
+        const combinedComments = fieldComments.join("\n");
+        return (0, ts_poet_1.code) `|${combinedComments ? " // " : ""}\n ${combinedComments} { ${mbReadonly}$case: '${fieldName}', ${mbReadonly}${valueName}: ${typeName} }`;
+    }));
     const name = (0, case_1.maybeSnakeToCamel)(messageDesc.oneofDecl[oneofIndex].name, options);
-    return (0, ts_poet_1.code) `${mbReadonly}${name}?: ${unionType} | ${(0, utils_1.nullOrUndefined)(options)},`;
-    /*
-    // Ideally we'd put the comments for each oneof field next to the anonymous
-    // type we've created in the type union above, but ts-poet currently lacks
-    // that ability. For now just concatenate all comments into one big one.
-    let comments: Array<string> = [];
-    const info = sourceInfo.lookup(Fields.message.oneof_decl, oneofIndex);
-    maybeAddComment(options, info, (text) => comments.push(text));
-    messageDesc.field.forEach((field, index) => {
-      if (!isWithinOneOf(field) || field.oneofIndex !== oneofIndex) {
-        return;
-      }
-      const info = sourceInfo.lookup(Fields.message.field, index);
-      const name = maybeSnakeToCamel(field.name, options);
-      maybeAddComment(options, info, (text) => comments.push(name + '\n' + text));
+    return (0, ts_poet_1.joinCode)([...outerComments, (0, ts_poet_1.code) `${mbReadonly}${name}?:`, unionType, (0, ts_poet_1.code) `| ${(0, utils_1.nullOrUndefined)(options)},`], {
+        on: "\n",
     });
-    if (comments.length) {
-      prop = prop.addJavadoc(comments.join('\n'));
-    }
-    return prop;
-    */
 }
 // Create a function that constructs 'base' instance with default values for decode to use as a prototype
 function generateBaseInstanceFactory(ctx, fullName, messageDesc, fullTypeName) {
@@ -1164,7 +1155,7 @@ function generateDecode(ctx, fullName, messageDesc) {
         }
         chunks.push((0, ts_poet_1.code) `
       const buf = reader.skip(tag & 7);
-      
+
       ${unknownFieldsInitializerSnippet}
       const list = message._unknownFields${maybeNonNullAssertion}[tag];
 

package/package.json

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