bump version

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@extollo/lib",
-  "version": "0.5.9",
+  "version": "0.5.12",
   "description": "The framework library that lifts up your code.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

src/auth/external/oauth2/OAuth2Repository.ts

@@ -1,7 +1,6 @@
 import {
     Authenticatable,
     AuthenticatableCredentials,
-    AuthenticatableIdentifier,
     AuthenticatableRepository,
 } from '../../types'
 import {Inject, Injectable} from '../../../di'
@@ -46,7 +45,7 @@ export class OAuth2Repository implements AuthenticatableRepository {
         return this.getAuthenticatableFromBearer(credentials.credential)
     }
 
-    getByIdentifier(id: AuthenticatableIdentifier): Awaitable<Maybe<Authenticatable>> {
+    getByIdentifier(): Awaitable<Maybe<Authenticatable>> {
         return undefined
     }
 

src/orm/model/Model.ts

@@ -174,13 +174,35 @@ export abstract class Model<T extends Model<T>> extends AppClass implements Bus
             builder.field(field.databaseKey)
         })
 
-        for ( const relation of this.prototype.with ) {
+        if ( Array.isArray(this.prototype.with) ) {
+            // Try to get the eager-loaded relations statically, if possible
+            for (const relation of this.prototype.with) {
                 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
                 // @ts-ignore
                 builder.with(relation)
             }
+        } else if ( this.constructor.length < 1 ) {
+            // Otherwise, if we can instantiate the model without any arguments,
+            // do that and get the eager-loaded relations directly.
+            const inst = Container.getContainer().make<Model<any>>(this)
+            if ( Array.isArray(inst.with) ) {
+                for (const relation of inst.with) {
+                    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+                    // @ts-ignore
+                    builder.with(relation)
+                }
+            }
+        }
 
+        if ( this.prototype.scopes ) {
+            // Same thing here. Try to get the scopes statically, if possible
             builder.withScopes(this.prototype.scopes)
+        } else if ( this.constructor.length < 1 ) {
+            // Otherwise, try to instantiate the model if possible and load the scopes that way
+            const inst = Container.getContainer().make<Model<any>>(this)
+            builder.withScopes(inst.scopes)
+        }
+
 
         return builder
     }

src/util/collection/AsyncCollection.ts

@@ -330,7 +330,7 @@ export class AsyncCollection<T> {
         await this.each(async (item, index) => {
             const result = await func(item, index)
             if ( typeof result !== 'undefined' ) {
-                newItems.push(result as NonNullable<T2>)
+                newItems.push(result as unknown as NonNullable<T2>)
             }
         })