refactor typecasting

Author: alkatrivedi

src/batch-transaction.ts

@@ -148,23 +148,16 @@ class BatchTransaction extends Snapshot {
     query: string | ExecuteSqlRequest,
     cb?: CreateQueryPartitionsCallback,
   ): void | Promise<CreateQueryPartitionsResponse> {
-    if (is.string(query)) {
-      query = {
-        sql: query as string,
-      };
-    }
+    const request: ExecuteSqlRequest =
+      typeof query === 'string' ? {sql: query} : query;
 
-    const reqOpts = Object.assign(
-      {},
-      query,
-      Snapshot.encodeParams(query as ExecuteSqlRequest),
-    );
+    const reqOpts = Object.assign({}, query, Snapshot.encodeParams(request));
 
     delete (reqOpts as any).gaxOptions;
     delete (reqOpts as any).types;
 
     const traceConfig: traceConfig = {
-      sql: (query as ExecuteSqlRequest).sql,
+      sql: request.sql,
       opts: this._observabilityOptions,
       dbName: this.getDBName(),
     };
@@ -182,7 +175,7 @@ class BatchTransaction extends Snapshot {
             client: 'SpannerClient',
             method: 'partitionQuery',
             reqOpts,
-            gaxOpts: (query as ExecuteSqlRequest).gaxOptions,
+            gaxOpts: request.gaxOptions,
             headers: injectRequestIDIntoHeaders(headers, this.session),
           },
           (err, partitions, resp) => {

test/batch-transaction.ts

@@ -33,6 +33,7 @@ import {
   LEADER_AWARE_ROUTING_HEADER,
 } from '../src/common';
 import {ExecuteSqlRequest} from '../src/transaction';
+import {CallOptions} from 'google-gax';
 
 let promisified = false;
 const fakePfy = extend({}, pfy, {
@@ -160,9 +161,9 @@ describe('BatchTransaction', () => {
       },
     };
 
-    const QUERY = {
+    const QUERY: ExecuteSqlRequest = {
       sql: 'SELECT * FROM Singers',
-      gaxOptions: GAX_OPTS,
+      gaxOptions: GAX_OPTS as CallOptions,
       params: {},
       types: {},
       dataBoostEnabled: true,
@@ -184,10 +185,7 @@ describe('BatchTransaction', () => {
         .withArgs(QUERY)
         .returns(fakeParams);
 
-      batchTransaction.createQueryPartitions(
-        QUERY as ExecuteSqlRequest,
-        assert.ifError,
-      );
+      batchTransaction.createQueryPartitions(QUERY, assert.ifError);
 
       const {client, method, reqOpts, gaxOpts, headers} = stub.lastCall.args[0];
       assert.strictEqual(client, 'SpannerClient');
@@ -234,7 +232,7 @@ describe('BatchTransaction', () => {
         .withArgs(QUERY)
         .returns(fakeParams);
 
-      await batchTransaction.createQueryPartitions(QUERY as ExecuteSqlRequest);
+      await batchTransaction.createQueryPartitions(QUERY);
 
       const {client, method, reqOpts, gaxOpts, headers} = stub.lastCall.args[0];
       assert.strictEqual(client, 'SpannerClient');