@dreamkit/app 0.0.26 → 0.0.28

package/lib/App.d.ts

@@ -1,5 +1,5 @@
 import { type MiddlewareConstructor } from "./builders/MiddlewareBuilder.js";
-import { Route } from "./builders/RouteBuilder.js";
+import { type Route } from "./builders/RouteBuilder.js";
 import { type AppService, type ServiceConstructor } from "./builders/ServiceBuilder.js";
 import { type SettingsConstructor } from "./builders/SettingsBuilder.js";
 import { AppContext } from "./contexts/AppContext.js";
@@ -17,6 +17,7 @@ export declare class App {
     readonly routes: Set<Route>;
     readonly services: Set<AppService>;
     readonly middlewares: Set<MiddlewareConstructor>;
+    protected sortedMiddlewares: MiddlewareConstructor[] | undefined;
     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>;
     settingsHandler: SettingsHandlerConstructor | undefined;
@@ -36,7 +37,7 @@ export declare class App {
             action: "add" | "remove";
         }) => any>;
     };
-    constructor();
+    constructor(input?: Record<string, any> | any[]);
     static instance(): App;
     static saveInstance(instance: App): void;
     static createGlobalInstance(): App;
@@ -51,7 +52,7 @@ export declare class App {
     }) => any): this;
     off(event: "add" | "remove" | "change", cb: any): this;
     getObjectId(value: unknown): string;
-    remove(ids: string[]): Promise<void>;
+    remove(items: any[]): Promise<void>;
     removeAll(): Promise<void>;
     protected addService(service: ServiceConstructor): AppService;
     protected startService(item: AppService): Promise<void>;
@@ -60,8 +61,10 @@ export declare class App {
     protected resolveEntry(input: Record<string, any> | any[]): {
         [k: string]: any;
     };
+    private addSync;
     add(input: Record<string, any> | any[]): Promise<void>;
     createRequestContext(request: Request): RequestContext;
+    private getSortedMiddlewares;
     request(request: Request, context?: RequestContext): Promise<any>;
     protected initSettingsValue(constructor: SettingsConstructor): Promise<any>;
     protected registerAllSettings(): Promise<void>;

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

@@ -28,6 +28,7 @@ export class App {
     routes = new Set();
     services = new Set();
     middlewares = new Set();
+    sortedMiddlewares;
     settings = new Set();
     api = new Map();
     settingsHandler;
@@ -37,11 +38,13 @@ export class App {
         remove: new Set(),
         change: new Set(),
     };
-    constructor() {
+    constructor(input) {
         this.context = new AppContext()
             .register(App, { value: this })
             .register(EJSON, { value: new EJSON([]) });
         this.context.register(AppContext, { value: this.context });
+        if (input)
+            this.addSync(input);
     }
     static instance() {
         const value = globalThis[App.instanceKey];
@@ -72,8 +75,9 @@ export class App {
         }
         throw new Error("Object not found");
     }
-    async remove(ids) {
-        for (const id of ids) {
+    async remove(items) {
+        for (const item of items) {
+            const id = typeof item === "string" ? item : this.getObjectId(item);
             const value = this.objects.get(id);
             if (!value)
                 throw new Error(`Object not found: ${id}`);
@@ -90,6 +94,7 @@ export class App {
             }
             else if (isMiddleware(value)) {
                 this.middlewares.delete(value);
+                this.sortedMiddlewares = undefined;
             }
             else if (isSettings(value)) {
                 this.removeSettings(value);
@@ -186,10 +191,7 @@ export class App {
         });
         return Object.fromEntries(entries);
     }
-    async add(input) {
-        let loadSettingsHandler = false;
-        const services = [];
-        const settings = [];
+    *addSync(input) {
         const objects = this.resolveEntry(input);
         for (const [id, value] of Object.entries(objects)) {
             const path = this.normalizeObjectPath(id);
@@ -199,18 +201,16 @@ export class App {
             }
             else if (isService(value)) {
                 const item = this.addService(value);
-                services.push(item);
                 this.services.add(item);
             }
             else if (isMiddleware(value)) {
                 this.middlewares.add(value);
+                this.sortedMiddlewares = undefined;
             }
             else if (isSettings(value)) {
                 this.settings.add(value);
-                settings.push(value);
             }
             else if (isSettingsHandler(value)) {
-                loadSettingsHandler = true;
                 this.settingsHandler = value;
                 this.context.register(SettingsHandler, {
                     singleton: true,
@@ -233,27 +233,31 @@ export class App {
             else {
                 this.unknownObjectIds.add(id);
             }
-            /*
-            // [review] require create a dependency for removing
-            
-            if (is(value, IocBaseClass)) {
-              const params = normalizeIocParams(value.$ioc.params);
-              for (const key in params) {
-                const { value } = params[key].options;
-                if (isSettings(value)) {
-                  this.settings.add(value);
-                  settings.push(value);
-                }
-              }
-            }*/
             this.objects.set(id, value);
+            yield { id, value };
+        }
+    }
+    async add(input) {
+        const settingsHandler = this.settingsHandler;
+        const services = [];
+        const settings = [];
+        for (const { id, value } of this.addSync(input)) {
+            if (this.started) {
+                if (isService(value)) {
+                    const lastService = [...this.services][this.services.size - 1];
+                    services.push(lastService);
+                }
+                else if (isSettings(value)) {
+                    settings.push(value);
+                }
+            }
             for (const cb of this.listeners.add)
                 await cb({ id, value });
             for (const cb of this.listeners.change)
                 await cb({ id, value, action: "add" });
         }
         if (this.started) {
-            if (loadSettingsHandler)
+            if (settingsHandler !== this.settingsHandler)
                 await this.context.resolve(SettingsHandler, { abstract: true }).load();
             for (const setting of settings)
                 await this.registerSettings(setting);
@@ -290,11 +294,21 @@ export class App {
             });
         return requestContext;
     }
+    getSortedMiddlewares() {
+        if (this.sortedMiddlewares)
+            return this.sortedMiddlewares;
+        this.sortedMiddlewares = sortByDeps([...this.middlewares].map((value) => ({
+            value,
+            deps: value.$options.deps,
+            priority: value.$options.priority,
+        }))).map((item) => item.value);
+        return this.sortedMiddlewares;
+    }
     async request(request, context) {
         if (!context)
             context = this.createRequestContext(request);
         log("request", context.resolve(RequestUrl).pathname);
-        for (const middleware of this.middlewares) {
+        for (const middleware of this.getSortedMiddlewares()) {
             const $md = context.resolve(middleware);
             const response = await $md.onRequest();
             if (response && response instanceof Response) {
@@ -302,8 +316,8 @@ export class App {
                 for (const [name, value] of headers.entries()) {
                     response.headers.set(name, value);
                 }
+                return response;
             }
-            return response;
         }
     }
     async initSettingsValue(constructor) {
@@ -406,6 +420,7 @@ export class App {
         this.routes.clear();
         this.services.clear();
         this.middlewares.clear();
+        this.sortedMiddlewares = undefined;
         this.settings.clear();
         this.api.clear();
         this.context.resolve(EJSON).clear();

package/lib/AppError.d.ts

@@ -0,0 +1,6 @@
+export declare class AppError extends Error {
+    constructor(message: string, options?: {
+        cause?: unknown;
+    });
+}
+//# sourceMappingURL=AppError.d.ts.map

package/lib/AppError.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"AppError.d.ts","sourceRoot":"","sources":["../src/AppError.ts"],"names":[],"mappings":"AAAA,qBAAa,QAAS,SAAQ,KAAK;gBACrB,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,OAAO,CAAA;KAAE;CAK3D"}

package/lib/AppError.js

@@ -0,0 +1,7 @@
+export class AppError extends Error {
+    constructor(message, options) {
+        super(message);
+        this.name = "AppError";
+        this.cause = options?.cause;
+    }
+}

package/lib/builders/MiddlewareBuilder.d.ts

@@ -4,6 +4,8 @@ export declare const kindMiddleware: (input: object, name?: string) => void, isM
 export type MiddlewareSelf = IocParamsUserConfig | undefined;
 export type MiddlewareData<TSelf extends MiddlewareSelf = MiddlewareSelf> = {
     self?: TSelf;
+    deps?: MiddlewareConstructor[];
+    priority?: number;
 };
 export type MiddlewareOptions<T extends MiddlewareData = MiddlewareData> = T & {
     static?: Record<string, any>;
@@ -12,7 +14,9 @@ export type MergeMiddlewareData<D1 extends MiddlewareData, D2 extends Partial<Mi
 export declare abstract class Middleware {
     abstract onRequest(): any;
 }
-export type MiddlewareConstructor = Constructor<Middleware>;
+export type MiddlewareConstructor = Constructor<Middleware> & {
+    $options: MiddlewareOptions;
+};
 export declare class MiddlewareBuilder<T extends MiddlewareData = {}> {
     readonly data: T;
     readonly options: MiddlewareOptions<T>;
@@ -21,6 +25,8 @@ export declare class MiddlewareBuilder<T extends MiddlewareData = {}> {
     self<TSelf extends MiddlewareSelf>(value: TSelf): MiddlewareBuilder<MergeMiddlewareData<T, {
         self: TSelf;
     }>>;
+    deps(deps: MiddlewareConstructor[]): this;
+    priority(priority: number): this;
     create(): IocClass<T["self"] & {}, Middleware>;
 }
 //# sourceMappingURL=MiddlewareBuilder.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"MiddlewareBuilder.d.ts","sourceRoot":"","sources":["../../src/builders/MiddlewareBuilder.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,cAAc,0CAAE,YAAY,oDAEzC,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,mBAAmB,GAAG,SAAS,CAAC;AAC7D,MAAM,MAAM,cAAc,CAAC,KAAK,SAAS,cAAc,GAAG,cAAc,IAAI;IAC1E,IAAI,CAAC,EAAE,KAAK,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,iBAAiB,CAAC,CAAC,SAAS,cAAc,GAAG,cAAc,IAAI,CAAC,GAAG;IAC7E,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,mBAAmB,CAC7B,EAAE,SAAS,cAAc,EACzB,EAAE,SAAS,OAAO,CAAC,cAAc,CAAC,IAChC,KAAK,CAAC,cAAc,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;AAElC,8BAAsB,UAAU;IAI9B,QAAQ,CAAC,SAAS,IAAI,GAAG;CAC1B;AAED,MAAM,MAAM,qBAAqB,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC;AAI5D,qBAAa,iBAAiB,CAAC,CAAC,SAAS,cAAc,GAAG,EAAE;IAC1D,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;IACjB,QAAQ,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC;gBAC3B,OAAO,GAAE,iBAAiB,CAAC,CAAC,CAAa;IASrD,SAAS,CAAC,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,iBAAiB,CAAC,GAAG,IAAI;IAOvD,IAAI,CAAC,KAAK,SAAS,cAAc,EAC/B,KAAK,EAAE,KAAK,GACX,iBAAiB,CAAC,mBAAmB,CAAC,CAAC,EAAE;QAAE,IAAI,EAAE,KAAK,CAAA;KAAE,CAAC,CAAC;IAG7D,MAAM,IAAI,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,EAAE,UAAU,CAAC;CAK/C"}
+{"version":3,"file":"MiddlewareBuilder.d.ts","sourceRoot":"","sources":["../../src/builders/MiddlewareBuilder.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,cAAc,0CAAE,YAAY,oDAEzC,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,mBAAmB,GAAG,SAAS,CAAC;AAC7D,MAAM,MAAM,cAAc,CAAC,KAAK,SAAS,cAAc,GAAG,cAAc,IAAI;IAC1E,IAAI,CAAC,EAAE,KAAK,CAAC;IACb,IAAI,CAAC,EAAE,qBAAqB,EAAE,CAAC;IAC/B,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,iBAAiB,CAAC,CAAC,SAAS,cAAc,GAAG,cAAc,IAAI,CAAC,GAAG;IAC7E,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,mBAAmB,CAC7B,EAAE,SAAS,cAAc,EACzB,EAAE,SAAS,OAAO,CAAC,cAAc,CAAC,IAChC,KAAK,CAAC,cAAc,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;AAElC,8BAAsB,UAAU;IAI9B,QAAQ,CAAC,SAAS,IAAI,GAAG;CAC1B;AAED,MAAM,MAAM,qBAAqB,GAAG,WAAW,CAAC,UAAU,CAAC,GAAG;IAC5D,QAAQ,EAAE,iBAAiB,CAAC;CAC7B,CAAC;AAIF,qBAAa,iBAAiB,CAAC,CAAC,SAAS,cAAc,GAAG,EAAE;IAC1D,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;IACjB,QAAQ,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC;gBAC3B,OAAO,GAAE,iBAAiB,CAAC,CAAC,CAAa;IASrD,SAAS,CAAC,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,iBAAiB,CAAC,GAAG,IAAI;IAOvD,IAAI,CAAC,KAAK,SAAS,cAAc,EAC/B,KAAK,EAAE,KAAK,GACX,iBAAiB,CAAC,mBAAmB,CAAC,CAAC,EAAE;QAAE,IAAI,EAAE,KAAK,CAAA;KAAE,CAAC,CAAC;IAG7D,IAAI,CAAC,IAAI,EAAE,qBAAqB,EAAE,GAAG,IAAI;IAGzC,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAGhC,MAAM,IAAI,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,EAAE,UAAU,CAAC;CAM/C"}

package/lib/builders/MiddlewareBuilder.js

@@ -29,8 +29,15 @@ export class MiddlewareBuilder {
     self(value) {
         return this.clone({ self: value });
     }
+    deps(deps) {
+        return this.clone({ deps });
+    }
+    priority(priority) {
+        return this.clone({ priority });
+    }
     create() {
         const Class = MiddlewareClass(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

@@ -2,6 +2,7 @@ export { ResponseHeaders } from "./ResponseHeaders.js";
 export { isRoute, isApp } from "./utils/kind.js";
 export { isApi } from "./builders/ApiBuilder.js";
 export { App } from "./App.js";
+export { AppError } from "./AppError.js";
 export { defineRoutePath, type RoutePathFunc } from "./routePath.js";
 export { EJSON, type EJSONEncodedObject } from "./EJSON.js";
 export { AppContext } from "./contexts/AppContext.js";
@@ -15,7 +16,7 @@ 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 { Settings, SettingsBuilder, isSettings, type SettingsConstructor, type SettingsData, } 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";

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

@@ -1 +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"}
+{"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,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,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,UAAU,EACV,KAAK,mBAAmB,EACxB,KAAK,YAAY,GAClB,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

@@ -2,6 +2,7 @@ export { ResponseHeaders } from "./ResponseHeaders.js";
 export { isRoute, isApp } from "./utils/kind.js";
 export { isApi } from "./builders/ApiBuilder.js";
 export { App } from "./App.js";
+export { AppError } from "./AppError.js";
 export { defineRoutePath } from "./routePath.js";
 export { EJSON } from "./EJSON.js";
 // contexts

package/lib/presets/serializers.d.ts

@@ -1,3 +1,4 @@
+import { AppError } from "../AppError.js";
 import { TypeAssertError } from "@dreamkit/schema";
 export declare const errorSerializer: import("../index.base.js").Serializer<Error, {
     name: string;
@@ -5,4 +6,8 @@ export declare const errorSerializer: import("../index.base.js").Serializer<Erro
 }>;
 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>[]>;
+export declare const appErrorSerializer: import("../index.base.js").Serializer<AppError, {
+    message: string;
+    cause: unknown;
+}>;
 //# 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,qDAMzB,CAAC;AAEH,eAAO,MAAM,yBAAyB,+GAMpC,CAAC"}
+{"version":3,"file":"serializers.d.ts","sourceRoot":"","sources":["../../src/presets/serializers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAEnD,eAAO,MAAM,eAAe;;;EAU1B,CAAC;AAEH,eAAO,MAAM,cAAc,qDAMzB,CAAC;AAEH,eAAO,MAAM,yBAAyB,+GAKpC,CAAC;AAEH,eAAO,MAAM,kBAAkB;;;EAK7B,CAAC"}

package/lib/presets/serializers.js

@@ -1,3 +1,4 @@
+import { AppError } from "../AppError.js";
 import { $serializer } from "../objects/$serializer.js";
 import { TypeAssertError } from "@dreamkit/schema";
 export const errorSerializer = $serializer.create({
@@ -20,8 +21,13 @@ export const dateSerializer = $serializer.create({
 });
 export const typeAssertErrorSerializer = $serializer.create({
     key: "TypeAssertError",
-    priority: -1,
     is: (input) => input instanceof TypeAssertError,
     to: (input) => input.errors,
     from: (input) => new TypeAssertError(input),
 });
+export const appErrorSerializer = $serializer.create({
+    key: "AppError",
+    is: (input) => input instanceof AppError,
+    to: (input) => ({ message: input.message, cause: input.cause }),
+    from: (input) => new AppError(input.message, { cause: input.cause }),
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dreamkit/app",
-  "version": "0.0.26",
+  "version": "0.0.28",
   "description": "Set of utils to create applications.",
   "homepage": "https://dreamkit.dev",
   "repository": {
@@ -28,10 +28,10 @@
   ],
   "dependencies": {
     "debug": "^4.4.3",
-    "@dreamkit/func": "0.0.15",
+    "@dreamkit/func": "0.0.16",
     "@dreamkit/ioc": "0.3.2",
     "@dreamkit/kind": "0.0.4",
-    "@dreamkit/schema": "0.0.11",
+    "@dreamkit/schema": "0.0.12",
     "@dreamkit/utils": "0.0.9"
   },
   "devDependencies": {