ts-proto 2.4.0 → 2.4.2

package/build/src/main.js

@@ -1971,6 +1971,7 @@ function generateToJson(ctx, fullName, fullProtobufTypeName, messageDesc) {
     toJSON(${messageDesc.field.length > 0 ? "message" : "_"}: ${fullName}): unknown {
       const obj: any = {};
   `);
+    let currentIfTarget = "";
     // then add a case for each field
     messageDesc.field.forEach((field) => {
         const fieldName = (0, utils_1.getFieldName)(field, options);
@@ -2120,10 +2121,11 @@ function generateToJson(ctx, fullName, fullProtobufTypeName, messageDesc) {
                 : (0, utils_1.getPropertyAccessor)("message", (0, case_1.maybeSnakeToCamel)(messageDesc.oneofDecl[field.oneofIndex].name, options));
             const valueName = (0, utils_1.oneofValueName)(fieldName, options);
             chunks.push((0, ts_poet_1.code) `
-        if (${oneofNameWithMessage}?.$case === '${fieldName}') {
+        ${currentIfTarget === oneofNameWithMessage ? "else " : ""}if (${oneofNameWithMessage}?.$case === '${fieldName}') {
           ${jsonProperty} = ${readSnippet(`${oneofNameWithMessage}.${valueName}`)};
         }
       `);
+            currentIfTarget = oneofNameWithMessage;
         }
         else {
             let emitDefaultValuesForJson = ctx.options.emitDefaultValues.includes("json-methods");
@@ -2176,11 +2178,17 @@ function generateFromPartial(ctx, fullName, messageDesc) {
         createBase = (0, ts_poet_1.code) `Object.create(${createBase}) as ${fullName}`;
     }
     chunks.push((0, ts_poet_1.code) `const message = ${createBase}${maybeAsAny(options)};`);
+    let currentSwitchTarget;
     // add a check for each incoming field
     messageDesc.field.forEach((field) => {
         const fieldName = (0, utils_1.getFieldName)(field, options);
         const messageProperty = (0, utils_1.getPropertyAccessor)("message", fieldName);
         const objectProperty = (0, utils_1.getPropertyAccessor)("object", fieldName);
+        if (currentSwitchTarget && !(0, types_1.isWithinOneOfThatShouldBeUnion)(options, field)) {
+            // We are exiting a switch, we need to close it
+            chunks.push((0, ts_poet_1.code) `}`);
+            currentSwitchTarget = undefined;
+        }
         const readSnippet = (from) => {
             if (((0, types_1.isLong)(field) || (0, types_1.isLongValueType)(field)) &&
                 options.forceLong === options_1.LongOption.LONG &&
@@ -2297,15 +2305,24 @@ function generateFromPartial(ctx, fullName, messageDesc) {
             const oneofNameWithObject = (0, utils_1.getPropertyAccessor)("object", oneofName);
             const valueName = (0, utils_1.oneofValueName)(fieldName, options);
             const v = readSnippet(`${oneofNameWithObject}.${valueName}`);
+            // If we are entering a new switch, close the previous one
+            if (currentSwitchTarget !== undefined && currentSwitchTarget !== oneofNameWithObject) {
+                chunks.push((0, ts_poet_1.code) `}`);
+                currentSwitchTarget = undefined;
+            }
+            if (currentSwitchTarget === undefined) {
+                chunks.push((0, ts_poet_1.code) `switch (${oneofNameWithObject}?.$case) {`);
+            }
             chunks.push((0, ts_poet_1.code) `
-        if (
-          ${oneofNameWithObject}?.$case === '${fieldName}'
-          && ${oneofNameWithObject}?.${valueName} !== undefined
-          && ${oneofNameWithObject}?.${valueName} !== null
-        ) {
-          ${oneofNameWithMessage} = { $case: '${fieldName}', ${valueName}: ${v} };
+        case '${fieldName}': {
+          if (${oneofNameWithObject}?.${valueName} !== undefined
+              && ${oneofNameWithObject}?.${valueName} !== null) {
+            ${oneofNameWithMessage} = { $case: '${fieldName}', ${valueName}: ${v} };
+          }
+          break;
         }
       `);
+            currentSwitchTarget = oneofNameWithObject;
         }
         else if (readSnippet(`x`).toCodeString([]) == "x") {
             // An optimized case of the else below that works when `readSnippet` returns the plain input
@@ -2321,6 +2338,11 @@ function generateFromPartial(ctx, fullName, messageDesc) {
       `);
         }
     });
+    if (currentSwitchTarget) {
+        // We are exiting a switch, we need to close it
+        chunks.push((0, ts_poet_1.code) `}`);
+        currentSwitchTarget = "";
+    }
     // and then wrap up the switch/while/return
     chunks.push((0, ts_poet_1.code) `return message;`);
     chunks.push((0, ts_poet_1.code) `}`);

package/package.json

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