ts-proto 1.143.0 → 1.144.1

package/build/generate-generic-service-definition.js

@@ -67,12 +67,11 @@ function generateMethodOptions(ctx, options) {
         else if (options.idempotencyLevel === ts_proto_descriptors_1.MethodOptions_IdempotencyLevel.NO_SIDE_EFFECTS) {
             chunks.push((0, ts_poet_1.code) `idempotencyLevel: 'NO_SIDE_EFFECTS',`);
         }
-        if ("_unknownFields" in options) {
-            const msgUnknownFields = options["_unknownFields"];
+        if (options._unknownFields !== undefined) {
             const unknownFieldsChunks = [];
             unknownFieldsChunks.push((0, ts_poet_1.code) `{`);
-            for (const key of Object.keys(msgUnknownFields)) {
-                const values = msgUnknownFields[key];
+            for (const key in options._unknownFields) {
+                const values = options._unknownFields[key];
                 const valuesChunks = [];
                 for (const value of values) {
                     valuesChunks.push((0, ts_poet_1.code) `${ctx.options.env == "node" ? "Buffer.from" : "new Uint8Array"}([${value.join(", ")}])`);

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/build/schema.js

@@ -78,8 +78,8 @@ function generateSchema(ctx, fileDesc, sourceInfo) {
     };
     let fileOptions;
     if (fileDesc.options) {
-        fileOptions = encodedOptionsToOptions(ctx, ".google.protobuf.FileOptions", fileDesc.options["_unknownFields"]);
-        delete fileDesc.options["_unknownFields"];
+        fileOptions = encodedOptionsToOptions(ctx, ".google.protobuf.FileOptions", fileDesc.options._unknownFields);
+        delete fileDesc.options._unknownFields;
     }
     const messagesOptions = [];
     (fileDesc.messageType || []).forEach((message) => {
@@ -93,8 +93,8 @@ function generateSchema(ctx, fileDesc, sourceInfo) {
         const methodsOptions = [];
         service.method.forEach((method) => {
             if (method.options) {
-                const methodOptions = encodedOptionsToOptions(ctx, ".google.protobuf.MethodOptions", method.options["_unknownFields"]);
-                delete method.options["_unknownFields"];
+                const methodOptions = encodedOptionsToOptions(ctx, ".google.protobuf.MethodOptions", method.options._unknownFields);
+                delete method.options._unknownFields;
                 if (methodOptions) {
                     methodsOptions.push((0, ts_poet_1.code) `'${method.name}': ${methodOptions}`);
                 }
@@ -102,8 +102,8 @@ function generateSchema(ctx, fileDesc, sourceInfo) {
         });
         let serviceOptions;
         if (service.options) {
-            serviceOptions = encodedOptionsToOptions(ctx, ".google.protobuf.ServiceOptions", service.options["_unknownFields"]);
-            delete service.options["_unknownFields"];
+            serviceOptions = encodedOptionsToOptions(ctx, ".google.protobuf.ServiceOptions", service.options._unknownFields);
+            delete service.options._unknownFields;
         }
         if (methodsOptions.length > 0 || serviceOptions) {
             servicesOptions.push((0, ts_poet_1.code) `
@@ -119,8 +119,8 @@ function generateSchema(ctx, fileDesc, sourceInfo) {
         const valuesOptions = [];
         Enum.value.forEach((value) => {
             if (value.options) {
-                const valueOptions = encodedOptionsToOptions(ctx, ".google.protobuf.EnumValueOptions", value.options["_unknownFields"]);
-                delete value.options["_unknownFields"];
+                const valueOptions = encodedOptionsToOptions(ctx, ".google.protobuf.EnumValueOptions", value.options._unknownFields);
+                delete value.options._unknownFields;
                 if (valueOptions) {
                     valuesOptions.push((0, ts_poet_1.code) `'${value.name}': ${valueOptions}`);
                 }
@@ -128,8 +128,8 @@ function generateSchema(ctx, fileDesc, sourceInfo) {
         });
         let enumOptions;
         if (Enum.options) {
-            enumOptions = encodedOptionsToOptions(ctx, ".google.protobuf.EnumOptions", Enum.options["_unknownFields"]);
-            delete Enum.options["_unknownFields"];
+            enumOptions = encodedOptionsToOptions(ctx, ".google.protobuf.EnumOptions", Enum.options._unknownFields);
+            delete Enum.options._unknownFields;
         }
         if (valuesOptions.length > 0 || enumOptions) {
             enumsOptions.push((0, ts_poet_1.code) `
@@ -185,7 +185,8 @@ function encodedOptionsToOptions(ctx, extendee, encodedOptions) {
         return undefined;
     }
     const resultOptions = [];
-    for (const [key, value] of Object.entries(encodedOptions)) {
+    for (const key in encodedOptions) {
+        const value = encodedOptions[key];
         const extension = extensionCache[extendee][parseInt(key, 10) >>> 3];
         resultOptions.push(getExtensionValue(ctx, extension, value));
     }
@@ -198,8 +199,8 @@ function resolveMessageOptions(ctx, message) {
     const fieldsOptions = [];
     message.field.forEach((field) => {
         if (field.options) {
-            const fieldOptions = encodedOptionsToOptions(ctx, ".google.protobuf.FieldOptions", field.options["_unknownFields"]);
-            delete field.options["_unknownFields"];
+            const fieldOptions = encodedOptionsToOptions(ctx, ".google.protobuf.FieldOptions", field.options._unknownFields);
+            delete field.options._unknownFields;
             if (fieldOptions) {
                 fieldsOptions.push((0, ts_poet_1.code) `'${field.name}': ${fieldOptions}`);
             }
@@ -208,8 +209,8 @@ function resolveMessageOptions(ctx, message) {
     const oneOfsOptions = [];
     message.oneofDecl.forEach((oneOf) => {
         if (oneOf.options) {
-            const oneOfOptions = encodedOptionsToOptions(ctx, ".google.protobuf.OneofOptions", oneOf.options["_unknownFields"]);
-            delete oneOf.options["_unknownFields"];
+            const oneOfOptions = encodedOptionsToOptions(ctx, ".google.protobuf.OneofOptions", oneOf.options._unknownFields);
+            delete oneOf.options._unknownFields;
             if (oneOfOptions) {
                 oneOfsOptions.push((0, ts_poet_1.code) `'${oneOf.name}': ${oneOfOptions}`);
             }
@@ -226,8 +227,8 @@ function resolveMessageOptions(ctx, message) {
     }
     let messageOptions;
     if (message.options) {
-        messageOptions = encodedOptionsToOptions(ctx, ".google.protobuf.MessageOptions", message.options["_unknownFields"]);
-        delete message.options["_unknownFields"];
+        messageOptions = encodedOptionsToOptions(ctx, ".google.protobuf.MessageOptions", message.options._unknownFields);
+        delete message.options._unknownFields;
     }
     if (fieldsOptions.length > 0 || oneOfsOptions.length > 0 || nestedOptions.length > 0 || messageOptions) {
         return (0, ts_poet_1.code) `

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-proto",
-  "version": "1.143.0",
+  "version": "1.144.1",
   "description": "",
   "main": "build/plugin.js",
   "repository": "github:stephenh/ts-proto",
@@ -65,7 +65,7 @@
     "object-hash": "^1.3.1",
     "protobufjs": "^6.11.3",
     "ts-poet": "^6.4.1",
-    "ts-proto-descriptors": "1.7.1"
+    "ts-proto-descriptors": "1.8.0"
   },
   "packageManager": "yarn@3.3.0"
 }