ts-proto 1.141.1 → 1.142.1

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

@@ -53,11 +53,11 @@ function generateMethodDefinition(ctx, methodDesc) {
       requestStream: ${methodDesc.clientStreaming},
       responseType: ${outputType},
       responseStream: ${methodDesc.serverStreaming},
-      options: ${generateMethodOptions(methodDesc.options)}
+      options: ${generateMethodOptions(ctx, methodDesc.options)}
     }
   `;
 }
-function generateMethodOptions(options) {
+function generateMethodOptions(ctx, options) {
     const chunks = [];
     chunks.push((0, ts_poet_1.code) `{`);
     if (options != null) {
@@ -67,6 +67,21 @@ function generateMethodOptions(options) {
         else if (options.idempotencyLevel === ts_proto_descriptors_1.MethodOptions_IdempotencyLevel.NO_SIDE_EFFECTS) {
             chunks.push((0, ts_poet_1.code) `idempotencyLevel: 'NO_SIDE_EFFECTS',`);
         }
+        if ("_unknownFields" in options) {
+            const msgUnknownFields = options["_unknownFields"];
+            const unknownFieldsChunks = [];
+            unknownFieldsChunks.push((0, ts_poet_1.code) `{`);
+            for (const key of Object.keys(msgUnknownFields)) {
+                const values = msgUnknownFields[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(", ")}])`);
+                }
+                unknownFieldsChunks.push((0, ts_poet_1.code) `${key}: [\n${(0, ts_poet_1.joinCode)(valuesChunks, { on: "," }).toCodeString([])}\n],`);
+            }
+            unknownFieldsChunks.push((0, ts_poet_1.code) `}`);
+            chunks.push((0, ts_poet_1.code) `_unknownFields: ${(0, ts_poet_1.joinCode)(unknownFieldsChunks, { on: "\n" }).toCodeString([])}`);
+        }
     }
     chunks.push((0, ts_poet_1.code) `}`);
     return (0, ts_poet_1.joinCode)(chunks, { on: "\n" });

package/build/generate-services.js

@@ -90,9 +90,9 @@ function generateRegularRpcMethod(ctx, methodDesc) {
     const maybeCtx = options.context ? "ctx," : "";
     const maybeAbortSignal = options.useAbortSignal ? "abortSignal || undefined," : "";
     let encode = (0, ts_poet_1.code) `${rawInputType}.encode(request).finish()`;
-    let decode = (0, ts_poet_1.code) `data => ${rawOutputType}.decode(new ${Reader}(data))`;
+    let decode = (0, ts_poet_1.code) `data => ${rawOutputType}.decode(${Reader}.create(data))`;
     // if (options.useDate && rawOutputType.toString().includes("Timestamp")) {
-    //   decode = code`data => ${utils.fromTimestamp}(${rawOutputType}.decode(new ${Reader}(data)))`;
+    //   decode = code`data => ${utils.fromTimestamp}(${rawOutputType}.decode(${Reader}.create(data)))`;
     // }
     if (methodDesc.clientStreaming) {
         if (options.useAsyncIterable) {
@@ -239,7 +239,7 @@ function generateCachingRpcMethod(ctx, fileDesc, serviceDesc, methodDesc) {
       const responses = requests.map(async request => {
         const data = ${inputType}.encode(request).finish()
         const response = await this.rpc.request(ctx, "${(0, utils_1.maybePrefixPackage)(fileDesc, serviceDesc.name)}", "${methodDesc.name}", data);
-        return ${outputType}.decode(new ${Reader}(response));
+        return ${outputType}.decode(${Reader}.create(response));
       });
       return Promise.all(responses);
     }

package/build/main.js

@@ -392,7 +392,7 @@ function makeDeepPartial(options, longs) {
     const maybeExport = options.exportCommonSymbols ? "export" : "";
     // Allow passing longs as numbers or strings, nad we'll convert them
     const maybeLong = options.forceLong === options_1.LongOption.LONG ? (0, ts_poet_1.code) ` : T extends ${longs.Long} ? string | number | Long ` : "";
-    const Builtin = (0, ts_poet_1.conditionalOutput)("Builtin", (0, ts_poet_1.code) `type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;`);
+    const Builtin = (0, ts_poet_1.conditionalOutput)("Builtin", (0, ts_poet_1.code) `type Builtin = Date | Function | Uint8Array | string | number | boolean |${options.forceLong === options_1.LongOption.BIGINT ? " bigint |" : ""} undefined;`);
     // Based on https://github.com/sindresorhus/type-fest/pull/259
     const maybeExcludeType = options.outputTypeRegistry ? `| '$type'` : "";
     const Exact = (0, ts_poet_1.conditionalOutput)("Exact", (0, ts_poet_1.code) `
@@ -669,7 +669,7 @@ function generateDecode(ctx, fullName, messageDesc) {
       input: ${Reader} | Uint8Array,
       length?: number,
     ): ${fullName} {
-      const reader = input instanceof ${Reader} ? input : new ${Reader}(input);
+      const reader = input instanceof ${Reader} ? input : ${Reader}.create(input);
       let end = length === undefined ? reader.len : reader.pos + length;
   `);
     chunks.push((0, ts_poet_1.code) `const message = ${createBase}${maybeAsAny(options)};`);
@@ -1082,14 +1082,14 @@ function generateFromJson(ctx, fullName, fullTypeName, messageDesc) {
                     }
                 }
                 else if ((0, types_1.isLong)(field) && options.forceLong === options_1.LongOption.LONG) {
-                    const cstr = (0, case_1.capitalize)((0, types_1.basicTypeName)(ctx, field, { keepValueType: true }).toCodeString());
+                    const cstr = (0, case_1.capitalize)((0, types_1.basicTypeName)(ctx, field, { keepValueType: true }).toCodeString([]));
                     return (0, ts_poet_1.code) `${cstr}.fromValue(${from})`;
                 }
                 else if ((0, types_1.isLong)(field) && options.forceLong === options_1.LongOption.BIGINT) {
                     return (0, ts_poet_1.code) `BigInt(${from})`;
                 }
                 else {
-                    const cstr = (0, case_1.capitalize)((0, types_1.basicTypeName)(ctx, field, { keepValueType: true }).toCodeString());
+                    const cstr = (0, case_1.capitalize)((0, types_1.basicTypeName)(ctx, field, { keepValueType: true }).toCodeString([]));
                     return (0, ts_poet_1.code) `${cstr}(${from})`;
                 }
             }
@@ -1116,16 +1116,16 @@ function generateFromJson(ctx, fullName, fullTypeName, messageDesc) {
             else if ((0, types_1.isValueType)(ctx, field)) {
                 const valueType = (0, types_1.valueTypeName)(ctx, field.typeName);
                 if ((0, types_1.isLongValueType)(field) && options.forceLong === options_1.LongOption.LONG) {
-                    return (0, ts_poet_1.code) `${(0, case_1.capitalize)(valueType.toCodeString())}.fromValue(${from})`;
+                    return (0, ts_poet_1.code) `${(0, case_1.capitalize)(valueType.toCodeString([]))}.fromValue(${from})`;
                 }
                 else if ((0, types_1.isLongValueType)(field) && options.forceLong === options_1.LongOption.BIGINT) {
                     return (0, ts_poet_1.code) `BigInt(${from})`;
                 }
                 else if ((0, types_1.isBytesValueType)(field)) {
-                    return (0, ts_poet_1.code) `new ${(0, case_1.capitalize)(valueType.toCodeString())}(${from})`;
+                    return (0, ts_poet_1.code) `new ${(0, case_1.capitalize)(valueType.toCodeString([]))}(${from})`;
                 }
                 else {
-                    return (0, ts_poet_1.code) `${(0, case_1.capitalize)(valueType.toCodeString())}(${from})`;
+                    return (0, ts_poet_1.code) `${(0, case_1.capitalize)(valueType.toCodeString([]))}(${from})`;
                 }
             }
             else if ((0, types_1.isMessage)(field)) {
@@ -1149,7 +1149,7 @@ function generateFromJson(ctx, fullName, fullTypeName, messageDesc) {
                             return (0, ts_poet_1.code) `${fromJson}(${from})`;
                         }
                         else {
-                            const cstr = (0, case_1.capitalize)(valueType.toCodeString());
+                            const cstr = (0, case_1.capitalize)(valueType.toCodeString([]));
                             return (0, ts_poet_1.code) `${cstr}(${from})`;
                         }
                     }
@@ -1505,7 +1505,7 @@ function generateFromPartial(ctx, fullName, messageDesc) {
                             return (0, ts_poet_1.code) `Long.fromValue(${from})`;
                         }
                         else {
-                            const cstr = (0, case_1.capitalize)(valueType.toCodeString());
+                            const cstr = (0, case_1.capitalize)(valueType.toCodeString([]));
                             return (0, ts_poet_1.code) `${cstr}(${from})`;
                         }
                     }
@@ -1587,7 +1587,7 @@ function generateFromPartial(ctx, fullName, messageDesc) {
         }
       `);
         }
-        else if (readSnippet(`x`).toCodeString() == "x") {
+        else if (readSnippet(`x`).toCodeString([]) == "x") {
             // An optimized case of the else below that works when `readSnippet` returns the plain input
             const fallback = (0, types_1.isWithinOneOf)(field) ? "undefined" : (0, types_1.defaultValue)(ctx, field);
             chunks.push((0, ts_poet_1.code) `message.${fieldName} = object.${fieldName} ?? ${fallback};`);
@@ -1609,7 +1609,7 @@ function generateFromPartial(ctx, fullName, messageDesc) {
 exports.contextTypeVar = "Context extends DataLoaders";
 function maybeCastToNumber(ctx, messageDesc, field, variableName) {
     const { keyType } = (0, types_1.detectMapType)(ctx, messageDesc, field);
-    if (keyType.toCodeString() === "string") {
+    if (keyType.toCodeString([]) === "string") {
         return variableName;
     }
     else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-proto",
-  "version": "1.141.1",
+  "version": "1.142.1",
   "description": "",
   "main": "build/plugin.js",
   "repository": "github:stephenh/ts-proto",
@@ -64,7 +64,7 @@
     "dataloader": "^1.4.0",
     "object-hash": "^1.3.1",
     "protobufjs": "^6.11.3",
-    "ts-poet": "^6.2.0",
+    "ts-poet": "^6.4.1",
     "ts-proto-descriptors": "1.7.1"
   },
   "packageManager": "yarn@3.3.0"