@codenameryuu/adonis-lucid-auto-preload 2.1.0 → 2.2.0

package/build/src/mixins/auto_preload.d.ts

@@ -65,6 +65,7 @@ export declare function AutoPreload<T extends NormalizeConstructor<LucidModel>>(
      * List of relationships to auto-preload.
      */
     $with: ReadonlyArray<PreloadEntry>;
+    boot(): void;
     beforeFindHook(query: ModelQueryBuilderContract<any, any>): void;
     beforeFetchHook(query: ModelQueryBuilderContract<any, any>): void;
     beforePaginateHook(queries: any): void;
@@ -114,7 +115,6 @@ export declare function AutoPreload<T extends NormalizeConstructor<LucidModel>>(
         <Model extends LucidModel>(this: Model, name: string): import("@adonisjs/lucid/types/relations").RelationshipsContract;
     };
     $defineProperty: <Model extends LucidModel, Prop extends keyof Model>(this: Model, propertyName: Prop, defaultValue: Model[Prop], strategy: "inherit" | "define" | ((value: Model[Prop]) => Model[Prop])) => void;
-    boot: () => void;
     before: {
         <Model extends LucidModel, Event extends "find" | "fetch">(this: Model, event: Event, handler: import("@adonisjs/lucid/types/model").HooksHandler<ModelQueryBuilderContract<Model>, Event>): void;
         <Model extends LucidModel>(this: Model, event: "paginate", handler: import("@adonisjs/lucid/types/model").HooksHandler<[ModelQueryBuilderContract<Model>, ModelQueryBuilderContract<Model>], "paginate">): void;

package/build/src/mixins/auto_preload.js

@@ -1,10 +1,22 @@
-import { beforeFetch, beforeFind, beforePaginate } from '@adonisjs/lucid/orm';
 export function AutoPreload(superclass) {
     class AutoPreloadModel extends superclass {
         /**
          * List of relationships to auto-preload.
          */
         static $with = [];
+        static boot() {
+            super.boot();
+            // `compose()` introduces an intermediate class. Depending on how Lucid
+            // handles boot flags, we might see `booted` as inherited and skip hook
+            // registration. Track it per subclass instead.
+            if (this.$autoPreloadHooksRegistered)
+                return;
+            this.$autoPreloadHooksRegistered = true;
+            // Register hooks on the actual model subclass.
+            this.before('find', this.beforeFindHook.bind(this));
+            this.before('fetch', this.beforeFetchHook.bind(this));
+            this.before('paginate', this.beforePaginateHook.bind(this));
+        }
         static beforeFindHook(query) {
             this.applyAutoPreload(query);
         }
@@ -72,10 +84,5 @@ export function AutoPreload(superclass) {
             return query;
         }
     }
-    // Apply Lucid hooks decorators without using `@decorator` syntax
-    // (some package tsconfigs disable the decorator syntax).
-    beforeFind()(AutoPreloadModel, 'beforeFindHook');
-    beforeFetch()(AutoPreloadModel, 'beforeFetchHook');
-    beforePaginate()(AutoPreloadModel, 'beforePaginateHook');
     return AutoPreloadModel;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codenameryuu/adonis-lucid-auto-preload",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "Auto-preload multiple relationships when retrieving Lucid models on Adonis JS 7",
   "author": "codenameryuu",
   "license": "MIT",