ts-proto 1.143.0 → 1.144.0

package/build/main.js

@@ -580,6 +580,9 @@ function generateInterfaceDeclaration(ctx, fullName, messageDesc, sourceInfo, fu
         const q = (0, types_1.isOptionalProperty)(fieldDesc, messageDesc.options, options) ? "?" : "";
         chunks.push((0, ts_poet_1.code) `${maybeReadonly(options)}${name}${q}: ${type}, `);
     });
+    if (ctx.options.unknownFields) {
+        chunks.push((0, ts_poet_1.code) `_unknownFields?: {[key: number]: Uint8Array[]},`);
+    }
     chunks.push((0, ts_poet_1.code) `}`);
     return (0, ts_poet_1.joinCode)(chunks, { on: "\n" });
 }
@@ -649,6 +652,9 @@ function generateBaseInstanceFactory(ctx, fullName, messageDesc, fullTypeName) {
     if (ctx.options.outputTypeRegistry) {
         fields.unshift((0, ts_poet_1.code) `$type: '${fullTypeName}'`);
     }
+    if (ctx.options.unknownFields && ctx.options.initializeFieldsAsUndefined) {
+        fields.push((0, ts_poet_1.code) `_unknownFields: {}`);
+    }
     return (0, ts_poet_1.code) `
     function createBase${fullName}(): ${fullName} {
       return { ${(0, ts_poet_1.joinCode)(fields, { on: "," })} };
@@ -674,9 +680,6 @@ function generateDecode(ctx, fullName, messageDesc) {
       let end = length === undefined ? reader.len : reader.pos + length;
   `);
     chunks.push((0, ts_poet_1.code) `const message = ${createBase}${maybeAsAny(options)};`);
-    if (options.unknownFields) {
-        chunks.push((0, ts_poet_1.code) `(message as any)._unknownFields = {}`);
-    }
     // start the tag loop
     chunks.push((0, ts_poet_1.code) `
     while (reader.pos < end) {
@@ -837,16 +840,26 @@ function generateDecode(ctx, fullName, messageDesc) {
         break;
   `);
     if (options.unknownFields) {
+        let unknownFieldsInitializerSnippet = "";
+        let maybeNonNullAssertion = options.initializeFieldsAsUndefined ? "!" : "";
+        if (!options.initializeFieldsAsUndefined) {
+            unknownFieldsInitializerSnippet = `
+        if(message._unknownFields === undefined)
+          message._unknownFields = {};
+      `;
+        }
         chunks.push((0, ts_poet_1.code) `
-        const startPos = reader.pos;
-        reader.skipType(tag & 7);
-        const buf = reader.buf.slice(startPos, reader.pos);
-        const list = (message as any)._unknownFields[tag];
+      const startPos = reader.pos;
+      reader.skipType(tag & 7);
+      const buf = reader.buf.slice(startPos, reader.pos);
+
+      ${unknownFieldsInitializerSnippet}
+      const list = message._unknownFields${maybeNonNullAssertion}[tag];
 
-        if(list === undefined)
-          (message as any)._unknownFields[tag] = [buf];
-        else
-          list.push(buf);
+      if(list === undefined)
+        message._unknownFields${maybeNonNullAssertion}[tag] = [buf];
+      else
+        list.push(buf);
     `);
     }
     else {
@@ -1067,12 +1080,12 @@ function generateEncode(ctx, fullName, messageDesc) {
         }
     });
     if (options.unknownFields) {
-        chunks.push((0, ts_poet_1.code) `if ('_unknownFields' in message) {
-      const msgUnknownFields: any = (message as any)['_unknownFields']
-      for (const key of Object.keys(msgUnknownFields)) {
-        const values = msgUnknownFields[key] as Uint8Array[];
+        chunks.push((0, ts_poet_1.code) `if (message._unknownFields !== undefined) {
+      for (const key in message._unknownFields) {
+        const values = message._unknownFields[key];
+        const tag = parseInt(key, 10);
         for (const value of values) {
-          writer.uint32(parseInt(key, 10));
+          writer.uint32(tag);
           (writer as any)['_push'](
             (val: Uint8Array, buf: Buffer, pos: number) => buf.set(val, pos),
             value.length,

package/package.json

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