@loopback/boot 2.1.1 → 2.3.1

package/dist/mixins/boot.mixin.js

@@ -4,9 +4,11 @@
 // This file is licensed under the MIT License.
 // License text available at https://opensource.org/licenses/MIT
 Object.defineProperty(exports, "__esModule", { value: true });
+exports._bindBooter = exports.BootMixin = exports.Binding = void 0;
 const context_1 = require("@loopback/context");
-exports.Binding = context_1.Binding;
+Object.defineProperty(exports, "Binding", { enumerable: true, get: function () { return context_1.Binding; } });
 const boot_component_1 = require("../boot.component");
+const component_application_booter_1 = require("../booters/component-application.booter");
 const keys_1 = require("../keys");
 /**
  * Mixin for @loopback/boot. This Mixin provides the following:
@@ -19,17 +21,7 @@ const keys_1 = require("../keys");
  * - Provides the `booter()` convenience method to bind a Booter(s) to the Application
  * - Override `component()` to call `mountComponentBooters`
  * - Adds `mountComponentBooters` which binds Booters to the application from `component.booters[]`
- *
- * ******************** NOTE ********************
- * Trying to constrain the type of this Mixin (or any Mixin) will cause errors.
- * For example, constraining this Mixin to type Application require all types using by
- * Application to be imported (including it's dependencies such as ResolutionSession).
- * Another issue was that if a Mixin that is type constrained is used with another Mixin
- * that is not, it will result in an error.
- * Example (class MyApp extends BootMixin(RepositoryMixin(Application))) {};
- ********************* END OF NOTE ********************
  */
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
 function BootMixin(superClass) {
     return class extends superClass {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -39,23 +31,33 @@ function BootMixin(superClass) {
             // We Dynamically bind the Project Root and Boot Options so these values can
             // be used to resolve an instance of the Bootstrapper (as they are dependencies)
             this.bind(keys_1.BootBindings.PROJECT_ROOT).toDynamicValue(() => this.projectRoot);
-            this.bind(keys_1.BootBindings.BOOT_OPTIONS).toDynamicValue(() => this.bootOptions);
+            this.bind(keys_1.BootBindings.BOOT_OPTIONS).toDynamicValue(() => { var _a; return (_a = this.bootOptions) !== null && _a !== void 0 ? _a : {}; });
         }
         /**
          * Convenience method to call bootstrapper.boot() by resolving bootstrapper
          */
         async boot() {
-            if (this.state === 'booting')
-                return this.awaitState('booted');
-            this.assertNotInProcess('boot');
-            this.assertInStates('boot', 'created', 'booted');
+            /* eslint-disable @typescript-eslint/ban-ts-ignore */
+            // A workaround to access protected Application methods
+            const self = this;
+            if (this.state === 'booting') {
+                // @ts-ignore
+                return self.awaitState('booted');
+            }
+            // @ts-ignore
+            self.assertNotInProcess('boot');
+            // @ts-ignore
+            self.assertInStates('boot', 'created', 'booted');
             if (this.state === 'booted')
                 return;
-            this.setState('booting');
+            // @ts-ignore
+            self.setState('booting');
             // Get a instance of the BootStrapper
             const bootstrapper = await this.get(keys_1.BootBindings.BOOTSTRAPPER_KEY);
             await bootstrapper.boot();
+            // @ts-ignore
             this.setState('booted');
+            /* eslint-enable @typescript-eslint/ban-ts-ignore */
         }
         /**
          * Given a N number of Booter Classes, this method binds them using the
@@ -71,6 +73,19 @@ function BootMixin(superClass) {
         booters(...booterCls) {
             return booterCls.map(cls => _bindBooter(this, cls));
         }
+        /**
+         * Register a booter to boot a sub-application. See
+         * {@link createComponentApplicationBooterBinding} for more details.
+         *
+         * @param subApp - A sub-application with artifacts to be booted
+         * @param filter - A binding filter to select what bindings from the sub
+         * application should be added to the main application.
+         */
+        applicationBooter(subApp, filter) {
+            const binding = component_application_booter_1.createComponentApplicationBooterBinding(subApp, filter);
+            this.add(binding);
+            return binding;
+        }
         /**
          * Override to ensure any Booter's on a Component are also mounted.
          *
@@ -90,9 +105,14 @@ function BootMixin(superClass) {
          * app.component(ProductComponent);
          * ```
          */
-        component(component) {
-            super.component(component);
-            this.mountComponentBooters(component);
+        // Unfortunately, TypeScript does not allow overriding methods inherited
+        // from mapped types. https://github.com/microsoft/TypeScript/issues/38496
+        // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
+        // @ts-ignore
+        component(componentCtor, nameOrOptions) {
+            const binding = super.component(componentCtor, nameOrOptions);
+            this.mountComponentBooters(componentCtor);
+            return binding;
         }
         /**
          * Get an instance of a component and mount all it's

package/dist/mixins/boot.mixin.js.map

@@ -1 +1 @@
-{"version":3,"file":"boot.mixin.js","sourceRoot":"","sources":["../../src/mixins/boot.mixin.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"boot.mixin.js","sourceRoot":"","sources":["../../src/mixins/boot.mixin.ts"],"names":[],"mappings":"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"}

package/dist/types.js

@@ -4,6 +4,7 @@
 // This file is licensed under the MIT License.
 // License text available at https://opensource.org/licenses/MIT
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.booter = exports.BOOTER_PHASES = void 0;
 const context_1 = require("@loopback/context");
 const keys_1 = require("./keys");
 /**

package/dist/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,8BAA8B;AAC9B,+CAA+C;AAC/C,gEAAgE;;AAEhE,+CAA0E;AAC1E,iCAAgC;AAoDhC;;;GAGG;AACU,QAAA,aAAa,GAAG,CAAC,WAAW,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;AAmE/D;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,SAAgB,MAAM,CAAC,iBAAyB,EAAE,GAAG,KAAoB;IACvE,OAAO,cAAI,CACT,EAAC,IAAI,EAAE,EAAC,iBAAiB,EAAE,CAAC,eAAQ,CAAC,MAAM,CAAC,EAAE,eAAQ,CAAC,MAAM,EAAC,EAAC,EAC/D,GAAG,KAAK,CACT,CAAC;AACJ,CAAC;AALD,wBAKC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,8BAA8B;AAC9B,+CAA+C;AAC/C,gEAAgE;;;AAEhE,+CAA0E;AAC1E,iCAAgC;AAoDhC;;;GAGG;AACU,QAAA,aAAa,GAAG,CAAC,WAAW,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;AAmE/D;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,SAAgB,MAAM,CAAC,iBAAyB,EAAE,GAAG,KAAoB;IACvE,OAAO,cAAI,CACT,EAAC,IAAI,EAAE,EAAC,iBAAiB,EAAE,CAAC,eAAQ,CAAC,MAAM,CAAC,EAAE,eAAQ,CAAC,MAAM,EAAC,EAAC,EAC/D,GAAG,KAAK,CACT,CAAC;AACJ,CAAC;AALD,wBAKC"}

package/package.json

@@ -1,7 +1,9 @@
 {
   "name": "@loopback/boot",
-  "version": "2.1.1",
+  "version": "2.3.1",
   "description": "A collection of Booters for LoopBack 4 Applications",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
   "engines": {
     "node": ">=10"
   },
@@ -22,30 +24,28 @@
   "copyright.owner": "IBM Corp.",
   "license": "MIT",
   "dependencies": {
-    "@loopback/context": "^3.5.1",
-    "@loopback/core": "^2.4.1",
-    "@loopback/model-api-builder": "^2.1.1",
-    "@loopback/repository": "^2.2.1",
-    "@loopback/service-proxy": "^2.1.1",
+    "@loopback/context": "^3.8.1",
+    "@loopback/core": "^2.7.0",
+    "@loopback/model-api-builder": "^2.1.5",
+    "@loopback/repository": "^2.5.1",
+    "@loopback/service-proxy": "^2.3.0",
     "@types/debug": "^4.1.5",
     "@types/glob": "^7.1.1",
     "debug": "^4.1.1",
     "glob": "^7.1.6",
-    "tslib": "^1.11.1"
+    "tslib": "^2.0.0"
   },
   "devDependencies": {
-    "@loopback/build": "^5.2.0",
-    "@loopback/eslint-config": "^6.0.4",
-    "@loopback/openapi-v3": "^3.2.1",
-    "@loopback/rest": "^3.3.1",
-    "@loopback/rest-crud": "^0.8.1",
-    "@loopback/testlab": "^3.1.1",
-    "@types/node": "^10.17.21"
+    "@loopback/build": "^5.4.1",
+    "@loopback/eslint-config": "^7.0.1",
+    "@loopback/openapi-v3": "^3.4.1",
+    "@loopback/rest": "^5.0.1",
+    "@loopback/rest-crud": "^0.8.5",
+    "@loopback/testlab": "^3.1.5",
+    "@types/node": "^10.17.24"
   },
   "files": [
     "README.md",
-    "index.js",
-    "index.d.ts",
     "dist",
     "src",
     "!*/__tests__"
@@ -55,5 +55,5 @@
     "url": "https://github.com/strongloop/loopback-next.git",
     "directory": "packages/boot"
   },
-  "gitHead": "11f282df0bbdf25c505a2131e6d82b85005a22a2"
+  "gitHead": "62aea854bf85c5a5995b59e6908fe5409f7eea96"
 }

package/src/boot.component.ts

@@ -12,6 +12,7 @@ import {
   InterceptorProviderBooter,
   LifeCycleObserverBooter,
   ModelApiBooter,
+  ModelBooter,
   RepositoryBooter,
   ServiceBooter,
 } from './booters';
@@ -35,6 +36,7 @@ export class BootComponent implements Component {
     LifeCycleObserverBooter,
     InterceptorProviderBooter,
     ModelApiBooter,
+    ModelBooter,
   ];
 
   /**

package/src/booters/component-application.booter.ts

@@ -0,0 +1,123 @@
+// Copyright IBM Corp. 2020. All Rights Reserved.
+// Node module: @loopback/boot
+// This file is licensed under the MIT License.
+// License text available at https://opensource.org/licenses/MIT
+
+import {
+  Application,
+  Binding,
+  BindingFilter,
+  Constructor,
+  CoreBindings,
+  createBindingFromClass,
+  inject,
+} from '@loopback/core';
+import debugFactory from 'debug';
+import {BootBindings} from '../keys';
+import {Bootable, Booter, booter} from '../types';
+
+const debug = debugFactory('loopback:boot:booter:component-application');
+
+/**
+ * Binding keys excluded from a sub application. These bindings booted from the
+ * sub application won't be added to the main application.
+ */
+export const bindingKeysExcludedFromSubApp = [
+  BootBindings.BOOT_OPTIONS.key,
+  BootBindings.PROJECT_ROOT.key,
+  BootBindings.BOOTSTRAPPER_KEY.key,
+  CoreBindings.APPLICATION_CONFIG.key,
+  CoreBindings.APPLICATION_INSTANCE.key,
+  CoreBindings.APPLICATION_METADATA.key,
+  CoreBindings.LIFE_CYCLE_OBSERVER_REGISTRY.key,
+  CoreBindings.LIFE_CYCLE_OBSERVER_OPTIONS.key,
+];
+
+/**
+ * Create a booter that boots the component application. Bindings that exist
+ * in the component application before `boot` are skipped. Locked bindings in
+ * the main application will not be overridden.
+ *
+ * @param componentApp - The application exposing a component
+ * @param filter Binding filter to selected bindings to be added
+ */
+export function createBooterForComponentApplication(
+  componentApp: Application & Bootable,
+  filter: BindingFilter = () => true,
+): Constructor<Booter> {
+  /**
+   * A booter to boot artifacts for the component application
+   */
+  @booter('componentApplications')
+  class ComponentApplicationBooter implements Booter {
+    constructor(
+      @inject(CoreBindings.APPLICATION_INSTANCE) private mainApp: Application,
+    ) {}
+
+    async load() {
+      /**
+       * List all bindings before boot
+       */
+      let bindings = componentApp.find(() => true);
+      const bindingsBeforeBoot = new Set(bindings);
+      // Boot the component application
+      await componentApp.boot();
+      /**
+       * Add bindings from the component application to the main application
+       */
+      bindings = componentApp.find(filter);
+      for (const binding of bindings) {
+        // Exclude boot related bindings
+        if (bindingKeysExcludedFromSubApp.includes(binding.key)) continue;
+
+        // Exclude bindings from the app before boot
+        if (bindingsBeforeBoot.has(binding)) {
+          debug(
+            'Skipping binding %s that exists before booting %s',
+            binding.key,
+            componentApp.name,
+          );
+          continue;
+        }
+
+        // Do not override locked bindings
+        const locked = this.mainApp.find(binding.key).some(b => b.isLocked);
+        if (locked) {
+          debug(
+            'Skipping binding %s from %s - locked in %s',
+            binding.key,
+            componentApp.name,
+            this.mainApp.name,
+          );
+          continue;
+        }
+
+        debug(
+          'Adding binding from %s to %s',
+          componentApp.name,
+          this.mainApp.name,
+          binding,
+        );
+        this.mainApp.add(binding as Binding);
+      }
+    }
+  }
+  return ComponentApplicationBooter;
+}
+
+/**
+ * Create a binding to register a booter that boots the component application.
+ * Bindings that exist in the component application before `boot` are skipped.
+ * Locked bindings in the main application will not be overridden.
+ *
+ * @param componentApp - The application exposing a component
+ * @param filter Binding filter to selected bindings to be added
+ */
+export function createComponentApplicationBooterBinding(
+  componentApp: Application & Bootable,
+  filter?: BindingFilter,
+) {
+  return createBindingFromClass(
+    createBooterForComponentApplication(componentApp, filter),
+  );
+}

package/src/booters/datasource.booter.ts

@@ -16,7 +16,7 @@ import {BaseArtifactBooter} from './base-artifact.booter';
 
 /**
  * A class that extends BaseArtifactBooter to boot the 'DataSource' artifact type.
- * Discovered DataSources are bound using `app.controller()`.
+ * Discovered DataSources are bound using `app.dataSource()`.
  *
  * Supported phases: configure, discover, load
  *

package/src/booters/index.ts

@@ -6,10 +6,12 @@
 export * from './application-metadata.booter';
 export * from './base-artifact.booter';
 export * from './booter-utils';
+export * from './component-application.booter';
 export * from './controller.booter';
 export * from './datasource.booter';
 export * from './interceptor.booter';
 export * from './lifecyle-observer.booter';
 export * from './model-api.booter';
+export * from './model.booter';
 export * from './repository.booter';
 export * from './service.booter';

package/src/booters/interceptor.booter.ts

@@ -4,10 +4,8 @@
 // License text available at https://opensource.org/licenses/MIT
 
 import {
-  BindingScope,
   config,
   Constructor,
-  createBindingFromClass,
   inject,
   Interceptor,
   Provider,
@@ -59,10 +57,7 @@ export class InterceptorProviderBooter extends BaseArtifactBooter {
     this.interceptors = this.classes as InterceptorProviderClass[];
     for (const interceptor of this.interceptors) {
       debug('Bind interceptor: %s', interceptor.name);
-      const binding = createBindingFromClass(interceptor, {
-        defaultScope: BindingScope.TRANSIENT,
-      });
-      this.app.add(binding);
+      const binding = this.app.interceptor(interceptor);
       debug('Binding created for interceptor: %j', binding);
     }
   }

package/src/booters/model.booter.ts

@@ -0,0 +1,76 @@
+// Copyright IBM Corp. 2020. All Rights Reserved.
+// Node module: @loopback/boot
+// This file is licensed under the MIT License.
+// License text available at https://opensource.org/licenses/MIT
+
+import {config, Constructor, inject} from '@loopback/context';
+import {CoreBindings} from '@loopback/core';
+import {
+  ApplicationWithRepositories,
+  ModelMetadataHelper,
+} from '@loopback/repository';
+import debugFactory from 'debug';
+import {BootBindings} from '../keys';
+import {ArtifactOptions, booter} from '../types';
+import {BaseArtifactBooter} from './base-artifact.booter';
+
+const debug = debugFactory('loopback:boot:model-booter');
+
+/**
+ * A class that extends BaseArtifactBooter to boot the 'Model' artifact type.
+ *
+ * Supported phases: configure, discover, load
+ *
+ * @param app - Application instance
+ * @param projectRoot - Root of User Project relative to which all paths are resolved
+ * @param bootConfig - Model Artifact Options Object
+ */
+@booter('models')
+export class ModelBooter extends BaseArtifactBooter {
+  constructor(
+    @inject(CoreBindings.APPLICATION_INSTANCE)
+    public app: ApplicationWithRepositories,
+    @inject(BootBindings.PROJECT_ROOT) projectRoot: string,
+    @config()
+    public modelConfig: ArtifactOptions = {},
+  ) {
+    super(
+      projectRoot,
+      // Set Model Booter Options if passed in via bootConfig
+      Object.assign({}, ModelDefaults, modelConfig),
+    );
+  }
+
+  /**
+   * Uses super method to get a list of Artifact classes. Boot each file by
+   * creating a DataSourceConstructor and binding it to the application class.
+   */
+  async load() {
+    await super.load();
+
+    for (const cls of this.classes) {
+      if (!isModelClass(cls)) {
+        debug('Skipping class %s - no @model is found', cls.name);
+        continue;
+      }
+
+      debug('Bind class: %s', cls.name);
+      // We are binding the model class itself
+      const binding = this.app.model(cls);
+      debug('Binding created for model class %s: %j', cls.name, binding);
+    }
+  }
+}
+
+/**
+ * Default ArtifactOptions for DataSourceBooter.
+ */
+export const ModelDefaults: ArtifactOptions = {
+  dirs: ['models'],
+  extensions: ['.model.js'],
+  nested: true,
+};
+
+function isModelClass(cls: Constructor<unknown>) {
+  return ModelMetadataHelper.getModelMetadata(cls) != null;
+}

package/src/booters/service.booter.ts

@@ -21,7 +21,7 @@ const debug = debugFactory('loopback:boot:service-booter');
 
 /**
  * A class that extends BaseArtifactBooter to boot the 'Service' artifact type.
- * Discovered DataSources are bound using `app.controller()`.
+ * Discovered services are bound using `app.service()`.
  *
  * Supported phases: configure, discover, load
  *

package/src/mixins/boot.mixin.ts

@@ -5,16 +5,50 @@
 
 import {
   Binding,
+  BindingFilter,
+  BindingFromClassOptions,
   BindingScope,
   Constructor,
   Context,
   createBindingFromClass,
 } from '@loopback/context';
+import {Application, Component, MixinTarget} from '@loopback/core';
 import {BootComponent} from '../boot.component';
+import {createComponentApplicationBooterBinding} from '../booters/component-application.booter';
 import {Bootstrapper} from '../bootstrapper';
 import {BootBindings, BootTags} from '../keys';
 import {Bootable, Booter, BootOptions} from '../types';
 
+// FIXME(rfeng): Workaround for https://github.com/microsoft/rushstack/pull/1867
+/* eslint-disable @typescript-eslint/no-unused-vars */
+import {
+  BindingAddress,
+  JSONObject,
+  Provider,
+  ContextSubscriptionManager,
+  ContextEvent,
+  Interceptor,
+  InterceptorBindingOptions,
+  ResolutionOptions,
+  BindingKey,
+  ValueOrPromise,
+  ContextEventObserver,
+  ContextObserver,
+  Subscription,
+  BindingComparator,
+  ContextView,
+  ResolutionSession,
+  BindingCreationPolicy,
+  ContextInspectOptions,
+} from '@loopback/context';
+import {
+  Server,
+  ApplicationConfig,
+  ApplicationMetadata,
+  LifeCycleObserver,
+  ServiceOptions,
+} from '@loopback/core';
+
 // Binding is re-exported as Binding / Booter types are needed when consuming
 // BootMixin and this allows a user to import them from the same package (UX!)
 export {Binding};
@@ -30,18 +64,8 @@ export {Binding};
  * - Provides the `booter()` convenience method to bind a Booter(s) to the Application
  * - Override `component()` to call `mountComponentBooters`
  * - Adds `mountComponentBooters` which binds Booters to the application from `component.booters[]`
- *
- * ******************** NOTE ********************
- * Trying to constrain the type of this Mixin (or any Mixin) will cause errors.
- * For example, constraining this Mixin to type Application require all types using by
- * Application to be imported (including it's dependencies such as ResolutionSession).
- * Another issue was that if a Mixin that is type constrained is used with another Mixin
- * that is not, it will result in an error.
- * Example (class MyApp extends BootMixin(RepositoryMixin(Application))) {};
- ********************* END OF NOTE ********************
  */
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export function BootMixin<T extends Constructor<any>>(superClass: T) {
+export function BootMixin<T extends MixinTarget<Application>>(superClass: T) {
   return class extends superClass implements Bootable {
     projectRoot: string;
     bootOptions?: BootOptions;
@@ -57,7 +81,7 @@ export function BootMixin<T extends Constructor<any>>(superClass: T) {
         () => this.projectRoot,
       );
       this.bind(BootBindings.BOOT_OPTIONS).toDynamicValue(
-        () => this.bootOptions,
+        () => this.bootOptions ?? {},
       );
     }
 
@@ -65,18 +89,34 @@ export function BootMixin<T extends Constructor<any>>(superClass: T) {
      * Convenience method to call bootstrapper.boot() by resolving bootstrapper
      */
     async boot(): Promise<void> {
-      if (this.state === 'booting') return this.awaitState('booted');
-      this.assertNotInProcess('boot');
-      this.assertInStates('boot', 'created', 'booted');
+      /* eslint-disable @typescript-eslint/ban-ts-ignore */
+      // A workaround to access protected Application methods
+      const self = (this as unknown) as Application;
+
+      if (this.state === 'booting') {
+        // @ts-ignore
+        return self.awaitState('booted');
+      }
+      // @ts-ignore
+      self.assertNotInProcess('boot');
+      // @ts-ignore
+      self.assertInStates('boot', 'created', 'booted');
+
       if (this.state === 'booted') return;
-      this.setState('booting');
+      // @ts-ignore
+      self.setState('booting');
+
       // Get a instance of the BootStrapper
       const bootstrapper: Bootstrapper = await this.get(
         BootBindings.BOOTSTRAPPER_KEY,
       );
 
       await bootstrapper.boot();
+
+      // @ts-ignore
       this.setState('booted');
+
+      /* eslint-enable @typescript-eslint/ban-ts-ignore */
     }
 
     /**
@@ -96,6 +136,20 @@ export function BootMixin<T extends Constructor<any>>(superClass: T) {
       );
     }
 
+    /**
+     * Register a booter to boot a sub-application. See
+     * {@link createComponentApplicationBooterBinding} for more details.
+     *
+     * @param subApp - A sub-application with artifacts to be booted
+     * @param filter - A binding filter to select what bindings from the sub
+     * application should be added to the main application.
+     */
+    applicationBooter(subApp: Application & Bootable, filter?: BindingFilter) {
+      const binding = createComponentApplicationBooterBinding(subApp, filter);
+      this.add(binding);
+      return binding;
+    }
+
     /**
      * Override to ensure any Booter's on a Component are also mounted.
      *
@@ -115,9 +169,17 @@ export function BootMixin<T extends Constructor<any>>(superClass: T) {
      * app.component(ProductComponent);
      * ```
      */
-    public component(component: Constructor<{}>) {
-      super.component(component);
-      this.mountComponentBooters(component);
+    // Unfortunately, TypeScript does not allow overriding methods inherited
+    // from mapped types. https://github.com/microsoft/TypeScript/issues/38496
+    // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
+    // @ts-ignore
+    public component<C extends Component = Component>(
+      componentCtor: Constructor<C>,
+      nameOrOptions?: string | BindingFromClassOptions,
+    ) {
+      const binding = super.component(componentCtor, nameOrOptions);
+      this.mountComponentBooters(componentCtor);
+      return binding;
     }
 
     /**
@@ -129,7 +191,9 @@ export function BootMixin<T extends Constructor<any>>(superClass: T) {
      */
     mountComponentBooters(component: Constructor<{}>) {
       const componentKey = `components.${component.name}`;
-      const compInstance = this.getSync(componentKey);
+      const compInstance = this.getSync<{
+        booters?: Constructor<Booter>[];
+      }>(componentKey);
 
       if (compInstance.booters) {
         this.booters(...compInstance.booters);