fix: pass service parameter to operations mixin macro to fix method generation

shivanee-p · shivanee-p · commit b1cc7fdcd108 · 2026-04-24T15:53:49.000Z
diff --git a/core/generator/gapic-generator-typescript/templates/cjs/typescript_gapic/_operations.njk b/core/generator/gapic-generator-typescript/templates/cjs/typescript_gapic/_operations.njk
@@ -1,4 +1,4 @@
-{%- macro operationsServiceMethods() -%}
+{%- macro operationsServiceMethods(service) -%}
 {#-
   This part will be added into src/version/client.ts.
   If the --service-yaml contains "google.longrunning.Operations", it means the client requires Operations methods [getOperation, listOperationsAsync, cancelOperation, deleteOperation].
diff --git a/core/generator/gapic-generator-typescript/templates/cjs/typescript_gapic/src/$version/$service_client.ts.njk b/core/generator/gapic-generator-typescript/templates/cjs/typescript_gapic/src/$version/$service_client.ts.njk
@@ -1109,7 +1109,7 @@ export class {{ service.name }}Client {
 {{ location.locationServiceMethods(service)}}
 {% endif -%}
 {%- if service.LongRunningOperationsMixin > 0 %}
-{{ operations.operationsServiceMethods()}}
+{{ operations.operationsServiceMethods(service)}}
 {% endif -%}
 {%- if service.pathTemplates.length > 0 %}
   // --------------------
diff --git a/core/generator/gapic-generator-typescript/templates/esm/typescript_gapic/_operations.njk b/core/generator/gapic-generator-typescript/templates/esm/typescript_gapic/_operations.njk
@@ -1,4 +1,4 @@
-{%- macro operationsServiceMethods() -%}
+{%- macro operationsServiceMethods(service) -%}
 {#-
   This part will be added into src/version/client.ts.
   If the --service-yaml contains "google.longrunning.Operations", it means the client requires Operations methods [getOperation, listOperationsAsync, cancelOperation, deleteOperation].
diff --git a/core/generator/gapic-generator-typescript/templates/esm/typescript_gapic/esm/src/$version/$service_client.ts.njk b/core/generator/gapic-generator-typescript/templates/esm/typescript_gapic/esm/src/$version/$service_client.ts.njk
@@ -1116,7 +1116,7 @@ export class {{ service.name }}Client {
 {{ location.locationServiceMethods(service)}}
 {% endif -%}
 {%- if service.LongRunningOperationsMixin > 0 %}
-{{ operations.operationsServiceMethods()}}
+{{ operations.operationsServiceMethods(service)}}
 {% endif -%}
 {%- if service.pathTemplates.length > 0 %}
   // --------------------

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{%- macro operationsServiceMethods() -%}`
	`1`	`+{%- macro operationsServiceMethods(service) -%}`
`2`	`2`	`{#-`
`3`	`3`	`This part will be added into src/version/client.ts.`
`4`	`4`	`If the --service-yaml contains "google.longrunning.Operations", it means the client requires Operations methods [getOperation, listOperationsAsync, cancelOperation, deleteOperation].`