refactor: model query builder subqueries can now access the parent model

adonis-typings/orm.ts

@@ -30,7 +30,7 @@ declare module '@ioc:Adonis/Lucid/Orm' {
   export interface ModelQueryBuilderContract<
     Model extends ModelConstructorContract,
   > extends ChainableContract<Model['refs']> {
-    model?: Model,
+    model: Model,
 
     /**
      * Execute and get first result

example/index.ts

@@ -5,6 +5,6 @@ class User extends BaseModel {
 }
 
 const user = User.query().then((a) => {
-  a.username.toLocaleLowerCase()
+  a[0].username.toLocaleLowerCase()
 })
 console.log(user)

src/Orm/QueryBuilder/index.ts

@@ -19,22 +19,9 @@ import {
 } from '@ioc:Adonis/Lucid/Orm'
 
 import { QueryClientContract } from '@ioc:Adonis/Lucid/Database'
-import { QueryCallback } from '@ioc:Adonis/Lucid/DatabaseQueryBuilder'
-
 import { Chainable } from '../../Database/QueryBuilder/Chainable'
 import { Executable, ExecutableConstructor } from '../../Database/Traits/Executable'
 
-/**
- * Wrapping the user function for a query callback and give them
- * a new instance of the `DatabaseQueryBuilder` and not
- * knex.QueryBuilder
- */
-function queryCallback (userFn: QueryCallback<ModelQueryBuilderContract<ModelConstructorContract>>) {
-  return (builder: knex.QueryBuilder) => {
-    userFn(new ModelQueryBuilder(builder))
-  }
-}
-
 /**
  * Database query builder exposes the API to construct and run queries for selecting,
  * updating and deleting records.
@@ -45,10 +32,14 @@ export class ModelQueryBuilder extends Chainable implements ModelQueryBuilderCon
 > {
   constructor (
     builder: knex.QueryBuilder,
-    public model?: ModelConstructorContract,
+    public model: ModelConstructorContract,
     public client?: QueryClientContract,
   ) {
-    super(builder, queryCallback)
+    super(builder, (userFn) => {
+      return (builder) => {
+        userFn(new ModelQueryBuilder(builder, this.model))
+      }
+    })
   }
 
   /**