@tsed/config 8.9.0-beta.3 → 8.9.0-beta.5

package/lib/types/interfaces/ConfigSource.d.ts

@@ -48,10 +48,12 @@ export type ConfigSourceOnChangeCB = () => void;
  */
 export interface ConfigSource<Opts = any> {
     options: Opts;
+    $onInit?(): Promise<void> | void;
+    $onDestroy?(): Promise<void> | void;
     /**
      * Load configuration from the source.
      */
     getAll(): Promise<Record<string, unknown>> | Record<string, unknown>;
-    watch?(onChange?: ConfigSourceOnChangeCB): Promise<ConfigSourceWatchCloseCB> | ConfigSourceWatchCloseCB;
+    watch?(onChange?: ConfigSourceOnChangeCB): Promise<ConfigSourceWatchCloseCB> | ConfigSourceWatchCloseCB | void | Promise<void>;
 }
 export type ConfigurationExtends = (Type<ConfigSource> | ConfigSourceOptions)[];

package/package.json

@@ -2,7 +2,7 @@
   "name": "@tsed/config",
   "description": "Configuration management for Ts.ED",
   "type": "module",
-  "version": "8.9.0-beta.3",
+  "version": "8.9.0-beta.5",
   "keywords": [
     "Ts.ED",
     "Configuration",
@@ -49,11 +49,11 @@
     "tslib": "2.7.0"
   },
   "devDependencies": {
-    "@tsed/ajv": "8.9.0-beta.3",
-    "@tsed/barrels": "8.9.0-beta.3",
-    "@tsed/core": "8.9.0-beta.3",
-    "@tsed/di": "8.9.0-beta.3",
-    "@tsed/typescript": "8.9.0-beta.3",
+    "@tsed/ajv": "8.9.0-beta.5",
+    "@tsed/barrels": "8.9.0-beta.5",
+    "@tsed/core": "8.9.0-beta.5",
+    "@tsed/di": "8.9.0-beta.5",
+    "@tsed/typescript": "8.9.0-beta.5",
     "@types/js-yaml": "4.0.9",
     "dotenv": "^16.5.0",
     "dotenv-expand": "^12.0.2",

package/src/hooks/afterResolveConfiguration.ts

@@ -1,6 +1,6 @@
 import "@tsed/ajv";
 
-import {configuration, constant, injectable, logger} from "@tsed/di";
+import {configuration, constant, inject, injectable, logger} from "@tsed/di";
 import {$on} from "@tsed/hooks";
 
 import {CONFIG_SOURCES} from "../constants/constants.js";
@@ -12,10 +12,16 @@ export async function afterResolveConfiguration() {
   const sources = getConfigSources(constant<ConfigurationExtends>("extends", []));
 
   for (const source of sources.values()) {
-    const {instance, options, watch, refreshOn, name, validationSchema} = source;
+    const {instance, watch, refreshOn, name, validationSchema} = source;
+
+    if (instance?.$onInit) {
+      await instance.$onInit();
+    }
+
+    const getAll = instance.getAll;
 
     const refresh = async () => {
-      let data = await instance.getAll();
+      let data = await getAll.apply(instance);
 
       if (validationSchema) {
         data = await validate(name!, data, validationSchema);
@@ -23,15 +29,19 @@ export async function afterResolveConfiguration() {
 
       source.data = data;
       configuration().set(data);
+
+      return data;
     };
 
+    instance.getAll = refresh as any;
+
     await refresh();
 
     // manage watcher
     if (watch && instance?.watch) {
       const closer = await instance.watch(refresh);
 
-      $on("$onDestroy", closer);
+      closer && $on("$onDestroy", closer);
     }
 
     // manager refresh on request
@@ -75,3 +85,12 @@ export async function afterResolveConfiguration() {
 }
 
 $on("$afterResolveConfiguration", afterResolveConfiguration);
+$on("$onDestroy", () => {
+  const configs = inject<CONFIG_SOURCES>(CONFIG_SOURCES);
+
+  const promises = Object.values(configs).map((config) => {
+    return config.$onDestroy?.();
+  });
+
+  return Promise.all(promises);
+});

package/src/interfaces/ConfigSource.ts

@@ -54,12 +54,14 @@ export type ConfigSourceOnChangeCB = () => void;
 export interface ConfigSource<Opts = any> {
   options: Opts;
 
+  $onInit?(): Promise<void> | void;
+  $onDestroy?(): Promise<void> | void;
   /**
    * Load configuration from the source.
    */
   getAll(): Promise<Record<string, unknown>> | Record<string, unknown>;
 
-  watch?(onChange?: ConfigSourceOnChangeCB): Promise<ConfigSourceWatchCloseCB> | ConfigSourceWatchCloseCB;
+  watch?(onChange?: ConfigSourceOnChangeCB): Promise<ConfigSourceWatchCloseCB> | ConfigSourceWatchCloseCB | void | Promise<void>;
 }
 
 export type ConfigurationExtends = (Type<ConfigSource> | ConfigSourceOptions)[];