ts-proto 2.11.5 → 2.11.7

package/build/src/main.js

@@ -72,8 +72,7 @@ function generateFile(ctx, fileDesc) {
             const prefix = (0, case_1.camelToSnake)(fileDesc.package.replace(/\./g, "_"));
             chunks.push((0, ts_poet_1.code) `export const ${prefix}_PACKAGE_NAME = '${fileDesc.package}';`);
         }
-        if (options.useDate === options_1.DateOption.DATE &&
-            fileDesc.messageType.find((message) => message.field.find((field) => field.typeName === ".google.protobuf.Timestamp"))) {
+        if (options.useDate === options_1.DateOption.DATE && fileDesc.messageType.find(hasTimestampField)) {
             chunks.push(makeProtobufTimestampWrapper());
         }
     }
@@ -220,7 +219,7 @@ function generateFile(ctx, fileDesc) {
         }
     }
     if (options.nestJs) {
-        if (fileDesc.messageType.find((message) => message.field.find(types_1.isStructType))) {
+        if (fileDesc.messageType.find(hasStructTypeField)) {
             chunks.push(makeProtobufStructWrapper(options));
         }
     }
@@ -358,6 +357,15 @@ function makeProtobufTimestampWrapper() {
         },
       } as any;`;
 }
+function hasField(message, predicate) {
+    return (message.field.some(predicate) || message.nestedType.some((nestedMessage) => hasField(nestedMessage, predicate)));
+}
+function hasTimestampField(message) {
+    return hasField(message, types_1.isTimestamp);
+}
+function hasStructTypeField(message) {
+    return hasField(message, types_1.isStructType);
+}
 function makeProtobufStructWrapper(options) {
     const wrappers = (0, ts_poet_1.imp)("wrappers@protobufjs");
     const Struct = (0, utils_1.impProto)(options, "google/protobuf/struct", (0, utils_1.wrapTypeName)(options, "Struct"));
@@ -422,7 +430,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 +461,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.5",
+  "version": "2.11.7",
   "description": "",
   "main": "build/src/plugin.js",
   "repository": "github:stephenh/ts-proto",