refactor: simplify types

adonisjs · Oct 6, 2019 · 118391e · 118391e
1 parent bac1467
commit 118391e
Show file tree

Hide file tree

Showing 3 changed files with 138 additions and 405 deletions.
diff --git a/adonis-typings/database.ts b/adonis-typings/database.ts
@@ -93,26 +93,19 @@ declare module '@ioc:Adonis/Lucid/Database' {
      * Get new query builder instance for select, update and
      * delete calls
      */
-    query<
-      Record extends any = any,
-      Result extends any = Record,
-    > (): DatabaseQueryBuilderContract<Record, Result> & ExcutableQueryBuilderContract<Result>,
+    query<Result extends any = any> (
+    ): DatabaseQueryBuilderContract<Result> & ExcutableQueryBuilderContract<Result>,
 
     /**
      * Get new query builder instance inserts
      */
-    insertQuery<
-      Record extends any = any,
-      ReturnColumns extends any = Record
-    > (
-    ): InsertQueryBuilderContract<Record, ReturnColumns[]> & ExcutableQueryBuilderContract<ReturnColumns[]>,
+    insertQuery<ReturnColumns extends any = any> (
+    ): InsertQueryBuilderContract & ExcutableQueryBuilderContract<ReturnColumns[]>,
 
     /**
      * Get raw query builder instance
      */
-    raw<
-      Result extends any = any
-    > (
+    raw<Result extends any = any> (
       sql: string,
       bindings?: { [key: string]: StrictValuesWithoutRaw } | StrictValuesWithoutRaw,
     ): RawContract & ExcutableQueryBuilderContract<Result>
@@ -594,29 +587,21 @@ declare module '@ioc:Adonis/Lucid/Database' {
     /**
      * Get query builder instance for a given connection.
      */
-    query<
-      Record extends any = any,
-      Result extends any = Record,
-    > (
+    query<Result extends any = any> (
       options?: DatabaseClientOptions,
-    ): DatabaseQueryBuilderContract<Record, Result> & ExcutableQueryBuilderContract<Result>,
+    ): DatabaseQueryBuilderContract<Result> & ExcutableQueryBuilderContract<Result>,
 
     /**
      * Get insert query builder instance for a given connection.
      */
-    insertQuery<
-      Record extends any = any,
-      ReturnColumns extends any = Record
-    > (
+    insertQuery<ReturnColumns extends any = any> (
       options?: DatabaseClientOptions,
-    ): InsertQueryBuilderContract<Record, ReturnColumns[]> & ExcutableQueryBuilderContract<ReturnColumns[]>,
+    ): InsertQueryBuilderContract & ExcutableQueryBuilderContract<ReturnColumns[]>,
 
     /**
      * Get raw query builder instance
      */
-    raw<
-      Result extends any = any
-    > (
+    raw<Result extends any = any> (
       sql: string,
       bindings?: { [key: string]: StrictValuesWithoutRaw } | StrictValuesWithoutRaw[],
       options?: DatabaseClientOptions,

diff --git a/adonis-typings/model.ts b/adonis-typings/model.ts
@@ -293,18 +293,18 @@ declare module '@ioc:Adonis/Lucid/Model' {
    * Possible signatures for adding a where clause
    */
   interface WherePivot<Builder extends ChainableContract> {
-    (key: string, value: StrictValues | ChainableContract<any>): Builder
-    (key: string, operator: string, value: StrictValues | ChainableContract<any>): Builder
+    (key: string, value: StrictValues | ChainableContract): Builder
+    (key: string, operator: string, value: StrictValues | ChainableContract): Builder
   }
 
   /**
    * Possible signatures for adding where in clause.
    */
   interface WhereInPivot<Builder extends ChainableContract> {
-    (K: string, value: (StrictValues | ChainableContract<any>)[]): Builder
-    (K: string[], value: (StrictValues | ChainableContract<any>)[][]): Builder
-    (k: string, subquery: ChainableContract<any> | QueryCallback<Builder>): Builder
-    (k: string[], subquery: ChainableContract<any>): Builder
+    (K: string, value: (StrictValues | ChainableContract)[]): Builder
+    (K: string[], value: (StrictValues | ChainableContract)[][]): Builder
+    (k: string, subquery: ChainableContract | QueryCallback<Builder>): Builder
+    (k: string[], subquery: ChainableContract): Builder
   }
 
   /**
@@ -369,8 +369,8 @@ declare module '@ioc:Adonis/Lucid/Model' {
    * Model query builder will have extras methods on top of Database query builder
    */
   export interface ModelQueryBuilderContract<
-    Model extends ModelConstructorContract,
-  > extends ChainableContract<Model['$refs']> {
+    Model extends ModelConstructorContract
+  > extends ChainableContract {
     model: Model
 
     /**