ts-proto 2.7.4 → 2.7.6

package/build/src/generate-grpc-js.js

@@ -7,7 +7,7 @@ const types_1 = require("./types");
 const utils_1 = require("./utils");
 const encode_1 = require("./encode");
 const CallOptions = (0, ts_poet_1.imp)("t:CallOptions@@grpc/grpc-js");
-const ChannelCredentials = (0, ts_poet_1.imp)("ChannelCredentials@@grpc/grpc-js");
+const ChannelCredentials = (0, ts_poet_1.imp)("t:ChannelCredentials@@grpc/grpc-js");
 const ClientOptions = (0, ts_poet_1.imp)("t:ClientOptions@@grpc/grpc-js");
 const Client = (0, ts_poet_1.imp)("Client@@grpc/grpc-js");
 const ClientDuplexStream = (0, ts_poet_1.imp)("t:ClientDuplexStream@@grpc/grpc-js");
@@ -20,7 +20,7 @@ const handleServerStreamingCall = (0, ts_poet_1.imp)("t:handleServerStreamingCal
 const handleUnaryCall = (0, ts_poet_1.imp)("t:handleUnaryCall@@grpc/grpc-js");
 const UntypedServiceImplementation = (0, ts_poet_1.imp)("t:UntypedServiceImplementation@@grpc/grpc-js");
 const makeGenericClientConstructor = (0, ts_poet_1.imp)("makeGenericClientConstructor@@grpc/grpc-js");
-const Metadata = (0, ts_poet_1.imp)("Metadata@@grpc/grpc-js");
+const Metadata = (0, ts_poet_1.imp)("t:Metadata@@grpc/grpc-js");
 const ServiceError = (0, ts_poet_1.imp)("t:ServiceError@@grpc/grpc-js");
 /**
  * Generates a service definition and server / client stubs for the

package/build/src/generate-nestjs.js

@@ -11,7 +11,7 @@ const utils_1 = require("./utils");
 function generateNestjsServiceController(ctx, fileDesc, sourceInfo, serviceDesc) {
     const { options } = ctx;
     const chunks = [];
-    const Metadata = (0, ts_poet_1.imp)("Metadata@@grpc/grpc-js");
+    const Metadata = (0, ts_poet_1.imp)("t:Metadata@@grpc/grpc-js");
     (0, utils_1.maybeAddComment)(options, sourceInfo, chunks, serviceDesc.options?.deprecated);
     const t = options.context ? `<${main_1.contextTypeVar}>` : "";
     chunks.push((0, ts_poet_1.code) `
@@ -72,7 +72,7 @@ function generateNestjsServiceController(ctx, fileDesc, sourceInfo, serviceDesc)
 function generateNestjsServiceClient(ctx, fileDesc, sourceInfo, serviceDesc) {
     const { options } = ctx;
     const chunks = [];
-    const Metadata = (0, ts_poet_1.imp)("Metadata@@grpc/grpc-js");
+    const Metadata = (0, ts_poet_1.imp)("t:Metadata@@grpc/grpc-js");
     (0, utils_1.maybeAddComment)(options, sourceInfo, chunks);
     const t = options.context ? `<${main_1.contextTypeVar}>` : ``;
     chunks.push((0, ts_poet_1.code) `

package/build/src/generate-services.js

@@ -50,7 +50,7 @@ function generateService(ctx, fileDesc, sourceInfo, serviceDesc) {
             params.push((0, ts_poet_1.code) `metadata?: ${Metadata}`);
         }
         else if (options.addGrpcMetadata) {
-            const Metadata = (0, ts_poet_1.imp)("Metadata@@grpc/grpc-js");
+            const Metadata = (0, ts_poet_1.imp)("t:Metadata@@grpc/grpc-js");
             params.push((0, ts_poet_1.code) `metadata?: ${Metadata}`);
         }
         if (options.useAbortSignal) {
@@ -81,7 +81,7 @@ function generateRegularRpcMethod(ctx, methodDesc) {
     const rawInputType = (0, types_1.rawRequestType)(ctx, methodDesc, { keepValueType: true });
     const inputType = (0, types_1.requestType)(ctx, methodDesc);
     const rawOutputType = (0, types_1.responseType)(ctx, methodDesc, { keepValueType: true });
-    const metadataType = options.metadataType ? (0, ts_poet_1.imp)(options.metadataType) : (0, ts_poet_1.imp)("Metadata@@grpc/grpc-js");
+    const metadataType = options.metadataType ? (0, ts_poet_1.imp)(options.metadataType) : (0, ts_poet_1.imp)("t:Metadata@@grpc/grpc-js");
     const params = [
         ...(options.context ? [(0, ts_poet_1.code) `ctx: Context`] : []),
         (0, ts_poet_1.code) `request: ${inputType}`,
@@ -334,7 +334,7 @@ function generateCachingRpcMethod(ctx, fileDesc, serviceDesc, methodDesc) {
  */
 function generateRpcType(ctx, hasStreamingMethods) {
     const { options } = ctx;
-    const metadata = options.metadataType ? (0, ts_poet_1.imp)(options.metadataType) : (0, ts_poet_1.imp)("Metadata@@grpc/grpc-js");
+    const metadata = options.metadataType ? (0, ts_poet_1.imp)(options.metadataType) : (0, ts_poet_1.imp)("t:Metadata@@grpc/grpc-js");
     const metadataType = metadata.symbol;
     const maybeContext = options.context ? "<Context>" : "";
     const maybeContextParam = options.context ? "ctx: Context," : "";

package/build/src/generate-type-registry.js

@@ -32,8 +32,8 @@ function generateMessageType(ctx) {
         chunks.push((0, ts_poet_1.code) `$type: string;`);
     }
     if (ctx.options.outputEncodeMethods) {
-        const BinaryReader = (0, ts_poet_1.imp)("BinaryReader@@bufbuild/protobuf/wire");
-        const BinaryWriter = (0, ts_poet_1.imp)("BinaryWriter@@bufbuild/protobuf/wire");
+        const BinaryReader = (0, ts_poet_1.imp)("t:BinaryReader@@bufbuild/protobuf/wire");
+        const BinaryWriter = (0, ts_poet_1.imp)("t:BinaryWriter@@bufbuild/protobuf/wire");
         chunks.push((0, ts_poet_1.code) `encode(message: Message, writer?: ${BinaryWriter}): ${BinaryWriter};`);
         chunks.push((0, ts_poet_1.code) `decode(input: ${BinaryReader} | Uint8Array, length?: number): Message;`);
     }

package/build/src/main.js

@@ -511,8 +511,8 @@ function makeDeepPartial(options, longs) {
     return { Builtin, DeepPartial, Exact };
 }
 function makeMessageFns(options, deepPartial, extension) {
-    const BinaryWriter = (0, ts_poet_1.imp)("BinaryWriter@@bufbuild/protobuf/wire");
-    const BinaryReader = (0, ts_poet_1.imp)("BinaryReader@@bufbuild/protobuf/wire");
+    const BinaryWriter = (0, ts_poet_1.imp)("t:BinaryWriter@@bufbuild/protobuf/wire");
+    const BinaryReader = (0, ts_poet_1.imp)("t:BinaryReader@@bufbuild/protobuf/wire");
     const { Exact, DeepPartial } = deepPartial;
     const { Extension } = extension;
     const commonStaticMembers = [];
@@ -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;
@@ -1009,7 +1010,7 @@ function getDecodeReadSnippet(ctx, field) {
     return readSnippet;
 }
 function generateEmptyDecode(fullName) {
-    const BinaryReader = (0, ts_poet_1.imp)("BinaryReader@@bufbuild/protobuf/wire");
+    const BinaryReader = (0, ts_poet_1.imp)("t:BinaryReader@@bufbuild/protobuf/wire");
     return (0, ts_poet_1.code) `
     decode(
       _: ${BinaryReader} | Uint8Array,
@@ -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/schema.js

@@ -8,7 +8,7 @@ const utils_1 = require("./utils");
 const types_1 = require("./types");
 const wire_1 = require("@bufbuild/protobuf/wire");
 const options_1 = require("./options");
-const fileDescriptorProto = (0, ts_poet_1.imp)("FileDescriptorProto@ts-proto-descriptors");
+const fileDescriptorProto = (0, ts_poet_1.imp)("t:FileDescriptorProto@ts-proto-descriptors");
 const extensionCache = {};
 function generateSchema(ctx, fileDesc, sourceInfo) {
     const { options } = ctx;

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.4",
+  "version": "2.7.6",
   "description": "",
   "main": "build/src/plugin.js",
   "repository": "github:stephenh/ts-proto",