@akanjs/service 0.9.47 → 0.9.49

package/cjs/src/base.service.js

@@ -27,46 +27,38 @@ var __decorateClass = (decorators, target, key, kind) => {
 var base_service_exports = {};
 __export(base_service_exports, {
   BaseService: () => BaseService,
-  allSrvs: () => allSrvs
+  allSrvs: () => allSrvs,
+  srv: () => srv
 });
 module.exports = __toCommonJS(base_service_exports);
-var import_dictionary = require("@akanjs/dictionary");
 var import_serviceDecorators = require("./serviceDecorators");
-let BaseService = class extends (0, import_serviceDecorators.LogService)("BaseService") {
+var import_serviceInfo = require("./serviceInfo");
+var import_serviceModule = require("./serviceModule");
+class BaseService extends (0, import_serviceDecorators.serve)("base") {
   onCleanup;
   baseSignal;
   publishPing() {
     this.baseSignal.pubsubPing("ping");
   }
-  l(lang, key) {
-    try {
-      const res = { lang, key, str: (0, import_dictionary.translate)(lang, key) };
-      return res;
-    } catch (e) {
-      return { lang, key, str: key };
-    }
-  }
-  getDictionary(lang) {
-    return (0, import_dictionary.getDictionary)(lang);
-  }
   async cleanup() {
     if (!this.onCleanup)
       throw new Error("onCleanup is not defined");
     await this.onCleanup();
   }
-};
+}
 __decorateClass([
   (0, import_serviceDecorators.Gen)((env) => env.onCleanup)
 ], BaseService.prototype, "onCleanup", 2);
 __decorateClass([
   (0, import_serviceDecorators.Sig)()
 ], BaseService.prototype, "baseSignal", 2);
-BaseService = __decorateClass([
-  (0, import_serviceDecorators.Service)("BaseService")
-], BaseService);
-const allSrvs = { BaseService };
+const allSrvs = import_serviceInfo.serviceInfo.registerServices({ BaseService });
+const srv = {
+  base: new import_serviceModule.ServiceModule("base", { BaseService })
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   BaseService,
-  allSrvs
+  allSrvs,
+  srv
 });

package/cjs/src/index.js

@@ -16,8 +16,12 @@ var src_exports = {};
 module.exports = __toCommonJS(src_exports);
 __reExport(src_exports, require("./serviceDecorators"), module.exports);
 __reExport(src_exports, require("./base.service"), module.exports);
+__reExport(src_exports, require("./serviceInfo"), module.exports);
+__reExport(src_exports, require("./serviceModule"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ...require("./serviceDecorators"),
-  ...require("./base.service")
+  ...require("./base.service"),
+  ...require("./serviceInfo"),
+  ...require("./serviceModule")
 });

package/cjs/src/serviceDecorators.js

@@ -32,7 +32,6 @@ __export(serviceDecorators_exports, {
   Gen: () => Gen,
   LogService: () => LogService,
   MixSrvs: () => MixSrvs,
-  Service: () => Service,
   ServiceStorage: () => ServiceStorage,
   Sig: () => Sig,
   Srv: () => Srv,
@@ -42,12 +41,14 @@ __export(serviceDecorators_exports, {
   getServiceRefs: () => getServiceRefs,
   isServiceEnabled: () => isServiceEnabled,
   makeProvidersForSrv: () => makeProvidersForSrv,
-  serviceOf: () => serviceOf
+  serve: () => serve,
+  serviceOf: () => serviceOf,
+  setServiceRefs: () => setServiceRefs
 });
 module.exports = __toCommonJS(serviceDecorators_exports);
 var import_reflect_metadata = require("reflect-metadata");
 var import_common = require("@akanjs/common");
-var import_constant = require("@akanjs/constant");
+var import_document = require("@akanjs/document");
 var import_common2 = require("@nestjs/common");
 var import_mongoose = require("@nestjs/mongoose");
 class ServiceStorage {
@@ -63,10 +64,10 @@ const setServiceRefs = (refName, services) => {
   Reflect.defineMetadata(refName, services, ServiceStorage.prototype);
 };
 const setServiceMeta = (srvRef, meta) => {
-  Reflect.defineMetadata("serviceMeta", meta, srvRef.prototype);
+  Reflect.defineMetadata("akan:service", meta, srvRef.prototype);
 };
 const getServiceMeta = (srvRef) => {
-  return Reflect.getMetadata("serviceMeta", srvRef.prototype);
+  return Reflect.getMetadata("akan:service", srvRef.prototype);
 };
 const isServiceEnabled = (srvRef) => {
   const meta = getServiceMeta(srvRef);
@@ -78,17 +79,6 @@ const getServiceInjectMetaMapOnPrototype = (prototype) => {
 const setServiceInjectMetaMapOnPrototype = (prototype, injectMetaMap) => {
   Reflect.defineMetadata("inject", injectMetaMap, prototype);
 };
-function Service(name, { enabled = true, serverMode } = {}) {
-  return function(target) {
-    const services = getServiceRefs(name);
-    const isEnabled = enabled && (!serverMode || process.env.SERVER_MODE === serverMode || process.env.SERVER_MODE === "all");
-    setServiceMeta(target, { name, enabled: isEnabled });
-    if (!isEnabled)
-      return target;
-    setServiceRefs(name, [...services, target]);
-    return target;
-  };
-}
 function Srv(name) {
   return function(prototype, key) {
     const metadataMap = getServiceInjectMetaMapOnPrototype(prototype);
@@ -300,16 +290,16 @@ const DbService = (database, ...libSrvRefs) => {
   const getQueryDataFromKey = (queryKey, args) => {
     const lastArg = args.at(-1);
     const hasQueryOption = lastArg && typeof lastArg === "object" && (typeof lastArg.select === "object" || typeof lastArg.skip === "number" || typeof lastArg.limit === "number" || typeof lastArg.sort === "string");
-    const queryFn = (0, import_constant.getFilterQuery)(database.Filter, queryKey);
+    const queryFn = (0, import_document.getFilterQuery)(database.Filter, queryKey);
     const query = queryFn(...hasQueryOption ? args.slice(0, -1) : args);
     const queryOption = hasQueryOption ? lastArg : {};
     return { query, queryOption };
   };
   const DbService2 = libSrvRefs.length > 0 ? MixSrvs(...libSrvRefs) : getDefaultDbService();
-  const filterKeyMetaMap = (0, import_constant.getFilterKeyMetaMapOnPrototype)(database.Filter.prototype);
+  const filterKeyMetaMap = (0, import_document.getFilterKeyMetaMapOnPrototype)(database.Filter.prototype);
   const queryKeys = [...filterKeyMetaMap.keys()];
   queryKeys.forEach((queryKey) => {
-    const queryFn = (0, import_constant.getFilterQuery)(database.Filter, queryKey);
+    const queryFn = (0, import_document.getFilterQuery)(database.Filter, queryKey);
     DbService2.prototype[`list${(0, import_common.capitalize)(queryKey)}`] = async function(...args) {
       const { query, queryOption } = getQueryDataFromKey(queryKey, args);
       return this.__list(query, queryOption);
@@ -346,9 +336,25 @@ const DbService = (database, ...libSrvRefs) => {
       const query = queryFn(...args);
       return this.__insight(query);
     };
+    DbService2.prototype[`query${(0, import_common.capitalize)(queryKey)}`] = async function(...args) {
+      return queryFn(...args);
+    };
   });
   return DbService2;
 };
+function serve(refNameOrDb, optionOrExtendSrv, ...extendSrvs) {
+  const refName = typeof refNameOrDb === "string" ? (0, import_common.lowerlize)(refNameOrDb) : refNameOrDb.refName;
+  const extSrvs = [
+    ...optionOrExtendSrv?.prototype ? [optionOrExtendSrv] : [],
+    ...extendSrvs
+  ];
+  const option = optionOrExtendSrv?.prototype ? { enabled: true } : optionOrExtendSrv ?? { enabled: true };
+  const srvRef = typeof refNameOrDb === "string" ? LogService(refNameOrDb) : DbService(refNameOrDb, ...extSrvs);
+  const isEnabled = option.enabled ?? (!option.serverMode || process.env.SERVER_MODE === option.serverMode || process.env.SERVER_MODE === "all");
+  const serviceMeta = { refName, name: `${(0, import_common.capitalize)(refName)}Service`, enabled: isEnabled };
+  setServiceMeta(srvRef, serviceMeta);
+  return srvRef;
+}
 const makeProvidersForSrv = (srvRef) => {
   const injectMetaMap = getServiceInjectMetaMapOnPrototype(srvRef.prototype);
   const providers = [];
@@ -380,7 +386,6 @@ const makeProvidersForSrv = (srvRef) => {
   Gen,
   LogService,
   MixSrvs,
-  Service,
   ServiceStorage,
   Sig,
   Srv,
@@ -390,5 +395,7 @@ const makeProvidersForSrv = (srvRef) => {
   getServiceRefs,
   isServiceEnabled,
   makeProvidersForSrv,
-  serviceOf
+  serve,
+  serviceOf,
+  setServiceRefs
 });

package/cjs/src/serviceInfo.js

@@ -0,0 +1,52 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var serviceInfo_exports = {};
+__export(serviceInfo_exports, {
+  serviceInfo: () => serviceInfo
+});
+module.exports = __toCommonJS(serviceInfo_exports);
+var import_serviceDecorators = require("./serviceDecorators");
+const serviceInfo = {
+  database: /* @__PURE__ */ new Map(),
+  service: /* @__PURE__ */ new Map(),
+  setDatabase(refName, service) {
+    const srvSet = serviceInfo.database.get(refName) ?? /* @__PURE__ */ new Set();
+    srvSet.add(service);
+    serviceInfo.database.set(refName, srvSet);
+  },
+  getDatabase(refName) {
+    return [...serviceInfo.database.get(refName) ?? /* @__PURE__ */ new Set()];
+  },
+  setService(refName, service) {
+    serviceInfo.service.set(refName, service);
+  },
+  registerServices(services) {
+    Object.entries(services).forEach(([serviceName, service]) => {
+      const serviceMeta = (0, import_serviceDecorators.getServiceMeta)(service);
+      if (!serviceMeta?.enabled)
+        return;
+      const services2 = (0, import_serviceDecorators.getServiceRefs)(serviceName);
+      (0, import_serviceDecorators.setServiceRefs)(serviceName, [...services2, service]);
+    });
+    return services;
+  }
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  serviceInfo
+});

package/cjs/src/serviceModule.js

@@ -0,0 +1,40 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var serviceModule_exports = {};
+__export(serviceModule_exports, {
+  ServiceModule: () => ServiceModule
+});
+module.exports = __toCommonJS(serviceModule_exports);
+class ServiceModule {
+  refName;
+  srv;
+  cnst;
+  constructor(refName, srv, cnst) {
+    this.refName = refName;
+    this.srv = srv;
+    this.cnst = cnst ?? null;
+  }
+  with(...srvs) {
+    this.srv = Object.assign(this.srv, ...srvs.map((srv) => srv.srv));
+    return this;
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  ServiceModule
+});

package/esm/src/base.service.js

@@ -9,42 +9,33 @@ var __decorateClass = (decorators, target, key, kind) => {
     __defProp(target, key, result);
   return result;
 };
-import { getDictionary, translate } from "@akanjs/dictionary";
-import { Gen, LogService, Service, Sig } from "./serviceDecorators";
-let BaseService = class extends LogService("BaseService") {
+import { Gen, serve, Sig } from "./serviceDecorators";
+import { serviceInfo } from "./serviceInfo";
+import { ServiceModule } from "./serviceModule";
+class BaseService extends serve("base") {
   onCleanup;
   baseSignal;
   publishPing() {
     this.baseSignal.pubsubPing("ping");
   }
-  l(lang, key) {
-    try {
-      const res = { lang, key, str: translate(lang, key) };
-      return res;
-    } catch (e) {
-      return { lang, key, str: key };
-    }
-  }
-  getDictionary(lang) {
-    return getDictionary(lang);
-  }
   async cleanup() {
     if (!this.onCleanup)
       throw new Error("onCleanup is not defined");
     await this.onCleanup();
   }
-};
+}
 __decorateClass([
   Gen((env) => env.onCleanup)
 ], BaseService.prototype, "onCleanup", 2);
 __decorateClass([
   Sig()
 ], BaseService.prototype, "baseSignal", 2);
-BaseService = __decorateClass([
-  Service("BaseService")
-], BaseService);
-const allSrvs = { BaseService };
+const allSrvs = serviceInfo.registerServices({ BaseService });
+const srv = {
+  base: new ServiceModule("base", { BaseService })
+};
 export {
   BaseService,
-  allSrvs
+  allSrvs,
+  srv
 };

package/esm/src/index.js

@@ -1,2 +1,4 @@
 export * from "./serviceDecorators";
 export * from "./base.service";
+export * from "./serviceInfo";
+export * from "./serviceModule";

package/esm/src/serviceDecorators.js

@@ -10,11 +10,11 @@ var __decorateClass = (decorators, target, key, kind) => {
   return result;
 };
 import "reflect-metadata";
-import { applyMixins, capitalize, Logger } from "@akanjs/common";
+import { applyMixins, capitalize, Logger, lowerlize } from "@akanjs/common";
 import {
   getFilterKeyMetaMapOnPrototype,
   getFilterQuery
-} from "@akanjs/constant";
+} from "@akanjs/document";
 import { Inject, Injectable } from "@nestjs/common";
 import { InjectConnection, InjectModel } from "@nestjs/mongoose";
 class ServiceStorage {
@@ -30,10 +30,10 @@ const setServiceRefs = (refName, services) => {
   Reflect.defineMetadata(refName, services, ServiceStorage.prototype);
 };
 const setServiceMeta = (srvRef, meta) => {
-  Reflect.defineMetadata("serviceMeta", meta, srvRef.prototype);
+  Reflect.defineMetadata("akan:service", meta, srvRef.prototype);
 };
 const getServiceMeta = (srvRef) => {
-  return Reflect.getMetadata("serviceMeta", srvRef.prototype);
+  return Reflect.getMetadata("akan:service", srvRef.prototype);
 };
 const isServiceEnabled = (srvRef) => {
   const meta = getServiceMeta(srvRef);
@@ -45,17 +45,6 @@ const getServiceInjectMetaMapOnPrototype = (prototype) => {
 const setServiceInjectMetaMapOnPrototype = (prototype, injectMetaMap) => {
   Reflect.defineMetadata("inject", injectMetaMap, prototype);
 };
-function Service(name, { enabled = true, serverMode } = {}) {
-  return function(target) {
-    const services = getServiceRefs(name);
-    const isEnabled = enabled && (!serverMode || process.env.SERVER_MODE === serverMode || process.env.SERVER_MODE === "all");
-    setServiceMeta(target, { name, enabled: isEnabled });
-    if (!isEnabled)
-      return target;
-    setServiceRefs(name, [...services, target]);
-    return target;
-  };
-}
 function Srv(name) {
   return function(prototype, key) {
     const metadataMap = getServiceInjectMetaMapOnPrototype(prototype);
@@ -313,9 +302,25 @@ const DbService = (database, ...libSrvRefs) => {
       const query = queryFn(...args);
       return this.__insight(query);
     };
+    DbService2.prototype[`query${capitalize(queryKey)}`] = async function(...args) {
+      return queryFn(...args);
+    };
   });
   return DbService2;
 };
+function serve(refNameOrDb, optionOrExtendSrv, ...extendSrvs) {
+  const refName = typeof refNameOrDb === "string" ? lowerlize(refNameOrDb) : refNameOrDb.refName;
+  const extSrvs = [
+    ...optionOrExtendSrv?.prototype ? [optionOrExtendSrv] : [],
+    ...extendSrvs
+  ];
+  const option = optionOrExtendSrv?.prototype ? { enabled: true } : optionOrExtendSrv ?? { enabled: true };
+  const srvRef = typeof refNameOrDb === "string" ? LogService(refNameOrDb) : DbService(refNameOrDb, ...extSrvs);
+  const isEnabled = option.enabled ?? (!option.serverMode || process.env.SERVER_MODE === option.serverMode || process.env.SERVER_MODE === "all");
+  const serviceMeta = { refName, name: `${capitalize(refName)}Service`, enabled: isEnabled };
+  setServiceMeta(srvRef, serviceMeta);
+  return srvRef;
+}
 const makeProvidersForSrv = (srvRef) => {
   const injectMetaMap = getServiceInjectMetaMapOnPrototype(srvRef.prototype);
   const providers = [];
@@ -346,7 +351,6 @@ export {
   Gen,
   LogService,
   MixSrvs,
-  Service,
   ServiceStorage,
   Sig,
   Srv,
@@ -356,5 +360,7 @@ export {
   getServiceRefs,
   isServiceEnabled,
   makeProvidersForSrv,
-  serviceOf
+  serve,
+  serviceOf,
+  setServiceRefs
 };

package/esm/src/serviceInfo.js

@@ -0,0 +1,29 @@
+import { getServiceMeta, getServiceRefs, setServiceRefs } from "./serviceDecorators";
+const serviceInfo = {
+  database: /* @__PURE__ */ new Map(),
+  service: /* @__PURE__ */ new Map(),
+  setDatabase(refName, service) {
+    const srvSet = serviceInfo.database.get(refName) ?? /* @__PURE__ */ new Set();
+    srvSet.add(service);
+    serviceInfo.database.set(refName, srvSet);
+  },
+  getDatabase(refName) {
+    return [...serviceInfo.database.get(refName) ?? /* @__PURE__ */ new Set()];
+  },
+  setService(refName, service) {
+    serviceInfo.service.set(refName, service);
+  },
+  registerServices(services) {
+    Object.entries(services).forEach(([serviceName, service]) => {
+      const serviceMeta = getServiceMeta(service);
+      if (!serviceMeta?.enabled)
+        return;
+      const services2 = getServiceRefs(serviceName);
+      setServiceRefs(serviceName, [...services2, service]);
+    });
+    return services;
+  }
+};
+export {
+  serviceInfo
+};

package/esm/src/serviceModule.js

@@ -0,0 +1,17 @@
+class ServiceModule {
+  refName;
+  srv;
+  cnst;
+  constructor(refName, srv, cnst) {
+    this.refName = refName;
+    this.srv = srv;
+    this.cnst = cnst ?? null;
+  }
+  with(...srvs) {
+    this.srv = Object.assign(this.srv, ...srvs.map((srv) => srv.srv));
+    return this;
+  }
+}
+export {
+  ServiceModule
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akanjs/service",
-  "version": "0.9.47",
+  "version": "0.9.49",
   "sourceType": "module",
   "publishConfig": {
     "access": "public"

package/src/base.service.d.ts

@@ -1,28 +1,21 @@
 import type { BaseSignal } from "@akanjs/signal";
-import { type GetServices, Sig } from "./serviceDecorators";
-declare const BaseService_base: {
-    new (): {
-        logger: import("@akanjs/common").Logger;
-    };
-};
+import { Sig } from "./serviceDecorators";
+import { ServiceModule } from "./serviceModule";
+declare const BaseService_base: import("@akanjs/base").Type<{
+    logger: import("@akanjs/common").Logger;
+}>;
 export declare class BaseService extends BaseService_base {
     onCleanup?: () => Promise<void>;
     baseSignal: Sig<BaseSignal>;
     publishPing(): void;
-    l(lang: string, key: string): {
-        lang: string;
-        key: string;
-        str: string;
-    };
-    getDictionary(lang: string): {
-        [key: string]: {
-            [key: string]: string;
-        };
-    };
     cleanup(): Promise<void>;
 }
 export declare const allSrvs: {
-    readonly BaseService: typeof BaseService;
+    BaseService: typeof BaseService;
+};
+export declare const srv: {
+    base: ServiceModule<"base", {
+        BaseService: typeof BaseService;
+    }, never, never, never, never>;
 };
-export type AllSrvs = GetServices<typeof allSrvs>;
 export {};

package/src/index.d.ts

@@ -1,2 +1,4 @@
 export * from "./serviceDecorators";
 export * from "./base.service";
+export * from "./serviceInfo";
+export * from "./serviceModule";

package/src/serviceDecorators.d.ts

@@ -1,8 +1,8 @@
 import "reflect-metadata";
 import type { GetActionObject, MergeAllTypes, Prettify, PromiseOrObject, Type, UnType } from "@akanjs/base";
 import { Logger } from "@akanjs/common";
-import { type DocumentModel, type FilterType, FindQueryOption, ListQueryOption, QueryOf, type SortOf } from "@akanjs/constant";
-import type { BaseMiddleware, CRUDEventType, Database, DatabaseModel, DataInputOf, Doc as DbDoc, GetDocObject, QueryMethodPart, SaveEventType } from "@akanjs/document";
+import { type DocumentModel, QueryOf } from "@akanjs/constant";
+import { BaseMiddleware, CRUDEventType, Database, DatabaseModel, DataInputOf, Doc as DbDoc, FilterType, FindQueryOption, GetDocObject, ListQueryOption, QueryMethodPart, SaveEventType, type SortOf } from "@akanjs/document";
 import { FilterOutInternalArgs } from "@akanjs/signal";
 import { type Provider } from "@nestjs/common";
 import type { Job, Queue as BullQueue } from "bull";
@@ -16,11 +16,13 @@ export type GetServices<AllSrvs extends {
 export declare class ServiceStorage {
 }
 interface ServiceMeta {
+    refName: string;
     name: string;
     enabled: boolean;
 }
 export declare const getServiceRefs: (refName: string) => Type[];
 export declare const getAllServiceRefs: () => Type[];
+export declare const setServiceRefs: (refName: string, services: Type[]) => void;
 export declare const getServiceMeta: (srvRef: Type) => ServiceMeta | undefined;
 export declare const isServiceEnabled: (srvRef: Type) => boolean;
 export interface ServiceInjectMeta {
@@ -29,11 +31,6 @@ export interface ServiceInjectMeta {
     key: string;
     generateFactory?: (...args: any[]) => any;
 }
-interface ServiceOptions {
-    enabled?: boolean;
-    serverMode?: "batch" | "federation";
-}
-export declare function Service(name: string, { enabled, serverMode }?: ServiceOptions): (target: Type) => Type;
 export declare function Srv(name?: string): PropertyDecorator;
 export declare function Use(name?: string): PropertyDecorator;
 export declare function Env(envKey: string, generateFactory?: (envValue: string, options: any) => any): PropertyDecorator;
@@ -62,8 +59,7 @@ export declare const LogService: <T extends string>(name: T) => {
         logger: Logger;
     };
 };
-type DatabaseService<T extends string, Input, Doc, Obj, Model, Insight, Filter> = DatabaseServiceWithQuerySort<T, Input, Doc, Obj, Model, Insight, GetActionObject<Filter>, SortOf<Filter>>;
-type DatabaseServiceWithQuerySort<T extends string, Input, Doc, Obj, Model, Insight, Query, Sort, _CapitalizedT extends Capitalize<T> = Capitalize<T>, _DataInputOfDoc extends DataInputOf<Input, Doc> = DataInputOf<Input, Doc>, _QueryOfDoc extends QueryOf<Doc> = QueryOf<Doc>, _FindQueryOption extends FindQueryOption<Sort, Obj> = FindQueryOption<Sort, Obj>, _ListQueryOption extends ListQueryOption<Sort, Obj> = ListQueryOption<Sort, Obj>> = {
+export type DatabaseService<T extends string, Input, Doc, Obj, Model, Insight, Filter, LibSrvs extends Type[] = [], _Query extends GetActionObject<Filter> = GetActionObject<Filter>, _Sort extends SortOf<Filter> = SortOf<Filter>, _CapitalizedT extends Capitalize<T> = Capitalize<T>, _DataInputOfDoc extends DataInputOf<Input, Doc> = DataInputOf<Input, Doc>, _QueryOfDoc extends QueryOf<Doc> = QueryOf<Doc>, _FindQueryOption extends FindQueryOption<_Sort, Obj> = FindQueryOption<_Sort, Obj>, _ListQueryOption extends ListQueryOption<_Sort, Obj> = ListQueryOption<_Sort, Obj>, _DocObjectOfDoc = GetDocObject<Doc>, _MixedLibSrv = MergeAllTypes<LibSrvs>> = {
     logger: Logger;
     __databaseModel: Model;
     __list(query?: _QueryOfDoc, queryOption?: _ListQueryOption): Promise<Doc[]>;
@@ -112,7 +108,12 @@ type DatabaseServiceWithQuerySort<T extends string, Input, Doc, Obj, Model, Insi
     [K in `searchDocs${_CapitalizedT}`]: (searchText: string, queryOption?: _ListQueryOption) => Promise<Doc[]>;
 } & {
     [K in `searchCount${_CapitalizedT}`]: (searchText: string) => Promise<number>;
-} & QueryMethodPart<Query, Sort, Obj, Doc, Insight, _FindQueryOption, _ListQueryOption>>;
-export declare const DbService: <T extends string, Input, Doc extends HydratedDocument<any>, Model extends DatabaseModel<T, Input, Doc, Obj, Insight, Filter, _CapitalizedT, _QueryOfDoc, _Query, _Sort, _DataInputOfDoc, _FindQueryOption, _ListQueryOption>, Middleware extends BaseMiddleware, Obj, Insight, Filter extends FilterType, LibSrvs extends Type[], _CapitalizedT extends string = Capitalize<T>, _QueryOfDoc extends QueryOf<Doc> = QueryOf<Doc>, _Query extends GetActionObject<Filter> = GetActionObject<Filter>, _Sort extends SortOf<Filter> = SortOf<Filter>, _DataInputOfDoc extends DataInputOf<Input, Doc> = DataInputOf<Input, Doc>, _FindQueryOption extends FindQueryOption<_Sort, Obj> = FindQueryOption<_Sort, Obj>, _ListQueryOption extends ListQueryOption<_Sort, Obj> = ListQueryOption<_Sort, Obj>, _DocObjectOfDoc = GetDocObject<Doc>, _MixedLibSrv = MergeAllTypes<LibSrvs>>(database: Database<T, Input, Doc, Model, Middleware, Obj, Insight, Filter>, ...libSrvRefs: LibSrvs) => Type<DatabaseService<T, Input, Doc, Obj, Model, Insight, Filter> & { [K in keyof _MixedLibSrv]: _MixedLibSrv[K] extends (...args: infer Args) => Promise<infer Value> ? Value extends (infer SingleValue)[] ? SingleValue extends DbDoc<any> ? _DocObjectOfDoc extends GetDocObject<SingleValue> ? (...args: Args) => Promise<Doc[]> : _MixedLibSrv[K] : _MixedLibSrv[K] : Value extends DbDoc<any> ? _DocObjectOfDoc extends GetDocObject<Value> ? (...args: Args) => Promise<Doc> : _MixedLibSrv[K] : _MixedLibSrv[K] : _MixedLibSrv[K]; }>;
+} & QueryMethodPart<_Query, _Sort, Obj, Doc, Insight, _FindQueryOption, _ListQueryOption, _QueryOfDoc> & {
+    [K in keyof _MixedLibSrv]: _MixedLibSrv[K] extends (...args: infer Args) => Promise<infer Value> ? Value extends (infer SingleValue)[] ? SingleValue extends DbDoc<any> ? _DocObjectOfDoc extends GetDocObject<SingleValue> ? (...args: Args) => Promise<Doc[]> : _MixedLibSrv[K] : _MixedLibSrv[K] : Value extends DbDoc<any> ? _DocObjectOfDoc extends GetDocObject<Value> ? (...args: Args) => Promise<Doc> : _MixedLibSrv[K] : _MixedLibSrv[K] : _MixedLibSrv[K];
+}>;
+export declare const DbService: <T extends string, Input, Doc extends HydratedDocument<any>, Model extends DatabaseModel<T, Input, Doc, Obj, Insight, Filter, _CapitalizedT, _QueryOfDoc, _Query, _Sort, _DataInputOfDoc, _FindQueryOption, _ListQueryOption>, Middleware extends BaseMiddleware, Obj, Insight, Filter extends FilterType, LibSrvs extends Type[], _CapitalizedT extends string = Capitalize<T>, _QueryOfDoc extends QueryOf<Doc> = QueryOf<Doc>, _Query extends GetActionObject<Filter> = GetActionObject<Filter>, _Sort extends SortOf<Filter> = SortOf<Filter>, _DataInputOfDoc extends DataInputOf<Input, Doc> = DataInputOf<Input, Doc>, _FindQueryOption extends FindQueryOption<_Sort, Obj> = FindQueryOption<_Sort, Obj>, _ListQueryOption extends ListQueryOption<_Sort, Obj> = ListQueryOption<_Sort, Obj>>(database: Database<T, Input, Doc, Model, Middleware, Obj, Insight, Filter>, ...libSrvRefs: LibSrvs) => Type<DatabaseService<T, Input, Doc, Obj, Model, Insight, Filter, LibSrvs>>;
+export declare function serve<RefNameOrDb, LibSrvOrOption, LibSrvs extends Type[]>(refNameOrDb: RefNameOrDb, optionOrExtendSrv?: LibSrvOrOption, ...extendSrvs: LibSrvs): Type<RefNameOrDb extends Database<infer T, infer Input, infer Doc, infer Model, infer Middleware, infer Obj, infer Insight, infer Filter> ? DatabaseService<T, Input, Doc, Obj, Model, Insight, Filter, LibSrvOrOption extends Type ? [LibSrvOrOption, ...LibSrvs] : LibSrvs> : {
+    logger: Logger;
+}>;
 export declare const makeProvidersForSrv: (srvRef: Type) => Provider[];
 export {};

package/src/serviceInfo.d.ts

@@ -0,0 +1,11 @@
+import type { Type } from "@akanjs/base";
+export declare const serviceInfo: {
+    database: Map<string, Set<Type>>;
+    service: Map<string, Type>;
+    setDatabase(refName: string, service: Type): void;
+    getDatabase(refName: string): Type[];
+    setService(refName: string, service: Type): void;
+    registerServices<Srvs extends {
+        [key: string]: Type;
+    }>(services: Srvs): Srvs;
+};

package/src/serviceModule.d.ts

@@ -0,0 +1,13 @@
+import { MergeAllKeyOfObjects, Type } from "@akanjs/base";
+import { ConstantModel } from "@akanjs/constant";
+export declare class ServiceModule<T extends string = string, Srv extends {
+    [key: string]: Type;
+} = {
+    [key: string]: Type;
+}, Input = never, Full = never, Light = never, Insight = never> {
+    refName: T;
+    srv: Srv;
+    cnst: ConstantModel<string, Input, Full, Light, Insight> | null;
+    constructor(refName: T, srv: Srv, cnst?: ConstantModel<string, Input, Full, Light, Insight>);
+    with<SrvModules extends ServiceModule<string, any, any, any, any, any>[]>(...srvs: SrvModules): ServiceModule<T, Srv & MergeAllKeyOfObjects<SrvModules, "srv">, Input, Full, Light, Insight>;
+}