@akanjs/service 0.9.56 → 0.9.58-canary.0

package/cjs/src/base.service.js

@@ -15,15 +15,6 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __decorateClass = (decorators, target, key, kind) => {
-  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc(target, key) : target;
-  for (var i = decorators.length - 1, decorator; i >= 0; i--)
-    if (decorator = decorators[i])
-      result = (kind ? decorator(target, key, result) : decorator(result)) || result;
-  if (kind && result)
-    __defProp(target, key, result);
-  return result;
-};
 var base_service_exports = {};
 __export(base_service_exports, {
   BaseService: () => BaseService,
@@ -34,9 +25,10 @@ module.exports = __toCommonJS(base_service_exports);
 var import_serviceDecorators = require("./serviceDecorators");
 var import_serviceInfo = require("./serviceInfo");
 var import_serviceModule = require("./serviceModule");
-class BaseService extends (0, import_serviceDecorators.serve)("base") {
-  onCleanup;
-  baseSignal;
+class BaseService extends (0, import_serviceDecorators.serve)("base", ({ generate, signal }) => ({
+  onCleanup: generate((env) => env.onCleanup ?? void 0),
+  baseSignal: signal()
+})) {
   publishPing() {
     this.baseSignal.pubsubPing("ping");
   }
@@ -46,12 +38,6 @@ class BaseService extends (0, import_serviceDecorators.serve)("base") {
     await this.onCleanup();
   }
 }
-__decorateClass([
-  (0, import_serviceDecorators.Gen)((env) => env.onCleanup)
-], BaseService.prototype, "onCleanup", 2);
-__decorateClass([
-  (0, import_serviceDecorators.Sig)()
-], BaseService.prototype, "baseSignal", 2);
 const allSrvs = import_serviceInfo.serviceInfo.registerServices({ BaseService });
 const srv = {
   base: new import_serviceModule.ServiceModule("base", { BaseService })

package/cjs/src/index.js

@@ -18,10 +18,12 @@ __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);
+__reExport(src_exports, require("./injectInfo"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ...require("./serviceDecorators"),
   ...require("./base.service"),
   ...require("./serviceInfo"),
-  ...require("./serviceModule")
+  ...require("./serviceModule"),
+  ...require("./injectInfo")
 });

package/cjs/src/injectInfo.js

@@ -0,0 +1,78 @@
+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 injectInfo_exports = {};
+__export(injectInfo_exports, {
+  InjectInfo: () => InjectInfo,
+  makeInjectBuilder: () => makeInjectBuilder
+});
+module.exports = __toCommonJS(injectInfo_exports);
+var import__ = require(".");
+class InjectInfo {
+  type;
+  generateFactory;
+  constructor(type, options = {}) {
+    this.type = type;
+    this.generateFactory = options.generateFactory ?? (() => void 0);
+  }
+  applyInjectInfo(srvRef, key) {
+    switch (this.type) {
+      case "service":
+        (0, import__.Srv)()(srvRef.prototype, key);
+        break;
+      case "use":
+        (0, import__.Use)()(srvRef.prototype, key);
+        break;
+      case "env":
+        (0, import__.Gen)(this.generateFactory)(srvRef.prototype, key);
+        break;
+      case "generate":
+        (0, import__.Gen)(this.generateFactory)(srvRef.prototype, key);
+        break;
+      case "signal":
+        (0, import__.Sig)()(srvRef.prototype, key);
+        break;
+      default:
+        throw new Error(`Invalid inject type: ${this.type}`);
+    }
+  }
+}
+const makeInjectBuilder = () => ({
+  service: () => new InjectInfo("service"),
+  use: () => new InjectInfo("use"),
+  env: (key, generateFactory = (envValue) => envValue) => new InjectInfo("env", {
+    generateFactory: (options) => {
+      const envValue = process.env[key];
+      if (!envValue)
+        throw new Error(`Environment variable ${key} not found`);
+      return generateFactory(envValue, options);
+    }
+  }),
+  envOptional: (key, generateFactory = (envValue) => envValue) => new InjectInfo("env", {
+    generateFactory: (options) => {
+      const envValue = process.env[key];
+      return generateFactory(envValue, options);
+    }
+  }),
+  generate: (generateFactory) => new InjectInfo("generate", { generateFactory }),
+  signal: () => new InjectInfo("signal")
+});
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  InjectInfo,
+  makeInjectBuilder
+});

package/cjs/src/serviceDecorators.js

@@ -51,6 +51,7 @@ var import_common = require("@akanjs/common");
 var import_document = require("@akanjs/document");
 var import_common2 = require("@nestjs/common");
 var import_mongoose = require("@nestjs/mongoose");
+var import_injectInfo = require("./injectInfo");
 class ServiceStorage {
 }
 const getServiceRefs = (refName) => {
@@ -342,17 +343,21 @@ const DbService = (database, ...libSrvRefs) => {
   });
   return DbService2;
 };
-function serve(refNameOrDb, optionOrExtendSrv, ...extendSrvs) {
+function serve(refNameOrDb, optionOrInjectBuilder, injectBuilderOrExtendSrv, ...extendSrvs) {
   const refName = typeof refNameOrDb === "string" ? (0, import_common.lowerlize)(refNameOrDb) : refNameOrDb.refName;
+  const option = typeof optionOrInjectBuilder === "object" ? optionOrInjectBuilder : { enabled: true };
+  const injectBuilder = typeof optionOrInjectBuilder === "function" ? optionOrInjectBuilder : injectBuilderOrExtendSrv;
   const extSrvs = [
-    ...optionOrExtendSrv?.prototype ? [optionOrExtendSrv] : [],
+    ...typeof optionOrInjectBuilder === "function" && injectBuilderOrExtendSrv ? [injectBuilderOrExtendSrv] : [],
     ...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);
+  Object.entries(injectBuilder((0, import_injectInfo.makeInjectBuilder)())).forEach(([key, injectInfo]) => {
+    injectInfo.applyInjectInfo(srvRef, key);
+  });
   return srvRef;
 }
 const makeProvidersForSrv = (srvRef) => {

package/esm/src/base.service.js

@@ -1,20 +1,10 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __decorateClass = (decorators, target, key, kind) => {
-  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc(target, key) : target;
-  for (var i = decorators.length - 1, decorator; i >= 0; i--)
-    if (decorator = decorators[i])
-      result = (kind ? decorator(target, key, result) : decorator(result)) || result;
-  if (kind && result)
-    __defProp(target, key, result);
-  return result;
-};
-import { Gen, serve, Sig } from "./serviceDecorators";
+import { serve } from "./serviceDecorators";
 import { serviceInfo } from "./serviceInfo";
 import { ServiceModule } from "./serviceModule";
-class BaseService extends serve("base") {
-  onCleanup;
-  baseSignal;
+class BaseService extends serve("base", ({ generate, signal }) => ({
+  onCleanup: generate((env) => env.onCleanup ?? void 0),
+  baseSignal: signal()
+})) {
   publishPing() {
     this.baseSignal.pubsubPing("ping");
   }
@@ -24,12 +14,6 @@ class BaseService extends serve("base") {
     await this.onCleanup();
   }
 }
-__decorateClass([
-  Gen((env) => env.onCleanup)
-], BaseService.prototype, "onCleanup", 2);
-__decorateClass([
-  Sig()
-], BaseService.prototype, "baseSignal", 2);
 const allSrvs = serviceInfo.registerServices({ BaseService });
 const srv = {
   base: new ServiceModule("base", { BaseService })

package/esm/src/index.js

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

package/esm/src/injectInfo.js

@@ -0,0 +1,54 @@
+import { Gen, Sig, Srv, Use } from ".";
+class InjectInfo {
+  type;
+  generateFactory;
+  constructor(type, options = {}) {
+    this.type = type;
+    this.generateFactory = options.generateFactory ?? (() => void 0);
+  }
+  applyInjectInfo(srvRef, key) {
+    switch (this.type) {
+      case "service":
+        Srv()(srvRef.prototype, key);
+        break;
+      case "use":
+        Use()(srvRef.prototype, key);
+        break;
+      case "env":
+        Gen(this.generateFactory)(srvRef.prototype, key);
+        break;
+      case "generate":
+        Gen(this.generateFactory)(srvRef.prototype, key);
+        break;
+      case "signal":
+        Sig()(srvRef.prototype, key);
+        break;
+      default:
+        throw new Error(`Invalid inject type: ${this.type}`);
+    }
+  }
+}
+const makeInjectBuilder = () => ({
+  service: () => new InjectInfo("service"),
+  use: () => new InjectInfo("use"),
+  env: (key, generateFactory = (envValue) => envValue) => new InjectInfo("env", {
+    generateFactory: (options) => {
+      const envValue = process.env[key];
+      if (!envValue)
+        throw new Error(`Environment variable ${key} not found`);
+      return generateFactory(envValue, options);
+    }
+  }),
+  envOptional: (key, generateFactory = (envValue) => envValue) => new InjectInfo("env", {
+    generateFactory: (options) => {
+      const envValue = process.env[key];
+      return generateFactory(envValue, options);
+    }
+  }),
+  generate: (generateFactory) => new InjectInfo("generate", { generateFactory }),
+  signal: () => new InjectInfo("signal")
+});
+export {
+  InjectInfo,
+  makeInjectBuilder
+};

package/esm/src/serviceDecorators.js

@@ -17,6 +17,7 @@ import {
 } from "@akanjs/document";
 import { Inject, Injectable } from "@nestjs/common";
 import { InjectConnection, InjectModel } from "@nestjs/mongoose";
+import { makeInjectBuilder } from "./injectInfo";
 class ServiceStorage {
 }
 const getServiceRefs = (refName) => {
@@ -308,17 +309,21 @@ const DbService = (database, ...libSrvRefs) => {
   });
   return DbService2;
 };
-function serve(refNameOrDb, optionOrExtendSrv, ...extendSrvs) {
+function serve(refNameOrDb, optionOrInjectBuilder, injectBuilderOrExtendSrv, ...extendSrvs) {
   const refName = typeof refNameOrDb === "string" ? lowerlize(refNameOrDb) : refNameOrDb.refName;
+  const option = typeof optionOrInjectBuilder === "object" ? optionOrInjectBuilder : { enabled: true };
+  const injectBuilder = typeof optionOrInjectBuilder === "function" ? optionOrInjectBuilder : injectBuilderOrExtendSrv;
   const extSrvs = [
-    ...optionOrExtendSrv?.prototype ? [optionOrExtendSrv] : [],
+    ...typeof optionOrInjectBuilder === "function" && injectBuilderOrExtendSrv ? [injectBuilderOrExtendSrv] : [],
     ...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);
+  Object.entries(injectBuilder(makeInjectBuilder())).forEach(([key, injectInfo]) => {
+    injectInfo.applyInjectInfo(srvRef, key);
+  });
   return srvRef;
 }
 const makeProvidersForSrv = (srvRef) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akanjs/service",
-  "version": "0.9.56",
+  "version": "0.9.58-canary.0",
   "sourceType": "module",
   "publishConfig": {
     "access": "public"

package/src/base.service.d.ts

@@ -1,12 +1,12 @@
-import type { BaseSignal } from "@akanjs/signal";
-import { Sig } from "./serviceDecorators";
+import type { Base } from "@akanjs/signal";
 import { ServiceModule } from "./serviceModule";
-declare const BaseService_base: import("@akanjs/base").Type<{
+declare const BaseService_base: new (...args: any[]) => {
     logger: import("@akanjs/common").Logger;
+} & import("./injectInfo").ExtractInjectInfoObject<{
+    onCleanup: import("./injectInfo").InjectInfo<(() => Promise<void>) | undefined>;
+    baseSignal: import("./injectInfo").InjectInfo<Base>;
 }>;
 export declare class BaseService extends BaseService_base {
-    onCleanup?: () => Promise<void>;
-    baseSignal: Sig<BaseSignal>;
     publishPing(): void;
     cleanup(): Promise<void>;
 }

package/src/index.d.ts

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

package/src/injectInfo.d.ts

@@ -0,0 +1,28 @@
+import { BackendEnv, Type } from "@akanjs/base";
+interface InjectBuilderOptions<ReturnType> {
+    generateFactory?: (options: any) => ReturnType;
+}
+type InjectType = "service" | "use" | "env" | "generate" | "signal";
+export declare class InjectInfo<ReturnType> {
+    type: InjectType;
+    generateFactory: (options: any) => ReturnType;
+    constructor(type: InjectType, options?: InjectBuilderOptions<ReturnType>);
+    applyInjectInfo(srvRef: Type, key: string): void;
+}
+export declare const makeInjectBuilder: () => {
+    service: <ReturnType>() => InjectInfo<ReturnType>;
+    use: <ReturnType>() => InjectInfo<ReturnType>;
+    env: <ReturnType>(key: string, generateFactory?: (envValue: string, options: BackendEnv) => ReturnType) => InjectInfo<ReturnType>;
+    envOptional: <ReturnType>(key: string, generateFactory?: (envValue: string | undefined, options: BackendEnv) => ReturnType) => InjectInfo<ReturnType | undefined>;
+    generate: <ReturnType>(generateFactory: (options: BackendEnv) => ReturnType) => InjectInfo<ReturnType>;
+    signal: <Signal>() => InjectInfo<Signal>;
+};
+export type InjectBuilder = (builder: ReturnType<typeof makeInjectBuilder>) => {
+    [key: string]: InjectInfo<any>;
+};
+export type ExtractInjectInfoObject<InjectInfoMap extends {
+    [key: string]: InjectInfo<any>;
+}> = {
+    [K in keyof InjectInfoMap]: InjectInfoMap[K] extends InjectInfo<infer ReturnType> ? ReturnType : never;
+};
+export {};

package/src/serviceDecorators.d.ts

@@ -1,13 +1,13 @@
 import "reflect-metadata";
-import type { GetActionObject, MergeAllTypes, Prettify, PromiseOrObject, Type, UnType } from "@akanjs/base";
+import type { MergeAllTypes, Prettify, PromiseOrObject, Type, UnType } from "@akanjs/base";
 import { Logger } from "@akanjs/common";
 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 { BaseMiddleware, CRUDEventType, Database, DatabaseModel, DataInputOf, Doc as DbDoc, ExtractQuery, ExtractSort, FilterInstance, FindQueryOption, GetDocObject, ListQueryOption, QueryMethodPart, SaveEventType } from "@akanjs/document";
 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";
+import { ExtractInjectInfoObject, InjectBuilder } from "./injectInfo";
 export type GetServices<AllSrvs extends {
     [key: string]: Type | undefined;
 }> = {
@@ -31,6 +31,10 @@ export interface ServiceInjectMeta {
     key: string;
     generateFactory?: (...args: any[]) => any;
 }
+interface ServiceOptions {
+    enabled?: boolean;
+    serverMode?: "batch" | "federation";
+}
 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;
@@ -44,22 +48,22 @@ type ServiceSignalReturnType = {
 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<{
+    }> ? (...args: Args) => Promise<Job> : Signal[K] extends (...args: infer Args) => PromiseOrObject<{
         __Returns__: "Subscribe";
-    } & infer Return> ? (...args: [...FilterOutInternalArgs<Args>, data: DocumentModel<Return>]) => void : never;
+    } & infer Return> ? (...args: [...Args, data: DocumentModel<Return>]) => void : never;
 } & {
     queue: BullQueue;
     websocket: Server;
 };
 export declare function Db(name: string): PropertyDecorator;
-export declare const serviceOf: (target: Type) => Type;
+export declare const serviceOf: (target: Type) => new (...args: any[]) => any;
 export declare function MixSrvs<T extends Type[]>(...services: [...T]): Type<MergeAllTypes<T>>;
 export declare const LogService: <T extends string>(name: T) => {
     new (): {
         logger: Logger;
     };
 };
-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>> = {
+export type DatabaseService<T extends string, Input, Doc, Obj, Model, Insight, Filter extends FilterInstance, LibSrvs extends Type[] = [], _Query extends ExtractQuery<Filter> = ExtractQuery<Filter>, _Sort extends ExtractSort<Filter> = ExtractSort<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[]>;
@@ -111,9 +115,15 @@ export type DatabaseService<T extends string, Input, Doc, Obj, Model, Insight, F
 } & 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> : {
+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 FilterInstance, LibSrvs extends Type[], _CapitalizedT extends string = Capitalize<T>, _QueryOfDoc extends QueryOf<Doc> = QueryOf<Doc>, _Query extends ExtractQuery<Filter> = ExtractQuery<Filter>, _Sort extends ExtractSort<Filter> = ExtractSort<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<Injection extends InjectBuilder>(refName: string, injectBuilder: Injection, ...extendSrvs: Type[]): Type<{
     logger: Logger;
-}>;
+} & ExtractInjectInfoObject<ReturnType<Injection>>>;
+export declare function serve<Injection extends InjectBuilder>(refName: string, option: ServiceOptions, injectBuilder: Injection, ...extendSrvs: Type[]): Type<{
+    logger: Logger;
+} & ExtractInjectInfoObject<ReturnType<Injection>>>;
+export declare function serve<T extends string, Input, Doc, Model, Middleware extends BaseMiddleware, Obj, Insight, Filter extends FilterInstance, Injection extends InjectBuilder, LibSrvs extends Type[] = []>(db: Database<T, Input, Doc, Model, Middleware, Obj, Insight, Filter>, injectBuilder: Injection, ...extendSrvs: LibSrvs): Type<DatabaseService<T, Input, Doc, Obj, Model, Insight, Filter, LibSrvs> & ExtractInjectInfoObject<ReturnType<Injection>>>;
+export declare function serve<T extends string, Input, Doc, Model, Middleware extends BaseMiddleware, Obj, Insight, Filter extends FilterInstance, Injection extends InjectBuilder, LibSrvs extends Type[] = []>(db: Database<T, Input, Doc, Model, Middleware, Obj, Insight, Filter>, injectBuilder: Injection, ...extendSrvs: LibSrvs): Type<DatabaseService<T, Input, Doc, Obj, Model, Insight, Filter, LibSrvs> & ExtractInjectInfoObject<ReturnType<Injection>>>;
+export declare function serve<T extends string, Input, Doc, Model, Middleware extends BaseMiddleware, Obj, Insight, Filter extends FilterInstance, Injection extends InjectBuilder, LibSrvs extends Type[] = []>(db: Database<T, Input, Doc, Model, Middleware, Obj, Insight, Filter>, option: ServiceOptions, injectBuilder: Injection, ...extendSrvs: LibSrvs): Type<DatabaseService<T, Input, Doc, Obj, Model, Insight, Filter, LibSrvs> & ExtractInjectInfoObject<ReturnType<Injection>>>;
 export declare const makeProvidersForSrv: (srvRef: Type) => Provider[];
 export {};

package/src/serviceInfo.d.ts

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