ts-proto 1.131.0 → 1.131.2

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [1.131.2](https://github.com/stephenh/ts-proto/compare/v1.131.1...v1.131.2) (2022-11-13)
+
+
+### Bug Fixes
+
+* Adding a failing regression test for wrapper types ([#689](https://github.com/stephenh/ts-proto/issues/689)) ([bde2e28](https://github.com/stephenh/ts-proto/commit/bde2e28ad70bf05ebb21effcdb1caad7217c8291))
+
+## [1.131.1](https://github.com/stephenh/ts-proto/compare/v1.131.0...v1.131.1) (2022-11-13)
+
+
+### Bug Fixes
+
+* Extend `global.Error` to avoid import collisions with Error proto msgs ([#699](https://github.com/stephenh/ts-proto/issues/699)) ([e9d8f91](https://github.com/stephenh/ts-proto/commit/e9d8f9123b7b3c5e274035fa3f2644b370915181))
+
 # [1.131.0](https://github.com/stephenh/ts-proto/compare/v1.130.0...v1.131.0) (2022-10-25)
 
 

package/build/generate-services.js

@@ -76,17 +76,17 @@ function generateRegularRpcMethod(ctx, fileDesc, serviceDesc, methodDesc) {
     (0, utils_1.assertInstanceOf)(methodDesc, utils_1.FormattedMethodDescriptor);
     const { options, utils } = ctx;
     const Reader = (0, utils_1.impFile)(ctx.options, "Reader@protobufjs/minimal");
-    const rawInputType = (0, types_1.rawRequestType)(ctx, methodDesc);
+    const rawInputType = (0, types_1.rawRequestType)(ctx, methodDesc, { keepValueType: true });
     const inputType = (0, types_1.requestType)(ctx, methodDesc);
     const outputType = (0, types_1.responseType)(ctx, methodDesc);
     const rawOutputType = (0, types_1.responseType)(ctx, methodDesc, { keepValueType: true });
     const params = [...(options.context ? [(0, ts_poet_1.code) `ctx: Context`] : []), (0, ts_poet_1.code) `request: ${inputType}`];
     const maybeCtx = options.context ? "ctx," : "";
     let encode = (0, ts_poet_1.code) `${rawInputType}.encode(request).finish()`;
-    let decode = (0, ts_poet_1.code) `data => ${outputType}.decode(new ${Reader}(data))`;
-    if (options.useDate && rawOutputType.toString().includes("Timestamp")) {
-        decode = (0, ts_poet_1.code) `data => ${utils.fromTimestamp}(${rawOutputType}.decode(new ${Reader}(data)))`;
-    }
+    let decode = (0, ts_poet_1.code) `data => ${rawOutputType}.decode(new ${Reader}(data))`;
+    // if (options.useDate && rawOutputType.toString().includes("Timestamp")) {
+    //   decode = code`data => ${utils.fromTimestamp}(${rawOutputType}.decode(new ${Reader}(data)))`;
+    // }
     if (methodDesc.clientStreaming) {
         if (options.useAsyncIterable) {
             encode = (0, ts_poet_1.code) `${rawInputType}.encodeTransform(request)`;

package/build/main.js

@@ -494,7 +494,7 @@ function makeNiceGrpcServerStreamingMethodResult() {
 }
 function makeGrpcWebErrorClass() {
     const GrpcWebError = (0, ts_poet_1.conditionalOutput)("GrpcWebError", (0, ts_poet_1.code) `
-      export class GrpcWebError extends Error {
+      export class GrpcWebError extends globalThis.Error {
         constructor(message: string, public code: grpc.Code, public metadata: grpc.Metadata) {
           super(message);
         }

package/build/types.js

@@ -615,8 +615,8 @@ function detectMapType(ctx, messageDesc, fieldDesc) {
     return undefined;
 }
 exports.detectMapType = detectMapType;
-function rawRequestType(ctx, methodDesc) {
-    return messageToTypeName(ctx, methodDesc.inputType);
+function rawRequestType(ctx, methodDesc, typeOptions = {}) {
+    return messageToTypeName(ctx, methodDesc.inputType, typeOptions);
 }
 exports.rawRequestType = rawRequestType;
 function observableType(ctx) {
@@ -627,7 +627,7 @@ function observableType(ctx) {
 }
 exports.observableType = observableType;
 function requestType(ctx, methodDesc, partial = false) {
-    let typeName = rawRequestType(ctx, methodDesc);
+    let typeName = rawRequestType(ctx, methodDesc, { keepValueType: true });
     if (partial) {
         typeName = (0, ts_poet_1.code) `${ctx.utils.DeepPartial}<${typeName}>`;
     }
@@ -638,15 +638,15 @@ function requestType(ctx, methodDesc, partial = false) {
 }
 exports.requestType = requestType;
 function responseType(ctx, methodDesc, typeOptions = {}) {
-    return messageToTypeName(ctx, methodDesc.outputType, typeOptions);
+    return messageToTypeName(ctx, methodDesc.outputType, { keepValueType: true });
 }
 exports.responseType = responseType;
 function responsePromise(ctx, methodDesc) {
-    return (0, ts_poet_1.code) `Promise<${responseType(ctx, methodDesc)}>`;
+    return (0, ts_poet_1.code) `Promise<${responseType(ctx, methodDesc, { keepValueType: true })}>`;
 }
 exports.responsePromise = responsePromise;
 function responseObservable(ctx, methodDesc) {
-    return (0, ts_poet_1.code) `${observableType(ctx)}<${responseType(ctx, methodDesc)}>`;
+    return (0, ts_poet_1.code) `${observableType(ctx)}<${responseType(ctx, methodDesc, { keepValueType: true })}>`;
 }
 exports.responseObservable = responseObservable;
 function responsePromiseOrObservable(ctx, methodDesc) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-proto",
-  "version": "1.131.0",
+  "version": "1.131.2",
   "description": "",
   "main": "build/plugin.js",
   "repository": "github:stephenh/ts-proto",
@@ -10,15 +10,11 @@
   "scripts": {
     "build": "yarn tsc",
     "build:test": "yarn proto2bin && yarn proto2pbjs && yarn bin2ts",
-    "build:test:local": "yarn proto2bin:local && yarn proto2pbjs:local && yarn bin2ts:local",
     "prepare": "yarn build",
     "proto2bin": "docker compose run --rm protoc update-bins.sh",
     "proto2bin-node": "docker compose run --rm node update-bins.sh",
     "proto2pbjs": "docker compose run --rm protoc pbjs.sh",
     "bin2ts": "docker compose run --rm protoc codegen.sh",
-    "proto2bin:local": "integration/update-bins.sh",
-    "proto2pbjs:local": "integration/pbjs.sh",
-    "bin2ts:local": "integration/codegen.sh",
     "test": "yarn jest -c jest.config.js --maxWorkers=2",
     "format": "prettier --write {src,tests}/**/*.ts integration/*.ts",
     "format:check": "prettier --list-different {src,tests}/**/*.ts",