@dreamkit/app 0.0.22 → 0.0.24

package/lib/App.d.ts

@@ -12,12 +12,13 @@ export declare class App {
     readonly started = false;
     readonly context: AppContext;
     readonly objects: Map<string, any>;
+    readonly objectsPath: Map<string, string>;
+    readonly unknownObjectIds: Set<string>;
     readonly routes: Set<Route>;
     readonly services: Set<AppService>;
     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: {
@@ -55,8 +56,7 @@ export declare class App {
     protected addService(service: ServiceConstructor): AppService;
     protected startService(item: AppService): Promise<void>;
     protected stopService(item: AppService): Promise<void>;
-    protected normalizeApiPath(path: string): string;
-    protected onUnknownObject(id: string, value: unknown): void;
+    protected normalizeObjectPath(path: string): string;
     protected resolveEntry(input: Record<string, any> | any[]): {
         [k: string]: 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":"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"}

package/lib/App.js

@@ -13,8 +13,8 @@ import { isSessionHandler, SessionHandler, } from "./handlers/SessionHandler.js"
 import { isSettingsHandler, SettingsHandler, } from "./handlers/SettingsHandler.js";
 import { isRoute, kindApp } from "./utils/kind.js";
 import { log } from "./utils/log.js";
-import { getKinds, kindOf } from "@dreamkit/kind";
-import { isPlainObject, merge } from "@dreamkit/utils/object.js";
+import { kindOf } from "@dreamkit/kind";
+import { isPlainObject, merge, sortByDeps } from "@dreamkit/utils/object.js";
 export class App {
     static {
         kindApp(this);
@@ -23,12 +23,13 @@ export class App {
     started = false;
     context;
     objects = new Map();
+    objectsPath = new Map();
+    unknownObjectIds = new Set();
     routes = new Set();
     services = new Set();
     middlewares = new Set();
     settings = new Set();
     api = new Map();
-    apiRef = new Map();
     settingsHandler;
     sessionHandler;
     listeners = {
@@ -76,6 +77,8 @@ export class App {
             const value = this.objects.get(id);
             if (!value)
                 throw new Error(`Object not found: ${id}`);
+            const path = this.objectsPath.get(id);
+            this.objectsPath.delete(id);
             if (isRoute(value)) {
                 this.routes.delete(value);
             }
@@ -99,8 +102,6 @@ export class App {
                 this.sessionHandler = undefined;
             }
             else if (isApi(value)) {
-                const path = this.apiRef.get(id);
-                this.apiRef.delete(id);
                 if (path)
                     this.api.delete(path);
             }
@@ -112,6 +113,7 @@ export class App {
             for (const cb of this.listeners.change)
                 await cb({ id, value, action: "remove" });
             this.objects.delete(id);
+            this.unknownObjectIds.delete(id);
         }
     }
     async removeAll() {
@@ -123,6 +125,7 @@ export class App {
             name: service.prototype.name ?? service.name ?? "anonymous",
             service,
             started: false,
+            options: service.$options,
         };
         this.services.add(item);
         return item;
@@ -144,18 +147,17 @@ export class App {
         item.started = false;
         log("service stopped", { name });
     }
-    normalizeApiPath(path) {
+    normalizeObjectPath(path) {
         return ("/" +
             path
                 .split(/[:/]/)
                 .map((value) => {
-                if (value === "index.ts" ||
-                    value === "index.js" ||
+                if (/^index\.[mc]?([jt]s)x?$/.test(value) ||
                     value === "." ||
                     !value.length) {
                     return undefined;
                 }
-                else if (value.endsWith(".ts") || value.endsWith(".js")) {
+                else if (/\.[mc]?([jt]s)x?$/.test(value)) {
                     const parts = value.split(".");
                     return parts.slice(0, -1).join(".");
                 }
@@ -166,9 +168,6 @@ export class App {
                 .filter(Boolean)
                 .join("/"));
     }
-    onUnknownObject(id, value) {
-        console.warn("Unknown object", { id, value, kinds: getKinds(value) });
-    }
     resolveEntry(input) {
         const objects = Array.isArray(input)
             ? input.reduce((result, value, index) => {
@@ -193,6 +192,8 @@ export class App {
         const settings = [];
         const objects = this.resolveEntry(input);
         for (const [id, value] of Object.entries(objects)) {
+            const path = this.normalizeObjectPath(id);
+            this.objectsPath.set(id, path);
             if (isRoute(value)) {
                 this.routes.add(value);
             }
@@ -224,15 +225,13 @@ export class App {
                 this.sessionHandler = value;
             }
             else if (isApi(value)) {
-                const path = this.normalizeApiPath(id);
                 this.api.set(path, value);
-                this.apiRef.set(id, path);
             }
             else if (kindOf(value, Serializer)) {
                 this.context.resolve(EJSON).add(value);
             }
             else {
-                this.onUnknownObject(id, value);
+                this.unknownObjectIds.add(id);
             }
             /*
             // [review] require create a dependency for removing
@@ -372,7 +371,13 @@ export class App {
             throw new Error("App is already started");
         await this.prepare();
         this.started = true;
-        for (const item of this.services)
+        const services = sortByDeps([...this.services].map((item) => ({
+            item,
+            value: item.service,
+            deps: item.options.deps,
+            priority: item.options.priority,
+        })));
+        for (const { item } of services)
             await this.startService(item);
     }
     async stop() {
@@ -396,12 +401,13 @@ export class App {
     }
     clear() {
         this.objects.clear();
+        this.objectsPath.clear();
+        this.unknownObjectIds.clear();
         this.routes.clear();
         this.services.clear();
         this.middlewares.clear();
         this.settings.clear();
         this.api.clear();
-        this.apiRef.clear();
         this.context.resolve(EJSON).clear();
         this.settingsHandler = undefined;
         this.sessionHandler = undefined;

package/lib/EJSON.js

@@ -46,8 +46,8 @@ export class EJSON {
                     };
                 }
             }
-            return input;
         }
+        return input;
     }
     decode(input) {
         if (isPlainObject(input)) {

package/lib/builders/ServiceBuilder.d.ts

@@ -4,6 +4,8 @@ export declare const kindService: (input: object, name?: string) => void, isServ
 export type ServiceSelf = IocParamsUserConfig | undefined;
 export type ServiceData<TSelf extends ServiceSelf = ServiceSelf> = {
     self?: TSelf;
+    deps?: ServiceConstructor[];
+    priority?: number;
 };
 export type ServiceOptions<T extends ServiceData = ServiceData> = T & {
     static?: Record<string, any>;
@@ -16,6 +18,7 @@ export type AppService = {
     service: ServiceConstructor;
     started: boolean;
     shutdown?: Shutdown;
+    options: ServiceOptions;
 };
 export declare abstract class Service {
     abstract onStart(): any;
@@ -29,6 +32,8 @@ export declare class ServiceBuilder<T extends ServiceData = {}> {
     self<TSelf extends ServiceSelf>(value: TSelf): ServiceBuilder<MergeServiceData<T, {
         self: TSelf;
     }>>;
+    deps(deps: ServiceConstructor[]): this;
+    priority(priority: number): this;
     create(): IocClass<T["self"] & {}, Service>;
 }
 export {};

package/lib/builders/ServiceBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ServiceBuilder.d.ts","sourceRoot":"","sources":["../../src/builders/ServiceBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,QAAQ,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAE9E,OAAO,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEhE,eAAO,MAAO,WAAW,0CAAE,SAAS,iDAEnC,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG,mBAAmB,GAAG,SAAS,CAAC;AAC1D,MAAM,MAAM,WAAW,CAAC,KAAK,SAAS,WAAW,GAAG,WAAW,IAAI;IACjE,IAAI,CAAC,EAAE,KAAK,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,cAAc,CAAC,CAAC,SAAS,WAAW,GAAG,WAAW,IAAI,CAAC,GAAG;IACpE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,gBAAgB,CAC1B,EAAE,SAAS,WAAW,EACtB,EAAE,SAAS,OAAO,CAAC,WAAW,CAAC,IAC7B,KAAK,CAAC,WAAW,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;AAE/B,KAAK,WAAW,CAAC,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;AACrC,MAAM,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,IAAI,CAAC,CAAC;AAC/C,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,kBAAkB,CAAC;IAC5B,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB,CAAC;AAEF,8BAAsB,OAAO;IAI3B,QAAQ,CAAC,OAAO,IAAI,GAAG;CACxB;AAED,MAAM,MAAM,kBAAkB,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;AAItD,qBAAa,cAAc,CAAC,CAAC,SAAS,WAAW,GAAG,EAAE;IACpD,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;IACjB,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC;gBACxB,OAAO,GAAE,cAAc,CAAC,CAAC,CAAa;IASlD,SAAS,CAAC,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,cAAc,CAAC,GAAG,IAAI;IAOpD,IAAI,CAAC,KAAK,SAAS,WAAW,EAC5B,KAAK,EAAE,KAAK,GACX,cAAc,CAAC,gBAAgB,CAAC,CAAC,EAAE;QAAE,IAAI,EAAE,KAAK,CAAA;KAAE,CAAC,CAAC;IAGvD,MAAM,IAAI,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,EAAE,OAAO,CAAC;CAK5C"}
+{"version":3,"file":"ServiceBuilder.d.ts","sourceRoot":"","sources":["../../src/builders/ServiceBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,QAAQ,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAE9E,OAAO,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEhE,eAAO,MAAO,WAAW,0CAAE,SAAS,iDAEnC,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG,mBAAmB,GAAG,SAAS,CAAC;AAC1D,MAAM,MAAM,WAAW,CAAC,KAAK,SAAS,WAAW,GAAG,WAAW,IAAI;IACjE,IAAI,CAAC,EAAE,KAAK,CAAC;IACb,IAAI,CAAC,EAAE,kBAAkB,EAAE,CAAC;IAC5B,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,cAAc,CAAC,CAAC,SAAS,WAAW,GAAG,WAAW,IAAI,CAAC,GAAG;IACpE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,gBAAgB,CAC1B,EAAE,SAAS,WAAW,EACtB,EAAE,SAAS,OAAO,CAAC,WAAW,CAAC,IAC7B,KAAK,CAAC,WAAW,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;AAE/B,KAAK,WAAW,CAAC,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;AACrC,MAAM,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,IAAI,CAAC,CAAC;AAC/C,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,kBAAkB,CAAC;IAC5B,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,OAAO,EAAE,cAAc,CAAC;CACzB,CAAC;AAEF,8BAAsB,OAAO;IAI3B,QAAQ,CAAC,OAAO,IAAI,GAAG;CACxB;AAED,MAAM,MAAM,kBAAkB,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;AAItD,qBAAa,cAAc,CAAC,CAAC,SAAS,WAAW,GAAG,EAAE;IACpD,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;IACjB,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC;gBACxB,OAAO,GAAE,cAAc,CAAC,CAAC,CAAa;IASlD,SAAS,CAAC,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,cAAc,CAAC,GAAG,IAAI;IAOpD,IAAI,CAAC,KAAK,SAAS,WAAW,EAC5B,KAAK,EAAE,KAAK,GACX,cAAc,CAAC,gBAAgB,CAAC,CAAC,EAAE;QAAE,IAAI,EAAE,KAAK,CAAA;KAAE,CAAC,CAAC;IAGvD,IAAI,CAAC,IAAI,EAAE,kBAAkB,EAAE,GAAG,IAAI;IAGtC,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAGhC,MAAM,IAAI,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,EAAE,OAAO,CAAC;CAM5C"}

package/lib/builders/ServiceBuilder.js

@@ -29,8 +29,15 @@ export class ServiceBuilder {
     self(value) {
         return this.clone({ self: value });
     }
+    deps(deps) {
+        return this.clone({ deps });
+    }
+    priority(priority) {
+        return this.clone({ priority });
+    }
     create() {
         const Class = ServiceClass(this.options.self || {});
+        Object.assign(Class, { $options: this.options });
         if (this.options.static)
             Object.assign(Class, this.options.static);
         return Class;

package/lib/index.base.d.ts

@@ -0,0 +1,25 @@
+export { ResponseHeaders } from "./ResponseHeaders.js";
+export { isRoute, isApp } from "./utils/kind.js";
+export { isApi } from "./builders/ApiBuilder.js";
+export { App } from "./App.js";
+export { defineRoutePath, type RoutePathFunc } from "./routePath.js";
+export { EJSON, type EJSONEncodedObject } from "./EJSON.js";
+export { AppContext } from "./contexts/AppContext.js";
+export { RequestContext } from "./contexts/RequestContext.js";
+export { $api } from "./objects/$api.js";
+export { $route } from "./objects/$route.js";
+export { $middleware } from "./objects/$middleware.js";
+export { $serializer } from "./objects/$serializer.js";
+export { $service } from "./objects/$service.js";
+export { $session } from "./objects/$session.js";
+export { $schema } from "./objects/$schema.js";
+export { RouteBuilder, type RouteOptions, type Route, type RouteData, type RouteProps, } from "./builders/RouteBuilder.js";
+export { $settings } from "./objects/$settings.js";
+export { Settings, SettingsBuilder, type SettingsConstructor, type SettingsData, isSettings, } from "./builders/SettingsBuilder.js";
+export { Middleware, isMiddleware, type MiddlewareConstructor, type MiddlewareOptions, type MiddlewareData, } from "./builders/MiddlewareBuilder.js";
+export { Serializer, type SerializerData, isSerializer, } from "./builders/SerializerBuilder.js";
+export { Service, type ServiceConstructor, type ServiceOptions, type ServiceData, isService, } from "./builders/ServiceBuilder.js";
+export { Session, type SessionConstructor, type SessionOptions, type SessionData, isSession, } from "./builders/SessionBuilder.js";
+export { SettingsHandler, SettingsHandlerClass, type SettingsHandlerConstructor, type SettingsHandlerSaveResult, } from "./handlers/SettingsHandler.js";
+export { SessionHandler, SessionHandlerClass, type SessionHandlerConstructor, } from "./handlers/SessionHandler.js";
+//# sourceMappingURL=index.base.d.ts.map

package/lib/index.base.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.base.d.ts","sourceRoot":"","sources":["../src/index.base.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACjD,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAC/B,OAAO,EAAE,eAAe,EAAE,KAAK,aAAa,EAAE,MAAM,gBAAgB,CAAC;AACrE,OAAO,EAAE,KAAK,EAAE,KAAK,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAE5D,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAE9D,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EACL,YAAY,EACZ,KAAK,YAAY,EACjB,KAAK,KAAK,EACV,KAAK,SAAS,EACd,KAAK,UAAU,GAChB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EACL,QAAQ,EACR,eAAe,EACf,KAAK,mBAAmB,EACxB,KAAK,YAAY,EACjB,UAAU,GACX,MAAM,+BAA+B,CAAC;AACvC,OAAO,EACL,UAAU,EACV,YAAY,EACZ,KAAK,qBAAqB,EAC1B,KAAK,iBAAiB,EACtB,KAAK,cAAc,GACpB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EACL,UAAU,EACV,KAAK,cAAc,EACnB,YAAY,GACb,MAAM,iCAAiC,CAAC;AACzC,OAAO,EACL,OAAO,EACP,KAAK,kBAAkB,EACvB,KAAK,cAAc,EACnB,KAAK,WAAW,EAChB,SAAS,GACV,MAAM,8BAA8B,CAAC;AACtC,OAAO,EACL,OAAO,EACP,KAAK,kBAAkB,EACvB,KAAK,cAAc,EACnB,KAAK,WAAW,EAChB,SAAS,GACV,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EACL,eAAe,EACf,oBAAoB,EACpB,KAAK,0BAA0B,EAC/B,KAAK,yBAAyB,GAC/B,MAAM,+BAA+B,CAAC;AACvC,OAAO,EACL,cAAc,EACd,mBAAmB,EACnB,KAAK,yBAAyB,GAC/B,MAAM,8BAA8B,CAAC"}

package/lib/index.base.js

@@ -0,0 +1,27 @@
+export { ResponseHeaders } from "./ResponseHeaders.js";
+export { isRoute, isApp } from "./utils/kind.js";
+export { isApi } from "./builders/ApiBuilder.js";
+export { App } from "./App.js";
+export { defineRoutePath } from "./routePath.js";
+export { EJSON } from "./EJSON.js";
+// contexts
+export { AppContext } from "./contexts/AppContext.js";
+export { RequestContext } from "./contexts/RequestContext.js";
+// objects
+export { $api } from "./objects/$api.js";
+export { $route } from "./objects/$route.js";
+export { $middleware } from "./objects/$middleware.js";
+export { $serializer } from "./objects/$serializer.js";
+export { $service } from "./objects/$service.js";
+export { $session } from "./objects/$session.js";
+export { $schema } from "./objects/$schema.js";
+export { RouteBuilder, } from "./builders/RouteBuilder.js";
+export { $settings } from "./objects/$settings.js";
+export { Settings, SettingsBuilder, isSettings, } from "./builders/SettingsBuilder.js";
+export { Middleware, isMiddleware, } from "./builders/MiddlewareBuilder.js";
+export { Serializer, isSerializer, } from "./builders/SerializerBuilder.js";
+export { Service, isService, } from "./builders/ServiceBuilder.js";
+export { Session, isSession, } from "./builders/SessionBuilder.js";
+// handlers
+export { SettingsHandler, SettingsHandlerClass, } from "./handlers/SettingsHandler.js";
+export { SessionHandler, SessionHandlerClass, } from "./handlers/SessionHandler.js";

package/lib/index.d.ts

@@ -1,29 +1,3 @@
-export { RequestUrl } from "./RequestUrl.js";
-export { ResponseHeaders } from "./ResponseHeaders.js";
-export { isRoute, isApp } from "./utils/kind.js";
-export { isApi } from "./builders/ApiBuilder.js";
-export { App } from "./App.js";
-export { defineRoutePath, routePath } from "./routePath.js";
-export { EJSON, type EJSONEncodedObject } from "./EJSON.js";
-export { AppContext } from "./contexts/AppContext.js";
-export { RequestContext } from "./contexts/RequestContext.js";
-export { $api } from "./objects/$api.js";
-export { $route } from "./objects/$route.js";
-export { $middleware } from "./objects/$middleware.js";
-export { $serializer } from "./objects/$serializer.js";
-export { $service } from "./objects/$service.js";
-export { $session } from "./objects/$session.js";
-export { $schema } from "./objects/$schema.js";
-export { RouteBuilder, type RouteOptions, type Route, type RouteData, type RouteProps, } from "./builders/RouteBuilder.js";
-export { $settings } from "./objects/$settings.js";
-export { Settings, SettingsBuilder, type SettingsConstructor, type SettingsData, isSettings, } from "./builders/SettingsBuilder.js";
-export { Middleware, isMiddleware, type MiddlewareConstructor, type MiddlewareOptions, type MiddlewareData, } from "./builders/MiddlewareBuilder.js";
-export { Serializer, type SerializerData, isSerializer, } from "./builders/SerializerBuilder.js";
-export { Service, type ServiceConstructor, type ServiceOptions, type ServiceData, isService, } from "./builders/ServiceBuilder.js";
-export { Session, type SessionConstructor, type SessionOptions, type SessionData, isSession, } from "./builders/SessionBuilder.js";
-export { SettingsHandler, SettingsHandlerClass, type SettingsHandlerConstructor, type SettingsHandlerSaveResult, } from "./handlers/SettingsHandler.js";
-export { SessionHandler, SessionHandlerClass, type SessionHandlerConstructor, } from "./handlers/SessionHandler.js";
-export { ClientSessionHandler } from "./presets/ClientSessionHandler.js";
-export { ClientSessionSettings } from "./presets/ClientSessionSettings.js";
-export * from "./presets/serializers.js";
+export * from "./index.typed.js";
+export * from "./index.base.js";
 //# sourceMappingURL=index.d.ts.map

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACjD,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAC/B,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC5D,OAAO,EAAE,KAAK,EAAE,KAAK,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAE5D,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAE9D,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EACL,YAAY,EACZ,KAAK,YAAY,EACjB,KAAK,KAAK,EACV,KAAK,SAAS,EACd,KAAK,UAAU,GAChB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EACL,QAAQ,EACR,eAAe,EACf,KAAK,mBAAmB,EACxB,KAAK,YAAY,EACjB,UAAU,GACX,MAAM,+BAA+B,CAAC;AACvC,OAAO,EACL,UAAU,EACV,YAAY,EACZ,KAAK,qBAAqB,EAC1B,KAAK,iBAAiB,EACtB,KAAK,cAAc,GACpB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EACL,UAAU,EACV,KAAK,cAAc,EACnB,YAAY,GACb,MAAM,iCAAiC,CAAC;AACzC,OAAO,EACL,OAAO,EACP,KAAK,kBAAkB,EACvB,KAAK,cAAc,EACnB,KAAK,WAAW,EAChB,SAAS,GACV,MAAM,8BAA8B,CAAC;AACtC,OAAO,EACL,OAAO,EACP,KAAK,kBAAkB,EACvB,KAAK,cAAc,EACnB,KAAK,WAAW,EAChB,SAAS,GACV,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EACL,eAAe,EACf,oBAAoB,EACpB,KAAK,0BAA0B,EAC/B,KAAK,yBAAyB,GAC/B,MAAM,+BAA+B,CAAC;AACvC,OAAO,EACL,cAAc,EACd,mBAAmB,EACnB,KAAK,yBAAyB,GAC/B,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAC3E,cAAc,0BAA0B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC"}

package/lib/index.js

@@ -1,32 +1,2 @@
-export { RequestUrl } from "./RequestUrl.js";
-export { ResponseHeaders } from "./ResponseHeaders.js";
-export { isRoute, isApp } from "./utils/kind.js";
-export { isApi } from "./builders/ApiBuilder.js";
-export { App } from "./App.js";
-export { defineRoutePath, routePath } from "./routePath.js";
-export { EJSON } from "./EJSON.js";
-// contexts
-export { AppContext } from "./contexts/AppContext.js";
-export { RequestContext } from "./contexts/RequestContext.js";
-// objects
-export { $api } from "./objects/$api.js";
-export { $route } from "./objects/$route.js";
-export { $middleware } from "./objects/$middleware.js";
-export { $serializer } from "./objects/$serializer.js";
-export { $service } from "./objects/$service.js";
-export { $session } from "./objects/$session.js";
-export { $schema } from "./objects/$schema.js";
-export { RouteBuilder, } from "./builders/RouteBuilder.js";
-export { $settings } from "./objects/$settings.js";
-export { Settings, SettingsBuilder, isSettings, } from "./builders/SettingsBuilder.js";
-export { Middleware, isMiddleware, } from "./builders/MiddlewareBuilder.js";
-export { Serializer, isSerializer, } from "./builders/SerializerBuilder.js";
-export { Service, isService, } from "./builders/ServiceBuilder.js";
-export { Session, isSession, } from "./builders/SessionBuilder.js";
-// handlers
-export { SettingsHandler, SettingsHandlerClass, } from "./handlers/SettingsHandler.js";
-export { SessionHandler, SessionHandlerClass, } from "./handlers/SessionHandler.js";
-// presets
-export { ClientSessionHandler } from "./presets/ClientSessionHandler.js";
-export { ClientSessionSettings } from "./presets/ClientSessionSettings.js";
-export * from "./presets/serializers.js";
+export * from "./index.typed.js";
+export * from "./index.base.js";

package/lib/index.typed.d.ts

@@ -0,0 +1,3 @@
+export { routePath } from "./routePath.js";
+export { RequestUrl } from "./RequestUrl.js";
+//# sourceMappingURL=index.typed.d.ts.map

package/lib/index.typed.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.typed.d.ts","sourceRoot":"","sources":["../src/index.typed.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC"}

package/lib/index.typed.js

@@ -0,0 +1,2 @@
+export { routePath } from "./routePath.js";
+export { RequestUrl } from "./RequestUrl.js";

package/lib/presets/ClientSessionSettings.d.ts

@@ -3,7 +3,7 @@ declare const params: {
     key: import("@dreamkit/schema").StringType<{}>;
     iv: import("@dreamkit/schema").StringType<{}>;
 };
-declare const ClientSessionSettings_base: import("../index.js").SettingsConstructor<{
+declare const ClientSessionSettings_base: import("../index.base.js").SettingsConstructor<{
     name: "clientSession";
     params: import("@dreamkit/schema").ObjectType<{
         key: import("@dreamkit/schema").StringType<{}>;

package/lib/presets/index.d.ts

@@ -0,0 +1,4 @@
+export { ClientSessionHandler } from "./ClientSessionHandler.js";
+export { ClientSessionSettings } from "./ClientSessionSettings.js";
+export * from "./serializers.js";
+//# sourceMappingURL=index.d.ts.map

package/lib/presets/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/presets/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,cAAc,kBAAkB,CAAC"}

package/lib/presets/index.js

@@ -0,0 +1,3 @@
+export { ClientSessionHandler } from "./ClientSessionHandler.js";
+export { ClientSessionSettings } from "./ClientSessionSettings.js";
+export * from "./serializers.js";

package/lib/presets/serializers.d.ts

@@ -1,8 +1,8 @@
 import { TypeAssertError } from "@dreamkit/schema";
-export declare const errorSerializer: import("../index.js").Serializer<Error, {
+export declare const errorSerializer: import("../index.base.js").Serializer<Error, {
     name: string;
     message: string;
 }>;
-export declare const dateSerializer: import("../index.js").Serializer<Date, string>;
-export declare const typeAssertErrorSerializer: import("../index.js").Serializer<TypeAssertError, import("@dreamkit/schema").TypeAssertErrorData<any>[]>;
+export declare const dateSerializer: import("../index.base.js").Serializer<Date, string>;
+export declare const typeAssertErrorSerializer: import("../index.base.js").Serializer<TypeAssertError, import("@dreamkit/schema").TypeAssertErrorData<any>[]>;
 //# sourceMappingURL=serializers.d.ts.map

package/lib/presets/serializers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"serializers.d.ts","sourceRoot":"","sources":["../../src/presets/serializers.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAEnD,eAAO,MAAM,eAAe;;;EAU1B,CAAC;AAEH,eAAO,MAAM,cAAc,gDAMzB,CAAC;AAEH,eAAO,MAAM,yBAAyB,0GAMpC,CAAC"}
+{"version":3,"file":"serializers.d.ts","sourceRoot":"","sources":["../../src/presets/serializers.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAEnD,eAAO,MAAM,eAAe;;;EAU1B,CAAC;AAEH,eAAO,MAAM,cAAc,qDAMzB,CAAC;AAEH,eAAO,MAAM,yBAAyB,+GAMpC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dreamkit/app",
-  "version": "0.0.22",
+  "version": "0.0.24",
   "description": "Set of utils to create applications.",
   "homepage": "https://dreamkit.dev",
   "repository": {
@@ -20,6 +20,7 @@
   "type": "module",
   "exports": {
     ".": "./lib/index.js",
+    "./presets": "./lib/presets/index.js",
     "./*": "./lib/*"
   },
   "files": [
@@ -27,11 +28,11 @@
   ],
   "dependencies": {
     "debug": "^4.4.3",
-    "@dreamkit/func": "0.0.12",
+    "@dreamkit/func": "0.0.13",
     "@dreamkit/ioc": "0.3.1",
-    "@dreamkit/schema": "0.0.9",
     "@dreamkit/kind": "0.0.4",
-    "@dreamkit/utils": "0.0.8"
+    "@dreamkit/schema": "0.0.10",
+    "@dreamkit/utils": "0.0.9"
   },
   "devDependencies": {
     "@types/debug": "^4.1.12",