@dreamkit/app 0.0.11 → 0.0.12

package/lib/App.d.ts

@@ -17,6 +17,7 @@ export declare class App {
     readonly middlewares: Set<MiddlewareConstructor>;
     readonly settings: Set<SettingsConstructor<import("./builders/SettingsBuilder.js").SettingsData<import("./builders/SettingsBuilder.js").SettingsName, import("./builders/SettingsBuilder.js").SettingsParams, import("./builders/SettingsBuilder.js").SettingsDefaults<import("./builders/SettingsBuilder.js").SettingsParams>>>>;
     readonly api: Map<string, Func>;
+    protected apiRef: Map<string, string>;
     settingsHandler: SettingsHandlerConstructor | undefined;
     sessionHandler: SessionHandlerConstructor | undefined;
     protected listeners: {
@@ -56,6 +57,9 @@ export declare class App {
     protected stopService(item: AppService): Promise<void>;
     protected normalizeApiPath(path: string): string;
     protected onUnknownObject(id: string, value: unknown): void;
+    protected resolveEntry(input: Record<string, any> | any[]): {
+        [k: string]: any;
+    };
     add(input: Record<string, any> | any[]): Promise<void>;
     createRequestContext(request: Request): RequestContext;
     request(request: Request): Promise<any>;

package/lib/App.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"App.d.ts","sourceRoot":"","sources":["../src/App.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"App.d.ts","sourceRoot":"","sources":["../src/App.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,qBAAqB,EACtB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAC;AACnD,OAAO,EACL,UAAU,EAEV,kBAAkB,EACnB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAc,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAChF,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAGL,yBAAyB,EAC1B,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAEL,eAAe,EACf,0BAA0B,EAC3B,MAAM,+BAA+B,CAAC;AAGvC,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAI3C,qBAAa,GAAG;IAId,MAAM,CAAC,WAAW,SAAY;IAC9B,QAAQ,CAAC,OAAO,SAAS;IACzB,QAAQ,CAAC,OAAO,EAAE,UAAU,CAAC;IAC7B,QAAQ,CAAC,OAAO,mBAA0B;IAC1C,QAAQ,CAAC,MAAM,aAAoB;IACnC,QAAQ,CAAC,QAAQ,kBAAyB;IAC1C,QAAQ,CAAC,WAAW,6BAAoC;IACxD,QAAQ,CAAC,QAAQ,iTAAkC;IACnD,QAAQ,CAAC,GAAG,oBAA2B;IACvC,SAAS,CAAC,MAAM,sBAA6B;IACtC,eAAe,EAAE,0BAA0B,GAAG,SAAS,CAAC;IACxD,cAAc,EAAE,yBAAyB,GAAG,SAAS,CAAC;IAC7D,SAAS,CAAC,SAAS;wBACG;YAAE,EAAE,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,OAAO,CAAA;SAAE,KAAK,GAAG;2BACnC;YAAE,EAAE,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,OAAO,CAAA;SAAE,KAAK,GAAG;2BAEpD;YAAE,EAAE,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,OAAO,CAAC;YAAC,MAAM,EAAE,KAAK,GAAG,QAAQ,CAAA;SAAE,KAAK,GAAG;MAEzE;;IAOF,MAAM,CAAC,QAAQ,IAAI,GAAG;IAKtB,MAAM,CAAC,YAAY,CAAC,QAAQ,EAAE,GAAG;IAGjC,MAAM,CAAC,oBAAoB,IAAI,GAAG;IAKlC,EAAE,CACA,KAAK,EAAE,KAAK,GAAG,QAAQ,EACvB,EAAE,EAAE,CAAC,IAAI,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,OAAO,CAAA;KAAE,KAAK,GAAG,GAChD,IAAI;IACP,EAAE,CACA,KAAK,EAAE,QAAQ,EACf,EAAE,EAAE,CAAC,IAAI,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,OAAO,CAAC;QAAC,MAAM,EAAE,KAAK,GAAG,QAAQ,CAAA;KAAE,KAAK,GAAG,GAC1E,IAAI;IAKP,GAAG,CAAC,KAAK,EAAE,KAAK,GAAG,QAAQ,GAAG,QAAQ,EAAE,EAAE,EAAE,GAAG,GAAG,IAAI;IAItD,WAAW,CAAC,KAAK,EAAE,OAAO;IAMpB,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IA8BpC,SAAS;IAIf,SAAS,CAAC,UAAU,CAAC,OAAO,EAAE,kBAAkB,GAAG,UAAU;cAU7C,YAAY,CAAC,IAAI,EAAE,UAAU;cAU7B,WAAW,CAAC,IAAI,EAAE,UAAU;IAO5C,SAAS,CAAC,gBAAgB,CAAC,IAAI,EAAE,MAAM;IAyBvC,SAAS,CAAC,eAAe,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO;IAIpD,SAAS,CAAC,YAAY,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,GAAG,EAAE;;;IA4BnD,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAiE5D,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,cAAc;IAoBhD,OAAO,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC;cAU7B,iBAAiB,CAAC,WAAW,EAAE,mBAAmB;;;cAiBlD,mBAAmB;cAUnB,gBAAgB,CAAC,WAAW,EAAE,mBAAmB;IAUjE,SAAS,CAAC,cAAc,CAAC,WAAW,EAAE,mBAAmB;IAKzD,SAAS,CAAC,gBAAgB,IAAI,eAAe,GAAG,SAAS;IAMnD,KAAK;IAQL,IAAI;IAkBV,KAAK;CAWN"}

package/lib/App.js

@@ -25,6 +25,7 @@ export class App {
     middlewares = new Set();
     settings = new Set();
     api = new Map();
+    apiRef = new Map();
     settingsHandler;
     sessionHandler;
     listeners = {
@@ -94,6 +95,12 @@ export class App {
             else if (isSessionHandler(value)) {
                 this.sessionHandler = undefined;
             }
+            else if (isApi(value)) {
+                const path = this.apiRef.get(id);
+                this.apiRef.delete(id);
+                if (path)
+                    this.api.delete(path);
+            }
             for (const cb of this.listeners.remove)
                 await cb({ id, value });
             for (const cb of this.listeners.change)
@@ -156,16 +163,30 @@ export class App {
     onUnknownObject(id, value) {
         console.warn("Unknown object", { id, value, kinds: getKinds(value) });
     }
-    async add(input) {
-        let loadSettingsHandler = false;
-        const services = [];
-        const settings = [];
+    resolveEntry(input) {
         const objects = Array.isArray(input)
             ? input.reduce((result, value, index) => {
                 result[index] = value;
                 return result;
             }, {})
-            : input;
+            : { ...input };
+        const isPlainObject = (input) => !!input && typeof input === "object";
+        const entries = Object.entries(objects).flatMap(([id, value]) => {
+            if (isPlainObject(value) || Array.isArray(value)) {
+                return Object.entries(this.resolveEntry(value)).map(([childId, childValue]) => [
+                    id === "default" ? childId : `${id}:${childId}`,
+                    childValue,
+                ]);
+            }
+            return [[id, value]];
+        });
+        return Object.fromEntries(entries);
+    }
+    async add(input) {
+        let loadSettingsHandler = false;
+        const services = [];
+        const settings = [];
+        const objects = this.resolveEntry(input);
         for (const [id, value] of Object.entries(objects)) {
             if (isRoute(value)) {
                 this.routes.add(value);
@@ -198,7 +219,9 @@ export class App {
                 this.sessionHandler = value;
             }
             else if (isApi(value)) {
-                this.api.set(this.normalizeApiPath(id), value);
+                const path = this.normalizeApiPath(id);
+                this.api.set(path, value);
+                this.apiRef.set(id, path);
             }
             else {
                 this.onUnknownObject(id, value);
@@ -224,7 +247,7 @@ export class App {
         }
         if (this.started) {
             if (loadSettingsHandler)
-                await this.context.resolve(SettingsHandler).load();
+                await this.context.resolve(SettingsHandler, { abstract: true }).load();
             for (const setting of settings)
                 await this.registerSettings(setting);
             for (const service of services)
@@ -263,6 +286,7 @@ export class App {
     async initSettingsValue(constructor) {
         const handler = this.context.resolve(SettingsHandler, {
             optional: true,
+            abstract: true,
         });
         if (!handler)
             return;
@@ -302,7 +326,10 @@ export class App {
         this.context.unregister(constructor);
     }
     seettingsHandler() {
-        return this.context.resolve(SettingsHandler, { optional: true });
+        return this.context.resolve(SettingsHandler, {
+            optional: true,
+            abstract: true,
+        });
     }
     async start() {
         log("starting app");
@@ -339,6 +366,7 @@ export class App {
         this.middlewares.clear();
         this.settings.clear();
         this.api.clear();
+        this.apiRef.clear();
         this.settingsHandler = undefined;
         this.sessionHandler = undefined;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dreamkit/app",
-  "version": "0.0.11",
+  "version": "0.0.12",
   "description": "Set of utils to create applications.",
   "homepage": "https://dreamkit.dev",
   "repository": {
@@ -27,11 +27,11 @@
   ],
   "dependencies": {
     "debug": "^4.4.1",
-    "@dreamkit/func": "0.0.6",
-    "@dreamkit/ioc": "0.1.0",
+    "@dreamkit/func": "0.0.7",
+    "@dreamkit/ioc": "0.2.0",
     "@dreamkit/kind": "0.0.3",
-    "@dreamkit/utils": "0.0.6",
-    "@dreamkit/schema": "0.0.6"
+    "@dreamkit/schema": "0.0.6",
+    "@dreamkit/utils": "0.0.6"
   },
   "devDependencies": {
     "@types/debug": "^4.1.12",