@tsed/common 6.73.8 → 6.75.0

package/lib/builder/PlatformBuilder.d.ts

@@ -89,7 +89,7 @@ export declare abstract class PlatformBuilder<App = TsED.Application, Router = T
     stop(): Promise<void>;
     ready(): Promise<void>;
     callHook(hook: string, ...args: any[]): Promise<void>;
-    loadStatics(): Promise<void>;
+    loadStatics(hook: string): Promise<void>;
     useProvider(token: Type<any>, settings?: Partial<IProvider>): this;
     protected importProviders(): Promise<void>;
     /**

package/lib/config/interfaces/PlatformStaticsSettings.d.ts

@@ -2,6 +2,7 @@ declare global {
     namespace TsED {
         interface StaticsOptions {
             root: string;
+            hook?: "$beforeRoutesInit" | "$afterRoutesInit";
             [key: string]: any;
         }
     }

package/lib/index.js

@@ -2722,6 +2722,26 @@ function createContext(injector) {
   };
 }
 
+function mapOptions$1(options) {
+  const opts = typeof options === "string" ? {
+    root: options,
+    hook: "$afterRoutesInit"
+  } : options;
+  return opts;
+}
+
+function getStaticsOptions(statics) {
+  return Object.entries(statics || {}).reduce((statics, [path, items]) => {
+    [].concat(items).forEach(options => {
+      statics.push({
+        path,
+        options: mapOptions$1(options)
+      });
+    });
+    return statics;
+  }, []);
+}
+
 const SKIP_HOOKS = ["$beforeInit", "$afterInit", "$onInit", "$onMountingMiddlewares"];
 const {
   bind,
@@ -2930,21 +2950,16 @@ class PlatformBuilder {
     }
   }
 
-  async loadStatics() {
-    const {
-      settings
-    } = this;
-
-    if (settings.statics) {
-      Object.entries(settings.statics).forEach(([path, items]) => {
-        [].concat(items).forEach(options => {
-          const opts = typeof options === "string" ? {
-            root: options
-          } : options;
-          this.platform.app.statics(path, opts);
-        });
-      });
-    }
+  async loadStatics(hook) {
+    const statics = this.settings.get("statics");
+    getStaticsOptions(statics).forEach(({
+      path,
+      options
+    }) => {
+      if (options.hook === hook) {
+        this.platform.app.statics(path, options);
+      }
+    });
   }
 
   useProvider(token, settings) {
@@ -3041,10 +3056,11 @@ class PlatformBuilder {
     }
 
     this.log("Load routes");
+    await this.loadStatics("$beforeRoutesInit");
     await this.callHook("$beforeRoutesInit");
     await this.callHook("$$loadRoutes");
     await this.callHook("$onRoutesInit");
-    await this.loadStatics();
+    await this.loadStatics("$afterRoutesInit");
     await this.callHook("$afterRoutesInit");
   }