refactor: improve types (googleapis#667)

feywind · Mar 23, 2020 · 3bf1ed8 · 3bf1ed8
1 parent 809c719
commit 3bf1ed8
Show file tree

Hide file tree

Showing 17 changed files with 870 additions and 1,141 deletions.
diff --git a/src/app-profile.ts b/src/app-profile.ts
@@ -67,9 +67,13 @@ export interface DeleteAppProfileOptions {
 
 export type CreateAppProfileCallback = (
   err: ServiceError | null,
-  appProfile?: AppProfile
+  appProfile?: AppProfile,
+  apiResponse?: google.bigtable.admin.v2.IAppProfile
 ) => void;
-export type CreateAppProfileResponse = [AppProfile];
+export type CreateAppProfileResponse = [
+  AppProfile,
+  google.bigtable.admin.v2.IAppProfile
+];
 export type DeleteAppProfileCallback = (
   err: ServiceError | null,
   apiResponse?: google.protobuf.Empty

diff --git a/src/cluster.ts b/src/cluster.ts
@@ -46,7 +46,7 @@ export type ApiResponse = [IOperation];
 export type CreateClusterResponse = [ICluster, GaxOperation, IOperation];
 export type BooleanResponse = [boolean];
 export type GetClusterResponse = [ICluster, IOperation];
-export type GetClustersResponse = [ICluster[], IOperation];
+export type GetClustersResponse = [Cluster[], IOperation];
 export type GetClusterMetadataResponse = [ICluster, IOperation];
 export type SetClusterMetadataResponse = [Operation, google.protobuf.Empty];
 
@@ -56,7 +56,7 @@ export type ExistsClusterCallback = GenericCallback<boolean>;
 export type GetClusterCallback = GenericClusterCallback<ICluster>;
 export type GetClustersCallback = (
   err: ServiceError | null,
-  clusters?: ICluster[],
+  clusters?: Cluster[],
   apiResponse?: google.bigtable.admin.v2.IListClustersResponse
 ) => void;
 export type SetClusterMetadataCallback = GenericOperationCallback<

diff --git a/src/family.ts b/src/family.ts
@@ -34,7 +34,7 @@ export interface InstanceCallback<I, R> {
 }
 
 export interface GcRule {
-  age?: google.protobuf.IDuration;
+  age?: google.protobuf.IDuration | number;
   versions?: number;
   rule?: GcRule;
   union?: boolean;
@@ -166,7 +166,7 @@ Please use the format 'follows' or '${table.name}/columnFamilies/my-family'.`);
 
     if (ruleObj.age) {
       rules.push({
-        maxAge: ruleObj.age,
+        maxAge: ruleObj.age as google.protobuf.IDuration,
       });
     }
 

diff --git a/src/filter.ts b/src/filter.ts
@@ -43,8 +43,8 @@ export interface BoundData {
 }
 
 export interface Time {
-  start: Date;
-  end: Date;
+  start: Date | number;
+  end: Date | number;
 }
 
 // tslint:disable-next-line no-any
@@ -136,7 +136,15 @@ export class Filter {
    * // => '(a|b|c)'
    */
   static convertToRegExpString(
-    regex: RegExp | string | string[] | Buffer | number
+    regex:
+      | RegExp
+      | RegExp[]
+      | string
+      | string[]
+      | Buffer
+      | Buffer[]
+      | number
+      | number[]
   ): string | Buffer {
     if (is.regexp(regex)) {
       return regex.toString().replace(/^\/|\/$/g, '');
@@ -199,7 +207,11 @@ export class Filter {
    * //   startTest2Exclusive: 'value3'
    * // }
    */
-  static createRange(start: BoundData, end: BoundData, key: string) {
+  static createRange(
+    start: BoundData | null,
+    end: BoundData | null,
+    key: string
+  ) {
     const range = {};
 
     if (start) {
@@ -521,7 +533,17 @@ export class Filter {
    *   }
    * ];
    */
-  family(family: RegExp): void {
+  family(
+    family:
+      | RegExp
+      | string
+      | number
+      | Buffer
+      | RegExp[]
+      | string[]
+      | number[]
+      | Buffer[]
+  ): void {
     const f = Filter.convertToRegExpString(family);
     this.set('familyNameRegexFilter', f);
   }

diff --git a/src/instance.ts b/src/instance.ts
@@ -187,16 +187,16 @@ Please use the format 'my-instance' or '${bigtable.projectName}/instances/my-ins
    * Instance.getTypeType_('production');
    * // 1
    */
-  static getTypeType_(type: string): number {
+  static getTypeType_(type?: string): number {
     const types = {
       unspecified: 0,
       production: 1,
       development: 2,
     } as {[index: string]: number};
-    if (is.string(type)) {
+    if (typeof type === 'string') {
       type = type.toLowerCase();
     }
-    return types[type] || types.unspecified;
+    return types[type!] || types.unspecified;
   }
 
   /**

diff --git a/src/mutation.ts b/src/mutation.ts
@@ -23,7 +23,8 @@ export type IMutateRowRequest = btTypes.bigtable.v2.IMutateRowRequest;
 export type ISetCell = btTypes.bigtable.v2.Mutation.ISetCell;
 
 export type Bytes = string | Buffer;
-export type Data = Value | Value[] | MutationSettingsObj;
+// tslint:disable-next-line:no-any
+export type Data = any;
 export interface JsonObj {
   [k: string]: string | JsonObj;
 }
@@ -158,7 +159,7 @@ export class Mutation {
    * @returns {object}
    * @private
    */
-  static createTimeRange(start: Date, end: Date): TimeRange {
+  static createTimeRange(start: Date | number, end: Date | number): TimeRange {
     const range: TimeRange = {};
 
     if (is.date(start)) {

diff --git a/src/row.ts b/src/row.ts
@@ -199,7 +199,7 @@ export class Row {
    * //   }
    * // }
    */
-  static formatChunks_(chunks: Chunk[], options: ConvertFromBytesUserOptions) {
+  static formatChunks_(chunks: Chunk[], options?: ConvertFromBytesUserOptions) {
     const rows: Row[] = [];
     let familyName: string | null;
     let qualifierName: string | null;