Keep the same ctx object for all hooks

.github/workflows/twirp-ts.yaml

@@ -12,7 +12,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14.x, 15.x]
+        node-version: [14.x, 16.x, 18.x]
 
     steps:
       - uses: actions/checkout@v2
@@ -28,3 +28,17 @@ jobs:
         uses: coverallsapp/github-action@master
         with:
          github-token: ${{ secrets.github_token }}
+      - name: Install Protoc
+        uses: arduino/setup-protoc@v1
+        with:
+          version: '3.19.4'
+      - run: |
+          npm ci
+          npm link ../
+          make
+          git diff --exit-code
+        working-directory: ./example/
+      - run: |
+          make
+          git diff --exit-code
+        working-directory: ./src/twirp/__mocks__

example/Makefile

@@ -1,10 +1,13 @@
+.PHONY: all clean ts-proto protobuf-ts
 
-PROTOC_GEN_TWIRP_BIN="../protoc-gen-twirp_ts"
+PROTOC_GEN_TWIRP_BIN="./node_modules/.bin/protoc-gen-twirp_ts"
 PROTOC_GEN_PROTOBUF_TS_BIN="./node_modules/.bin/protoc-gen-ts"
 PROTOC_GEN_TS_PROTO_BIN="./node_modules/.bin/protoc-gen-ts_proto"
 
 OUT_DIR="./generated"
 
+all: protobuf-ts
+
 clean:
 	rm -rf $(OUT_DIR)
 	mkdir -p $(OUT_DIR)
@@ -39,4 +42,3 @@ protobuf-ts: clean
     --twirp_ts_opt="openapi_gateway" \
 	--twirp_ts_out=$(OUT_DIR) \
 	./protos/*.proto
-

example/generated/haberdasher.openapi.yaml

@@ -83,20 +83,3 @@ components:
             $ref: "#/components/schemas/Filter"
           description: ""
       description: ""
-    Filter:
-      properties:
-        order_by:
-          type: string
-          description: ""
-        pagination:
-          $ref: "#/components/schemas/Pagination"
-      description: ""
-    Pagination:
-      properties:
-        limit:
-          type: integer
-          description: ""
-        offset:
-          type: integer
-          description: ""
-      description: ""

example/generated/haberdasher.twirp.openapi.yaml

@@ -97,20 +97,3 @@ components:
             $ref: "#/components/schemas/Filter"
           description: ""
       description: ""
-    Filter:
-      properties:
-        order_by:
-          type: string
-          description: ""
-        pagination:
-          $ref: "#/components/schemas/Pagination"
-      description: ""
-    Pagination:
-      properties:
-        limit:
-          type: integer
-          description: ""
-        offset:
-          type: integer
-          description: ""
-      description: ""

example/generated/service.twirp.ts

@@ -174,7 +174,7 @@ function matchHaberdasherRoute<T extends TwirpContext = TwirpContext>(
         data: Buffer,
         interceptors?: Interceptor<T, Size, Hat>[]
       ) => {
-        ctx = { ...ctx, methodName: "MakeHat" };
+        ctx.methodName = "MakeHat";
         await events.onMatch(ctx);
         return handleHaberdasherMakeHatRequest(
           ctx,
@@ -190,7 +190,7 @@ function matchHaberdasherRoute<T extends TwirpContext = TwirpContext>(
         data: Buffer,
         interceptors?: Interceptor<T, FindHatRPC, FindHatRPC>[]
       ) => {
-        ctx = { ...ctx, methodName: "FindHat" };
+        ctx.methodName = "FindHat";
         await events.onMatch(ctx);
         return handleHaberdasherFindHatRequest(
           ctx,
@@ -206,7 +206,7 @@ function matchHaberdasherRoute<T extends TwirpContext = TwirpContext>(
         data: Buffer,
         interceptors?: Interceptor<T, ListHatRPC, ListHatRPC>[]
       ) => {
-        ctx = { ...ctx, methodName: "ListHat" };
+        ctx.methodName = "ListHat";
         await events.onMatch(ctx);
         return handleHaberdasherListHatRequest(
           ctx,

src/protoc-gen-twirp-ts/gen/twirp.ts

@@ -251,7 +251,7 @@ function genRouteHandler(ctx: any, file: FileDescriptorProto, service: ServiceDe
     const cases = service.method.map(method => code`
     case "${formatMethodName(ctx, method.name!)}":
         return async (ctx: T, service: ${service.name}Twirp ,data: Buffer, interceptors?: ${Interceptor}<T, ${relativeMessageName(ctx, file, method.inputType)}, ${relativeMessageName(ctx, file, method.outputType)}>[]) => {
-            ctx = {...ctx, methodName: "${formatMethodName(ctx, method.name!)}" }
+            ctx.methodName = "${formatMethodName(ctx, method.name!)}"
             await events.onMatch(ctx);
             return handle${formatMethodName(ctx, method.name!, service.name)}Request(ctx, service, data, interceptors)
         }
@@ -472,4 +472,4 @@ function formatMethodName(ctx: any, methodName: string, serviceName?: string) {
 
     serviceName = serviceName || ""
     return ctx.camelCase ? camelCase(serviceName) + camelCase(methodName) : serviceName + methodName;
-}
+}

src/twirp/__mocks__/Makefile

@@ -0,0 +1,29 @@
+.PHONY: all clean protobuf-ts
+PROTOC_GEN_TWIRP_BIN="../../../protoc-gen-twirp_ts"
+PROTOC_GEN_PROTOBUF_TS_BIN="../../../node_modules/.bin/protoc-gen-ts"
+
+OUT_DIR="./"
+
+ifeq ($(shell uname),Darwin)
+SP=" "
+endif
+
+all: replace
+
+clean:
+	find $(OUT_DIR) -name '*.ts' -delete
+
+protobuf-ts: clean
+	protoc \
+	-I ./ \
+	-I ../../../example/protos \
+	--plugin=protoc-gen-ts=$(PROTOC_GEN_PROTOBUF_TS_BIN) \
+	--plugin=protoc-gen-twirp_ts=$(PROTOC_GEN_TWIRP_BIN) \
+	--ts_opt=client_none \
+	--ts_out=$(OUT_DIR) \
+	--twirp_ts_opt="gateway" \
+	--twirp_ts_out=$(OUT_DIR) \
+	./service.proto
+
+replace: protobuf-ts
+	find $(OUT_DIR) -name '*.ts' -exec sed -i$(SP)'' 's/from "twirp-ts"/from "..\/index"/g' {} +