@dreamkit/app 0.0.7-next.2 → 0.0.7-next.3

package/lib/App.d.ts

@@ -1,10 +1,10 @@
+import { MiddlewareConstructor } from "./builders/MiddlewareBuilder.js";
 import { Route } from "./builders/RouteBuilder.js";
+import { AppService, ServiceConstructor } from "./builders/ServiceBuilder.js";
 import { SettingsConstructor } from "./builders/SettingsBuilder.js";
 import { AppContext } from "./contexts/AppContext.js";
 import { RequestContext } from "./contexts/RequestContext.js";
 import { SettingsHandler, SettingsHandlerConstructor } from "./handlers/SettingsHandler.js";
-import { MiddlewareConstructor } from "./objects/middleware.js";
-import { AppService, ServiceConstructor } from "./objects/service.js";
 export declare class App {
     static instanceKey: string;
     readonly started = false;

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":"AAEA,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,EAEL,eAAe,EACf,0BAA0B,EAC3B,MAAM,+BAA+B,CAAC;AAYvC,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;IAC5C,eAAe,EAAE,0BAA0B,GAAG,SAAS,CAAC;IAC/D,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;IAwB1C,SAAS,CAAC,UAAU,CAAC,OAAO,EAAE,kBAAkB,GAAG,UAAU;cAiB7C,YAAY,CAAC,IAAI,EAAE,UAAU;cAU7B,WAAW,CAAC,IAAI,EAAE,UAAU;IAQtC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAuD5D,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,cAAc;IAahD,OAAO,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC;cAU9C,iBAAiB,CAAC,WAAW,EAAE,mBAAmB;;;cAgBlD,mBAAmB;cAanB,gBAAgB,CAAC,WAAW,EAAE,mBAAmB;IAUjE,SAAS,CAAC,cAAc,CAAC,WAAW,EAAE,mBAAmB;IAKzD,SAAS,CAAC,gBAAgB,IAAI,eAAe,GAAG,SAAS;IAGnD,KAAK;IAOL,IAAI;CAkBX"}

package/lib/App.js

@@ -1,11 +1,11 @@
 import { RequestUrl } from "./RequestUrl.js";
 import { isApi } from "./builders/ApiBuilder.js";
+import { isMiddleware, } from "./builders/MiddlewareBuilder.js";
+import { isService, } from "./builders/ServiceBuilder.js";
 import { isSettings } from "./builders/SettingsBuilder.js";
 import { AppContext } from "./contexts/AppContext.js";
 import { RequestContext } from "./contexts/RequestContext.js";
 import { isSettingsHandler, SettingsHandler, } from "./handlers/SettingsHandler.js";
-import { isMiddleware } from "./objects/middleware.js";
-import { isService, } from "./objects/service.js";
 import { isRoute, kindApp } from "./utils/kind.js";
 import { log } from "./utils/log.js";
 import { IocBaseClass, normalizeIocParams, } from "@dreamkit/ioc";

package/lib/builders/ApiBuilder.d.ts

@@ -1,6 +1,5 @@
 import { Func, FuncBuilder, FuncData } from "@dreamkit/func";
 export declare const kindApi: (input: object, name?: string) => void, isApi: (input: unknown) => input is Func;
 export declare class ApiBuilder<T extends FuncData> extends FuncBuilder<T> {
-    protected onCreate(func: Func): Func;
 }
 //# sourceMappingURL=ApiBuilder.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ApiBuilder.d.ts","sourceRoot":"","sources":["../../src/builders/ApiBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAG7D,eAAO,MAAO,OAAO,0CAAE,KAAK,mCAAyC,CAAC;AAEtE,qBAAa,UAAU,CAAC,CAAC,SAAS,QAAQ,CAAE,SAAQ,WAAW,CAAC,CAAC,CAAC;cAC7C,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;CAI9C"}
+{"version":3,"file":"ApiBuilder.d.ts","sourceRoot":"","sources":["../../src/builders/ApiBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAG7D,eAAO,MAAO,OAAO,0CAAE,KAAK,mCAAyC,CAAC;AAEtE,qBAAa,UAAU,CAAC,CAAC,SAAS,QAAQ,CAAE,SAAQ,WAAW,CAAC,CAAC,CAAC;CAAG"}

package/lib/builders/ApiBuilder.js

@@ -2,8 +2,4 @@ import { FuncBuilder } from "@dreamkit/func";
 import { createKind } from "@dreamkit/kind";
 export const [kindApi, isApi] = createKind("@dreamkit/app/api");
 export class ApiBuilder extends FuncBuilder {
-    onCreate(func) {
-        kindApi(func);
-        return func;
-    }
 }

package/lib/builders/MiddlewareBuilder.d.ts

@@ -0,0 +1,24 @@
+import { IocClass, IocParamsUserConfig } from "@dreamkit/ioc";
+import type { Constructor, Merge } from "@dreamkit/utils/ts.js";
+export declare const kindMiddleware: (input: object, name?: string) => void, isMiddleware: (input: unknown) => input is MiddlewareConstructor;
+export type MiddlewareSelf = IocParamsUserConfig | undefined;
+export type MiddlewareData<TSelf extends MiddlewareSelf = MiddlewareSelf> = {
+    self?: TSelf;
+};
+export type MiddlewareOptions<T extends MiddlewareData = MiddlewareData> = T & {};
+export type MergeMiddlewareData<D1 extends MiddlewareData, D2 extends Partial<MiddlewareData>> = Merge<MiddlewareData, D1, D2>;
+export declare abstract class Middleware {
+    abstract onRequest(): any;
+}
+export type MiddlewareConstructor = Constructor<Middleware>;
+export declare class MiddlewareBuilder<T extends MiddlewareData = {}> {
+    readonly data: T;
+    readonly options: MiddlewareOptions<T>;
+    constructor(options?: MiddlewareOptions<T>);
+    protected clone(next: Partial<MiddlewareOptions>): this;
+    self<TSelf extends MiddlewareSelf>(value: TSelf): MiddlewareBuilder<MergeMiddlewareData<T, {
+        self: TSelf;
+    }>>;
+    create(): IocClass<T["self"] & {}, Middleware>;
+}
+//# sourceMappingURL=MiddlewareBuilder.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"MiddlewareBuilder.d.ts","sourceRoot":"","sources":["../../src/builders/MiddlewareBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAER,mBAAmB,EACpB,MAAM,eAAe,CAAC;AAEvB,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,IACrE,CAAC,GAAG,EAAE,CAAC;AAET,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;CAG/C"}

package/lib/builders/MiddlewareBuilder.js

@@ -0,0 +1,35 @@
+import { createIocClass, } from "@dreamkit/ioc";
+import { createKind } from "@dreamkit/kind";
+export const [kindMiddleware, isMiddleware] = createKind("@dreamkit/app/middleware");
+export class Middleware {
+    static {
+        kindMiddleware(this);
+    }
+}
+const MiddlewareClass = createIocClass(Middleware);
+export class MiddlewareBuilder {
+    data;
+    options;
+    constructor(options = {}) {
+        const $this = this;
+        this.options = options;
+        this.data = {
+            get self() {
+                return $this.options.self;
+            },
+        };
+    }
+    clone(next) {
+        const prev = this.options;
+        return new MiddlewareBuilder({
+            ...prev,
+            ...next,
+        });
+    }
+    self(value) {
+        return this.clone({ self: value });
+    }
+    create() {
+        return MiddlewareClass(this.options.self || {});
+    }
+}

package/lib/builders/ServiceBuilder.d.ts

@@ -0,0 +1,33 @@
+import { IocClass, IocParamsUserConfig } from "@dreamkit/ioc";
+import type { Constructor, Merge } from "@dreamkit/utils/ts.js";
+export declare const kindService: (input: object, name?: string) => void, isService: (input: unknown) => input is ServiceConstructor;
+export type ServiceSelf = IocParamsUserConfig | undefined;
+export type ServiceData<TSelf extends ServiceSelf = ServiceSelf> = {
+    self?: TSelf;
+};
+export type ServiceOptions<T extends ServiceData = ServiceData> = T & {};
+export type MergeServiceData<D1 extends ServiceData, D2 extends Partial<ServiceData>> = Merge<ServiceData, D1, D2>;
+type SyncOrAsync<T> = T | Promise<T>;
+export type Shutdown = () => SyncOrAsync<void>;
+export type AppService = {
+    name: string;
+    service: ServiceConstructor;
+    started: boolean;
+    shutdown?: Shutdown;
+};
+export declare abstract class Service {
+    abstract onStart(): any;
+}
+export type ServiceConstructor = Constructor<Service>;
+export declare class ServiceBuilder<T extends ServiceData = {}> {
+    readonly data: T;
+    readonly options: ServiceOptions<T>;
+    constructor(options?: ServiceOptions<T>);
+    protected clone(next: Partial<ServiceOptions>): this;
+    self<TSelf extends ServiceSelf>(value: TSelf): ServiceBuilder<MergeServiceData<T, {
+        self: TSelf;
+    }>>;
+    create(): IocClass<T["self"] & {}, Service>;
+}
+export {};
+//# sourceMappingURL=ServiceBuilder.d.ts.map

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

@@ -0,0 +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,EAAE,CAAC;AAEzE,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;CAG5C"}

package/lib/builders/ServiceBuilder.js

@@ -0,0 +1,35 @@
+import { createIocClass } from "@dreamkit/ioc";
+import { createKind } from "@dreamkit/kind";
+export const [kindService, isService] = createKind("@dreamkit/app/service");
+export class Service {
+    static {
+        kindService(this);
+    }
+}
+const ServiceClass = createIocClass(Service);
+export class ServiceBuilder {
+    data;
+    options;
+    constructor(options = {}) {
+        const $this = this;
+        this.options = options;
+        this.data = {
+            get self() {
+                return $this.options.self;
+            },
+        };
+    }
+    clone(next) {
+        const prev = this.options;
+        return new ServiceBuilder({
+            ...prev,
+            ...next,
+        });
+    }
+    self(value) {
+        return this.clone({ self: value });
+    }
+    create() {
+        return ServiceClass(this.options.self || {});
+    }
+}

package/lib/index.d.ts

@@ -7,10 +7,12 @@ 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 { $service } from "./objects/$service.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, MiddlewareClass, isMiddleware, } from "./objects/middleware.js";
-export { Service, ServiceClass, type ServiceStop, isService, } from "./objects/service.js";
+export { Middleware, isMiddleware, type MiddlewareConstructor, type MiddlewareOptions, type MiddlewareData, } from "./builders/MiddlewareBuilder.js";
+export { Service, type ServiceConstructor, type ServiceOptions, type ServiceData, isService, } from "./builders/ServiceBuilder.js";
 export { SettingsHandler, SettingsHandlerClass, type SettingsHandlerSaveResult, } from "./handlers/SettingsHandler.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,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;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,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,eAAe,EACf,YAAY,GACb,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,OAAO,EACP,YAAY,EACZ,KAAK,WAAW,EAChB,SAAS,GACV,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EACL,eAAe,EACf,oBAAoB,EACpB,KAAK,yBAAyB,GAC/B,MAAM,+BAA+B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,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;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,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,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,OAAO,EACP,KAAK,kBAAkB,EACvB,KAAK,cAAc,EACnB,KAAK,WAAW,EAChB,SAAS,GACV,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EACL,eAAe,EACf,oBAAoB,EACpB,KAAK,yBAAyB,GAC/B,MAAM,+BAA+B,CAAC"}

package/lib/index.js

@@ -9,10 +9,12 @@ 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 { $service } from "./objects/$service.js";
 export { RouteBuilder, } from "./builders/RouteBuilder.js";
 export { $settings } from "./objects/$settings.js";
 export { Settings, SettingsBuilder, isSettings, } from "./builders/SettingsBuilder.js";
-export { Middleware, MiddlewareClass, isMiddleware, } from "./objects/middleware.js";
-export { Service, ServiceClass, isService, } from "./objects/service.js";
+export { Middleware, isMiddleware, } from "./builders/MiddlewareBuilder.js";
+export { Service, isService, } from "./builders/ServiceBuilder.js";
 // handlers
 export { SettingsHandler, SettingsHandlerClass, } from "./handlers/SettingsHandler.js";

package/lib/objects/$api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"$api.d.ts","sourceRoot":"","sources":["../../src/objects/$api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAEvD,eAAO,MAAM,IAAI,gBAAmC,CAAC"}
+{"version":3,"file":"$api.d.ts","sourceRoot":"","sources":["../../src/objects/$api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAW,MAAM,2BAA2B,CAAC;AAEhE,eAAO,MAAM,IAAI,gBAKf,CAAC"}

package/lib/objects/$api.js

@@ -1,2 +1,7 @@
-import { ApiBuilder } from "../builders/ApiBuilder.js";
-export const $api = /*#__PURE__*/ new ApiBuilder({});
+import { ApiBuilder, kindApi } from "../builders/ApiBuilder.js";
+export const $api = /*#__PURE__*/ new ApiBuilder({})["clone"]({
+    onCreate: (func) => {
+        kindApi(func);
+        return func;
+    },
+});

package/lib/objects/$middleware.d.ts

@@ -0,0 +1,3 @@
+import { MiddlewareBuilder } from "../builders/MiddlewareBuilder.js";
+export declare const $middleware: MiddlewareBuilder<{}>;
+//# sourceMappingURL=$middleware.d.ts.map

package/lib/objects/$middleware.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"$middleware.d.ts","sourceRoot":"","sources":["../../src/objects/$middleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAErE,eAAO,MAAM,WAAW,uBAA0C,CAAC"}

package/lib/objects/$middleware.js

@@ -0,0 +1,2 @@
+import { MiddlewareBuilder } from "../builders/MiddlewareBuilder.js";
+export const $middleware = /*#__PURE__*/ new MiddlewareBuilder({});

package/lib/objects/$service.d.ts

@@ -0,0 +1,3 @@
+import { ServiceBuilder } from "../builders/ServiceBuilder.js";
+export declare const $service: ServiceBuilder<{}>;
+//# sourceMappingURL=$service.d.ts.map

package/lib/objects/$service.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"$service.d.ts","sourceRoot":"","sources":["../../src/objects/$service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAE/D,eAAO,MAAM,QAAQ,oBAAuC,CAAC"}

package/lib/objects/$service.js

@@ -0,0 +1,2 @@
+import { ServiceBuilder } from "../builders/ServiceBuilder.js";
+export const $service = /*#__PURE__*/ new ServiceBuilder({});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dreamkit/app",
-  "version": "0.0.7-next.2",
+  "version": "0.0.7-next.3",
   "description": "Set of utils to create applications.",
   "homepage": "https://dreamkit.dev",
   "repository": {
@@ -27,10 +27,10 @@
   ],
   "dependencies": {
     "debug": "^4.3.7",
-    "@dreamkit/func": "0.0.3-next.2",
-    "@dreamkit/ioc": "0.0.2-next.1",
+    "@dreamkit/func": "0.0.3-next.3",
+    "@dreamkit/ioc": "0.0.2-next.2",
     "@dreamkit/kind": "0.0.2",
-    "@dreamkit/schema": "0.0.5-next.0",
+    "@dreamkit/schema": "0.0.5-next.1",
     "@dreamkit/utils": "0.0.5-next.0"
   },
   "devDependencies": {

package/lib/objects/middleware.d.ts

@@ -1,8 +0,0 @@
-import { Constructor } from "@dreamkit/utils/ts.js";
-export declare const kindMiddleware: (input: object, name?: string) => void, isMiddleware: (input: unknown) => input is MiddlewareConstructor;
-export type MiddlewareConstructor = Constructor<Middleware>;
-export declare abstract class Middleware {
-    abstract onRequest(): any;
-}
-export declare const MiddlewareClass: <P extends import("@dreamkit/ioc").IocParamsUserConfig = {}>(params: P) => import("@dreamkit/ioc").IocClass<P & {}, Middleware, never, import("@dreamkit/ioc").IocParams<P & {}>>;
-//# sourceMappingURL=middleware.d.ts.map

package/lib/objects/middleware.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../../src/objects/middleware.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEpD,eAAO,MAAO,cAAc,0CAAE,YAAY,oDAEzC,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC;AAC5D,8BAAsB,UAAU;IAI9B,QAAQ,CAAC,SAAS,IAAI,GAAG;CAC1B;AAED,eAAO,MAAM,eAAe,mLAA6B,CAAC"}

package/lib/objects/middleware.js

@@ -1,9 +0,0 @@
-import { createIocClass } from "@dreamkit/ioc";
-import { createKind } from "@dreamkit/kind";
-export const [kindMiddleware, isMiddleware] = createKind("@dreamkit/app/middleware");
-export class Middleware {
-    static {
-        kindMiddleware(this);
-    }
-}
-export const MiddlewareClass = createIocClass(Middleware);

package/lib/objects/service.d.ts

@@ -1,20 +0,0 @@
-import { Constructor } from "@dreamkit/utils/ts.js";
-export declare const kindService: (input: object, name?: string) => void, isService: (input: unknown) => input is ServiceConstructor;
-type SyncOrAsync<T> = T | Promise<T>;
-export type Shutdown = () => SyncOrAsync<void>;
-export type AppService = {
-    name: string;
-    service: ServiceConstructor;
-    started: boolean;
-    shutdown?: Shutdown;
-};
-export type ServiceStop = SyncOrAsync<void> | Shutdown;
-export type ServiceConstructor = Constructor<Service>;
-export declare abstract class Service {
-    get name(): string | undefined;
-    abstract onStart(): ServiceStop;
-    onStop(): any;
-}
-export declare const ServiceClass: <P extends import("@dreamkit/ioc").IocParamsUserConfig = {}>(params: P) => import("@dreamkit/ioc").IocClass<P & {}, Service, never, import("@dreamkit/ioc").IocParams<P & {}>>;
-export {};
-//# sourceMappingURL=service.d.ts.map

package/lib/objects/service.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/objects/service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEpD,eAAO,MAAO,WAAW,0CAAE,SAAS,iDAEnC,CAAC;AAEF,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;AACF,MAAM,MAAM,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC;AACvD,MAAM,MAAM,kBAAkB,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;AACtD,8BAAsB,OAAO;IAI3B,IAAI,IAAI,IAAI,MAAM,GAAG,SAAS,CAE7B;IACD,QAAQ,CAAC,OAAO,IAAI,WAAW;IAC/B,MAAM,IAAI,GAAG;CACd;AAED,eAAO,MAAM,YAAY,gLAA0B,CAAC"}

package/lib/objects/service.js

@@ -1,13 +0,0 @@
-import { createIocClass } from "@dreamkit/ioc";
-import { createKind } from "@dreamkit/kind";
-export const [kindService, isService] = createKind("@dreamkit/app/service");
-export class Service {
-    static {
-        kindService(this);
-    }
-    get name() {
-        return;
-    }
-    onStop() { }
-}
-export const ServiceClass = createIocClass(Service);