@akanjs/service 0.9.40 → 0.9.42

package/cjs/src/base.service.js

@@ -34,9 +34,9 @@ var import_nest = require("@akanjs/nest");
 var import_serviceDecorators = require("./serviceDecorators");
 let BaseService = class extends (0, import_serviceDecorators.LogService)("BaseService") {
   onCleanup;
-  websocket;
+  baseSignal;
   intervalPing() {
-    this.websocket.pubsubPing((/* @__PURE__ */ new Date()).toISOString());
+    this.baseSignal.pubsubPing((/* @__PURE__ */ new Date()).toISOString());
   }
   async cleanup() {
     if (!this.onCleanup)
@@ -45,11 +45,11 @@ let BaseService = class extends (0, import_serviceDecorators.LogService)("BaseSe
   }
 };
 __decorateClass([
-  (0, import_serviceDecorators.Use)()
+  (0, import_serviceDecorators.Gen)((env) => env.onCleanup)
 ], BaseService.prototype, "onCleanup", 2);
 __decorateClass([
-  (0, import_serviceDecorators.Websocket)()
-], BaseService.prototype, "websocket", 2);
+  (0, import_serviceDecorators.Sig)()
+], BaseService.prototype, "baseSignal", 2);
 __decorateClass([
   (0, import_nest.Interval)(5e3)
 ], BaseService.prototype, "intervalPing", 1);

package/cjs/src/serviceDecorators.js

@@ -28,18 +28,22 @@ var serviceDecorators_exports = {};
 __export(serviceDecorators_exports, {
   Db: () => Db,
   DbService: () => DbService,
+  Env: () => Env,
   ExtendedSettingService: () => ExtendedSettingService,
   ExtendedSummaryService: () => ExtendedSummaryService,
   ExtendedUserService: () => ExtendedUserService,
+  Gen: () => Gen,
   LogService: () => LogService,
   MixSrvs: () => MixSrvs,
-  Queue: () => Queue,
   Service: () => Service,
   ServiceStorage: () => ServiceStorage,
+  Sig: () => Sig,
   Srv: () => Srv,
   Use: () => Use,
-  Websocket: () => Websocket,
+  getServiceMeta: () => getServiceMeta,
+  getServiceRefs: () => getServiceRefs,
   isServiceEnabled: () => isServiceEnabled,
+  makeProvidersForSrv: () => makeProvidersForSrv,
   serviceOf: () => serviceOf
 });
 module.exports = __toCommonJS(serviceDecorators_exports);
@@ -56,12 +60,6 @@ const getServiceRefs = (refName) => {
 const setServiceRefs = (refName, services) => {
   Reflect.defineMetadata(refName, services, ServiceStorage.prototype);
 };
-const isServiceDefined = (srvRef) => {
-  return Reflect.getMetadata("service", srvRef.prototype) ?? false;
-};
-const setServiceDefined = (srvRef) => {
-  Reflect.defineMetadata("service", true, srvRef.prototype);
-};
 const setServiceMeta = (srvRef, meta) => {
   Reflect.defineMetadata("serviceMeta", meta, srvRef.prototype);
 };
@@ -103,17 +101,24 @@ function Use(name) {
     setServiceInjectMetaMapOnPrototype(prototype, metadataMap);
   };
 }
-function Queue(name) {
+function Env(envKey, generateFactory) {
   return function(prototype, key) {
     const metadataMap = getServiceInjectMetaMapOnPrototype(prototype);
-    metadataMap.set(key, { type: "Queue", key, name: name ?? (0, import_common.capitalize)(key) });
+    metadataMap.set(key, { type: "Env", key, name: envKey, generateFactory });
     setServiceInjectMetaMapOnPrototype(prototype, metadataMap);
   };
 }
-function Websocket(name) {
+function Gen(generateFactory) {
   return function(prototype, key) {
     const metadataMap = getServiceInjectMetaMapOnPrototype(prototype);
-    metadataMap.set(key, { type: "Websocket", key, name: name ?? (0, import_common.capitalize)(key) });
+    metadataMap.set(key, { type: "Gen", key, name: (0, import_common.capitalize)(key), generateFactory });
+    setServiceInjectMetaMapOnPrototype(prototype, metadataMap);
+  };
+}
+function Sig(name) {
+  return function(prototype, key) {
+    const metadataMap = getServiceInjectMetaMapOnPrototype(prototype);
+    metadataMap.set(key, { type: "Sig", key, name: name ?? (0, import_common.capitalize)(key) });
     setServiceInjectMetaMapOnPrototype(prototype, metadataMap);
   };
 }
@@ -124,9 +129,12 @@ function Db(name) {
     setServiceInjectMetaMapOnPrototype(prototype, metadataMap);
   };
 }
-const serviceOf = (srvRef) => {
-  if (isServiceDefined(srvRef))
-    return srvRef;
+const serviceOf = (target) => {
+  const serviceMeta = getServiceMeta(target);
+  if (!serviceMeta)
+    throw new Error(`Service Meta of ${target.name} not found`);
+  const srvRefs = getServiceRefs(serviceMeta.name);
+  const srvRef = srvRefs.length === 1 ? srvRefs[0] : ExtSrvs(srvRefs[0], [target]);
   const injectMetaMap = getServiceInjectMetaMapOnPrototype(srvRef.prototype);
   for (const injectMeta of [...injectMetaMap.values()]) {
     if (injectMeta.type === "Db")
@@ -137,15 +145,16 @@ const serviceOf = (srvRef) => {
       const services = getServiceRefs(injectMeta.name);
       if (!services.length)
         throw new Error(`Service ${injectMeta.name} not found`);
-      (0, import_common2.Inject)(services.at(-1))(srvRef.prototype, injectMeta.key);
-    } else if (injectMeta.type === "Queue")
+      (0, import_common2.Inject)(services.at(0))(srvRef.prototype, injectMeta.key);
+    } else if (injectMeta.type === "Env")
       (0, import_common2.Inject)(injectMeta.name)(srvRef.prototype, injectMeta.key);
-    else
+    else if (injectMeta.type === "Gen")
+      (0, import_common2.Inject)(injectMeta.name)(srvRef.prototype, injectMeta.key);
+    else if (injectMeta.type === "Sig")
       (0, import_common2.Inject)(injectMeta.name)(srvRef.prototype, injectMeta.key);
   }
   (0, import_mongoose.InjectConnection)()(srvRef.prototype, "connection");
   (0, import_common2.Injectable)()(srvRef);
-  setServiceDefined(srvRef);
   return srvRef;
 };
 const AVOID_MIX_SRV_KEY_SET = /* @__PURE__ */ new Set(["onModuleInit", "onModuleDestroy"]);
@@ -159,10 +168,19 @@ function MixSrvs(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t1
       return [...acc, ...injectMetadataMap2];
     }, [])
   );
-  Reflect.defineMetadata("service", false, Mix.prototype);
-  Reflect.defineMetadata("inject", injectMetadataMap, Mix.prototype);
+  setServiceInjectMetaMapOnPrototype(Mix.prototype, injectMetadataMap);
   return Mix;
 }
+function ExtSrvs(baseSrv, extSrvs) {
+  const injectMetadataMap = new Map(
+    [baseSrv, ...extSrvs].reduce((acc, srvRef) => {
+      const injectMetadataMap2 = getServiceInjectMetaMapOnPrototype(srvRef.prototype);
+      return [...acc, ...injectMetadataMap2];
+    }, [])
+  );
+  setServiceInjectMetaMapOnPrototype(baseSrv.prototype, injectMetadataMap);
+  return (0, import_common.applyMixins)(baseSrv, extSrvs);
+}
 const LogService = (name) => {
   class LogService2 {
     logger = new import_common.Logger(name);
@@ -341,21 +359,48 @@ const ExtendedSummaryService = (database, srvRef, sigRef) => {
 const ExtendedSettingService = (database, srvRef, sigRef) => {
   return srvRef;
 };
+const makeProvidersForSrv = (srvRef) => {
+  const injectMetaMap = getServiceInjectMetaMapOnPrototype(srvRef.prototype);
+  const providers = [];
+  [...injectMetaMap.values()].forEach((injectMeta) => {
+    if (injectMeta.type === "Env") {
+      const envValue = process.env[injectMeta.name];
+      const generateFactory = injectMeta.generateFactory;
+      if (envValue === void 0)
+        throw new Error(`Environment variable ${injectMeta.name} not found`);
+      providers.push({
+        provide: injectMeta.name,
+        useFactory: (env) => generateFactory ? generateFactory(envValue, env) : envValue,
+        inject: ["GLOBAL_ENV"]
+      });
+    } else if (injectMeta.type === "Gen") {
+      const generateFactory = injectMeta.generateFactory;
+      if (!generateFactory)
+        throw new Error(`Generate factory not found for ${injectMeta.key}`);
+      providers.push({ provide: injectMeta.name, useFactory: generateFactory, inject: ["GLOBAL_ENV"] });
+    }
+  });
+  return providers;
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Db,
   DbService,
+  Env,
   ExtendedSettingService,
   ExtendedSummaryService,
   ExtendedUserService,
+  Gen,
   LogService,
   MixSrvs,
-  Queue,
   Service,
   ServiceStorage,
+  Sig,
   Srv,
   Use,
-  Websocket,
+  getServiceMeta,
+  getServiceRefs,
   isServiceEnabled,
+  makeProvidersForSrv,
   serviceOf
 });

package/esm/src/base.service.js

@@ -10,12 +10,12 @@ var __decorateClass = (decorators, target, key, kind) => {
   return result;
 };
 import { Interval } from "@akanjs/nest";
-import { LogService, Service, Use, Websocket } from "./serviceDecorators";
+import { Gen, LogService, Service, Sig } from "./serviceDecorators";
 let BaseService = class extends LogService("BaseService") {
   onCleanup;
-  websocket;
+  baseSignal;
   intervalPing() {
-    this.websocket.pubsubPing((/* @__PURE__ */ new Date()).toISOString());
+    this.baseSignal.pubsubPing((/* @__PURE__ */ new Date()).toISOString());
   }
   async cleanup() {
     if (!this.onCleanup)
@@ -24,11 +24,11 @@ let BaseService = class extends LogService("BaseService") {
   }
 };
 __decorateClass([
-  Use()
+  Gen((env) => env.onCleanup)
 ], BaseService.prototype, "onCleanup", 2);
 __decorateClass([
-  Websocket()
-], BaseService.prototype, "websocket", 2);
+  Sig()
+], BaseService.prototype, "baseSignal", 2);
 __decorateClass([
   Interval(5e3)
 ], BaseService.prototype, "intervalPing", 1);

package/esm/src/serviceDecorators.js

@@ -25,12 +25,6 @@ const getServiceRefs = (refName) => {
 const setServiceRefs = (refName, services) => {
   Reflect.defineMetadata(refName, services, ServiceStorage.prototype);
 };
-const isServiceDefined = (srvRef) => {
-  return Reflect.getMetadata("service", srvRef.prototype) ?? false;
-};
-const setServiceDefined = (srvRef) => {
-  Reflect.defineMetadata("service", true, srvRef.prototype);
-};
 const setServiceMeta = (srvRef, meta) => {
   Reflect.defineMetadata("serviceMeta", meta, srvRef.prototype);
 };
@@ -72,17 +66,24 @@ function Use(name) {
     setServiceInjectMetaMapOnPrototype(prototype, metadataMap);
   };
 }
-function Queue(name) {
+function Env(envKey, generateFactory) {
   return function(prototype, key) {
     const metadataMap = getServiceInjectMetaMapOnPrototype(prototype);
-    metadataMap.set(key, { type: "Queue", key, name: name ?? capitalize(key) });
+    metadataMap.set(key, { type: "Env", key, name: envKey, generateFactory });
     setServiceInjectMetaMapOnPrototype(prototype, metadataMap);
   };
 }
-function Websocket(name) {
+function Gen(generateFactory) {
   return function(prototype, key) {
     const metadataMap = getServiceInjectMetaMapOnPrototype(prototype);
-    metadataMap.set(key, { type: "Websocket", key, name: name ?? capitalize(key) });
+    metadataMap.set(key, { type: "Gen", key, name: capitalize(key), generateFactory });
+    setServiceInjectMetaMapOnPrototype(prototype, metadataMap);
+  };
+}
+function Sig(name) {
+  return function(prototype, key) {
+    const metadataMap = getServiceInjectMetaMapOnPrototype(prototype);
+    metadataMap.set(key, { type: "Sig", key, name: name ?? capitalize(key) });
     setServiceInjectMetaMapOnPrototype(prototype, metadataMap);
   };
 }
@@ -93,9 +94,12 @@ function Db(name) {
     setServiceInjectMetaMapOnPrototype(prototype, metadataMap);
   };
 }
-const serviceOf = (srvRef) => {
-  if (isServiceDefined(srvRef))
-    return srvRef;
+const serviceOf = (target) => {
+  const serviceMeta = getServiceMeta(target);
+  if (!serviceMeta)
+    throw new Error(`Service Meta of ${target.name} not found`);
+  const srvRefs = getServiceRefs(serviceMeta.name);
+  const srvRef = srvRefs.length === 1 ? srvRefs[0] : ExtSrvs(srvRefs[0], [target]);
   const injectMetaMap = getServiceInjectMetaMapOnPrototype(srvRef.prototype);
   for (const injectMeta of [...injectMetaMap.values()]) {
     if (injectMeta.type === "Db")
@@ -106,15 +110,16 @@ const serviceOf = (srvRef) => {
       const services = getServiceRefs(injectMeta.name);
       if (!services.length)
         throw new Error(`Service ${injectMeta.name} not found`);
-      Inject(services.at(-1))(srvRef.prototype, injectMeta.key);
-    } else if (injectMeta.type === "Queue")
+      Inject(services.at(0))(srvRef.prototype, injectMeta.key);
+    } else if (injectMeta.type === "Env")
       Inject(injectMeta.name)(srvRef.prototype, injectMeta.key);
-    else
+    else if (injectMeta.type === "Gen")
+      Inject(injectMeta.name)(srvRef.prototype, injectMeta.key);
+    else if (injectMeta.type === "Sig")
       Inject(injectMeta.name)(srvRef.prototype, injectMeta.key);
   }
   InjectConnection()(srvRef.prototype, "connection");
   Injectable()(srvRef);
-  setServiceDefined(srvRef);
   return srvRef;
 };
 const AVOID_MIX_SRV_KEY_SET = /* @__PURE__ */ new Set(["onModuleInit", "onModuleDestroy"]);
@@ -128,10 +133,19 @@ function MixSrvs(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t1
       return [...acc, ...injectMetadataMap2];
     }, [])
   );
-  Reflect.defineMetadata("service", false, Mix.prototype);
-  Reflect.defineMetadata("inject", injectMetadataMap, Mix.prototype);
+  setServiceInjectMetaMapOnPrototype(Mix.prototype, injectMetadataMap);
   return Mix;
 }
+function ExtSrvs(baseSrv, extSrvs) {
+  const injectMetadataMap = new Map(
+    [baseSrv, ...extSrvs].reduce((acc, srvRef) => {
+      const injectMetadataMap2 = getServiceInjectMetaMapOnPrototype(srvRef.prototype);
+      return [...acc, ...injectMetadataMap2];
+    }, [])
+  );
+  setServiceInjectMetaMapOnPrototype(baseSrv.prototype, injectMetadataMap);
+  return applyMixins(baseSrv, extSrvs);
+}
 const LogService = (name) => {
   class LogService2 {
     logger = new Logger(name);
@@ -310,20 +324,47 @@ const ExtendedSummaryService = (database, srvRef, sigRef) => {
 const ExtendedSettingService = (database, srvRef, sigRef) => {
   return srvRef;
 };
+const makeProvidersForSrv = (srvRef) => {
+  const injectMetaMap = getServiceInjectMetaMapOnPrototype(srvRef.prototype);
+  const providers = [];
+  [...injectMetaMap.values()].forEach((injectMeta) => {
+    if (injectMeta.type === "Env") {
+      const envValue = process.env[injectMeta.name];
+      const generateFactory = injectMeta.generateFactory;
+      if (envValue === void 0)
+        throw new Error(`Environment variable ${injectMeta.name} not found`);
+      providers.push({
+        provide: injectMeta.name,
+        useFactory: (env) => generateFactory ? generateFactory(envValue, env) : envValue,
+        inject: ["GLOBAL_ENV"]
+      });
+    } else if (injectMeta.type === "Gen") {
+      const generateFactory = injectMeta.generateFactory;
+      if (!generateFactory)
+        throw new Error(`Generate factory not found for ${injectMeta.key}`);
+      providers.push({ provide: injectMeta.name, useFactory: generateFactory, inject: ["GLOBAL_ENV"] });
+    }
+  });
+  return providers;
+};
 export {
   Db,
   DbService,
+  Env,
   ExtendedSettingService,
   ExtendedSummaryService,
   ExtendedUserService,
+  Gen,
   LogService,
   MixSrvs,
-  Queue,
   Service,
   ServiceStorage,
+  Sig,
   Srv,
   Use,
-  Websocket,
+  getServiceMeta,
+  getServiceRefs,
   isServiceEnabled,
+  makeProvidersForSrv,
   serviceOf
 };

package/package.json

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

package/src/base.service.d.ts

@@ -1,13 +1,13 @@
 import type { BaseSignal } from "@akanjs/signal";
-import { type GetServices, Websocket } from "./serviceDecorators";
+import { type GetServices, Sig } from "./serviceDecorators";
 declare const BaseService_base: {
     new (): {
         logger: import("@akanjs/common").Logger;
     };
 };
 export declare class BaseService extends BaseService_base {
-    protected onCleanup?: () => Promise<void>;
-    websocket: Websocket<BaseSignal>;
+    onCleanup?: () => Promise<void>;
+    baseSignal: Sig<BaseSignal>;
     intervalPing(): void;
     cleanup(): Promise<void>;
 }

package/src/serviceDecorators.d.ts

@@ -1,9 +1,10 @@
 import "reflect-metadata";
-import { BaseObject, Dayjs, type Prettify, Type } from "@akanjs/base";
+import { BaseObject, type Prettify, Type } 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 { FilterOutInternalArgs } from "@akanjs/signal";
+import { type Provider } from "@nestjs/common";
 import type { Job, Queue as BullQueue } from "bull";
 import type { HydratedDocument } from "mongoose";
 import type { Server } from "socket.io";
@@ -14,11 +15,18 @@ export type GetServices<AllSrvs extends {
 };
 export declare class ServiceStorage {
 }
+interface ServiceMeta {
+    name: string;
+    enabled: boolean;
+}
+export declare const getServiceRefs: (refName: string) => Type[];
+export declare const getServiceMeta: (srvRef: Type) => ServiceMeta | undefined;
 export declare const isServiceEnabled: (srvRef: Type) => boolean;
 export interface ServiceInjectMeta {
-    type: "Db" | "Srv" | "Use" | "Queue" | "Websocket";
+    type: "Db" | "Srv" | "Use" | "Env" | "Gen" | "Sig" | (string & {});
     name: string;
     key: string;
+    generateFactory?: (...args: any[]) => any;
 }
 interface ServiceOptions {
     enabled?: boolean;
@@ -27,14 +35,16 @@ interface ServiceOptions {
 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 Queue(name?: string): PropertyDecorator;
-export type Queue<Signal> = {
+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;
-} & BullQueue;
-export declare function Websocket(name?: string): PropertyDecorator;
-export type Websocket<Signal> = {
+} & {
+    queue: BullQueue;
+};
+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) => {
@@ -45,10 +55,12 @@ export type Websocket<Signal> = {
         __Returns__: "Subscribe";
     } & infer R ? (...args: [...FilterOutInternalArgs<Args>, data: DocumentModel<R>]) => void : never;
 } & {
-    server: Server;
+    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: (srvRef: Type) => Type;
+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 const LogService: <T extends string>(name: T) => {
     new (): {
@@ -128,45 +140,14 @@ type DatabaseServiceWithQuerySort<T extends string, Input, Doc, Obj, Model, Insi
     [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 & {
-    nickname: string;
-}, 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 & {
-    nickname: string;
-}> ? (...args: Args) => Promise<Doc> : Srv[K] extends (...args: infer Args) => Promise<(BaseObject & {
-    nickname: string;
-})[]> ? (...args: Args) => Promise<Doc[]> : Srv[K] extends BaseObject & {
-    nickname: string;
-} ? Doc : Srv[K] extends (BaseObject & {
-    nickname: string;
-})[] ? Doc[] : Srv[K]; }>;
+} & { [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 & {
-    type: string;
-    at: Dayjs;
-}> ? (...args: Args) => Promise<Doc> : Srv[K] extends (...args: infer Args) => Promise<(BaseObject & {
-    type: string;
-    at: Dayjs;
-})[]> ? (...args: Args) => Promise<Doc[]> : Srv[K] extends BaseObject & {
-    type: string;
-    at: Dayjs;
-} ? Doc : Srv[K] extends (BaseObject & {
-    type: string;
-    at: Dayjs;
-})[] ? 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 & {
-    resignupDays: number;
-}, Model, Insight, Filter, Summary> & {
+} & { [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 & {
-    resignupDays: number;
-}> ? (...args: Args) => Promise<Doc> : Srv[K] extends (...args: infer Args) => Promise<(BaseObject & {
-    resignupDays: number;
-})[]> ? (...args: Args) => Promise<Doc[]> : Srv[K] extends BaseObject & {
-    resignupDays: number;
-} ? Doc : Srv[K] extends (BaseObject & {
-    resignupDays: number;
-})[] ? Doc[] : Srv[K]; }>;
+} & { [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 makeProvidersForSrv: (srvRef: Type) => Provider[];
 export {};