ts-proto 1.83.3 → 1.84.0

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [1.84.0](https://github.com/stephenh/ts-proto/compare/v1.83.3...v1.84.0) (2021-11-02)
+
+
+### Features
+
+* Reduce code size by using nullish coalescing operator in fromPartial ([#376](https://github.com/stephenh/ts-proto/issues/376)) ([19d2ded](https://github.com/stephenh/ts-proto/commit/19d2deda2cf7c47b1b56bfc65cf58653291dba4a))
+
 ## [1.83.3](https://github.com/stephenh/ts-proto/compare/v1.83.2...v1.83.3) (2021-10-28)
 
 

package/build/main.js

@@ -1002,12 +1002,6 @@ function generateFromPartial(ctx, fullName, messageDesc) {
     fromPartial(${messageDesc.field.length > 0 ? 'object' : '_'}: ${utils.DeepPartial}<${fullName}>): ${fullName} {
       const message = { ...base${fullName} } as ${fullName};
   `);
-    // initialize all lists
-    messageDesc.field.filter(types_1.isRepeated).forEach((field) => {
-        const value = types_1.isMapType(ctx, messageDesc, field) ? '{}' : '[]';
-        const name = case_1.maybeSnakeToCamel(field.name, options);
-        chunks.push(ts_poet_1.code `message.${name} = ${value};`);
-    });
     // add a check for each incoming field
     messageDesc.field.forEach((field) => {
         const fieldName = case_1.maybeSnakeToCamel(field.name, options);
@@ -1055,6 +1049,9 @@ function generateFromPartial(ctx, fullName, messageDesc) {
         };
         // and then use the snippet to handle repeated fields if necessary
         if (types_1.isRepeated(field)) {
+            const value = types_1.isMapType(ctx, messageDesc, field) ? '{}' : '[]';
+            const name = case_1.maybeSnakeToCamel(field.name, options);
+            chunks.push(ts_poet_1.code `message.${name} = ${value};`);
             chunks.push(ts_poet_1.code `if (object.${fieldName} !== undefined && object.${fieldName} !== null) {`);
             if (types_1.isMapType(ctx, messageDesc, field)) {
                 const i = maybeCastToNumber(ctx, messageDesc, field, 'key');
@@ -1073,6 +1070,7 @@ function generateFromPartial(ctx, fullName, messageDesc) {
           }
         `);
             }
+            chunks.push(ts_poet_1.code `}`);
         }
         else if (types_1.isWithinOneOfThatShouldBeUnion(options, field)) {
             let oneofName = case_1.maybeSnakeToCamel(messageDesc.oneofDecl[field.oneofIndex].name, options);
@@ -1084,25 +1082,34 @@ function generateFromPartial(ctx, fullName, messageDesc) {
           && object.${oneofName}?.${fieldName} !== null
         ) {
           message.${oneofName} = { $case: '${fieldName}', ${fieldName}: ${v} };
+        }  
       `);
         }
-        else {
+        else if ((types_1.isLong(field) || types_1.isLongValueType(field)) && options.forceLong === options_1.LongOption.LONG) {
+            const v = readSnippet(`object.${fieldName}`);
+            const type = types_1.basicTypeName(ctx, field);
             chunks.push(ts_poet_1.code `if (object.${fieldName} !== undefined && object.${fieldName} !== null) {`);
-            if ((types_1.isLong(field) || types_1.isLongValueType(field)) && options.forceLong === options_1.LongOption.LONG) {
-                const v = readSnippet(`object.${fieldName}`);
-                const type = types_1.basicTypeName(ctx, field);
-                chunks.push(ts_poet_1.code `message.${fieldName} = ${v} as ${type};`);
-            }
-            else {
-                chunks.push(ts_poet_1.code `message.${fieldName} = ${readSnippet(`object.${fieldName}`)};`);
-            }
+            chunks.push(ts_poet_1.code `message.${fieldName} = ${v} as ${type};`);
+            chunks.push(ts_poet_1.code `} else {`);
+            const fallback = types_1.isWithinOneOf(field) ? 'undefined' : types_1.defaultValue(ctx, field);
+            chunks.push(ts_poet_1.code `message.${fieldName} = ${fallback}`);
+            chunks.push(ts_poet_1.code `}`);
         }
-        if (!types_1.isRepeated(field) && !types_1.isWithinOneOfThatShouldBeUnion(options, field)) {
+        else if (types_1.isPrimitive(field) ||
+            (types_1.isTimestamp(field) && (options.useDate === options_1.DateOption.DATE || options.useDate === options_1.DateOption.STRING)) ||
+            types_1.isValueType(ctx, field)) {
+            // An optimized case of the else below that works when `readSnippet` returns the plain input
+            const fallback = types_1.isWithinOneOf(field) ? 'undefined' : types_1.defaultValue(ctx, field);
+            chunks.push(ts_poet_1.code `message.${fieldName} = object.${fieldName} ?? ${fallback};`);
+        }
+        else {
+            chunks.push(ts_poet_1.code `if (object.${fieldName} !== undefined && object.${fieldName} !== null) {`);
+            chunks.push(ts_poet_1.code `message.${fieldName} = ${readSnippet(`object.${fieldName}`)};`);
             chunks.push(ts_poet_1.code `} else {`);
-            const v = types_1.isWithinOneOf(field) ? 'undefined' : types_1.defaultValue(ctx, field);
-            chunks.push(ts_poet_1.code `message.${fieldName} = ${v}`);
+            const fallback = types_1.isWithinOneOf(field) ? 'undefined' : types_1.defaultValue(ctx, field);
+            chunks.push(ts_poet_1.code `message.${fieldName} = ${fallback}`);
+            chunks.push(ts_poet_1.code `}`);
         }
-        chunks.push(ts_poet_1.code `}`);
     });
     // and then wrap up the switch/while/return
     chunks.push(ts_poet_1.code `return message;`);

package/package.json

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