ts-proto 2.7.5 → 2.7.6

package/build/src/main.js

@@ -800,6 +800,7 @@ function makeExtensionClass(options) {
         number: number;
         tag: number;
         singularTag?: number;
+        packedTag?: number;
         encode?: (message: T) => Uint8Array[];
         decode?: (tag: number, input: Uint8Array[]) => T;
         repeated: boolean;
@@ -1340,7 +1341,7 @@ function generateEncode(ctx, fullName, messageDesc) {
           `);
                 }
             }
-            else if ((0, types_1.packedType)(field.type) === undefined) {
+            else if ((0, types_1.packedField)(field, currentFile.isProto3Syntax) === undefined) {
                 const listWriteSnippet = (0, ts_poet_1.code) `
           for (const v of ${messageProperty}) {
             ${writeSnippet("v!")};
@@ -1512,6 +1513,9 @@ function generateSetExtension(ctx, fullName) {
         if (extension.singularTag !== undefined) {
           delete message._unknownFields[extension.singularTag];
         }
+        if (extension.packedTag !== undefined) {
+          delete message._unknownFields[extension.packedTag];
+        }
       }
 
       if (encoded.length !== 0) {
@@ -1539,14 +1543,17 @@ function generateGetExtension(ctx, fullName) {
         results = extension.decode!(extension.tag, list);
       }
 
-      if (extension.singularTag === undefined) {
+      if (extension.singularTag === undefined ||
+          extension.packedTag === undefined) {
         return results;
       }
 
-      list = message._unknownFields[extension.singularTag];
+      const nonDefaultTag = (extension.singularTag === extension.tag) ?
+          extension.packedTag : extension.singularTag;
+      list = message._unknownFields[nonDefaultTag];
 
       if (list !== undefined) {
-        const results2 = extension.decode!(extension.singularTag, list);
+        const results2 = extension.decode!(nonDefaultTag, list);
 
         if (results !== undefined && (results as any).length !== 0) {
           results = (results as any).concat(results2);
@@ -1561,15 +1568,19 @@ function generateGetExtension(ctx, fullName) {
 }
 function generateExtension(ctx, message, extension) {
     const type = (0, types_1.toTypeName)(ctx, message, extension);
+    const { currentFile } = ctx;
     const packedTag = (0, types_1.isRepeated)(extension) && (0, types_1.packedType)(extension.type) !== undefined ? ((extension.number << 3) | 2) >>> 0 : undefined;
     const singularTag = ((extension.number << 3) | (0, types_1.basicWireType)(extension.type)) >>> 0;
-    const tag = packedTag ?? singularTag;
+    const packed = (0, types_1.isRepeated)(extension) && (0, types_1.packedField)(extension, currentFile.isProto3Syntax);
+    const tag = packed ? packedTag : singularTag;
     const chunks = [];
     chunks.push((0, ts_poet_1.code) `{`);
     chunks.push((0, ts_poet_1.code) `number: ${extension.number},`);
     chunks.push((0, ts_poet_1.code) `tag: ${tag},`);
-    if (packedTag !== undefined)
+    if (packedTag !== undefined) {
         chunks.push((0, ts_poet_1.code) `singularTag: ${singularTag},`);
+        chunks.push((0, ts_poet_1.code) `packedTag: ${packedTag},`);
+    }
     chunks.push((0, ts_poet_1.code) `repeated: ${extension.label == ts_proto_descriptors_1.FieldDescriptorProto_Label.LABEL_REPEATED},`);
     chunks.push((0, ts_poet_1.code) `packed: ${extension.options?.packed ? true : false},`);
     const BinaryReader = (0, ts_poet_1.imp)("BinaryReader@@bufbuild/protobuf/wire");
@@ -1634,7 +1645,7 @@ function generateExtension(ctx, message, extension) {
         }
         const writeSnippet = getEncodeSnippet(ctx, extension);
         if ((0, types_1.isRepeated)(extension)) {
-            if (packedTag === undefined) {
+            if (!packed) {
                 chunks.push((0, ts_poet_1.code) `
           for (const v of value) {
             const writer = new ${BinaryWriter}();
@@ -1688,7 +1699,7 @@ function generateExtension(ctx, message, extension) {
         for (const buffer of input) {
           const reader = new ${BinaryReader}(buffer);
       `);
-            if ((0, types_1.packedType)(extension.type) === undefined) {
+            if (packedTag === undefined) {
                 chunks.push((0, ts_poet_1.code) `
           values.push(${readSnippet});
         `);

package/build/src/types.d.ts

@@ -11,6 +11,7 @@ export declare function basicTypeName(ctx: Context, field: FieldDescriptorProto,
 }): Code;
 /** Returns the Reader method for the primitive's read/write call. */
 export declare function toReaderCall(field: FieldDescriptorProto): string;
+export declare function packedField(field: FieldDescriptorProto, isProto3Syntax: boolean): number | undefined;
 export declare function packedType(type: FieldDescriptorProto_Type): number | undefined;
 export declare function getFieldOptionsJsType(field: FieldDescriptorProto, options: Options): FieldDescriptorProto_Type | undefined;
 export declare function defaultValue(ctx: Context, field: FieldDescriptorProto): any;

package/build/src/types.js

@@ -4,6 +4,7 @@ exports.basicWireType = basicWireType;
 exports.basicLongWireType = basicLongWireType;
 exports.basicTypeName = basicTypeName;
 exports.toReaderCall = toReaderCall;
+exports.packedField = packedField;
 exports.packedType = packedType;
 exports.getFieldOptionsJsType = getFieldOptionsJsType;
 exports.defaultValue = defaultValue;
@@ -185,6 +186,15 @@ function toReaderCall(field) {
             throw new Error(`Not a primitive field ${field}`);
     }
 }
+function packedField(field, isProto3Syntax) {
+    if (isProto3Syntax && field.options?.packed === false) {
+        return undefined;
+    }
+    else if (!isProto3Syntax && !!field.options?.packed) {
+        return undefined;
+    }
+    return packedType(field.type);
+}
 function packedType(type) {
     switch (type) {
         case ts_proto_descriptors_1.FieldDescriptorProto_Type.TYPE_DOUBLE:

package/package.json

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