ts-proto 2.9.0 → 2.10.1

package/build/src/generate-struct-wrappers.js

@@ -36,7 +36,7 @@ function generateWrapDeep(ctx, fullProtoTypeName, fieldNames) {
       const struct = createBase${(0, utils_1.wrapTypeName)(ctx.options, "Struct")}();
       ${defaultFields}
       if (object !== undefined) {
-        for (const key of Object.keys(object)) {
+        for (const key of ${ctx.utils.globalThis}.Object.keys(object)) {
           ${setStatement}
         }
       }
@@ -105,7 +105,7 @@ function generateUnwrapDeep(ctx, fullProtoTypeName, fieldNames) {
             chunks.push((0, ts_poet_1.code) `unwrap(message: ${(0, utils_1.wrapTypeName)(ctx.options, "Struct")}): {[key: string]: any} {
         const object: { [key: string]: any } = {};
         if (message.fields) {
-          for (const key of Object.keys(message.fields)) {
+          for (const key of ${ctx.utils.globalThis}.Object.keys(message.fields)) {
             object[key] = Value.unwrap(message.fields[key]);
           }
         }
@@ -168,7 +168,7 @@ function generateWrapShallow(ctx, fullProtoTypeName, fieldNames) {
       const struct = createBase${(0, utils_1.wrapTypeName)(ctx.options, "Struct")}();
       ${defaultFields}
       if (object !== undefined) {
-        for (const key of Object.keys(object)) {
+        for (const key of ${ctx.utils.globalThis}.Object.keys(object)) {
           ${setStatement}
         }
       }
@@ -280,7 +280,7 @@ function generateUnwrapShallow(ctx, fullProtoTypeName, fieldNames) {
             chunks.push((0, ts_poet_1.code) `unwrap(message: ${(0, utils_1.wrapTypeName)(ctx.options, "Struct")}): {[key: string]: any} {
         const object: { [key: string]: any } = {};
         if (message.fields) {
-          for (const key of Object.keys(message.fields)) {
+          for (const key of ${ctx.utils.globalThis}.Object.keys(message.fields)) {
             object[key] = message.fields[key];
           }
         }

package/build/src/main.js

@@ -1358,7 +1358,8 @@ function generateEncode(ctx, fullName, messageDesc) {
         const isOptional = (0, types_1.isOptionalProperty)(field, messageDesc.options, options, currentFile.isProto3Syntax);
         if ((0, types_1.isRepeated)(field)) {
             if ((0, types_1.isMapType)(ctx, messageDesc, field)) {
-                const valueType = typeMap.get(field.typeName)[2].field[1];
+                const mapInfo = (0, types_1.detectMapType)(ctx, messageDesc, field);
+                const valueType = mapInfo.valueField;
                 const maybeTypeField = (0, options_1.addTypeToMessages)(options) ? `$type: '${field.typeName.slice(1)}',` : "";
                 const entryWriteSnippet = (0, types_1.isValueType)(ctx, valueType)
                     ? (0, ts_poet_1.code) `
@@ -1378,7 +1379,7 @@ function generateEncode(ctx, fullName, messageDesc) {
                 }
                 else {
                     chunks.push((0, ts_poet_1.code) `
-            Object.entries(${messageProperty}${optionalAlternative}).forEach(([key, value]) => {
+            ${utils.globalThis}.Object.entries(${messageProperty}${optionalAlternative}).forEach(([key, value]: [string, ${mapInfo.valueType}]) => {
               ${entryWriteSnippet}
             });
           `);
@@ -1533,7 +1534,7 @@ function generateEncode(ctx, fullName, messageDesc) {
     });
     if (options.unknownFields) {
         chunks.push((0, ts_poet_1.code) `if (message._unknownFields !== undefined) {
-      for (const [key, values] of Object.entries(message._unknownFields)) {
+      for (const [key, values] of ${utils.globalThis}.Object.entries(message._unknownFields)) {
         const tag = parseInt(key, 10);
         for (const value of values) {
           writer.uint32(tag).raw(value);
@@ -1926,7 +1927,7 @@ function generateFromJson(ctx, fullName, fullTypeName, messageDesc) {
                         }
                         else {
                             const cstr = (0, case_1.capitalize)(valueType.toCodeString([]));
-                            return (0, ts_poet_1.code) `${cstr}(${from})`;
+                            return (0, ts_poet_1.code) `${utils.globalThis}.${cstr}(${from})`;
                         }
                     }
                     else if ((0, types_1.isObjectId)(valueField) && options.useMongoObjectId) {
@@ -1969,13 +1970,14 @@ function generateFromJson(ctx, fullName, fullTypeName, messageDesc) {
         }
         else if ((0, types_1.isRepeated)(field)) {
             if ((0, types_1.isMapType)(ctx, messageDesc, field)) {
+                const mapInfo = (0, types_1.detectMapType)(ctx, messageDesc, field);
                 const fieldType = (0, types_1.toTypeName)(ctx, messageDesc, field);
                 const i = convertFromObjectKey(ctx, messageDesc, field, "key");
                 if ((0, types_1.shouldGenerateJSMapType)(ctx, messageDesc, field)) {
                     const fallback = noDefaultValue ? (0, utils_1.nullOrUndefined)(options) : "new Map()";
                     chunks.push((0, ts_poet_1.code) `
             ${fieldKey}: ${ctx.utils.isObject}(${jsonProperty})
-              ? Object.entries(${jsonProperty}).reduce<${fieldType}>((acc, [key, value]) => {
+              ? (${ctx.utils.globalThis}.Object.entries(${jsonProperty}) as [string, any][]).reduce((acc: ${fieldType}, [key, value]: [string, any]) => {
                   acc.set(${i}, ${readSnippet("value")});
                   return acc;
                 }, new Map())
@@ -1986,7 +1988,7 @@ function generateFromJson(ctx, fullName, fullTypeName, messageDesc) {
                     const fallback = noDefaultValue ? (0, utils_1.nullOrUndefined)(options) : "{}";
                     chunks.push((0, ts_poet_1.code) `
             ${fieldKey}: ${ctx.utils.isObject}(${jsonProperty})
-              ? Object.entries(${jsonProperty}).reduce<${fieldType}>((acc, [key, value]) => {
+              ? (${ctx.utils.globalThis}.Object.entries(${jsonProperty}) as [string, any][]).reduce((acc: ${fieldType}, [key, value]: [string, any]) => {
                   acc[${i}] = ${readSnippet("value")};
                   return acc;
                 }, {})
@@ -2216,9 +2218,10 @@ function generateToJson(ctx, fullName, fullProtobufTypeName, messageDesc) {
         `);
             }
             else {
+                const mapInfo = (0, types_1.detectMapType)(ctx, messageDesc, field);
                 chunks.push((0, ts_poet_1.code) `
         if (${messageProperty}) {
-            const entries = Object.entries(${messageProperty});
+            const entries = ${utils.globalThis}.Object.entries(${messageProperty}) as [string, ${mapInfo.valueType}][];
             if (entries.length > 0) {
               ${jsonProperty} = {};
               entries.forEach(([k, v]) => {
@@ -2390,6 +2393,7 @@ function generateFromPartial(ctx, fullName, messageDesc) {
         // and then use the snippet to handle repeated fields if necessary
         if ((0, types_1.isRepeated)(field)) {
             if ((0, types_1.isMapType)(ctx, messageDesc, field)) {
+                const mapInfo = (0, types_1.detectMapType)(ctx, messageDesc, field);
                 const fieldType = (0, types_1.toTypeName)(ctx, messageDesc, field);
                 const i = convertFromObjectKey(ctx, messageDesc, field, "key");
                 const noValueSnippet = noDefaultValue
@@ -2410,12 +2414,15 @@ function generateFromPartial(ctx, fullName, messageDesc) {
                 }
                 else {
                     chunks.push((0, ts_poet_1.code) `
-            ${messageProperty} = ${noValueSnippet} Object.entries(${objectProperty} ?? {}).reduce<${fieldType}>((acc, [key, value]) => {
-              if (value !== undefined) {
-                acc[${i}] = ${readSnippet("value")};
-              }
-              return acc;
-            }, {});
+            ${messageProperty} = ${noValueSnippet} (${utils.globalThis}.Object.entries(${objectProperty} ?? {}) as [string, ${mapInfo.valueType}][]).reduce(
+              (acc: ${fieldType}, [key, value]: [string, ${mapInfo.valueType}]) => {
+                if (value !== undefined) {
+                  acc[${i}] = ${readSnippet("value")};
+                }
+                return acc;
+              },
+              {},
+            );
           `);
                 }
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-proto",
-  "version": "2.9.0",
+  "version": "2.10.1",
   "description": "",
   "main": "build/src/plugin.js",
   "repository": "github:stephenh/ts-proto",
@@ -70,7 +70,7 @@
     "uglify-js": "^3.17.4"
   },
   "dependencies": {
-    "@bufbuild/protobuf": "^2.0.0",
+    "@bufbuild/protobuf": "^2.10.2",
     "case-anything": "^2.1.13",
     "ts-poet": "^6.12.0",
     "ts-proto-descriptors": "2.1.0"