fix: improve types for row (#661)

googleapis · Mar 20, 2020 · 340689e · 340689e
1 parent 4910e77
commit 340689e
Show file tree

Hide file tree

Showing 4 changed files with 366 additions and 136 deletions.
diff --git a/src/chunktransformer.ts b/src/chunktransformer.ts
@@ -23,7 +23,7 @@ export interface Chunk {
   rowContents: Value;
   commitRow: boolean;
   resetRow: boolean;
-  rowKey?: string | Uint8Array;
+  rowKey?: string | Bytes;
   familyName?: {value: string};
   qualifier?: Qualifier | {value: Value};
   timestampMicros?: number | Long;

diff --git a/src/instance.ts b/src/instance.ts
@@ -156,7 +156,7 @@ export class Instance {
   bigtable: Bigtable;
   id: string;
   name: string;
-  metadata?: {};
+  metadata?: google.bigtable.admin.v2.IInstance;
   getTablesStream!: (options?: GetTablesOptions) => ResourceStream<Table>;
   constructor(bigtable: Bigtable, id: string) {
     this.bigtable = bigtable;

diff --git a/src/mutation.ts b/src/mutation.ts
@@ -36,9 +36,13 @@ export interface ParsedColumn {
   qualifier: string | null;
 }
 export interface ConvertFromBytesOptions {
-  userOptions?: {decode?: boolean; encoding?: string};
+  userOptions?: ConvertFromBytesUserOptions;
   isPossibleNumber?: boolean;
 }
+export interface ConvertFromBytesUserOptions {
+  decode?: boolean;
+  encoding?: string;
+}
 export interface MutationConstructorObj {
   key: string;
   method: string;
@@ -103,9 +107,9 @@ export class Mutation {
    * @private
    */
   static convertFromBytes(
-    bytes: Bytes,
+    bytes: Buffer | string,
     options?: ConvertFromBytesOptions
-  ): Buffer | Value {
+  ): Buffer | Value | string {
     const buf = bytes instanceof Buffer ? bytes : Buffer.from(bytes, 'base64');
     if (options && options.isPossibleNumber && buf.length === 8) {
       // tslint:disable-next-line no-any