feat(repository): add model() to RepositoryMixin

See #5378 (comment)

packages/boot/src/booters/model.booter.ts

@@ -4,8 +4,11 @@
 // License text available at https://opensource.org/licenses/MIT
 
 import {config, Constructor, inject} from '@loopback/context';
-import {Application, CoreBindings} from '@loopback/core';
-import {ModelMetadataHelper} from '@loopback/repository';
+import {CoreBindings} from '@loopback/core';
+import {
+  ApplicationWithRepositories,
+  ModelMetadataHelper,
+} from '@loopback/repository';
 import debugFactory from 'debug';
 import {BootBindings} from '../keys';
 import {ArtifactOptions, booter} from '../types';
@@ -26,7 +29,7 @@ const debug = debugFactory('loopback:boot:model-booter');
 export class ModelBooter extends BaseArtifactBooter {
   constructor(
     @inject(CoreBindings.APPLICATION_INSTANCE)
-    public app: Application,
+    public app: ApplicationWithRepositories,
     @inject(BootBindings.PROJECT_ROOT) projectRoot: string,
     @config()
     public modelConfig: ArtifactOptions = {},
@@ -53,7 +56,7 @@ export class ModelBooter extends BaseArtifactBooter {
 
       debug('Bind class: %s', cls.name);
       // We are binding the model class itself
-      const binding = this.app.bind(`models.${cls.name}`).to(cls).tag('model');
+      const binding = this.app.model(cls);
       debug('Binding created for model class %s: %j', cls.name, binding);
     }
   }

packages/repository/src/__tests__/unit/mixins/repository.mixin.unit.ts

@@ -15,6 +15,7 @@ import {
   Repository,
   RepositoryMixin,
 } from '../../..';
+import {model, property} from '../../../decorators';
 
 describe('RepositoryMixin', () => {
   it('mixed class has .repository()', () => {
@@ -316,3 +317,26 @@ describe('RepositoryMixin dataSource', () => {
     }
   }
 });
+
+describe('RepositoryMixin model', () => {
+  it('mixes into the target class', () => {
+    const myApp = new AppWithRepoMixin();
+    expect(typeof myApp.model).to.be.eql('function');
+  });
+
+  it('binds a model class', () => {
+    const myApp = new AppWithRepoMixin();
+    const binding = myApp.model(MyModel);
+    expect(binding.key).to.eql('models.MyModel');
+    expect(binding.tagMap).to.have.property('model');
+    expect(myApp.getSync('models.MyModel')).to.eql(MyModel);
+  });
+
+  @model()
+  class MyModel {
+    @property()
+    name: string;
+  }
+
+  class AppWithRepoMixin extends RepositoryMixin(Application) {}
+});

packages/repository/src/mixins/repository.mixin.ts

@@ -141,6 +141,16 @@ export function RepositoryMixin<T extends MixinTarget<Application>>(
       }
     }
 
+    /**
+     * Register a model class
+     * @param modelClass - Model class
+     */
+    model<M extends Class<unknown>>(modelClass: M) {
+      return this.bind<M>(`models.${modelClass.name}`)
+        .to(modelClass)
+        .tag('model');
+    }
+
     /**
      * Add a component to this application. Also mounts
      * all the components repositories.
@@ -264,6 +274,7 @@ export interface ApplicationWithRepositories extends Application {
     dataSource: Class<D> | D,
     name?: string,
   ): Binding<D>;
+  model<M extends Class<unknown>>(modelClass: M): Binding<M>;
   component(component: Class<unknown>, name?: string): Binding;
   mountComponentRepositories(component: Class<unknown>): void;
   migrateSchema(options?: SchemaMigrationOptions): Promise<void>;