ts-proto 2.11.4 → 2.11.6

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

@@ -47,9 +47,9 @@ function generateMethodDefinition(ctx, methodDesc) {
     return (0, ts_poet_1.code) `
     {
       name: '${methodDesc.name}',
-      requestType: ${inputType},
+      requestType: ${inputType} as typeof ${inputType},
       requestStream: ${methodDesc.clientStreaming},
-      responseType: ${outputType},
+      responseType: ${outputType} as typeof ${outputType},
       responseStream: ${methodDesc.serverStreaming},
       options: ${generateMethodOptions(ctx, methodDesc.options)}
     }
@@ -72,7 +72,7 @@ function generateMethodOptions(ctx, options) {
                 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(", ")}])`);
+                    valuesChunks.push((0, ts_poet_1.code) `${ctx.options.env == "node" ? "Buffer.from" : "new Uint8Array"}([${value.join(", ")}]) as ${ctx.options.env == "node" ? "Buffer" : "Uint8Array"}`);
                 }
                 unknownFieldsChunks.push((0, ts_poet_1.code) `${key}: [\n${(0, ts_poet_1.joinCode)(valuesChunks, { on: "," })}\n],`);
             }

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

@@ -61,9 +61,9 @@ function generateServiceDefinition(ctx, fileDesc, sourceInfo, serviceDesc) {
         const outputDecoder = (0, encode_1.generateDecoder)(ctx, methodDesc.outputType);
         chunks.push((0, ts_poet_1.code) `
       ${methodDesc.formattedName}: {
-        path: '/${(0, utils_1.maybePrefixPackage)(fileDesc, serviceDesc.name)}/${methodDesc.name}',
-        requestStream: ${methodDesc.clientStreaming},
-        responseStream: ${methodDesc.serverStreaming},
+        path: '/${(0, utils_1.maybePrefixPackage)(fileDesc, serviceDesc.name)}/${methodDesc.name}' as const,
+        requestStream: ${methodDesc.clientStreaming} as const,
+        responseStream: ${methodDesc.serverStreaming} as const,
         requestSerialize: (value: ${inputType}): Buffer =>
           Buffer.from(${inputEncoder}),
         requestDeserialize: (value: Buffer): ${inputType} => ${inputDecoder},

package/build/src/main.js

@@ -422,7 +422,7 @@ function makeByteUtils(options) {
             default:
                 return (0, ts_poet_1.code) `
         if ((${globalThis} as any).Buffer) {
-          ${bytesFromBase64NodeSnippet}
+          return Uint8Array.from((${globalThis} as any).Buffer.from(b64, 'base64'));
           } else {
             ${bytesFromBase64BrowserSnippet}
           }
@@ -453,7 +453,7 @@ function makeByteUtils(options) {
             default:
                 return (0, ts_poet_1.code) `
           if ((${globalThis} as any).Buffer) {
-            ${base64FromBytesNodeSnippet}
+            return (${globalThis} as any).Buffer.from(arr).toString('base64');
           } else {
             ${base64FromBytesBrowserSnippet}
           }

package/package.json

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