@akanjs/server 0.9.40 → 0.9.42

package/cjs/src/base.module.js

@@ -27,8 +27,7 @@ const registerBaseModule = (option) => {
   return (0, import_module.serviceModuleOf)(
     {
       signal: import_signal.BaseSignal,
-      service: import_service.BaseService,
-      uses: { onCleanup: option.onCleanup }
+      service: import_service.BaseService
     },
     import_service.allSrvs
   );

package/cjs/src/boot.js

@@ -98,9 +98,9 @@ const createNestApp = async ({ registerModules, serverMode = "federation", env,
     (0, import_common2.Injectable)()
   ], AuthMiddleWare);
   const redisClient = await (0, import_redis.createClient)({ url: redisUri }).connect();
-  let SubDatabaseModule = class {
+  let GlobalProvideModule = class {
   };
-  SubDatabaseModule = __decorateClass([
+  GlobalProvideModule = __decorateClass([
     (0, import_common2.Global)(),
     (0, import_common2.Module)({
       providers: [
@@ -108,11 +108,12 @@ const createNestApp = async ({ registerModules, serverMode = "federation", env,
         {
           provide: "MEILI_CLIENT",
           useFactory: () => new import_meilisearch.MeiliSearch({ host: meiliUri, apiKey: (0, import_nest.generateMeiliKey)(env) })
-        }
+        },
+        { provide: "GLOBAL_ENV", useValue: env }
       ],
-      exports: ["REDIS_CLIENT", "MEILI_CLIENT"]
+      exports: ["REDIS_CLIENT", "MEILI_CLIENT", "GLOBAL_ENV"]
     })
-  ], SubDatabaseModule);
+  ], GlobalProvideModule);
   let AppModule = class {
     configure(consumer) {
       consumer.apply(AuthMiddleWare).forRoutes({ path: "*", method: import_common2.RequestMethod.ALL });
@@ -139,7 +140,7 @@ const createNestApp = async ({ registerModules, serverMode = "federation", env,
         import_mongoose.MongooseModule.forRootAsync({
           useFactory: () => ({ uri: mongoUri, autoIndex: import_base.baseEnv.environment !== "main" })
         }),
-        SubDatabaseModule,
+        GlobalProvideModule,
         (0, import_module.useGlobals)({
           injects: { SearchClient: import_nest.SearchClient, DatabaseClient: import_nest.DatabaseClient, CacheClient: import_nest.CacheClient }
         }),

package/cjs/src/controller.js

@@ -43,10 +43,11 @@ const controllerOf = (sigRef, allSrvs) => {
   const gqlMetas = (0, import_signal.getGqlMetas)(sigRef);
   const prefix = (0, import_signal.getControllerPrefix)(sigMeta);
   const Ctrl = (0, import_signal.copySignal)(sigRef);
-  Object.keys(allSrvs).forEach((srv) => {
-    if (!(0, import_service.isServiceEnabled)(allSrvs[srv]))
+  Object.keys(allSrvs).forEach((srvName) => {
+    if (!(0, import_service.isServiceEnabled)(allSrvs[srvName]))
       return;
-    (0, import_common2.Inject)(allSrvs[srv])(Ctrl.prototype, (0, import_common.lowerlize)(srv));
+    const srvRef = (0, import_service.getServiceRefs)(srvName)[0];
+    (0, import_common2.Inject)(srvRef)(Ctrl.prototype, (0, import_common.lowerlize)(srvName));
   });
   for (const gqlMeta of gqlMetas) {
     if (gqlMeta.guards.some((guard) => guard === "None") || gqlMeta.signalOption.onlyFor === "graphql" || !["Query", "Mutation"].includes(gqlMeta.type))

package/cjs/src/module.js

@@ -26,9 +26,7 @@ var __decorateClass = (decorators, target, key, kind) => {
 };
 var module_exports = {};
 __export(module_exports, {
-  batchModuleOf: () => batchModuleOf,
   databaseModuleOf: () => databaseModuleOf,
-  scalarModuleOf: () => scalarModuleOf,
   scalarModulesOf: () => scalarModulesOf,
   serviceModuleOf: () => serviceModuleOf,
   useGlobals: () => useGlobals
@@ -50,20 +48,12 @@ var import_websocket = require("./websocket");
 const hasWebsocket = (signal) => (0, import_signal.getGqlMetas)(signal).some((gqlMeta) => ["Message", "Pubsub"].includes(gqlMeta.type));
 const hasProcessor = (signal) => (0, import_signal.getGqlMetas)(signal).some((gqlMeta) => gqlMeta.type === "Process");
 const filterSrvs = (srvs) => Object.fromEntries(Object.entries(srvs).filter(([_, srv]) => !!srv));
-const databaseModuleOf = ({
-  constant,
-  database,
-  signal,
-  service,
-  uses = {},
-  useAsyncs = {},
-  providers = [],
-  extended
-}, allSrvs) => {
+const databaseModuleOf = ({ constant, database, signal, service }, allSrvs) => {
   if (!(0, import_service.isServiceEnabled)(service))
     return null;
   const [modelName, className] = [(0, import_common.lowerlize)(constant.refName), (0, import_common.capitalize)(constant.refName)];
   const mongoToken = (0, import_mongoose.getModelToken)(className);
+  const srvRef = (0, import_service.serviceOf)(service);
   let DatabaseModule = class {
   };
   DatabaseModule = __decorateClass([
@@ -73,7 +63,7 @@ const databaseModuleOf = ({
         import_mongoose.MongooseModule.forFeature([
           {
             name: className,
-            schema: extended ? (0, import_schema.addSchema)(database.Model, database.Doc, database.Input, database.Middleware) : (0, import_schema.schemaOf)(database.Model, database.Doc, database.Middleware)
+            schema: (0, import_schema.hasSchema)(constant.Full) ? (0, import_schema.addSchema)(database.Model, database.Doc, database.Input, database.Middleware) : (0, import_schema.schemaOf)(database.Model, database.Doc, database.Middleware)
           }
         ]),
         ...hasProcessor(signal) ? [
@@ -84,15 +74,11 @@ const databaseModuleOf = ({
         ] : []
       ],
       providers: [
-        (0, import_service.serviceOf)(service),
+        ...service === srvRef ? [srvRef] : [],
         (0, import_resolver.resolverOf)(signal, filterSrvs(allSrvs)),
-        ...hasProcessor(signal) ? [
-          (0, import_processor.processorOf)(signal, filterSrvs(allSrvs)),
-          { provide: `${className}Queue`, useFactory: (queue) => queue, inject: [(0, import_bull.getQueueToken)(modelName)] }
-        ] : [],
-        ...hasWebsocket(signal) ? [(0, import_websocket.websocketOf)(signal, filterSrvs(allSrvs)), { provide: "Websocket", useClass: (0, import_websocket.websocketServerOf)(signal) }] : [],
-        ...Object.entries(uses).map(([key, useValue]) => ({ provide: (0, import_common.capitalize)(key), useValue })),
-        ...Object.entries(useAsyncs).map(([key, useFactory]) => ({ provide: (0, import_common.capitalize)(key), useFactory })),
+        ...hasWebsocket(signal) ? [(0, import_websocket.websocketOf)(signal, filterSrvs(allSrvs))] : [],
+        ...hasProcessor(signal) ? [(0, import_processor.processorOf)(signal, filterSrvs(allSrvs))] : [],
+        { provide: `${className}Signal`, useClass: makeSigForSrv(signal) },
         {
           provide: `${modelName}Model`,
           useFactory: (model, redis, meili) => {
@@ -100,74 +86,52 @@ const databaseModuleOf = ({
           },
           inject: [mongoToken, "REDIS_CLIENT", "MEILI_CLIENT"]
         },
-        ...providers
+        ...(0, import_service.makeProvidersForSrv)(srvRef)
       ],
       controllers: [(0, import_controller.controllerOf)(signal, filterSrvs(allSrvs))],
-      exports: [service]
+      exports: service === srvRef ? [srvRef] : []
     })
   ], DatabaseModule);
   return DatabaseModule;
 };
-const serviceModuleOf = ({ signal, service, uses = {}, useAsyncs = {}, providers = [] }, allSrvs) => {
+const serviceModuleOf = ({ signal, service }, allSrvs) => {
   if (!(0, import_service.isServiceEnabled)(service))
     return null;
-  const sigMeta = (0, import_signal.getSigMeta)(signal);
-  const [modelName, className] = [(0, import_common.lowerlize)(sigMeta.refName), (0, import_common.capitalize)(sigMeta.refName)];
+  const serviceMeta = (0, import_service.getServiceMeta)(service);
+  if (!serviceMeta)
+    throw new Error(`Service ${service} is not a valid service`);
+  const refName = serviceMeta.name.replace("Service", "");
+  const [modelName, className] = [(0, import_common.lowerlize)(refName), (0, import_common.capitalize)(refName)];
+  const srvRef = (0, import_service.serviceOf)(service);
   let ServiceModule = class {
   };
   ServiceModule = __decorateClass([
     (0, import_common2.Global)(),
     (0, import_common2.Module)({
-      imports: [
+      imports: signal ? [
         ...hasProcessor(signal) ? [
           import_bull.BullModule.registerQueue({
             name: modelName,
             defaultJobOptions: { removeOnComplete: true, removeOnFail: true }
           })
         ] : []
-      ],
+      ] : [],
       providers: [
-        (0, import_service.serviceOf)(service),
-        (0, import_resolver.resolverOf)(signal, filterSrvs(allSrvs)),
-        ...hasWebsocket(signal) ? [(0, import_websocket.websocketOf)(signal, filterSrvs(allSrvs)), { provide: "Websocket", useClass: (0, import_websocket.websocketServerOf)(signal) }] : [],
-        ...hasProcessor(signal) ? [
-          (0, import_processor.processorOf)(signal, filterSrvs(allSrvs)),
-          { provide: `${className}Queue`, useFactory: (queue) => queue, inject: [(0, import_bull.getQueueToken)(modelName)] }
+        ...service === srvRef ? [srvRef] : [],
+        ...signal ? [
+          (0, import_resolver.resolverOf)(signal, filterSrvs(allSrvs)),
+          ...hasWebsocket(signal) ? [(0, import_websocket.websocketOf)(signal, filterSrvs(allSrvs))] : [],
+          ...hasProcessor(signal) ? [(0, import_processor.processorOf)(signal, filterSrvs(allSrvs))] : [],
+          { provide: `${className}Signal`, useClass: makeSigForSrv(signal) }
         ] : [],
-        ...Object.entries(uses).map(([key, useValue]) => ({ provide: (0, import_common.capitalize)(key), useValue })),
-        ...Object.entries(useAsyncs).map(([key, useFactory]) => ({ provide: (0, import_common.capitalize)(key), useFactory })),
-        ...providers
+        ...(0, import_service.makeProvidersForSrv)(srvRef)
       ],
-      controllers: [(0, import_controller.controllerOf)(signal, filterSrvs(allSrvs))],
-      exports: [service]
+      controllers: signal ? [(0, import_controller.controllerOf)(signal, filterSrvs(allSrvs))] : [],
+      exports: service === srvRef ? [srvRef] : []
     })
   ], ServiceModule);
   return ServiceModule;
 };
-const scalarModuleOf = ({ signals, uses = {}, useAsyncs = {}, providers = [], enabled = true }, allSrvs) => {
-  if (!enabled)
-    return null;
-  let ScalarModule = class {
-  };
-  ScalarModule = __decorateClass([
-    (0, import_common2.Global)(),
-    (0, import_common2.Module)({
-      imports: [],
-      providers: [
-        ...signals.map((signal) => (0, import_resolver.resolverOf)(signal, filterSrvs(allSrvs))),
-        ...signals.filter(hasWebsocket).map((signal) => [
-          (0, import_websocket.websocketOf)(signal, filterSrvs(allSrvs)),
-          { provide: "Websocket", useClass: (0, import_websocket.websocketServerOf)(signal) }
-        ]).flat(),
-        ...Object.entries(uses).map(([key, useValue]) => ({ provide: (0, import_common.capitalize)(key), useValue })),
-        ...Object.entries(useAsyncs).map(([key, useFactory]) => ({ provide: (0, import_common.capitalize)(key), useFactory })),
-        ...providers
-      ],
-      controllers: signals.map((signal) => (0, import_controller.controllerOf)(signal, filterSrvs(allSrvs)))
-    })
-  ], ScalarModule);
-  return ScalarModule;
-};
 const scalarModulesOf = ({ constants }, allSrvs) => {
   const signals = constants.filter((modelRef) => {
     const childRefs = (0, import_constant.getChildClassRefs)(modelRef);
@@ -194,32 +158,7 @@ const scalarModulesOf = ({ constants }, allSrvs) => {
   ], ScalarModule);
   return ScalarModule;
 };
-const batchModuleOf = ({
-  service,
-  uses = {},
-  useAsyncs = {},
-  providers = []
-}) => {
-  if (!(0, import_service.isServiceEnabled)(service))
-    return null;
-  let BatchModule = class {
-  };
-  BatchModule = __decorateClass([
-    (0, import_common2.Global)(),
-    (0, import_common2.Module)({
-      imports: [],
-      providers: [
-        (0, import_service.serviceOf)(service),
-        ...Object.entries(uses).map(([key, useValue]) => ({ provide: (0, import_common.capitalize)(key), useValue })),
-        ...Object.entries(useAsyncs).map(([key, useFactory]) => ({ provide: (0, import_common.capitalize)(key), useFactory })),
-        ...providers
-      ],
-      exports: [service]
-    })
-  ], BatchModule);
-  return BatchModule;
-};
-const useGlobals = ({ uses, useAsyncs, injects }) => {
+const useGlobals = ({ uses, useAsyncs, providers = [], injects }) => {
   let GlobalsModule = class {
   };
   GlobalsModule = __decorateClass([
@@ -232,7 +171,8 @@ const useGlobals = ({ uses, useAsyncs, injects }) => {
           useValue
         })),
         ...Object.entries(useAsyncs ?? {}).map(([key, useFactory]) => ({ provide: (0, import_common.capitalize)(key), useFactory })),
-        ...Object.entries(injects ?? {}).map(([key, inject]) => ({ provide: (0, import_common.capitalize)(key), useClass: inject }))
+        ...Object.entries(injects ?? {}).map(([key, inject]) => ({ provide: (0, import_common.capitalize)(key), useClass: inject })),
+        ...providers
       ],
       exports: [
         ...Object.keys(uses ?? {}).map((key) => (0, import_common.capitalize)(key)),
@@ -243,11 +183,21 @@ const useGlobals = ({ uses, useAsyncs, injects }) => {
   ], GlobalsModule);
   return GlobalsModule;
 };
+const makeSigForSrv = (sigRef) => {
+  let Sig = class {
+  };
+  Sig = __decorateClass([
+    (0, import_common2.Injectable)()
+  ], Sig);
+  if (hasWebsocket(sigRef))
+    (0, import_websocket.applyWebsocketSignal)(Sig, sigRef);
+  if (hasProcessor(sigRef))
+    (0, import_processor.applyQueueSignal)(Sig, sigRef);
+  return Sig;
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  batchModuleOf,
   databaseModuleOf,
-  scalarModuleOf,
   scalarModulesOf,
   serviceModuleOf,
   useGlobals

package/cjs/src/processor.js

@@ -17,8 +17,8 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var processor_exports = {};
 __export(processor_exports, {
-  processorOf: () => processorOf,
-  queueOf: () => queueOf
+  applyQueueSignal: () => applyQueueSignal,
+  processorOf: () => processorOf
 });
 module.exports = __toCommonJS(processor_exports);
 var import_common = require("@akanjs/common");
@@ -55,10 +55,11 @@ const processorOf = (sigRef, allSrvs) => {
   );
   class QueueProcessor {
   }
-  Object.keys(allSrvs).forEach((srv) => {
-    if (!(0, import_service.isServiceEnabled)(allSrvs[srv]))
+  Object.keys(allSrvs).forEach((srvName) => {
+    if (!(0, import_service.isServiceEnabled)(allSrvs[srvName]))
       return;
-    (0, import_common2.Inject)(allSrvs[srv])(QueueProcessor.prototype, (0, import_common.lowerlize)(srv));
+    const srvRef = (0, import_service.getServiceRefs)(srvName)[0];
+    (0, import_common2.Inject)(srvRef)(QueueProcessor.prototype, (0, import_common.lowerlize)(srvName));
   });
   for (const gqlMeta of gqlMetas) {
     const [argMetas, internalArgMetas] = (0, import_signal.getArgMetas)(sigRef, gqlMeta.key);
@@ -75,18 +76,21 @@ const processorOf = (sigRef, allSrvs) => {
   (0, import_bull.Processor)(sigMeta.refName)(QueueProcessor);
   return QueueProcessor;
 };
-const queueOf = (sigRef, queue) => {
+const applyQueueSignal = (targetRef, sigRef) => {
   const sigMeta = (0, import_signal.getSigMeta)(sigRef);
   const gqlMetas = (0, import_signal.getGqlMetas)(sigRef).filter((gqlMeta) => gqlMeta.type === "Process");
+  (0, import_common2.Inject)((0, import_bull.getQueueToken)(sigMeta.refName))(targetRef.prototype, "queue");
   for (const gqlMeta of gqlMetas) {
-    if (queue[gqlMeta.key])
+    if (targetRef.prototype[gqlMeta.key])
       throw new Error(`Queue already has ${gqlMeta.key} in ${sigMeta.refName}`);
-    queue[gqlMeta.key] = (...args) => queue.add(gqlMeta.key, args);
+    targetRef.prototype[gqlMeta.key] = function(...args) {
+      return this.queue.add(gqlMeta.key, args);
+    };
   }
-  return queue;
+  return targetRef;
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  processorOf,
-  queueOf
+  applyQueueSignal,
+  processorOf
 });

package/cjs/src/resolver.js

@@ -71,10 +71,11 @@ const resolverOf = (sigRef, allSrvs) => {
   const Rsv = (0, import_signal.copySignal)(sigRef);
   const sigMeta = (0, import_signal.getSigMeta)(Rsv);
   const gqlMetas = (0, import_signal.getGqlMetas)(Rsv);
-  Object.keys(allSrvs).forEach((srv) => {
-    if (!(0, import_service.isServiceEnabled)(allSrvs[srv]))
+  Object.keys(allSrvs).forEach((srvName) => {
+    if (!(0, import_service.isServiceEnabled)(allSrvs[srvName]))
       return;
-    (0, import_common2.Inject)(allSrvs[srv])(Rsv.prototype, (0, import_common.lowerlize)(srv));
+    const srvRef = (0, import_service.getServiceRefs)(srvName)[0];
+    (0, import_common2.Inject)(srvRef)(Rsv.prototype, (0, import_common.lowerlize)(srvName));
   });
   for (const gqlMeta of gqlMetas) {
     if (gqlMeta.guards.some((guard) => guard === "None") || gqlMeta.signalOption.onlyFor === "restapi" || !["Query", "Mutation"].includes(gqlMeta.type))

package/cjs/src/schema.js

@@ -18,6 +18,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var schema_exports = {};
 __export(schema_exports, {
   addSchema: () => addSchema,
+  hasSchema: () => hasSchema,
   schemaOf: () => schemaOf
 });
 module.exports = __toCommonJS(schema_exports);
@@ -32,6 +33,24 @@ class ScalarSchemaStorage {
 }
 class SchemaStorage {
 }
+const getSchemaMetaByName = (refName) => {
+  const schemaMeta = Reflect.getMetadata(refName, SchemaStorage.prototype);
+  return schemaMeta;
+};
+const setSchemaMetaByName = (refName, schema) => {
+  Reflect.defineMetadata(refName, schema, SchemaStorage.prototype);
+};
+const hasSchema = (modelRef) => {
+  const classMeta = (0, import_constant.getClassMeta)(modelRef);
+  return !!getSchemaMetaByName(classMeta.refName);
+};
+const getScalarSchemaMetaByName = (refName) => {
+  const schemaMeta = Reflect.getMetadata(refName, ScalarSchemaStorage.prototype);
+  return schemaMeta;
+};
+const setScalarSchemaMetaByName = (refName, schema) => {
+  Reflect.defineMetadata(refName, schema, ScalarSchemaStorage.prototype);
+};
 const scalarMongoTypeMap = /* @__PURE__ */ new Map([
   [import_base.ID, import_document.ObjectId],
   [import_base.Int, Number],
@@ -71,12 +90,12 @@ const applyMongoProp = (schemaProps, fieldMeta) => {
     }
     prop = { type: (0, import_base.arraiedModel)(prop, fieldMeta.optArrDepth), default: [], required: true };
     if (fieldMeta.modelRef.prototype === Date.prototype) {
-      prop.get = (dates) => dates.map((date) => (0, import_base.dayjs)(date));
-      prop.set = (days) => days.map((day) => day.toDate());
+      prop.get = (dates) => (0, import_base.applyFnToArrayObjects)(dates, (date) => (0, import_base.dayjs)(date));
+      prop.set = (days) => (0, import_base.applyFnToArrayObjects)(days, (day) => day.toDate());
     }
     if (fieldMeta.isClass && !fieldMeta.isScalar || fieldMeta.modelRef.prototype === import_base.ID.prototype) {
-      prop.get = (ids) => ids.map((id) => id.toString());
-      prop.set = (ids) => ids.map((id) => new import_mongoose.Types.ObjectId(id));
+      prop.get = (ids) => (0, import_base.applyFnToArrayObjects)(ids, (id) => id.toString());
+      prop.set = (ids) => (0, import_base.applyFnToArrayObjects)(ids, (id) => new import_mongoose.Types.ObjectId(id));
     }
   } else {
     prop.type = (0, import_base.arraiedModel)(type, fieldMeta.arrDepth);
@@ -118,12 +137,17 @@ const applyMongoProp = (schemaProps, fieldMeta) => {
       prop.set = (v) => v === null ? void 0 : v;
     }
     if (fieldMeta.modelRef.prototype === Date.prototype) {
-      prop.get = (date) => date ? (0, import_base.dayjs)(date) : void 0;
-      prop.set = (day) => day ? (0, import_base.dayjs)(day).toDate() : void 0;
+      prop.get = (date) => (0, import_base.applyFnToArrayObjects)(date, (date2) => date2 ? (0, import_base.dayjs)(date2) : void 0);
+      prop.set = (day) => (0, import_base.applyFnToArrayObjects)(day, (day2) => day2 ? (0, import_base.dayjs)(day2).toDate() : void 0);
     }
     if (fieldMeta.isClass && !fieldMeta.isScalar || fieldMeta.modelRef.prototype === import_base.ID.prototype) {
-      prop.get = (id) => id ? id.toString() : void 0;
-      prop.set = (id) => id ? new import_mongoose.Types.ObjectId(id) : void 0;
+      if (fieldMeta.arrDepth === 0) {
+        prop.get = (id) => id ? id.toString() : void 0;
+        prop.set = (id) => id ? new import_mongoose.Types.ObjectId(id) : void 0;
+      } else {
+        prop.get = (val) => (0, import_base.applyFnToArrayObjects)(val, (id) => id ? id.toString() : void 0);
+        prop.set = (val) => (0, import_base.applyFnToArrayObjects)(val, (id) => id ? new import_mongoose.Types.ObjectId(id) : void 0);
+      }
     }
     if (fieldMeta.isClass && fieldMeta.isScalar && fieldMeta.default === null && !fieldMeta.nullable) {
       prop.default = (0, import_signal.makeDefault)(fieldMeta.modelRef);
@@ -138,7 +162,7 @@ const applyMongoProp = (schemaProps, fieldMeta) => {
 };
 const createSchema = (modelRef) => {
   const classMeta = (0, import_constant.getClassMeta)(modelRef);
-  const schemaMeta = Reflect.getMetadata(classMeta.refName, ScalarSchemaStorage.prototype);
+  const schemaMeta = getScalarSchemaMetaByName(classMeta.refName);
   if (schemaMeta)
     return schemaMeta;
   const fieldMetas = (0, import_constant.getFieldMetas)(modelRef);
@@ -147,12 +171,12 @@ const createSchema = (modelRef) => {
     applyMongoProp(schemaProps, fieldMeta);
   });
   const schema = new import_mongoose.Schema(schemaProps);
-  Reflect.defineMetadata(classMeta.refName, schema, ScalarSchemaStorage.prototype);
+  setScalarSchemaMetaByName(classMeta.refName, schema);
   return schema;
 };
 const schemaOf = (modelRef, docRef, middleware) => {
   const classMeta = (0, import_constant.getClassMeta)(docRef);
-  const schemaMeta = Reflect.getMetadata(classMeta.refName, SchemaStorage.prototype);
+  const schemaMeta = getSchemaMetaByName(classMeta.refName);
   if (schemaMeta)
     return schemaMeta;
   const fieldMetas = (0, import_constant.getFieldMetas)(docRef);
@@ -192,7 +216,7 @@ const schemaOf = (modelRef, docRef, middleware) => {
   const onSchema = Object.getOwnPropertyDescriptor(middleware.prototype, "onSchema")?.value;
   onSchema?.(schema);
   schema.index({ removedAt: -1 });
-  Reflect.defineMetadata(classMeta.refName, schema, SchemaStorage.prototype);
+  setSchemaMetaByName(classMeta.refName, schema);
   return schema;
 };
 const addSchema = (modelRef, docRef, inputRef, middleware) => {
@@ -239,5 +263,6 @@ const addSchema = (modelRef, docRef, inputRef, middleware) => {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   addSchema,
+  hasSchema,
   schemaOf
 });

package/cjs/src/websocket.js

@@ -26,8 +26,8 @@ var __decorateClass = (decorators, target, key, kind) => {
 };
 var websocket_exports = {};
 __export(websocket_exports, {
-  websocketOf: () => websocketOf,
-  websocketServerOf: () => websocketServerOf
+  applyWebsocketSignal: () => applyWebsocketSignal,
+  websocketOf: () => websocketOf
 });
 module.exports = __toCommonJS(websocket_exports);
 var import_common = require("@akanjs/common");
@@ -73,10 +73,11 @@ const websocketOf = (sigRef, allSrvs) => {
   class WsGateway {
     __sigRef__ = sigRef;
   }
-  Object.keys(allSrvs).forEach((srv) => {
-    if (!(0, import_service.isServiceEnabled)(allSrvs[srv]))
+  Object.keys(allSrvs).forEach((srvName) => {
+    if (!(0, import_service.isServiceEnabled)(allSrvs[srvName]))
       return;
-    (0, import_common2.Inject)(allSrvs[srv])(WsGateway.prototype, (0, import_common.lowerlize)(srv));
+    const srvRef = (0, import_service.getServiceRefs)(srvName)[0];
+    (0, import_common2.Inject)(srvRef)(WsGateway.prototype, (0, import_common.lowerlize)(srvName));
   });
   const messageGqlMetas = (0, import_signal.getGqlMetas)(sigRef).filter((gqlMeta) => gqlMeta.type === "Message");
   for (const gqlMeta of messageGqlMetas) {
@@ -115,32 +116,24 @@ const websocketOf = (sigRef, allSrvs) => {
   (0, import_websockets.WebSocketGateway)({ cors: { origin: "*" }, transports: ["websocket"] })(WsGateway);
   return WsGateway;
 };
-const websocketServerOf = (sigRef) => {
+const applyWebsocketSignal = (targetRef, sigRef) => {
   const pubsubGqlMetas = (0, import_signal.getGqlMetas)(sigRef).filter((gqlMeta) => gqlMeta.type === "Pubsub");
-  let Websocket = class {
-    server;
-  };
-  __decorateClass([
-    (0, import_websockets.WebSocketServer)()
-  ], Websocket.prototype, "server", 2);
-  Websocket = __decorateClass([
-    (0, import_common2.Injectable)(),
-    (0, import_websockets.WebSocketGateway)({ cors: { origin: "*" }, transports: ["websocket"] })
-  ], Websocket);
+  (0, import_websockets.WebSocketGateway)({ cors: { origin: "*" }, transports: ["websocket"] })(targetRef);
+  (0, import_websockets.WebSocketServer)()(targetRef.prototype, "websocket");
   for (const gqlMeta of pubsubGqlMetas) {
     const [argMetas] = (0, import_signal.getArgMetas)(sigRef, gqlMeta.key);
-    Websocket.prototype[gqlMeta.key] = function(...args) {
+    targetRef.prototype[gqlMeta.key] = function(...args) {
       const roomId = makeRoomId(
         gqlMeta.key,
         argMetas.map((argMeta) => args[argMeta.idx])
       );
-      this.server.to(roomId).emit(roomId, args.at(-1));
+      this.websocket.to(roomId).emit(roomId, args.at(-1));
     };
   }
-  return Websocket;
+  return targetRef;
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  websocketOf,
-  websocketServerOf
+  applyWebsocketSignal,
+  websocketOf
 });

package/esm/src/base.module.js

@@ -5,8 +5,7 @@ const registerBaseModule = (option) => {
   return serviceModuleOf(
     {
       signal: BaseSignal,
-      service: BaseService,
-      uses: { onCleanup: option.onCleanup }
+      service: BaseService
     },
     allSrvs
   );

package/esm/src/boot.js

@@ -89,9 +89,9 @@ const createNestApp = async ({ registerModules, serverMode = "federation", env,
     Injectable()
   ], AuthMiddleWare);
   const redisClient = await createClient({ url: redisUri }).connect();
-  let SubDatabaseModule = class {
+  let GlobalProvideModule = class {
   };
-  SubDatabaseModule = __decorateClass([
+  GlobalProvideModule = __decorateClass([
     Global(),
     Module({
       providers: [
@@ -99,11 +99,12 @@ const createNestApp = async ({ registerModules, serverMode = "federation", env,
         {
           provide: "MEILI_CLIENT",
           useFactory: () => new MeiliSearch({ host: meiliUri, apiKey: generateMeiliKey(env) })
-        }
+        },
+        { provide: "GLOBAL_ENV", useValue: env }
       ],
-      exports: ["REDIS_CLIENT", "MEILI_CLIENT"]
+      exports: ["REDIS_CLIENT", "MEILI_CLIENT", "GLOBAL_ENV"]
     })
-  ], SubDatabaseModule);
+  ], GlobalProvideModule);
   let AppModule = class {
     configure(consumer) {
       consumer.apply(AuthMiddleWare).forRoutes({ path: "*", method: RequestMethod.ALL });
@@ -130,7 +131,7 @@ const createNestApp = async ({ registerModules, serverMode = "federation", env,
         MongooseModule.forRootAsync({
           useFactory: () => ({ uri: mongoUri, autoIndex: baseEnv.environment !== "main" })
         }),
-        SubDatabaseModule,
+        GlobalProvideModule,
         useGlobals({
           injects: { SearchClient, DatabaseClient, CacheClient }
         }),

package/esm/src/controller.js

@@ -13,7 +13,7 @@ import {
   Self,
   UserIp
 } from "@akanjs/nest";
-import { isServiceEnabled } from "@akanjs/service";
+import { getServiceRefs, isServiceEnabled } from "@akanjs/service";
 import {
   copySignal,
   getArgMetas,
@@ -51,10 +51,11 @@ const controllerOf = (sigRef, allSrvs) => {
   const gqlMetas = getGqlMetas(sigRef);
   const prefix = getControllerPrefix(sigMeta);
   const Ctrl = copySignal(sigRef);
-  Object.keys(allSrvs).forEach((srv) => {
-    if (!isServiceEnabled(allSrvs[srv]))
+  Object.keys(allSrvs).forEach((srvName) => {
+    if (!isServiceEnabled(allSrvs[srvName]))
       return;
-    Inject(allSrvs[srv])(Ctrl.prototype, lowerlize(srv));
+    const srvRef = getServiceRefs(srvName)[0];
+    Inject(srvRef)(Ctrl.prototype, lowerlize(srvName));
   });
   for (const gqlMeta of gqlMetas) {
     if (gqlMeta.guards.some((guard) => guard === "None") || gqlMeta.signalOption.onlyFor === "graphql" || !["Query", "Mutation"].includes(gqlMeta.type))

package/esm/src/module.js

@@ -12,33 +12,25 @@ var __decorateClass = (decorators, target, key, kind) => {
 import { capitalize, lowerlize } from "@akanjs/common";
 import { getChildClassRefs, getClassMeta } from "@akanjs/constant";
 import { databaseModelOf } from "@akanjs/document";
-import { isServiceEnabled, serviceOf } from "@akanjs/service";
-import { getGqlMetas, getSigMeta, LogSignal, Signal } from "@akanjs/signal";
-import { BullModule, getQueueToken } from "@nestjs/bull";
-import { Global, Module } from "@nestjs/common";
+import { getServiceMeta, isServiceEnabled, makeProvidersForSrv, serviceOf } from "@akanjs/service";
+import { getGqlMetas, LogSignal, Signal } from "@akanjs/signal";
+import { BullModule } from "@nestjs/bull";
+import { Global, Injectable, Module } from "@nestjs/common";
 import { getModelToken, MongooseModule } from "@nestjs/mongoose";
 import { controllerOf } from "./controller";
-import { processorOf } from "./processor";
+import { applyQueueSignal, processorOf } from "./processor";
 import { resolverOf } from "./resolver";
-import { addSchema, schemaOf } from "./schema";
-import { websocketOf, websocketServerOf } from "./websocket";
+import { addSchema, hasSchema, schemaOf } from "./schema";
+import { applyWebsocketSignal, websocketOf } from "./websocket";
 const hasWebsocket = (signal) => getGqlMetas(signal).some((gqlMeta) => ["Message", "Pubsub"].includes(gqlMeta.type));
 const hasProcessor = (signal) => getGqlMetas(signal).some((gqlMeta) => gqlMeta.type === "Process");
 const filterSrvs = (srvs) => Object.fromEntries(Object.entries(srvs).filter(([_, srv]) => !!srv));
-const databaseModuleOf = ({
-  constant,
-  database,
-  signal,
-  service,
-  uses = {},
-  useAsyncs = {},
-  providers = [],
-  extended
-}, allSrvs) => {
+const databaseModuleOf = ({ constant, database, signal, service }, allSrvs) => {
   if (!isServiceEnabled(service))
     return null;
   const [modelName, className] = [lowerlize(constant.refName), capitalize(constant.refName)];
   const mongoToken = getModelToken(className);
+  const srvRef = serviceOf(service);
   let DatabaseModule = class {
   };
   DatabaseModule = __decorateClass([
@@ -48,7 +40,7 @@ const databaseModuleOf = ({
         MongooseModule.forFeature([
           {
             name: className,
-            schema: extended ? addSchema(database.Model, database.Doc, database.Input, database.Middleware) : schemaOf(database.Model, database.Doc, database.Middleware)
+            schema: hasSchema(constant.Full) ? addSchema(database.Model, database.Doc, database.Input, database.Middleware) : schemaOf(database.Model, database.Doc, database.Middleware)
           }
         ]),
         ...hasProcessor(signal) ? [
@@ -59,15 +51,11 @@ const databaseModuleOf = ({
         ] : []
       ],
       providers: [
-        serviceOf(service),
+        ...service === srvRef ? [srvRef] : [],
         resolverOf(signal, filterSrvs(allSrvs)),
-        ...hasProcessor(signal) ? [
-          processorOf(signal, filterSrvs(allSrvs)),
-          { provide: `${className}Queue`, useFactory: (queue) => queue, inject: [getQueueToken(modelName)] }
-        ] : [],
-        ...hasWebsocket(signal) ? [websocketOf(signal, filterSrvs(allSrvs)), { provide: "Websocket", useClass: websocketServerOf(signal) }] : [],
-        ...Object.entries(uses).map(([key, useValue]) => ({ provide: capitalize(key), useValue })),
-        ...Object.entries(useAsyncs).map(([key, useFactory]) => ({ provide: capitalize(key), useFactory })),
+        ...hasWebsocket(signal) ? [websocketOf(signal, filterSrvs(allSrvs))] : [],
+        ...hasProcessor(signal) ? [processorOf(signal, filterSrvs(allSrvs))] : [],
+        { provide: `${className}Signal`, useClass: makeSigForSrv(signal) },
         {
           provide: `${modelName}Model`,
           useFactory: (model, redis, meili) => {
@@ -75,74 +63,52 @@ const databaseModuleOf = ({
           },
           inject: [mongoToken, "REDIS_CLIENT", "MEILI_CLIENT"]
         },
-        ...providers
+        ...makeProvidersForSrv(srvRef)
       ],
       controllers: [controllerOf(signal, filterSrvs(allSrvs))],
-      exports: [service]
+      exports: service === srvRef ? [srvRef] : []
     })
   ], DatabaseModule);
   return DatabaseModule;
 };
-const serviceModuleOf = ({ signal, service, uses = {}, useAsyncs = {}, providers = [] }, allSrvs) => {
+const serviceModuleOf = ({ signal, service }, allSrvs) => {
   if (!isServiceEnabled(service))
     return null;
-  const sigMeta = getSigMeta(signal);
-  const [modelName, className] = [lowerlize(sigMeta.refName), capitalize(sigMeta.refName)];
+  const serviceMeta = getServiceMeta(service);
+  if (!serviceMeta)
+    throw new Error(`Service ${service} is not a valid service`);
+  const refName = serviceMeta.name.replace("Service", "");
+  const [modelName, className] = [lowerlize(refName), capitalize(refName)];
+  const srvRef = serviceOf(service);
   let ServiceModule = class {
   };
   ServiceModule = __decorateClass([
     Global(),
     Module({
-      imports: [
+      imports: signal ? [
         ...hasProcessor(signal) ? [
           BullModule.registerQueue({
             name: modelName,
             defaultJobOptions: { removeOnComplete: true, removeOnFail: true }
           })
         ] : []
-      ],
+      ] : [],
       providers: [
-        serviceOf(service),
-        resolverOf(signal, filterSrvs(allSrvs)),
-        ...hasWebsocket(signal) ? [websocketOf(signal, filterSrvs(allSrvs)), { provide: "Websocket", useClass: websocketServerOf(signal) }] : [],
-        ...hasProcessor(signal) ? [
-          processorOf(signal, filterSrvs(allSrvs)),
-          { provide: `${className}Queue`, useFactory: (queue) => queue, inject: [getQueueToken(modelName)] }
+        ...service === srvRef ? [srvRef] : [],
+        ...signal ? [
+          resolverOf(signal, filterSrvs(allSrvs)),
+          ...hasWebsocket(signal) ? [websocketOf(signal, filterSrvs(allSrvs))] : [],
+          ...hasProcessor(signal) ? [processorOf(signal, filterSrvs(allSrvs))] : [],
+          { provide: `${className}Signal`, useClass: makeSigForSrv(signal) }
         ] : [],
-        ...Object.entries(uses).map(([key, useValue]) => ({ provide: capitalize(key), useValue })),
-        ...Object.entries(useAsyncs).map(([key, useFactory]) => ({ provide: capitalize(key), useFactory })),
-        ...providers
+        ...makeProvidersForSrv(srvRef)
       ],
-      controllers: [controllerOf(signal, filterSrvs(allSrvs))],
-      exports: [service]
+      controllers: signal ? [controllerOf(signal, filterSrvs(allSrvs))] : [],
+      exports: service === srvRef ? [srvRef] : []
     })
   ], ServiceModule);
   return ServiceModule;
 };
-const scalarModuleOf = ({ signals, uses = {}, useAsyncs = {}, providers = [], enabled = true }, allSrvs) => {
-  if (!enabled)
-    return null;
-  let ScalarModule = class {
-  };
-  ScalarModule = __decorateClass([
-    Global(),
-    Module({
-      imports: [],
-      providers: [
-        ...signals.map((signal) => resolverOf(signal, filterSrvs(allSrvs))),
-        ...signals.filter(hasWebsocket).map((signal) => [
-          websocketOf(signal, filterSrvs(allSrvs)),
-          { provide: "Websocket", useClass: websocketServerOf(signal) }
-        ]).flat(),
-        ...Object.entries(uses).map(([key, useValue]) => ({ provide: capitalize(key), useValue })),
-        ...Object.entries(useAsyncs).map(([key, useFactory]) => ({ provide: capitalize(key), useFactory })),
-        ...providers
-      ],
-      controllers: signals.map((signal) => controllerOf(signal, filterSrvs(allSrvs)))
-    })
-  ], ScalarModule);
-  return ScalarModule;
-};
 const scalarModulesOf = ({ constants }, allSrvs) => {
   const signals = constants.filter((modelRef) => {
     const childRefs = getChildClassRefs(modelRef);
@@ -169,32 +135,7 @@ const scalarModulesOf = ({ constants }, allSrvs) => {
   ], ScalarModule);
   return ScalarModule;
 };
-const batchModuleOf = ({
-  service,
-  uses = {},
-  useAsyncs = {},
-  providers = []
-}) => {
-  if (!isServiceEnabled(service))
-    return null;
-  let BatchModule = class {
-  };
-  BatchModule = __decorateClass([
-    Global(),
-    Module({
-      imports: [],
-      providers: [
-        serviceOf(service),
-        ...Object.entries(uses).map(([key, useValue]) => ({ provide: capitalize(key), useValue })),
-        ...Object.entries(useAsyncs).map(([key, useFactory]) => ({ provide: capitalize(key), useFactory })),
-        ...providers
-      ],
-      exports: [service]
-    })
-  ], BatchModule);
-  return BatchModule;
-};
-const useGlobals = ({ uses, useAsyncs, injects }) => {
+const useGlobals = ({ uses, useAsyncs, providers = [], injects }) => {
   let GlobalsModule = class {
   };
   GlobalsModule = __decorateClass([
@@ -207,7 +148,8 @@ const useGlobals = ({ uses, useAsyncs, injects }) => {
           useValue
         })),
         ...Object.entries(useAsyncs ?? {}).map(([key, useFactory]) => ({ provide: capitalize(key), useFactory })),
-        ...Object.entries(injects ?? {}).map(([key, inject]) => ({ provide: capitalize(key), useClass: inject }))
+        ...Object.entries(injects ?? {}).map(([key, inject]) => ({ provide: capitalize(key), useClass: inject })),
+        ...providers
       ],
       exports: [
         ...Object.keys(uses ?? {}).map((key) => capitalize(key)),
@@ -218,10 +160,20 @@ const useGlobals = ({ uses, useAsyncs, injects }) => {
   ], GlobalsModule);
   return GlobalsModule;
 };
+const makeSigForSrv = (sigRef) => {
+  let Sig = class {
+  };
+  Sig = __decorateClass([
+    Injectable()
+  ], Sig);
+  if (hasWebsocket(sigRef))
+    applyWebsocketSignal(Sig, sigRef);
+  if (hasProcessor(sigRef))
+    applyQueueSignal(Sig, sigRef);
+  return Sig;
+};
 export {
-  batchModuleOf,
   databaseModuleOf,
-  scalarModuleOf,
   scalarModulesOf,
   serviceModuleOf,
   useGlobals

package/esm/src/processor.js

@@ -1,12 +1,12 @@
 import { lowerlize } from "@akanjs/common";
-import { isServiceEnabled } from "@akanjs/service";
+import { getServiceRefs, isServiceEnabled } from "@akanjs/service";
 import {
   deserializeArg,
   getArgMetas,
   getGqlMetas,
   getSigMeta
 } from "@akanjs/signal";
-import { Process, Processor } from "@nestjs/bull";
+import { getQueueToken, Process, Processor } from "@nestjs/bull";
 import { Inject } from "@nestjs/common";
 const convertProcessFunction = (gqlMeta, argMetas, internalArgMetas, fn) => {
   return async function(job, done) {
@@ -37,10 +37,11 @@ const processorOf = (sigRef, allSrvs) => {
   );
   class QueueProcessor {
   }
-  Object.keys(allSrvs).forEach((srv) => {
-    if (!isServiceEnabled(allSrvs[srv]))
+  Object.keys(allSrvs).forEach((srvName) => {
+    if (!isServiceEnabled(allSrvs[srvName]))
       return;
-    Inject(allSrvs[srv])(QueueProcessor.prototype, lowerlize(srv));
+    const srvRef = getServiceRefs(srvName)[0];
+    Inject(srvRef)(QueueProcessor.prototype, lowerlize(srvName));
   });
   for (const gqlMeta of gqlMetas) {
     const [argMetas, internalArgMetas] = getArgMetas(sigRef, gqlMeta.key);
@@ -57,17 +58,20 @@ const processorOf = (sigRef, allSrvs) => {
   Processor(sigMeta.refName)(QueueProcessor);
   return QueueProcessor;
 };
-const queueOf = (sigRef, queue) => {
+const applyQueueSignal = (targetRef, sigRef) => {
   const sigMeta = getSigMeta(sigRef);
   const gqlMetas = getGqlMetas(sigRef).filter((gqlMeta) => gqlMeta.type === "Process");
+  Inject(getQueueToken(sigMeta.refName))(targetRef.prototype, "queue");
   for (const gqlMeta of gqlMetas) {
-    if (queue[gqlMeta.key])
+    if (targetRef.prototype[gqlMeta.key])
       throw new Error(`Queue already has ${gqlMeta.key} in ${sigMeta.refName}`);
-    queue[gqlMeta.key] = (...args) => queue.add(gqlMeta.key, args);
+    targetRef.prototype[gqlMeta.key] = function(...args) {
+      return this.queue.add(gqlMeta.key, args);
+    };
   }
-  return queue;
+  return targetRef;
 };
 export {
-  processorOf,
-  queueOf
+  applyQueueSignal,
+  processorOf
 };

package/esm/src/resolver.js

@@ -2,7 +2,7 @@ import { arraiedModel, Float, getNonArrayModel, ID, Int, JSON, Upload } from "@a
 import { capitalize, lowerlize } from "@akanjs/common";
 import { getClassMeta, getFieldMetas } from "@akanjs/constant";
 import { Access, Account, guards, Me, Req, Res, Self, UserIp } from "@akanjs/nest";
-import { isServiceEnabled } from "@akanjs/service";
+import { getServiceRefs, isServiceEnabled } from "@akanjs/service";
 import {
   copySignal,
   getArgMetas,
@@ -45,10 +45,11 @@ const resolverOf = (sigRef, allSrvs) => {
   const Rsv = copySignal(sigRef);
   const sigMeta = getSigMeta(Rsv);
   const gqlMetas = getGqlMetas(Rsv);
-  Object.keys(allSrvs).forEach((srv) => {
-    if (!isServiceEnabled(allSrvs[srv]))
+  Object.keys(allSrvs).forEach((srvName) => {
+    if (!isServiceEnabled(allSrvs[srvName]))
       return;
-    Inject(allSrvs[srv])(Rsv.prototype, lowerlize(srv));
+    const srvRef = getServiceRefs(srvName)[0];
+    Inject(srvRef)(Rsv.prototype, lowerlize(srvName));
   });
   for (const gqlMeta of gqlMetas) {
     if (gqlMeta.guards.some((guard) => guard === "None") || gqlMeta.signalOption.onlyFor === "restapi" || !["Query", "Mutation"].includes(gqlMeta.type))

package/esm/src/schema.js

@@ -1,4 +1,13 @@
-import { arraiedModel, dayjs, Enum, Float, ID, Int, JSON } from "@akanjs/base";
+import {
+  applyFnToArrayObjects,
+  arraiedModel,
+  dayjs,
+  Enum,
+  Float,
+  ID,
+  Int,
+  JSON
+} from "@akanjs/base";
 import { isDayjs } from "@akanjs/common";
 import { getClassMeta, getFieldMetas, getFullModelRef, getInputModelRef } from "@akanjs/constant";
 import { getDefaultSchemaOptions, ObjectId } from "@akanjs/document";
@@ -9,6 +18,24 @@ class ScalarSchemaStorage {
 }
 class SchemaStorage {
 }
+const getSchemaMetaByName = (refName) => {
+  const schemaMeta = Reflect.getMetadata(refName, SchemaStorage.prototype);
+  return schemaMeta;
+};
+const setSchemaMetaByName = (refName, schema) => {
+  Reflect.defineMetadata(refName, schema, SchemaStorage.prototype);
+};
+const hasSchema = (modelRef) => {
+  const classMeta = getClassMeta(modelRef);
+  return !!getSchemaMetaByName(classMeta.refName);
+};
+const getScalarSchemaMetaByName = (refName) => {
+  const schemaMeta = Reflect.getMetadata(refName, ScalarSchemaStorage.prototype);
+  return schemaMeta;
+};
+const setScalarSchemaMetaByName = (refName, schema) => {
+  Reflect.defineMetadata(refName, schema, ScalarSchemaStorage.prototype);
+};
 const scalarMongoTypeMap = /* @__PURE__ */ new Map([
   [ID, ObjectId],
   [Int, Number],
@@ -48,12 +75,12 @@ const applyMongoProp = (schemaProps, fieldMeta) => {
     }
     prop = { type: arraiedModel(prop, fieldMeta.optArrDepth), default: [], required: true };
     if (fieldMeta.modelRef.prototype === Date.prototype) {
-      prop.get = (dates) => dates.map((date) => dayjs(date));
-      prop.set = (days) => days.map((day) => day.toDate());
+      prop.get = (dates) => applyFnToArrayObjects(dates, (date) => dayjs(date));
+      prop.set = (days) => applyFnToArrayObjects(days, (day) => day.toDate());
     }
     if (fieldMeta.isClass && !fieldMeta.isScalar || fieldMeta.modelRef.prototype === ID.prototype) {
-      prop.get = (ids) => ids.map((id) => id.toString());
-      prop.set = (ids) => ids.map((id) => new Types.ObjectId(id));
+      prop.get = (ids) => applyFnToArrayObjects(ids, (id) => id.toString());
+      prop.set = (ids) => applyFnToArrayObjects(ids, (id) => new Types.ObjectId(id));
     }
   } else {
     prop.type = arraiedModel(type, fieldMeta.arrDepth);
@@ -95,12 +122,17 @@ const applyMongoProp = (schemaProps, fieldMeta) => {
       prop.set = (v) => v === null ? void 0 : v;
     }
     if (fieldMeta.modelRef.prototype === Date.prototype) {
-      prop.get = (date) => date ? dayjs(date) : void 0;
-      prop.set = (day) => day ? dayjs(day).toDate() : void 0;
+      prop.get = (date) => applyFnToArrayObjects(date, (date2) => date2 ? dayjs(date2) : void 0);
+      prop.set = (day) => applyFnToArrayObjects(day, (day2) => day2 ? dayjs(day2).toDate() : void 0);
     }
     if (fieldMeta.isClass && !fieldMeta.isScalar || fieldMeta.modelRef.prototype === ID.prototype) {
-      prop.get = (id) => id ? id.toString() : void 0;
-      prop.set = (id) => id ? new Types.ObjectId(id) : void 0;
+      if (fieldMeta.arrDepth === 0) {
+        prop.get = (id) => id ? id.toString() : void 0;
+        prop.set = (id) => id ? new Types.ObjectId(id) : void 0;
+      } else {
+        prop.get = (val) => applyFnToArrayObjects(val, (id) => id ? id.toString() : void 0);
+        prop.set = (val) => applyFnToArrayObjects(val, (id) => id ? new Types.ObjectId(id) : void 0);
+      }
     }
     if (fieldMeta.isClass && fieldMeta.isScalar && fieldMeta.default === null && !fieldMeta.nullable) {
       prop.default = makeDefault(fieldMeta.modelRef);
@@ -115,7 +147,7 @@ const applyMongoProp = (schemaProps, fieldMeta) => {
 };
 const createSchema = (modelRef) => {
   const classMeta = getClassMeta(modelRef);
-  const schemaMeta = Reflect.getMetadata(classMeta.refName, ScalarSchemaStorage.prototype);
+  const schemaMeta = getScalarSchemaMetaByName(classMeta.refName);
   if (schemaMeta)
     return schemaMeta;
   const fieldMetas = getFieldMetas(modelRef);
@@ -124,12 +156,12 @@ const createSchema = (modelRef) => {
     applyMongoProp(schemaProps, fieldMeta);
   });
   const schema = new Schema(schemaProps);
-  Reflect.defineMetadata(classMeta.refName, schema, ScalarSchemaStorage.prototype);
+  setScalarSchemaMetaByName(classMeta.refName, schema);
   return schema;
 };
 const schemaOf = (modelRef, docRef, middleware) => {
   const classMeta = getClassMeta(docRef);
-  const schemaMeta = Reflect.getMetadata(classMeta.refName, SchemaStorage.prototype);
+  const schemaMeta = getSchemaMetaByName(classMeta.refName);
   if (schemaMeta)
     return schemaMeta;
   const fieldMetas = getFieldMetas(docRef);
@@ -169,7 +201,7 @@ const schemaOf = (modelRef, docRef, middleware) => {
   const onSchema = Object.getOwnPropertyDescriptor(middleware.prototype, "onSchema")?.value;
   onSchema?.(schema);
   schema.index({ removedAt: -1 });
-  Reflect.defineMetadata(classMeta.refName, schema, SchemaStorage.prototype);
+  setSchemaMetaByName(classMeta.refName, schema);
   return schema;
 };
 const addSchema = (modelRef, docRef, inputRef, middleware) => {
@@ -215,5 +247,6 @@ const addSchema = (modelRef, docRef, inputRef, middleware) => {
 };
 export {
   addSchema,
+  hasSchema,
   schemaOf
 };

package/esm/src/websocket.js

@@ -11,7 +11,7 @@ var __decorateClass = (decorators, target, key, kind) => {
 };
 import { lowerlize } from "@akanjs/common";
 import { Access, Account, getBodyPipes, Me, Self, UserIp, Ws } from "@akanjs/nest";
-import { isServiceEnabled } from "@akanjs/service";
+import { getServiceRefs, isServiceEnabled } from "@akanjs/service";
 import { getArgMetas, getGqlMetas, getSigMeta } from "@akanjs/signal";
 import { Inject, Injectable, UseInterceptors } from "@nestjs/common";
 import { MessageBody, SubscribeMessage, WebSocketGateway, WebSocketServer } from "@nestjs/websockets";
@@ -52,10 +52,11 @@ const websocketOf = (sigRef, allSrvs) => {
   class WsGateway {
     __sigRef__ = sigRef;
   }
-  Object.keys(allSrvs).forEach((srv) => {
-    if (!isServiceEnabled(allSrvs[srv]))
+  Object.keys(allSrvs).forEach((srvName) => {
+    if (!isServiceEnabled(allSrvs[srvName]))
       return;
-    Inject(allSrvs[srv])(WsGateway.prototype, lowerlize(srv));
+    const srvRef = getServiceRefs(srvName)[0];
+    Inject(srvRef)(WsGateway.prototype, lowerlize(srvName));
   });
   const messageGqlMetas = getGqlMetas(sigRef).filter((gqlMeta) => gqlMeta.type === "Message");
   for (const gqlMeta of messageGqlMetas) {
@@ -94,31 +95,23 @@ const websocketOf = (sigRef, allSrvs) => {
   WebSocketGateway({ cors: { origin: "*" }, transports: ["websocket"] })(WsGateway);
   return WsGateway;
 };
-const websocketServerOf = (sigRef) => {
+const applyWebsocketSignal = (targetRef, sigRef) => {
   const pubsubGqlMetas = getGqlMetas(sigRef).filter((gqlMeta) => gqlMeta.type === "Pubsub");
-  let Websocket = class {
-    server;
-  };
-  __decorateClass([
-    WebSocketServer()
-  ], Websocket.prototype, "server", 2);
-  Websocket = __decorateClass([
-    Injectable(),
-    WebSocketGateway({ cors: { origin: "*" }, transports: ["websocket"] })
-  ], Websocket);
+  WebSocketGateway({ cors: { origin: "*" }, transports: ["websocket"] })(targetRef);
+  WebSocketServer()(targetRef.prototype, "websocket");
   for (const gqlMeta of pubsubGqlMetas) {
     const [argMetas] = getArgMetas(sigRef, gqlMeta.key);
-    Websocket.prototype[gqlMeta.key] = function(...args) {
+    targetRef.prototype[gqlMeta.key] = function(...args) {
       const roomId = makeRoomId(
         gqlMeta.key,
         argMetas.map((argMeta) => args[argMeta.idx])
       );
-      this.server.to(roomId).emit(roomId, args.at(-1));
+      this.websocket.to(roomId).emit(roomId, args.at(-1));
     };
   }
-  return Websocket;
+  return targetRef;
 };
 export {
-  websocketOf,
-  websocketServerOf
+  applyWebsocketSignal,
+  websocketOf
 };

package/package.json

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

package/src/module.d.ts

@@ -7,44 +7,15 @@ interface DatabaseModuleCreateOptions {
     database: Database<string, any, any, any, any, any, any, any, any>;
     signal: Type;
     service: Type;
-    uses?: {
-        [key: string]: any;
-    };
-    useAsyncs?: {
-        [key: string]: () => Promise<any>;
-    };
-    providers?: Type[];
-    extended?: boolean;
 }
-export declare const databaseModuleOf: ({ constant, database, signal, service, uses, useAsyncs, providers, extended, }: DatabaseModuleCreateOptions, allSrvs: {
+export declare const databaseModuleOf: ({ constant, database, signal, service }: DatabaseModuleCreateOptions, allSrvs: {
     [key: string]: Type | undefined;
 }) => DynamicModule | null;
 interface ServiceModuleCreateOptions {
-    signal: Type;
+    signal?: Type;
     service: Type;
-    uses?: {
-        [key: string]: any;
-    };
-    useAsyncs?: {
-        [key: string]: () => Promise<any>;
-    };
-    providers?: Type[];
 }
-export declare const serviceModuleOf: ({ signal, service, uses, useAsyncs, providers }: ServiceModuleCreateOptions, allSrvs: {
-    [key: string]: Type | undefined;
-}) => DynamicModule | null;
-interface ScalarModuleCreateOptions {
-    signals: Type[];
-    uses?: {
-        [key: string]: any;
-    };
-    useAsyncs?: {
-        [key: string]: () => Promise<any>;
-    };
-    providers?: Type[];
-    enabled?: boolean;
-}
-export declare const scalarModuleOf: ({ signals, uses, useAsyncs, providers, enabled }: ScalarModuleCreateOptions, allSrvs: {
+export declare const serviceModuleOf: ({ signal, service }: ServiceModuleCreateOptions, allSrvs: {
     [key: string]: Type | undefined;
 }) => DynamicModule | null;
 interface ScalarModulesCreateOptions {
@@ -53,17 +24,6 @@ interface ScalarModulesCreateOptions {
 export declare const scalarModulesOf: ({ constants }: ScalarModulesCreateOptions, allSrvs: {
     [key: string]: Type | undefined;
 }) => DynamicModule | null;
-interface BatchModuleCreateOptions {
-    service: Type;
-    uses?: {
-        [key: string]: any;
-    };
-    useAsyncs?: {
-        [key: string]: () => Promise<any>;
-    };
-    providers?: Type[];
-}
-export declare const batchModuleOf: ({ service, uses, useAsyncs, providers, }: BatchModuleCreateOptions) => DynamicModule | null;
 interface UseGlobalsCreateOptions {
     uses?: {
         [key: string]: any;
@@ -71,9 +31,10 @@ interface UseGlobalsCreateOptions {
     useAsyncs?: {
         [key: string]: () => Promise<any>;
     };
+    providers?: Type[];
     injects?: {
         [key: string]: Type;
     };
 }
-export declare const useGlobals: ({ uses, useAsyncs, injects }: UseGlobalsCreateOptions) => DynamicModule;
+export declare const useGlobals: ({ uses, useAsyncs, providers, injects }: UseGlobalsCreateOptions) => DynamicModule;
 export {};

package/src/processor.d.ts

@@ -1,8 +1,7 @@
 import { Type } from "@akanjs/base";
-import type { Queue } from "bull";
 export declare const processorOf: (sigRef: Type, allSrvs: {
     [key: string]: Type;
 }) => {
     new (): {};
 };
-export declare const queueOf: (sigRef: Type, queue: Queue) => Queue<any>;
+export declare const applyQueueSignal: (targetRef: Type, sigRef: Type) => Type;

package/src/schema.d.ts

@@ -1,5 +1,6 @@
 import { Type } from "@akanjs/base";
 import { BaseMiddleware } from "@akanjs/document";
 import { Schema } from "mongoose";
+export declare const hasSchema: (modelRef: Type) => boolean;
 export declare const schemaOf: <Mdl, Doc, Middleware extends BaseMiddleware>(modelRef: Type<Mdl>, docRef: Type<Doc>, middleware: Type<Middleware>) => Schema<null, Mdl, Doc, undefined, null, Mdl>;
 export declare const addSchema: <Mdl, Doc, Input, Middleware extends BaseMiddleware>(modelRef: Type<Mdl>, docRef: Type<Doc>, inputRef: Type<Input>, middleware: Type<Middleware>) => Schema<null, Mdl, Doc, undefined, null, Mdl>;

package/src/websocket.d.ts

@@ -10,8 +10,6 @@ export declare const websocketOf: (sigRef: Type, allSrvs: {
         __sigRef__: Type;
     };
 };
-export declare const websocketServerOf: (sigRef: Type) => {
-    new (): {
-        server: Server;
-    };
-};
+export declare const applyWebsocketSignal: (targetRef: Type, sigRef: Type) => Type<{
+    websocket: Server;
+}>;