@akanjs/service 0.9.42 → 0.9.44

package/cjs/src/base.service.js

@@ -30,13 +30,24 @@ __export(base_service_exports, {
   allSrvs: () => allSrvs
 });
 module.exports = __toCommonJS(base_service_exports);
-var import_nest = require("@akanjs/nest");
+var import_dictionary = require("@akanjs/dictionary");
 var import_serviceDecorators = require("./serviceDecorators");
 let BaseService = class extends (0, import_serviceDecorators.LogService)("BaseService") {
   onCleanup;
   baseSignal;
-  intervalPing() {
-    this.baseSignal.pubsubPing((/* @__PURE__ */ new Date()).toISOString());
+  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)
@@ -50,9 +61,6 @@ __decorateClass([
 __decorateClass([
   (0, import_serviceDecorators.Sig)()
 ], BaseService.prototype, "baseSignal", 2);
-__decorateClass([
-  (0, import_nest.Interval)(5e3)
-], BaseService.prototype, "intervalPing", 1);
 BaseService = __decorateClass([
   (0, import_serviceDecorators.Service)("BaseService")
 ], BaseService);

package/cjs/src/serviceDecorators.js

@@ -29,9 +29,6 @@ __export(serviceDecorators_exports, {
   Db: () => Db,
   DbService: () => DbService,
   Env: () => Env,
-  ExtendedSettingService: () => ExtendedSettingService,
-  ExtendedSummaryService: () => ExtendedSummaryService,
-  ExtendedUserService: () => ExtendedUserService,
   Gen: () => Gen,
   LogService: () => LogService,
   MixSrvs: () => MixSrvs,
@@ -40,6 +37,7 @@ __export(serviceDecorators_exports, {
   Sig: () => Sig,
   Srv: () => Srv,
   Use: () => Use,
+  getAllServiceRefs: () => getAllServiceRefs,
   getServiceMeta: () => getServiceMeta,
   getServiceRefs: () => getServiceRefs,
   isServiceEnabled: () => isServiceEnabled,
@@ -57,6 +55,10 @@ class ServiceStorage {
 const getServiceRefs = (refName) => {
   return Reflect.getMetadata(refName, ServiceStorage.prototype) ?? [];
 };
+const getAllServiceRefs = () => {
+  const keys = Reflect.getMetadataKeys(ServiceStorage.prototype);
+  return keys.map((key) => getServiceRefs(key)[0]);
+};
 const setServiceRefs = (refName, services) => {
   Reflect.defineMetadata(refName, services, ServiceStorage.prototype);
 };
@@ -157,14 +159,16 @@ const serviceOf = (target) => {
   (0, import_common2.Injectable)()(srvRef);
   return srvRef;
 };
-const AVOID_MIX_SRV_KEY_SET = /* @__PURE__ */ new Set(["onModuleInit", "onModuleDestroy"]);
-function MixSrvs(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, t17, t18, t19, t20) {
-  class Mix extends t1 {
+function MixSrvs(...services) {
+  if (services.length === 0)
+    throw new Error("MixSrvs requires at least one service");
+  const [baseService, ...restServices] = services;
+  class Mix extends baseService {
   }
   const injectMetadataMap = new Map(
-    [t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, t17, t18, t19, t20].filter((t) => !!t).reduce((acc, srvRef) => {
+    restServices.reduce((acc, srvRef) => {
       const injectMetadataMap2 = getServiceInjectMetaMapOnPrototype(srvRef);
-      (0, import_common.applyMixins)(Mix, [srvRef], AVOID_MIX_SRV_KEY_SET);
+      (0, import_common.applyMixins)(Mix, [srvRef]);
       return [...acc, ...injectMetadataMap2];
     }, [])
   );
@@ -187,102 +191,112 @@ const LogService = (name) => {
   }
   return LogService2;
 };
-const DbService = (database, sigRef) => {
+const DbService = (database, ...libSrvRefs) => {
   const [modelName, className] = [database.refName, (0, import_common.capitalize)(database.refName)];
-  class DbService2 {
-    logger = new import_common.Logger(`${(0, import_common.capitalize)(modelName)}Service`);
-    __databaseModel;
-    async __list(query, queryOption) {
-      return await this.__databaseModel.__list(query, queryOption);
-    }
-    async __listIds(query, queryOption) {
-      return await this.__databaseModel.__listIds(query, queryOption);
-    }
-    async __find(query, queryOption) {
-      return await this.__databaseModel.__find(query, queryOption);
-    }
-    async __findId(query, queryOption) {
-      return await this.__databaseModel.__findId(query, queryOption);
-    }
-    async __pick(query, queryOption) {
-      return await this.__databaseModel.__pick(query, queryOption);
-    }
-    async __pickId(query, queryOption) {
-      return await this.__databaseModel.__pickId(query, queryOption);
-    }
-    async __exists(query) {
-      return await this.__databaseModel.__exists(query);
-    }
-    async __count(query) {
-      return await this.__databaseModel.__count(query);
-    }
-    async __insight(query) {
-      return await this.__databaseModel.__insight(query);
-    }
-    async __search(searchText, queryOption) {
-      return await this.__databaseModel[`search${className}`](searchText, queryOption);
-    }
-    async __searchDocs(searchText, queryOption) {
-      return await this.__databaseModel[`searchDocs${className}`](searchText, queryOption);
-    }
-    async __searchCount(searchText) {
-      return await this.__databaseModel[`searchCount${className}`](searchText);
-    }
-    async _preCreate(data) {
-      return data;
-    }
-    async _postCreate(doc) {
-      return doc;
-    }
-    async _preUpdate(id, data) {
-      return data;
-    }
-    async _postUpdate(doc) {
-      return doc;
-    }
-    async _preRemove(id) {
-      return;
-    }
-    async _postRemove(doc) {
-      return doc;
-    }
-    async [`get${className}`](id) {
-      return await this.__databaseModel[`get${className}`](id);
-    }
-    async [`load${className}`](id) {
-      return await this.__databaseModel[`load${className}`](id);
-    }
-    async [`load${className}Many`](ids) {
-      return await this.__databaseModel[`load${className}Many`](ids);
-    }
-    async [`create${className}`](data) {
-      const input = await this._preCreate(data);
-      const doc = await this.__databaseModel[`create${className}`](input);
-      return await this._postCreate(doc);
-    }
-    async [`update${className}`](id, data) {
-      const input = await this._preUpdate(id, data);
-      const doc = await this.__databaseModel[`update${className}`](id, input);
-      return await this._postUpdate(doc);
+  const getDefaultDbService = () => {
+    class DbService3 {
+      logger = new import_common.Logger(`${(0, import_common.capitalize)(modelName)}Service`);
+      __databaseModel;
+      async __list(query, queryOption) {
+        return await this.__databaseModel.__list(query, queryOption);
+      }
+      async __listIds(query, queryOption) {
+        return await this.__databaseModel.__listIds(query, queryOption);
+      }
+      async __find(query, queryOption) {
+        return await this.__databaseModel.__find(query, queryOption);
+      }
+      async __findId(query, queryOption) {
+        return await this.__databaseModel.__findId(query, queryOption);
+      }
+      async __pick(query, queryOption) {
+        return await this.__databaseModel.__pick(query, queryOption);
+      }
+      async __pickId(query, queryOption) {
+        return await this.__databaseModel.__pickId(query, queryOption);
+      }
+      async __exists(query) {
+        return await this.__databaseModel.__exists(query);
+      }
+      async __count(query) {
+        return await this.__databaseModel.__count(query);
+      }
+      async __insight(query) {
+        return await this.__databaseModel.__insight(query);
+      }
+      async __search(searchText, queryOption) {
+        return await this.__databaseModel[`search${className}`](searchText, queryOption);
+      }
+      async __searchDocs(searchText, queryOption) {
+        return await this.__databaseModel[`searchDocs${className}`](searchText, queryOption);
+      }
+      async __searchCount(searchText) {
+        return await this.__databaseModel[`searchCount${className}`](searchText);
+      }
+      async _preCreate(data) {
+        return data;
+      }
+      async _postCreate(doc) {
+        return doc;
+      }
+      async _preUpdate(id, data) {
+        return data;
+      }
+      async _postUpdate(doc) {
+        return doc;
+      }
+      async _preRemove(id) {
+        return;
+      }
+      async _postRemove(doc) {
+        return doc;
+      }
+      listenPre(type, listener) {
+        return this.__databaseModel.listenPre(type, listener);
+      }
+      listenPost(type, listener) {
+        return this.__databaseModel.listenPost(type, listener);
+      }
+      async [`get${className}`](id) {
+        return await this.__databaseModel[`get${className}`](id);
+      }
+      async [`load${className}`](id) {
+        return await this.__databaseModel[`load${className}`](id);
+      }
+      async [`load${className}Many`](ids) {
+        return await this.__databaseModel[`load${className}Many`](ids);
+      }
+      async [`create${className}`](data) {
+        const input = await this._preCreate(data);
+        const doc = await this.__databaseModel[`create${className}`](input);
+        return await this._postCreate(doc);
+      }
+      async [`update${className}`](id, data) {
+        const input = await this._preUpdate(id, data);
+        const doc = await this.__databaseModel[`update${className}`](id, input);
+        return await this._postUpdate(doc);
+      }
+      async [`remove${className}`](id) {
+        await this._preRemove(id);
+        const doc = await this.__databaseModel[`remove${className}`](id);
+        return await this._postRemove(doc);
+      }
+      async [`search${className}`](query, queryOption) {
+        return await this.__databaseModel[`search${className}`](query, queryOption);
+      }
+      async [`searchDocs${className}`](query, queryOption) {
+        return await this.__databaseModel[`searchDocs${className}`](query, queryOption);
+      }
+      async [`searchCount${className}`](query) {
+        return await this.__databaseModel[`searchCount${className}`](query);
+      }
     }
-    async [`remove${className}`](id) {
-      await this._preRemove(id);
-      const doc = await this.__databaseModel[`remove${className}`](id);
-      return await this._postRemove(doc);
-    }
-    async [`search${className}`](query, queryOption) {
-      return await this.__databaseModel[`search${className}`](query, queryOption);
-    }
-    async [`searchDocs${className}`](query, queryOption) {
-      return await this.__databaseModel[`searchDocs${className}`](query, queryOption);
-    }
-    async [`searchCount${className}`](query) {
-      return await this.__databaseModel[`searchCount${className}`](query);
-    }
-  }
-  __decorateClass([
-    Use(`${modelName}Model`)
-  ], DbService2.prototype, "__databaseModel", 2);
+    __decorateClass([
+      Use(`${modelName}Model`)
+    ], DbService3.prototype, "__databaseModel", 2);
+    Use(`${modelName}Model`)(DbService3.prototype, `${modelName}Model`);
+    return DbService3;
+  };
   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");
@@ -291,6 +305,7 @@ const DbService = (database, sigRef) => {
     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 queryKeys = [...filterKeyMetaMap.keys()];
   queryKeys.forEach((queryKey) => {
@@ -332,33 +347,8 @@ const DbService = (database, sigRef) => {
       return this.__insight(query);
     };
   });
-  Use(`${modelName}Model`)(DbService2.prototype, `${modelName}Model`);
   return DbService2;
 };
-const ExtendedUserService = (database, srvRef, sigRef) => {
-  const filterKeyMetaMap = (0, import_constant.getFilterKeyMetaMapOnPrototype)(database.Filter.prototype);
-  const queryKeys = [...filterKeyMetaMap.keys()];
-  queryKeys.forEach((queryKey) => {
-    const queryFn = (0, import_constant.getFilterQuery)(database.Filter, queryKey);
-    srvRef.prototype[`list${(0, import_common.capitalize)(queryKey)}`] = async function(...args) {
-      const queryOption = args.at(-1);
-      const hasQueryOption = typeof queryOption === "object" && (typeof queryOption.select === "object" || typeof queryOption.skip === "number" || typeof queryOption.limit === "number" || typeof queryOption.sort === "string");
-      const query = queryFn(...hasQueryOption ? args.slice(0, -1) : args);
-      return this.__list(query, queryOption);
-    };
-    srvRef.prototype[`insight${(0, import_common.capitalize)(queryKey)}`] = async function(...args) {
-      const query = queryFn(...args);
-      return this.__insight(query);
-    };
-  });
-  return srvRef;
-};
-const ExtendedSummaryService = (database, srvRef, sigRef) => {
-  return srvRef;
-};
-const ExtendedSettingService = (database, srvRef, sigRef) => {
-  return srvRef;
-};
 const makeProvidersForSrv = (srvRef) => {
   const injectMetaMap = getServiceInjectMetaMapOnPrototype(srvRef.prototype);
   const providers = [];
@@ -387,9 +377,6 @@ const makeProvidersForSrv = (srvRef) => {
   Db,
   DbService,
   Env,
-  ExtendedSettingService,
-  ExtendedSummaryService,
-  ExtendedUserService,
   Gen,
   LogService,
   MixSrvs,
@@ -398,6 +385,7 @@ const makeProvidersForSrv = (srvRef) => {
   Sig,
   Srv,
   Use,
+  getAllServiceRefs,
   getServiceMeta,
   getServiceRefs,
   isServiceEnabled,

package/esm/src/base.service.js

@@ -9,13 +9,24 @@ var __decorateClass = (decorators, target, key, kind) => {
     __defProp(target, key, result);
   return result;
 };
-import { Interval } from "@akanjs/nest";
+import { getDictionary, translate } from "@akanjs/dictionary";
 import { Gen, LogService, Service, Sig } from "./serviceDecorators";
 let BaseService = class extends LogService("BaseService") {
   onCleanup;
   baseSignal;
-  intervalPing() {
-    this.baseSignal.pubsubPing((/* @__PURE__ */ new Date()).toISOString());
+  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)
@@ -29,9 +40,6 @@ __decorateClass([
 __decorateClass([
   Sig()
 ], BaseService.prototype, "baseSignal", 2);
-__decorateClass([
-  Interval(5e3)
-], BaseService.prototype, "intervalPing", 1);
 BaseService = __decorateClass([
   Service("BaseService")
 ], BaseService);

package/esm/src/serviceDecorators.js

@@ -22,6 +22,10 @@ class ServiceStorage {
 const getServiceRefs = (refName) => {
   return Reflect.getMetadata(refName, ServiceStorage.prototype) ?? [];
 };
+const getAllServiceRefs = () => {
+  const keys = Reflect.getMetadataKeys(ServiceStorage.prototype);
+  return keys.map((key) => getServiceRefs(key)[0]);
+};
 const setServiceRefs = (refName, services) => {
   Reflect.defineMetadata(refName, services, ServiceStorage.prototype);
 };
@@ -122,14 +126,16 @@ const serviceOf = (target) => {
   Injectable()(srvRef);
   return srvRef;
 };
-const AVOID_MIX_SRV_KEY_SET = /* @__PURE__ */ new Set(["onModuleInit", "onModuleDestroy"]);
-function MixSrvs(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, t17, t18, t19, t20) {
-  class Mix extends t1 {
+function MixSrvs(...services) {
+  if (services.length === 0)
+    throw new Error("MixSrvs requires at least one service");
+  const [baseService, ...restServices] = services;
+  class Mix extends baseService {
   }
   const injectMetadataMap = new Map(
-    [t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, t17, t18, t19, t20].filter((t) => !!t).reduce((acc, srvRef) => {
+    restServices.reduce((acc, srvRef) => {
       const injectMetadataMap2 = getServiceInjectMetaMapOnPrototype(srvRef);
-      applyMixins(Mix, [srvRef], AVOID_MIX_SRV_KEY_SET);
+      applyMixins(Mix, [srvRef]);
       return [...acc, ...injectMetadataMap2];
     }, [])
   );
@@ -152,102 +158,112 @@ const LogService = (name) => {
   }
   return LogService2;
 };
-const DbService = (database, sigRef) => {
+const DbService = (database, ...libSrvRefs) => {
   const [modelName, className] = [database.refName, capitalize(database.refName)];
-  class DbService2 {
-    logger = new Logger(`${capitalize(modelName)}Service`);
-    __databaseModel;
-    async __list(query, queryOption) {
-      return await this.__databaseModel.__list(query, queryOption);
-    }
-    async __listIds(query, queryOption) {
-      return await this.__databaseModel.__listIds(query, queryOption);
-    }
-    async __find(query, queryOption) {
-      return await this.__databaseModel.__find(query, queryOption);
-    }
-    async __findId(query, queryOption) {
-      return await this.__databaseModel.__findId(query, queryOption);
-    }
-    async __pick(query, queryOption) {
-      return await this.__databaseModel.__pick(query, queryOption);
-    }
-    async __pickId(query, queryOption) {
-      return await this.__databaseModel.__pickId(query, queryOption);
-    }
-    async __exists(query) {
-      return await this.__databaseModel.__exists(query);
-    }
-    async __count(query) {
-      return await this.__databaseModel.__count(query);
-    }
-    async __insight(query) {
-      return await this.__databaseModel.__insight(query);
-    }
-    async __search(searchText, queryOption) {
-      return await this.__databaseModel[`search${className}`](searchText, queryOption);
-    }
-    async __searchDocs(searchText, queryOption) {
-      return await this.__databaseModel[`searchDocs${className}`](searchText, queryOption);
-    }
-    async __searchCount(searchText) {
-      return await this.__databaseModel[`searchCount${className}`](searchText);
-    }
-    async _preCreate(data) {
-      return data;
-    }
-    async _postCreate(doc) {
-      return doc;
-    }
-    async _preUpdate(id, data) {
-      return data;
-    }
-    async _postUpdate(doc) {
-      return doc;
-    }
-    async _preRemove(id) {
-      return;
-    }
-    async _postRemove(doc) {
-      return doc;
-    }
-    async [`get${className}`](id) {
-      return await this.__databaseModel[`get${className}`](id);
-    }
-    async [`load${className}`](id) {
-      return await this.__databaseModel[`load${className}`](id);
-    }
-    async [`load${className}Many`](ids) {
-      return await this.__databaseModel[`load${className}Many`](ids);
-    }
-    async [`create${className}`](data) {
-      const input = await this._preCreate(data);
-      const doc = await this.__databaseModel[`create${className}`](input);
-      return await this._postCreate(doc);
-    }
-    async [`update${className}`](id, data) {
-      const input = await this._preUpdate(id, data);
-      const doc = await this.__databaseModel[`update${className}`](id, input);
-      return await this._postUpdate(doc);
+  const getDefaultDbService = () => {
+    class DbService3 {
+      logger = new Logger(`${capitalize(modelName)}Service`);
+      __databaseModel;
+      async __list(query, queryOption) {
+        return await this.__databaseModel.__list(query, queryOption);
+      }
+      async __listIds(query, queryOption) {
+        return await this.__databaseModel.__listIds(query, queryOption);
+      }
+      async __find(query, queryOption) {
+        return await this.__databaseModel.__find(query, queryOption);
+      }
+      async __findId(query, queryOption) {
+        return await this.__databaseModel.__findId(query, queryOption);
+      }
+      async __pick(query, queryOption) {
+        return await this.__databaseModel.__pick(query, queryOption);
+      }
+      async __pickId(query, queryOption) {
+        return await this.__databaseModel.__pickId(query, queryOption);
+      }
+      async __exists(query) {
+        return await this.__databaseModel.__exists(query);
+      }
+      async __count(query) {
+        return await this.__databaseModel.__count(query);
+      }
+      async __insight(query) {
+        return await this.__databaseModel.__insight(query);
+      }
+      async __search(searchText, queryOption) {
+        return await this.__databaseModel[`search${className}`](searchText, queryOption);
+      }
+      async __searchDocs(searchText, queryOption) {
+        return await this.__databaseModel[`searchDocs${className}`](searchText, queryOption);
+      }
+      async __searchCount(searchText) {
+        return await this.__databaseModel[`searchCount${className}`](searchText);
+      }
+      async _preCreate(data) {
+        return data;
+      }
+      async _postCreate(doc) {
+        return doc;
+      }
+      async _preUpdate(id, data) {
+        return data;
+      }
+      async _postUpdate(doc) {
+        return doc;
+      }
+      async _preRemove(id) {
+        return;
+      }
+      async _postRemove(doc) {
+        return doc;
+      }
+      listenPre(type, listener) {
+        return this.__databaseModel.listenPre(type, listener);
+      }
+      listenPost(type, listener) {
+        return this.__databaseModel.listenPost(type, listener);
+      }
+      async [`get${className}`](id) {
+        return await this.__databaseModel[`get${className}`](id);
+      }
+      async [`load${className}`](id) {
+        return await this.__databaseModel[`load${className}`](id);
+      }
+      async [`load${className}Many`](ids) {
+        return await this.__databaseModel[`load${className}Many`](ids);
+      }
+      async [`create${className}`](data) {
+        const input = await this._preCreate(data);
+        const doc = await this.__databaseModel[`create${className}`](input);
+        return await this._postCreate(doc);
+      }
+      async [`update${className}`](id, data) {
+        const input = await this._preUpdate(id, data);
+        const doc = await this.__databaseModel[`update${className}`](id, input);
+        return await this._postUpdate(doc);
+      }
+      async [`remove${className}`](id) {
+        await this._preRemove(id);
+        const doc = await this.__databaseModel[`remove${className}`](id);
+        return await this._postRemove(doc);
+      }
+      async [`search${className}`](query, queryOption) {
+        return await this.__databaseModel[`search${className}`](query, queryOption);
+      }
+      async [`searchDocs${className}`](query, queryOption) {
+        return await this.__databaseModel[`searchDocs${className}`](query, queryOption);
+      }
+      async [`searchCount${className}`](query) {
+        return await this.__databaseModel[`searchCount${className}`](query);
+      }
     }
-    async [`remove${className}`](id) {
-      await this._preRemove(id);
-      const doc = await this.__databaseModel[`remove${className}`](id);
-      return await this._postRemove(doc);
-    }
-    async [`search${className}`](query, queryOption) {
-      return await this.__databaseModel[`search${className}`](query, queryOption);
-    }
-    async [`searchDocs${className}`](query, queryOption) {
-      return await this.__databaseModel[`searchDocs${className}`](query, queryOption);
-    }
-    async [`searchCount${className}`](query) {
-      return await this.__databaseModel[`searchCount${className}`](query);
-    }
-  }
-  __decorateClass([
-    Use(`${modelName}Model`)
-  ], DbService2.prototype, "__databaseModel", 2);
+    __decorateClass([
+      Use(`${modelName}Model`)
+    ], DbService3.prototype, "__databaseModel", 2);
+    Use(`${modelName}Model`)(DbService3.prototype, `${modelName}Model`);
+    return DbService3;
+  };
   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");
@@ -256,6 +272,7 @@ const DbService = (database, sigRef) => {
     const queryOption = hasQueryOption ? lastArg : {};
     return { query, queryOption };
   };
+  const DbService2 = libSrvRefs.length > 0 ? MixSrvs(...libSrvRefs) : getDefaultDbService();
   const filterKeyMetaMap = getFilterKeyMetaMapOnPrototype(database.Filter.prototype);
   const queryKeys = [...filterKeyMetaMap.keys()];
   queryKeys.forEach((queryKey) => {
@@ -297,33 +314,8 @@ const DbService = (database, sigRef) => {
       return this.__insight(query);
     };
   });
-  Use(`${modelName}Model`)(DbService2.prototype, `${modelName}Model`);
   return DbService2;
 };
-const ExtendedUserService = (database, srvRef, sigRef) => {
-  const filterKeyMetaMap = getFilterKeyMetaMapOnPrototype(database.Filter.prototype);
-  const queryKeys = [...filterKeyMetaMap.keys()];
-  queryKeys.forEach((queryKey) => {
-    const queryFn = getFilterQuery(database.Filter, queryKey);
-    srvRef.prototype[`list${capitalize(queryKey)}`] = async function(...args) {
-      const queryOption = args.at(-1);
-      const hasQueryOption = typeof queryOption === "object" && (typeof queryOption.select === "object" || typeof queryOption.skip === "number" || typeof queryOption.limit === "number" || typeof queryOption.sort === "string");
-      const query = queryFn(...hasQueryOption ? args.slice(0, -1) : args);
-      return this.__list(query, queryOption);
-    };
-    srvRef.prototype[`insight${capitalize(queryKey)}`] = async function(...args) {
-      const query = queryFn(...args);
-      return this.__insight(query);
-    };
-  });
-  return srvRef;
-};
-const ExtendedSummaryService = (database, srvRef, sigRef) => {
-  return srvRef;
-};
-const ExtendedSettingService = (database, srvRef, sigRef) => {
-  return srvRef;
-};
 const makeProvidersForSrv = (srvRef) => {
   const injectMetaMap = getServiceInjectMetaMapOnPrototype(srvRef.prototype);
   const providers = [];
@@ -351,9 +343,6 @@ export {
   Db,
   DbService,
   Env,
-  ExtendedSettingService,
-  ExtendedSummaryService,
-  ExtendedUserService,
   Gen,
   LogService,
   MixSrvs,
@@ -362,6 +351,7 @@ export {
   Sig,
   Srv,
   Use,
+  getAllServiceRefs,
   getServiceMeta,
   getServiceRefs,
   isServiceEnabled,

package/package.json

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

package/src/base.service.d.ts

@@ -8,7 +8,17 @@ declare const BaseService_base: {
 export declare class BaseService extends BaseService_base {
     onCleanup?: () => Promise<void>;
     baseSignal: Sig<BaseSignal>;
-    intervalPing(): void;
+    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: {

package/src/serviceDecorators.d.ts

@@ -1,8 +1,8 @@
 import "reflect-metadata";
-import { BaseObject, type Prettify, Type } from "@akanjs/base";
+import type { GetActionObject, MergeAllTypes, Prettify, PromiseOrObject, Type, UnType } from "@akanjs/base";
 import { Logger } from "@akanjs/common";
-import { type DocumentModel, type FilterType, FindQueryOption, type GetActionObject, ListQueryOption, QueryOf, type SortOf } from "@akanjs/constant";
-import type { BaseMiddleware, Database, DatabaseModel, DataInputOf } from "@akanjs/document";
+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 { FilterOutInternalArgs } from "@akanjs/signal";
 import { type Provider } from "@nestjs/common";
 import type { Job, Queue as BullQueue } from "bull";
@@ -11,7 +11,7 @@ import type { Server } from "socket.io";
 export type GetServices<AllSrvs extends {
     [key: string]: Type | undefined;
 }> = {
-    [key in keyof AllSrvs]: AllSrvs[key] extends Type<infer Srv> | undefined ? Srv : AllSrvs[key] extends Type<infer Srv> ? Srv : never;
+    [K in keyof AllSrvs]: UnType<NonNullable<AllSrvs[K]>>;
 };
 export declare class ServiceStorage {
 }
@@ -20,6 +20,7 @@ interface ServiceMeta {
     enabled: boolean;
 }
 export declare const getServiceRefs: (refName: string) => Type[];
+export declare const getAllServiceRefs: () => Type[];
 export declare const getServiceMeta: (srvRef: Type) => ServiceMeta | undefined;
 export declare const isServiceEnabled: (srvRef: Type) => boolean;
 export interface ServiceInjectMeta {
@@ -37,117 +38,81 @@ 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;
 export declare function Gen(generateFactory: (options: any) => any): PropertyDecorator;
-type Queue<Signal> = {
-    [K in keyof Signal as K extends string ? Signal[K] extends (...args: any) => Promise<{
-        __Returns__: "Done";
-    }> ? K : never : never]: Signal[K] extends (...args: infer Args) => Promise<infer R> ? (...args: FilterOutInternalArgs<Args>) => Promise<Job> : never;
-} & {
-    queue: BullQueue;
+export declare function Sig(name?: string): PropertyDecorator;
+type ServiceSignalReturnType = {
+    __Returns__: "Done";
+} | {
+    __Returns__: "Subscribe";
 };
-type Websocket<Signal> = {
-    [K in keyof Signal as K extends string ? Signal[K] extends (...args: any) => Promise<{
-        __Returns__: "Subscribe";
-    }> ? K : Signal[K] extends (...args: any) => {
-        __Returns__: "Subscribe";
-    } ? K : never : never]: Signal[K] extends (...args: infer Args) => Promise<{
-        __Returns__: "Subscribe";
-    } & infer R> ? (...args: [...FilterOutInternalArgs<Args>, data: DocumentModel<R>]) => Promise<void> : Signal[K] extends (...args: infer Args) => {
+export type Sig<Signal> = {
+    [K in keyof Signal as Signal[K] extends (...args: any) => PromiseOrObject<ServiceSignalReturnType> ? K : never]: Signal[K] extends (...args: infer Args) => PromiseOrObject<{
+        __Returns__: "Done";
+    }> ? (...args: FilterOutInternalArgs<Args>) => Promise<Job> : Signal[K] extends (...args: infer Args) => PromiseOrObject<{
         __Returns__: "Subscribe";
-    } & infer R ? (...args: [...FilterOutInternalArgs<Args>, data: DocumentModel<R>]) => void : never;
+    } & infer Return> ? (...args: [...FilterOutInternalArgs<Args>, data: DocumentModel<Return>]) => void : never;
 } & {
+    queue: BullQueue;
     websocket: Server;
 };
-export declare function Sig(name?: string): PropertyDecorator;
-export type Sig<Signal> = Queue<Signal> & Websocket<Signal>;
 export declare function Db(name: string): PropertyDecorator;
 export declare const serviceOf: (target: Type) => Type;
-export declare function MixSrvs<T1 = unknown, T2 = unknown, T3 = unknown, T4 = unknown, T5 = unknown, T6 = unknown, T7 = unknown, T8 = unknown, T9 = unknown, T10 = unknown, T11 = unknown, T12 = unknown, T13 = unknown, T14 = unknown, T15 = unknown, T16 = unknown, T17 = unknown, T18 = unknown, T19 = unknown, T20 = unknown>(t1: Type<T1>, t2?: Type<T2>, t3?: Type<T3>, t4?: Type<T4>, t5?: Type<T5>, t6?: Type<T6>, t7?: Type<T7>, t8?: Type<T8>, t9?: Type<T9>, t10?: Type<T10>, t11?: Type<T11>, t12?: Type<T12>, t13?: Type<T13>, t14?: Type<T14>, t15?: Type<T15>, t16?: Type<T16>, t17?: Type<T17>, t18?: Type<T18>, t19?: Type<T19>, t20?: Type<T20>): Type<T1 & T2 & T3 & T4 & T5 & T6 & T7 & T8 & T9 & T10 & T11 & T12 & T13 & T14 & T15 & T16 & T17 & T18 & T19 & T20>;
+export declare function MixSrvs<T extends Type[]>(...services: [...T]): Type<MergeAllTypes<T>>;
 export declare const LogService: <T extends string>(name: T) => {
     new (): {
         logger: Logger;
     };
 };
-type QueueService<Signal> = {
-    [K in keyof Signal as K extends string ? Signal[K] extends (...args: any) => Promise<{
-        __Returns__: "Done";
-    }> ? K : never : never]: Signal[K] extends (...args: infer Args) => Promise<infer R> ? (...args: FilterOutInternalArgs<Args>) => Promise<Job> : never;
-};
-type DatabaseService<T extends string, Input, Doc, Obj, Model, Insight, Filter, Summary> = DatabaseServiceWithQuerySort<T, Input, Doc, Obj, Model, Insight, GetActionObject<Filter>, SortOf<Filter>>;
-type DatabaseServiceWithQuerySort<T extends string, Input, Doc, Obj, Model, Insight, Query, Sort> = {
+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>> = {
     logger: Logger;
     __databaseModel: Model;
-    __list(query?: QueryOf<Doc>, queryOption?: ListQueryOption<Sort, Obj>): Promise<Doc[]>;
-    __listIds(query?: QueryOf<Doc>, queryOption?: ListQueryOption<Sort, Obj>): Promise<string[]>;
-    __find(query?: QueryOf<Doc>, queryOption?: FindQueryOption<Sort, Obj>): Promise<Doc | null>;
-    __findId(query?: QueryOf<Doc>, queryOption?: FindQueryOption<Sort, Obj>): Promise<string | null>;
-    __pick(query?: QueryOf<Doc>, queryOption?: FindQueryOption<Sort, Obj>): Promise<Doc>;
-    __pickId(query?: QueryOf<Doc>, queryOption?: FindQueryOption<Sort, Obj>): Promise<string>;
-    __exists(query?: QueryOf<Doc>): Promise<string | null>;
-    __count(query?: QueryOf<Doc>): Promise<number>;
-    __insight(query?: QueryOf<Doc>): Promise<Insight>;
-    __search(query: QueryOf<Doc>, queryOption?: ListQueryOption<Sort, Obj>): Promise<{
+    __list(query?: _QueryOfDoc, queryOption?: _ListQueryOption): Promise<Doc[]>;
+    __listIds(query?: _QueryOfDoc, queryOption?: _ListQueryOption): Promise<string[]>;
+    __find(query?: _QueryOfDoc, queryOption?: _FindQueryOption): Promise<Doc | null>;
+    __findId(query?: _QueryOfDoc, queryOption?: _FindQueryOption): Promise<string | null>;
+    __pick(query?: _QueryOfDoc, queryOption?: _FindQueryOption): Promise<Doc>;
+    __pickId(query?: _QueryOfDoc, queryOption?: _FindQueryOption): Promise<string>;
+    __exists(query?: _QueryOfDoc): Promise<string | null>;
+    __count(query?: _QueryOfDoc): Promise<number>;
+    __insight(query?: _QueryOfDoc): Promise<Insight>;
+    __search(query: _QueryOfDoc, queryOption?: _ListQueryOption): Promise<{
         docs: Doc[];
         count: number;
     }>;
-    __searchDocs(query: QueryOf<Doc>, queryOption?: ListQueryOption<Sort, Obj>): Promise<Doc[]>;
-    __searchCount(query: QueryOf<Doc>): Promise<number>;
-    _preCreate(data: DataInputOf<Input, Doc>): Promise<DataInputOf<Input, Doc>> | DataInputOf<Input, Doc>;
+    __searchDocs(query: _QueryOfDoc, queryOption?: _ListQueryOption): Promise<Doc[]>;
+    __searchCount(query: _QueryOfDoc): Promise<number>;
+    _preCreate(data: _DataInputOfDoc): PromiseOrObject<_DataInputOfDoc>;
     _postCreate(doc: Doc): Promise<Doc> | Doc;
-    _preUpdate(id: string, data: Partial<Doc>): Promise<Partial<Doc>> | Partial<Doc>;
+    _preUpdate(id: string, data: Partial<Doc>): PromiseOrObject<Partial<Doc>>;
     _postUpdate(doc: Doc): Promise<Doc> | Doc;
     _preRemove(id: string): Promise<void> | void;
     _postRemove(doc: Doc): Promise<Doc> | Doc;
+    listenPre: (type: SaveEventType, listener: (doc: Doc, type: CRUDEventType) => PromiseOrObject<void>) => () => void;
+    listenPost: (type: SaveEventType, listener: (doc: Doc, type: CRUDEventType) => PromiseOrObject<void>) => () => void;
 } & Prettify<{
     [key in `${T}Model`]: Model;
 } & {
-    [K in `get${Capitalize<T>}`]: (id: string) => Promise<Doc>;
+    [K in `get${_CapitalizedT}`]: (id: string) => Promise<Doc>;
 } & {
-    [K in `load${Capitalize<T>}`]: (id?: string) => Promise<Doc | null>;
+    [K in `load${_CapitalizedT}`]: (id?: string) => Promise<Doc | null>;
 } & {
-    [K in `load${Capitalize<T>}Many`]: (ids: string[]) => Promise<Doc[]>;
+    [K in `load${_CapitalizedT}Many`]: (ids: string[]) => Promise<Doc[]>;
 } & {
-    [K in `create${Capitalize<T>}`]: (data: DataInputOf<Input, Doc>) => Promise<Doc>;
+    [K in `create${_CapitalizedT}`]: (data: _DataInputOfDoc) => Promise<Doc>;
 } & {
-    [K in `update${Capitalize<T>}`]: (id: string, data: Partial<Doc>) => Promise<Doc>;
+    [K in `update${_CapitalizedT}`]: (id: string, data: Partial<Doc>) => Promise<Doc>;
 } & {
-    [K in `remove${Capitalize<T>}`]: (id: string) => Promise<Doc>;
+    [K in `remove${_CapitalizedT}`]: (id: string) => Promise<Doc>;
 } & {
-    [K in `search${Capitalize<T>}`]: (searchText: string, queryOption?: ListQueryOption<Sort, Obj>) => Promise<{
+    [K in `search${_CapitalizedT}`]: (searchText: string, queryOption?: _ListQueryOption) => Promise<{
         docs: Doc[];
         count: number;
     }>;
 } & {
-    [K in `searchDocs${Capitalize<T>}`]: (searchText: string, queryOption?: ListQueryOption<Sort, Obj>) => Promise<Doc[]>;
-} & {
-    [K in `searchCount${Capitalize<T>}`]: (searchText: string) => Promise<number>;
-} & {
-    [K in keyof Query as K extends string ? `list${Capitalize<K>}` : never]: Query[K] extends (...args: infer Args) => any ? (...args: [...Args, queryOption?: ListQueryOption<Sort, Obj>]) => Promise<Doc[]> : never;
-} & {
-    [K in keyof Query as K extends string ? `listIds${Capitalize<K>}` : never]: Query[K] extends (...args: infer Args) => any ? (...args: [...Args, queryOption?: ListQueryOption<Sort, Obj>]) => Promise<string[]> : never;
-} & {
-    [K in keyof Query as K extends string ? `find${Capitalize<K>}` : never]: Query[K] extends (...args: infer Args) => any ? (...args: [...Args, queryOption?: FindQueryOption<Sort, Obj>]) => Promise<Doc | null> : never;
-} & {
-    [K in keyof Query as K extends string ? `findId${Capitalize<K>}` : never]: Query[K] extends (...args: infer Args) => any ? (...args: [...Args, queryOption?: FindQueryOption<Sort, Obj>]) => Promise<string | null> : never;
-} & {
-    [K in keyof Query as K extends string ? `pick${Capitalize<K>}` : never]: Query[K] extends (...args: infer Args) => any ? (...args: [...Args, queryOption?: FindQueryOption<Sort, Obj>]) => Promise<Doc> : never;
-} & {
-    [K in keyof Query as K extends string ? `pickId${Capitalize<K>}` : never]: Query[K] extends (...args: infer Args) => any ? (...args: [...Args, queryOption?: FindQueryOption<Sort, Obj>]) => Promise<string> : never;
-} & {
-    [K in keyof Query as K extends string ? `exists${Capitalize<K>}` : never]: Query[K] extends (...args: infer Args) => any ? (...args: [...Args]) => Promise<string | null> : never;
-} & {
-    [K in keyof Query as K extends string ? `count${Capitalize<K>}` : never]: Query[K] extends (...args: infer Args) => any ? (...args: [...Args]) => Promise<number> : never;
+    [K in `searchDocs${_CapitalizedT}`]: (searchText: string, queryOption?: _ListQueryOption) => Promise<Doc[]>;
 } & {
-    [K in keyof Query as K extends string ? `insight${Capitalize<K>}` : never]: Query[K] extends (...args: infer Args) => any ? (...args: [...Args]) => Promise<Insight> : never;
-}>;
-export declare const DbService: <T extends string, Input, Doc extends HydratedDocument<any>, Model extends DatabaseModel<T, Input, Doc, Obj, Insight, Filter, Summary>, Middleware extends BaseMiddleware, Obj, Insight, Filter extends FilterType, Summary, Signal = unknown>(database: Database<T, Input, Doc, Model, Middleware, Obj, Insight, Filter, Summary>, sigRef?: Type<Signal>) => Type<DatabaseService<T, Input, Doc, Obj, Model, Insight, Filter, Summary>>;
-export declare const ExtendedUserService: <T extends string, Input, Doc extends HydratedDocument<any>, Model extends DatabaseModel<T, Input, Doc, Obj, Insight, Filter, Summary>, Middleware extends BaseMiddleware, Obj, Insight, Filter extends FilterType, Summary, Srv, Signal = unknown>(database: Database<T, Input, Doc, Model, Middleware, Obj, Insight, Filter, Summary>, srvRef: Type<Srv>, sigRef?: Type<Signal>) => Type<DatabaseService<T, Input, Doc, BaseObject, Model, Insight, Filter, Summary> & {
-    queue: QueueService<Signal>;
-} & { [K in keyof Srv]: Srv[K] extends (...args: infer Args) => Promise<BaseObject> ? (...args: Args) => Promise<Doc> : Srv[K] extends (...args: infer Args) => Promise<BaseObject[]> ? (...args: Args) => Promise<Doc[]> : Srv[K] extends BaseObject ? Doc : Srv[K] extends BaseObject[] ? Doc[] : Srv[K]; }>;
-export declare const ExtendedSummaryService: <T extends string, Input, Doc extends HydratedDocument<any>, Model, Middleware extends BaseMiddleware, Obj, Insight, Filter extends FilterType, Summary, Srv, Signal = unknown>(database: Database<T, Input, Doc, Model, Middleware, Obj, Insight, Filter, Summary>, srvRef: Type<Srv>, sigRef?: Type<Signal>) => Type<Omit<DatabaseService<T, Input, Doc, Obj, Model, Insight, Filter, Summary> & {
-    queue: QueueService<Signal>;
-} & { [K in keyof Srv]: Srv[K] extends (...args: infer Args) => Promise<BaseObject> ? (...args: Args) => Promise<Doc> : Srv[K] extends (...args: infer Args) => Promise<BaseObject[]> ? (...args: Args) => Promise<Doc[]> : Srv[K] extends BaseObject ? Doc : Srv[K] extends BaseObject[] ? Doc[] : Srv[K]; }, "userService">>;
-export declare const ExtendedSettingService: <T extends string, Input, Doc extends HydratedDocument<any>, Model extends DatabaseModel<T, Input, Doc, Obj, Insight, Filter, Summary>, Middleware extends BaseMiddleware, Obj, Insight, Filter extends FilterType, Summary, Srv, Signal = unknown>(database: Database<T, Input, Doc, Model, Middleware, Obj, Insight, Filter, Summary>, srvRef: Type<Srv>, sigRef?: Type<Signal>) => Type<DatabaseService<T, Input, Doc, BaseObject, Model, Insight, Filter, Summary> & {
-    queue: QueueService<Signal>;
-} & { [K in keyof Srv]: Srv[K] extends (...args: infer Args) => Promise<BaseObject> ? (...args: Args) => Promise<Doc> : Srv[K] extends (...args: infer Args) => Promise<BaseObject[]> ? (...args: Args) => Promise<Doc[]> : Srv[K] extends BaseObject ? Doc : Srv[K] extends BaseObject[] ? Doc[] : Srv[K]; }>;
+    [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]; }>;
 export declare const makeProvidersForSrv: (srvRef: Type) => Provider[];
 export {};