ts-proto 2.12.0 → 2.12.1

package/build/src/main.js

@@ -1089,7 +1089,13 @@ function generateDecode(ctx, fullName, messageDesc) {
       length?: number,
     ): ${fullName} {
       const reader = input instanceof ${BinaryReader} ? input : new ${BinaryReader}(input);
-      const end = length === undefined ? reader.len : reader.pos + length;
+      const previousRecursionDepth = (reader as any).__tsProtoDecodeDepth ?? 0;
+      if (previousRecursionDepth >= 100) {
+        throw new ${ctx.utils.globalThis}.Error("protobuf decode recursion limit exceeded");
+      }
+      (reader as any).__tsProtoDecodeDepth = previousRecursionDepth + 1;
+      try {
+        const end = length === undefined ? reader.len : reader.pos + length;
   `);
     chunks.push((0, ts_poet_1.code) `const message = ${createBase}${maybeAsAny(options)};`);
     // start the tag loop
@@ -1255,7 +1261,12 @@ function generateDecode(ctx, fullName, messageDesc) {
     // and then wrap up the while/return
     chunks.push((0, ts_poet_1.code) `}`);
     chunks.push((0, ts_poet_1.code) `return message;`);
-    chunks.push((0, ts_poet_1.code) `}`);
+    chunks.push((0, ts_poet_1.code) `
+      } finally {
+        (reader as any).__tsProtoDecodeDepth = previousRecursionDepth;
+      }
+    }
+  `);
     return (0, ts_poet_1.joinCode)(chunks, { on: "\n" });
 }
 /** Returns a generic writer.doSomething based on the basic type */
@@ -2039,7 +2050,10 @@ function generateFromJson(ctx, fullName, fullTypeName, messageDesc) {
                         protoJsonComparison = (0, ts_poet_1.code) `
                  : ${ctx.utils.isObject}(${protoJsonProperty})
                  ? (${ctx.utils.globalThis}.Object.entries(${protoJsonProperty}) as [string, any][]).reduce((acc: ${fieldType}, [key, value]: [string, any]) => {
-                     acc[${i}] = ${readSnippet("value")};
+                     ${ctx.utils.globalThis}.Object.defineProperty(acc, ${i}, {
+                       value: ${readSnippet("value")},
+                       enumerable: true, configurable: true, writable: true,
+                     });
                      return acc;
                    }, {})
                `;
@@ -2047,7 +2061,10 @@ function generateFromJson(ctx, fullName, fullTypeName, messageDesc) {
                     chunks.push((0, ts_poet_1.code) `
             ${fieldKey}: ${ctx.utils.isObject}(${jsonProperty})
               ? (${ctx.utils.globalThis}.Object.entries(${jsonProperty}) as [string, any][]).reduce((acc: ${fieldType}, [key, value]: [string, any]) => {
-                  acc[${i}] = ${readSnippet("value")};
+                  ${ctx.utils.globalThis}.Object.defineProperty(acc, ${i}, {
+                    value: ${readSnippet("value")},
+                    enumerable: true, configurable: true, writable: true,
+                  });
                   return acc;
                 }, {})
               ${protoJsonComparison}
@@ -2221,6 +2238,9 @@ function generateToJson(ctx, fullName, fullProtobufTypeName, messageDesc) {
         const jsonName = (0, utils_1.getFieldJsonName)(field, options);
         const jsonProperty = (0, utils_1.getPropertyAccessor)("obj", jsonName);
         const messageProperty = (0, utils_1.getPropertyAccessor)("message", fieldName);
+        const setJsonProperty = (value) => jsonName === "__proto__"
+            ? (0, ts_poet_1.code) `${utils.globalThis}.Object.defineProperty(obj, "__proto__", { value: ${value}, enumerable: true });`
+            : (0, ts_poet_1.code) `${jsonProperty} = ${value};`;
         const readSnippet = (from) => {
             if ((0, types_1.isEnum)(field)) {
                 const toJson = (0, types_1.getEnumMethod)(ctx, field.typeName, "ToJSON");
@@ -2332,7 +2352,7 @@ function generateToJson(ctx, fullName, fullProtobufTypeName, messageDesc) {
             if ((0, types_1.shouldGenerateJSMapType)(ctx, messageDesc, field)) {
                 chunks.push((0, ts_poet_1.code) `
           if (${messageProperty}?.size) {
-            ${jsonProperty} = {};
+            ${setJsonProperty("{}")}
             ${messageProperty}.forEach((v, k) => {
               ${jsonProperty}[${i}] = ${readSnippet("v")};
             });
@@ -2345,7 +2365,7 @@ function generateToJson(ctx, fullName, fullProtobufTypeName, messageDesc) {
         if (${messageProperty}) {
             const entries = ${utils.globalThis}.Object.entries(${messageProperty}) as [string, ${mapInfo.valueType}][];
             if (entries.length > 0) {
-              ${jsonProperty} = {};
+              ${setJsonProperty("{}")}
               entries.forEach(([k, v]) => {
                 ${jsonProperty}[${i}] = ${readSnippet("v")};
               });
@@ -2360,7 +2380,7 @@ function generateToJson(ctx, fullName, fullProtobufTypeName, messageDesc) {
             const maybeMap = needMap ? (0, ts_poet_1.code) `.map(e => ${readSnippet("e")})` : "";
             chunks.push((0, ts_poet_1.code) `
         if (${messageProperty}?.length) {
-          ${jsonProperty} = ${messageProperty}${maybeMap};
+          ${setJsonProperty((0, ts_poet_1.code) `${messageProperty}${maybeMap}`)}
         }
       `);
         }
@@ -2372,7 +2392,7 @@ function generateToJson(ctx, fullName, fullProtobufTypeName, messageDesc) {
             const valueName = (0, utils_1.oneofValueName)(fieldName, options);
             chunks.push((0, ts_poet_1.code) `
         ${currentIfTarget === oneofNameWithMessage ? "else " : ""}if (${oneofNameWithMessage}?.$case === '${fieldName}') {
-          ${jsonProperty} = ${readSnippet(`${oneofNameWithMessage}.${valueName}`)};
+          ${setJsonProperty(readSnippet(`${oneofNameWithMessage}.${valueName}`))}
         }
       `);
             currentIfTarget = oneofNameWithMessage;
@@ -2384,7 +2404,7 @@ function generateToJson(ctx, fullName, fullProtobufTypeName, messageDesc) {
                 : `${messageProperty} !== undefined ${(0, utils_1.withAndMaybeCheckIsNotNull)(options, messageProperty)}`;
             chunks.push((0, ts_poet_1.code) `
         if (${check}) {
-          ${jsonProperty} = ${readSnippet(`${messageProperty}`)};
+          ${setJsonProperty(readSnippet(`${messageProperty}`))}
         }
       `);
         }

package/build/src/types.js

@@ -296,7 +296,7 @@ function defaultValue(ctx, field) {
         case ts_proto_descriptors_1.FieldDescriptorProto_Type.TYPE_BOOL:
             return useDefaultValue ? field.defaultValue : false;
         case ts_proto_descriptors_1.FieldDescriptorProto_Type.TYPE_STRING:
-            return useDefaultValue ? `"${field.defaultValue}"` : '""';
+            return useDefaultValue ? JSON.stringify(field.defaultValue) : '""';
         case ts_proto_descriptors_1.FieldDescriptorProto_Type.TYPE_BYTES:
             // todo(proto2): need to look into all the possible default values for the bytes type, and handle each one
             if (options.env === options_1.EnvOption.NODE) {

package/package.json

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