change from veneer to gapic_combo

rules_typescript_gapic/typescript_gapic.bzl

@@ -26,7 +26,7 @@ def typescript_gapic_library(
   metadata = None,
   transport = None,
   diregapic = None,
-  veneer = None,
+  gapic_combo = None,
   legacy_proto_load = None,
   extra_protoc_parameters = [],
   extra_protoc_file_parameters = {},
@@ -43,8 +43,8 @@ def typescript_gapic_library(
     plugin_args_dict["transport"] = transport
   if diregapic:
     plugin_args_dict["diregapic"] = "true"
-  if veneer:
-    plugin_args_dict["veneer"] = "true"
+  if gapic_combo:
+    plugin_args_dict["gapic_combo"] = "true"
   if legacy_proto_load:
     plugin_args_dict["legacy-proto-load"] = "true"
 

typescript/src/gapic-generator-typescript.ts

@@ -88,8 +88,8 @@ yargs.describe(
   'DIREGAPIC represents Discovery Rest GAPICs. Set to true for GCE API or non-gRPC APIs with a Discovery doc description.'
 );
 yargs.describe(
-  'veneer',
-  'Set to true if the library has a handwritten veneer over GAPIC layer.'
+  'gapic_combo',
+  'Set to true if the library has a handwritten gapic_combo over GAPIC layer.'
 );
 yargs.describe(
   'legacy_proto_load',
@@ -120,7 +120,7 @@ export interface IArguments {
   descriptor?: string;
   transport?: string;
   diregapic?: boolean;
-  veneer?: boolean;
+  gapic_combo?: boolean;
   legacyProtoLoad?: boolean;
   _: string[];
   $0: string;
@@ -139,7 +139,7 @@ const validation = (argv.validation as string | undefined) ?? 'true';
 const metadata = argv.metadata as boolean | undefined;
 const transport = argv.transport as string | undefined;
 const diregapic = argv.diregapic as boolean | undefined;
-const veneer = argv.veneer as boolean | undefined;
+const gapic_combo = argv.gapic_combo as boolean | undefined;
 const legacyProtoLoad = argv.legacyProtoLoad as boolean | undefined;
 
 // --protoc can be passed from BUILD.bazel and overridden from the command line
@@ -200,8 +200,8 @@ if (metadata) {
 if (diregapic) {
   protocCommand.push('--typescript_gapic_opt="diregapic"');
 }
-if (veneer) {
-  protocCommand.push('--typescript_gapic_opt="veneer"');
+if (gapic_combo) {
+  protocCommand.push('--typescript_gapic_opt="gapic_combo"');
 }
 if (transport && transport === 'rest') {
   protocCommand.push('--typescript_gapic_opt="transport=rest"');

typescript/src/generator.ts

@@ -72,7 +72,7 @@ export class Generator {
   // This is for services using mixin services (e.g. google.iam.v1.Policy).
   // As long as the mixin service is defined under 'apis' in the service yaml file, the generator will include it in the client library.
   serviceYaml?: ServiceYaml;
-  veneer?: boolean;
+  gapic_combo?: boolean;
   templates: string[];
   metadata?: boolean;
   rest?: boolean;
@@ -202,9 +202,9 @@ export class Generator {
     }
   }
 
-  private readVeneer() {
-    if (this.paramMap['veneer'] === 'true') {
-      this.veneer = true;
+  private readGapicCombo() {
+    if (this.paramMap['gapic_combo'] === 'true') {
+      this.gapic_combo = true;
     }
   }
 
@@ -229,7 +229,7 @@ export class Generator {
       this.readTemplates();
       this.readRest();
       this.readDiregapic();
-      this.readVeneer();
+      this.readGapicCombo();
       this.readLegacyProtoLoad();
     }
   }
@@ -270,7 +270,7 @@ export class Generator {
       serviceYaml: this.serviceYaml,
       rest: this.rest,
       diregapic: this.diregapic,
-      veneer: this.veneer,
+      gapic_combo: this.gapic_combo,
       legacyProtoLoad: this.legacyProtoLoad,
     });
     return api;

typescript/src/schema/api.ts

@@ -37,7 +37,7 @@ export class API {
   packageName: string;
   rest?: boolean;
   diregapic?: boolean;
-  veneer?: boolean;
+  gapic_combo?: boolean;
   legacyProtoLoad: boolean;
 
   static isIgnoredService(
@@ -89,7 +89,7 @@ export class API {
     // users specify the actual package name, if not, set it to product name.
     this.publishName =
       options.publishName || this.naming.productName.toKebabCase();
-    this.veneer = options.veneer ?? false;
+    this.gapic_combo = options.gapic_combo ?? false;
     this.rest = options.rest;
     this.diregapic = options.diregapic ?? false;
     this.legacyProtoLoad = options.legacyProtoLoad ?? false;
@@ -215,7 +215,7 @@ export class API {
       services: this.services,
       rest: this.rest,
       diregapic: this.diregapic,
-      veneer: this.veneer,
+      gapic_combo: this.gapic_combo,
       legacyProtoLoad: this.legacyProtoLoad,
     });
   }

typescript/src/schema/naming.ts

@@ -26,7 +26,7 @@ export interface Options {
   serviceYaml?: ServiceYaml;
   rest?: boolean;
   diregapic?: boolean;
-  veneer?: boolean;
+  gapic_combo?: boolean;
   legacyProtoLoad?: boolean;
 }