ts-proto 1.97.1 → 1.97.2

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [1.97.2](https://github.com/stephenh/ts-proto/compare/v1.97.1...v1.97.2) (2022-01-06)
+
+
+### Performance Improvements
+
+* fromJSON returns object literal to allow v8 optimizations ([#463](https://github.com/stephenh/ts-proto/issues/463)) ([5fcd05b](https://github.com/stephenh/ts-proto/commit/5fcd05b79e7c02547c4b6db46fae7a7202f97629))
+
 ## [1.97.1](https://github.com/stephenh/ts-proto/compare/v1.97.0...v1.97.1) (2022-01-05)
 
 

package/build/main.js

@@ -814,11 +814,16 @@ function generateEncode(ctx, fullName, messageDesc) {
 function generateFromJson(ctx, fullName, messageDesc) {
     const { options, utils, typeMap } = ctx;
     const chunks = [];
+    const choiceFieldChunks = [];
     // create the basic function declaration
     chunks.push(ts_poet_1.code `
     fromJSON(${messageDesc.field.length > 0 ? 'object' : '_'}: any): ${fullName} {
-      const message = createBase${fullName}();
+      return {
   `);
+    if (ctx.options.outputTypeRegistry) {
+        chunks.push(ts_poet_1.code `$type: ${fullName}.$type,`);
+    }
+    const oneofFieldsCases = messageDesc.oneofDecl.map((oneof, oneofIndex) => messageDesc.field.filter(types_1.isWithinOneOf).filter((field) => field.oneofIndex === oneofIndex));
     // add a check for each incoming field
     messageDesc.field.forEach((field) => {
         const fieldName = case_1.maybeSnakeToCamel(field.name, options);
@@ -931,62 +936,71 @@ function generateFromJson(ctx, fullName, messageDesc) {
                 const fieldType = types_1.toTypeName(ctx, messageDesc, field);
                 const i = maybeCastToNumber(ctx, messageDesc, field, 'key');
                 chunks.push(ts_poet_1.code `
-          message.${fieldName} = Object.entries(object.${jsonName} ?? {}).reduce<${fieldType}>((acc, [key, value]) => {
-            acc[${i}] = ${readSnippet('value')};
-            return acc;
-          }, {});
+          ${fieldName}: ${ctx.utils.isObject}(object.${jsonName})
+            ? Object.entries(object.${jsonName}).reduce<${fieldType}>((acc, [key, value]) => {
+                acc[${i}] = ${readSnippet('value')};
+                return acc;
+              }, {})
+            : {},
         `);
             }
             else {
                 const readValueSnippet = readSnippet('e');
                 if (readValueSnippet.toString() === ts_poet_1.code `e`.toString()) {
-                    chunks.push(ts_poet_1.code `message.${fieldName} = Array.isArray(object?.${jsonName}) ? [...object.${jsonName}] : [];`);
+                    chunks.push(ts_poet_1.code `${fieldName}: Array.isArray(object?.${jsonName}) ? [...object.${jsonName}] : [],`);
                 }
                 else {
                     // Explicit `any` type required to make TS with noImplicitAny happy. `object` is also `any` here.
                     chunks.push(ts_poet_1.code `
-            message.${fieldName} = Array.isArray(object?.${jsonName}) ? object.${jsonName}.map((e: any) => ${readValueSnippet}): [];
+            ${fieldName}: Array.isArray(object?.${jsonName}) ? object.${jsonName}.map((e: any) => ${readValueSnippet}): [],
           `);
                 }
             }
         }
         else if (types_1.isWithinOneOfThatShouldBeUnion(options, field)) {
-            chunks.push(ts_poet_1.code `if (${ctx.utils.isSet}(object.${jsonName})) {`);
-            const oneofName = case_1.maybeSnakeToCamel(messageDesc.oneofDecl[field.oneofIndex].name, options);
-            chunks.push(ts_poet_1.code `
-        message.${oneofName} = { $case: '${fieldName}', ${fieldName}: ${readSnippet(`object.${jsonName}`)} }
-      `);
-            chunks.push(ts_poet_1.code `}`);
+            const cases = oneofFieldsCases[field.oneofIndex];
+            const firstCase = cases[0];
+            const lastCase = cases[cases.length - 1];
+            if (field === firstCase) {
+                const fieldName = case_1.maybeSnakeToCamel(messageDesc.oneofDecl[field.oneofIndex].name, options);
+                chunks.push(ts_poet_1.code `${fieldName}: `);
+            }
+            const ternaryIf = ts_poet_1.code `${ctx.utils.isSet}(object.${jsonName})`;
+            const ternaryThen = ts_poet_1.code `{ $case: '${fieldName}', ${fieldName}: ${readSnippet(`object.${jsonName}`)}`;
+            chunks.push(ts_poet_1.code `${ternaryIf} ? ${ternaryThen}} : `);
+            if (field === lastCase) {
+                chunks.push(ts_poet_1.code `undefined,`);
+            }
         }
         else if (types_1.isAnyValueType(field)) {
-            chunks.push(ts_poet_1.code `message.${fieldName} = ${ctx.utils.isSet}(object?.${jsonName})
+            chunks.push(ts_poet_1.code `${fieldName}: ${ctx.utils.isSet}(object?.${jsonName})
         ? ${readSnippet(`object.${jsonName}`)}
-        : undefined;
+        : undefined,
       `);
         }
         else if (types_1.isStructType(field)) {
-            chunks.push(ts_poet_1.code `message.${fieldName} = ${ctx.utils.isObject}(object.${jsonName})
+            chunks.push(ts_poet_1.code `${fieldName}: ${ctx.utils.isObject}(object.${jsonName})
           ? ${readSnippet(`object.${jsonName}`)}
-          : undefined;`);
+          : undefined,`);
         }
         else if (types_1.isListValueType(field)) {
             chunks.push(ts_poet_1.code `
-        message.${fieldName} = Array.isArray(object.${jsonName})
+        ${fieldName}: Array.isArray(object.${jsonName})
           ? ${readSnippet(`object.${jsonName}`)}
-          : ${'undefined'};
+          : undefined,
       `);
         }
         else {
             const fallback = types_1.isWithinOneOf(field) ? 'undefined' : types_1.defaultValue(ctx, field);
             chunks.push(ts_poet_1.code `
-        message.${fieldName} = ${ctx.utils.isSet}(object.${jsonName})
+        ${fieldName}: ${ctx.utils.isSet}(object.${jsonName})
           ? ${readSnippet(`object.${jsonName}`)}
-          : ${fallback};
+          : ${fallback},
       `);
         }
     });
     // and then wrap up the switch/while/return
-    chunks.push(ts_poet_1.code `return message`);
+    chunks.push(ts_poet_1.code `};`);
     chunks.push(ts_poet_1.code `}`);
     return ts_poet_1.joinCode(chunks, { on: '\n' });
 }

package/package.json

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