change method name rather than coping ctx

hopin-team · May 31, 2022 · c1cb293 · c1cb293
1 parent 6bcb65d
commit c1cb293
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/example/generated/service.twirp.ts b/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,

diff --git a/package-lock.json b/package-lock.json
diff --git a/src/protoc-gen-twirp-ts/gen/twirp.ts b/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;
-}
+}
diff --git a/src/twirp/__mocks__/service.twirp.ts b/src/twirp/__mocks__/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,

diff --git a/src/twirp/context.ts b/src/twirp/context.ts
@@ -7,7 +7,7 @@ export interface TwirpContext<
 > {
   readonly packageName: string;
   readonly serviceName: string;
-  readonly methodName: string;
+  methodName: string;
 
   readonly contentType: TwirpContentType;
   readonly req: Request;