Fix Model collection inheritance

CHANGELOG.md

@@ -10,6 +10,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - Augmenting the `ModelEvents` interface it is now possible to extend model events with custom events.
 
+### Changed
+
+- Model collections are no longer inherited unless they were initialized explicitly.
+
 ### Deprecated
 
 - `ModelEvent` and `ModelEventValue` have been deprecated in favour of the `ModelEvents` interface.

src/models/Model.test.ts

@@ -131,6 +131,32 @@ describe('Models definition', () => {
         expect(StubModel.collection).toBe('stubs');
     });
 
+    it('testInheritedCollection', () => {
+        class StubModel extends Model {
+            static collection = 'stubs';
+        }
+        class User extends StubModel {}
+        class Admin extends User {}
+
+        bootModels({ StubModel, User, Admin });
+
+        expect(StubModel.collection).toBe('stubs');
+        expect(User.collection).toBe('stubs');
+        expect(Admin.collection).toBe('stubs');
+    });
+
+    it('testEmptyInheritedCollection', () => {
+        class StubModel extends Model {}
+        class User extends StubModel {}
+        class Admin extends User {}
+
+        bootModels({ stub: StubModel, User, Admin });
+
+        expect(StubModel.collection).toBe('stubs');
+        expect(User.collection).toBe('users');
+        expect(Admin.collection).toBe('admins');
+    });
+
     it('testTimestamps', () => {
         class StubModel extends Model {
 

src/models/Model.ts

@@ -34,6 +34,8 @@ import type { ModelConstructor } from './inference';
 import type { Relation } from './relations/Relation';
 import type { TimestampFieldValue, TimestampsDefinition } from './timestamps';
 
+const modelsWithMintedCollections = new WeakSet();
+
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export type Key = any;
 export type ModelListener<
@@ -102,7 +104,7 @@ export class Model {
         modelClass.modelName = modelNameDescriptor?.value ?? name ?? modelClass.name;
 
         // Validate collection
-        modelClass.collection = modelClass.collection ?? instance.getDefaultCollection();
+        modelClass.bootCollection();
 
         // Validate timestamps
         if (typeof modelClass.timestamps === 'boolean' || typeof modelClass.timestamps === 'undefined') {
@@ -363,6 +365,19 @@ export class Model {
         this.boot();
     }
 
+    protected static bootCollection(): void {
+        let modelClass = this;
+        while (modelClass !== Model && (!modelClass.hasOwnProperty('collection') || modelsWithMintedCollections.has(modelClass))) {
+            modelClass = Object.getPrototypeOf(modelClass);
+        }
+
+        if (modelClass === Model) {
+            modelsWithMintedCollections.add(this);
+        }
+
+        this.collection = modelClass.collection ?? this.pureInstance().getDefaultCollection();
+    }
+
     // TODO this should be optional (but it's too annoying to use)
     declare public id: string;
     declare protected _exists: boolean;