ts-proto 1.85.0 → 1.86.0

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [1.86.0](https://github.com/stephenh/ts-proto/compare/v1.85.0...v1.86.0) (2021-11-15)
+
+
+### Features
+
+* Initialize lists with map ([#387](https://github.com/stephenh/ts-proto/issues/387)) ([200e674](https://github.com/stephenh/ts-proto/commit/200e674e4baf2640d67720ad535fe042d291d4a0))
+
 # [1.85.0](https://github.com/stephenh/ts-proto/compare/v1.84.0...v1.85.0) (2021-11-02)
 
 

package/build/main.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.contextTypeVar = exports.makeUtils = exports.generateFile = void 0;
 const ts_poet_1 = require("ts-poet");
-const ts_proto_descriptors_1 = require("ts-proto-descriptors");
 const types_1 = require("./types");
 const sourceInfo_1 = require("./sourceInfo");
 const utils_1 = require("./utils");
@@ -739,20 +738,6 @@ function generateFromJson(ctx, fullName, messageDesc) {
     fromJSON(${messageDesc.field.length > 0 ? 'object' : '_'}: any): ${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};`);
-    });
-    // initialize all buffers
-    messageDesc.field
-        .filter((field) => !types_1.isRepeated(field) && !types_1.isWithinOneOf(field) && types_1.isBytes(field))
-        .forEach((field) => {
-        const value = options.env === options_1.EnvOption.NODE ? 'Buffer.alloc(0)' : 'new Uint8Array()';
-        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);
@@ -847,42 +832,41 @@ function generateFromJson(ctx, fullName, messageDesc) {
             }
         };
         // and then use the snippet to handle repeated fields if necessary
-        chunks.push(ts_poet_1.code `if (object.${fieldName} !== undefined && object.${fieldName} !== null) {`);
         if (types_1.isRepeated(field)) {
             if (types_1.isMapType(ctx, messageDesc, field)) {
+                chunks.push(ts_poet_1.code `message.${fieldName} = {};`);
+                chunks.push(ts_poet_1.code `if (object.${fieldName} !== undefined && object.${fieldName} !== null) {`);
                 const i = maybeCastToNumber(ctx, messageDesc, field, 'key');
                 chunks.push(ts_poet_1.code `
           Object.entries(object.${fieldName}).forEach(([key, value]) => {
             message.${fieldName}[${i}] = ${readSnippet('value')};
           });
         `);
+                chunks.push(ts_poet_1.code `}`);
             }
             else {
+                // Explicit `any` type required to make TS with noImplicitAny happy. `object` is also `any` here.
                 chunks.push(ts_poet_1.code `
-          for (const e of object.${fieldName}) {
-            message.${fieldName}.push(${readSnippet('e')});
-          }
+          message.${fieldName} = (object.${fieldName} ?? []).map((e: any) => ${readSnippet('e')});
         `);
             }
         }
         else if (types_1.isWithinOneOfThatShouldBeUnion(options, field)) {
+            chunks.push(ts_poet_1.code `if (object.${fieldName} !== undefined && object.${fieldName} !== null) {`);
             const oneofName = case_1.maybeSnakeToCamel(messageDesc.oneofDecl[field.oneofIndex].name, options);
             chunks.push(ts_poet_1.code `
         message.${oneofName} = { $case: '${fieldName}', ${fieldName}: ${readSnippet(`object.${fieldName}`)} }
       `);
+            chunks.push(ts_poet_1.code `}`);
         }
         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}`)};`);
-        }
-        // set the default value (TODO Support bytes)
-        if (!types_1.isRepeated(field) &&
-            field.type !== ts_proto_descriptors_1.FieldDescriptorProto_Type.TYPE_BYTES &&
-            options.oneof !== options_1.OneofOption.UNIONS) {
-            const v = types_1.isWithinOneOf(field) ? 'undefined' : types_1.defaultValue(ctx, field);
             chunks.push(ts_poet_1.code `} else {`);
-            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`);
@@ -1055,11 +1039,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)) {
+                chunks.push(ts_poet_1.code `message.${fieldName} = {};`);
+                chunks.push(ts_poet_1.code `if (object.${fieldName} !== undefined && object.${fieldName} !== null) {`);
                 const i = maybeCastToNumber(ctx, messageDesc, field, 'key');
                 chunks.push(ts_poet_1.code `
           Object.entries(object.${fieldName}).forEach(([key, value]) => {
@@ -1068,15 +1050,13 @@ function generateFromPartial(ctx, fullName, messageDesc) {
             }
           });
         `);
+                chunks.push(ts_poet_1.code `}`);
             }
             else {
                 chunks.push(ts_poet_1.code `
-          for (const e of object.${fieldName}) {
-            message.${fieldName}.push(${readSnippet('e')});
-          }
+          message.${fieldName} = (object.${fieldName} ?? []).map((e) => ${readSnippet('e')});
         `);
             }
-            chunks.push(ts_poet_1.code `}`);
         }
         else if (types_1.isWithinOneOfThatShouldBeUnion(options, field)) {
             let oneofName = case_1.maybeSnakeToCamel(messageDesc.oneofDecl[field.oneofIndex].name, options);
@@ -1113,7 +1093,7 @@ function generateFromPartial(ctx, fullName, messageDesc) {
             chunks.push(ts_poet_1.code `message.${fieldName} = ${readSnippet(`object.${fieldName}`)};`);
             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 `message.${fieldName} = ${fallback};`);
             chunks.push(ts_poet_1.code `}`);
         }
     });

package/package.json

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