ts-proto 1.162.1 → 1.163.0

package/build/encode.js

@@ -18,7 +18,7 @@ function generateEncoder(ctx, typeName) {
         }
         return (0, ts_poet_1.code) `${TimestampValue}.encode(${value}).finish()`;
     }
-    if (name == "Struct") {
+    if (name == "Struct" || name == "Value") {
         const StructType = (0, utils_1.impProto)(ctx.options, "google/protobuf/struct", name);
         return (0, ts_poet_1.code) `${StructType}.encode(${StructType}.wrap(value)).finish()`;
     }
@@ -64,7 +64,7 @@ function generateDecoder(ctx, typeName) {
         }
         return decoder;
     }
-    if (name == "Struct" || name == "ListValue") {
+    if (name == "Struct" || name == "ListValue" || name == "Value") {
         TypeValue = (0, utils_1.impProto)(ctx.options, "google/protobuf/struct", name);
         return (0, ts_poet_1.code) `${TypeValue}.unwrap(${TypeValue}.decode(value))`;
     }

package/build/enums.js

@@ -38,6 +38,16 @@ function generateEnum(ctx, fullName, enumDesc, sourceInfo) {
         chunks.push((0, ts_poet_1.code) `} as const`);
         chunks.push((0, ts_poet_1.code) `\n`);
         chunks.push((0, ts_poet_1.code) `export type ${(0, ts_poet_1.def)(fullName)} = typeof ${(0, ts_poet_1.def)(fullName)}[keyof typeof ${(0, ts_poet_1.def)(fullName)}]`);
+        chunks.push((0, ts_poet_1.code) `\n`);
+        chunks.push((0, ts_poet_1.code) `export namespace ${(0, ts_poet_1.def)(fullName)} {`);
+        enumDesc.value.forEach((valueDesc) => {
+            const memberName = getMemberName(ctx, enumDesc, valueDesc);
+            chunks.push((0, ts_poet_1.code) `export type ${memberName} = typeof ${(0, ts_poet_1.def)(fullName)}.${memberName};`);
+        });
+        if (options.unrecognizedEnum && !unrecognizedEnum.present) {
+            chunks.push((0, ts_poet_1.code) `export type ${options.unrecognizedEnumName} = typeof ${(0, ts_poet_1.def)(fullName)}.${options.unrecognizedEnumName};`);
+        }
+        chunks.push((0, ts_poet_1.code) `}`);
     }
     else {
         chunks.push((0, ts_poet_1.code) `}`);

package/build/generate-struct-wrappers.js

@@ -134,9 +134,7 @@ function generateUnwrapDeep(ctx, fullProtoTypeName, fieldNames) {
     }`);
     }
     if ((0, types_1.isFieldMaskTypeName)(fullProtoTypeName)) {
-        chunks.push((0, ts_poet_1.code) `unwrap(message: ${ctx.options.useReadonlyTypes ? "any" : "FieldMask"}): string[] {
-      return message.paths;
-    }`);
+        chunks.push(generateFieldMaskUnwrap(ctx));
     }
     return chunks;
 }
@@ -303,13 +301,18 @@ function generateUnwrapShallow(ctx, fullProtoTypeName, fieldNames) {
     }`);
     }
     if ((0, types_1.isFieldMaskTypeName)(fullProtoTypeName)) {
-        chunks.push((0, ts_poet_1.code) `unwrap(message: ${ctx.options.useReadonlyTypes ? "any" : "FieldMask"}): string[] {
-      return message.paths;
-    }`);
+        chunks.push(generateFieldMaskUnwrap(ctx));
     }
     return chunks;
 }
 exports.generateUnwrapShallow = generateUnwrapShallow;
+function generateFieldMaskUnwrap(ctx) {
+    const returnType = ctx.options.useOptionals === "all" ? "string[] | undefined" : "string[]";
+    const pathModifier = ctx.options.useOptionals === "all" ? "?" : "";
+    return (0, ts_poet_1.code) `unwrap(message: ${ctx.options.useReadonlyTypes ? "any" : "FieldMask"}): ${returnType} {
+    return message${pathModifier}.paths;
+  }`;
+}
 function maybeReadonly(options) {
     return options.useReadonlyTypes ? "readonly " : "";
 }

package/build/main.js

@@ -1687,11 +1687,13 @@ function generateFromJson(ctx, fullName, fullTypeName, messageDesc) {
     chunks.push((0, ts_poet_1.code) `}`);
     return (0, ts_poet_1.joinCode)(chunks, { on: "\n" });
 }
-function generateCanonicalToJson(fullName, fullProtobufTypeName) {
+function generateCanonicalToJson(fullName, fullProtobufTypeName, { useOptionals }) {
     if ((0, types_1.isFieldMaskTypeName)(fullProtobufTypeName)) {
+        const returnType = useOptionals === "all" ? "string | undefined" : "string";
+        const pathModifier = useOptionals === "all" ? "?" : "";
         return (0, ts_poet_1.code) `
-    toJSON(message: ${fullName}): string {
-      return message.paths.join(',');
+    toJSON(message: ${fullName}): ${returnType} {
+      return message.paths${pathModifier}.join(',');
     }
   `;
     }
@@ -1700,7 +1702,7 @@ function generateCanonicalToJson(fullName, fullProtobufTypeName) {
 function generateToJson(ctx, fullName, fullProtobufTypeName, messageDesc) {
     const { options, utils, typeMap } = ctx;
     const chunks = [];
-    const canonicalToJson = generateCanonicalToJson(fullName, fullProtobufTypeName);
+    const canonicalToJson = generateCanonicalToJson(fullName, fullProtobufTypeName, options);
     if (canonicalToJson) {
         chunks.push(canonicalToJson);
         return (0, ts_poet_1.joinCode)(chunks, { on: "\n" });

package/build/types.js

@@ -512,6 +512,7 @@ function wrapperTypeName(typeName) {
         case ".google.protobuf.ListValue":
         case ".google.protobuf.Timestamp":
         case ".google.protobuf.Struct":
+        case ".google.protobuf.Value":
             return typeName.split(".")[3];
         default:
             return undefined;

package/package.json

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