move shouldLoad check from register to load function (#493)

hotwired · Nov 25, 2021 · ab531d4 · ab531d4
1 parent 0fa2fa5
commit ab531d4
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/core/application.ts b/src/core/application.ts
@@ -43,16 +43,18 @@ export class Application implements ErrorHandler {
   }
 
   register(identifier: string, controllerConstructor: ControllerConstructor) {
-    if ((controllerConstructor as any).shouldLoad) {
-      this.load({ identifier, controllerConstructor })
-    }
+    this.load({ identifier, controllerConstructor })
   }
 
   load(...definitions: Definition[]): void
   load(definitions: Definition[]): void
   load(head: Definition | Definition[], ...rest: Definition[]) {
     const definitions = Array.isArray(head) ? head : [head, ...rest]
-    definitions.forEach(definition => this.router.loadDefinition(definition))
+    definitions.forEach(definition => {
+      if ((definition.controllerConstructor as any).shouldLoad) {
+        this.router.loadDefinition(definition)
+      }
+    })
   }
 
   unload(...identifiers: string[]): void