@wxn0brp/db-core 0.11.3 → 0.11.4-alpha.1

package/dist/db/valthera.d.ts

@@ -11,6 +11,7 @@ import { ValtheraCompatible } from "../types/valthera.js";
  * @class
  */
 export declare class ValtheraClass implements ValtheraCompatible {
+    options: DbOpts;
     dbAction: ActionsBase;
     executor: ExecutorInterface;
     emitter: VEE<{

package/dist/db/valthera.js

@@ -1,12 +1,13 @@
 import { VEE } from "@wxn0brp/event-emitter";
 import { Collection } from "../helpers/collection.js";
-import { Executor, SmartExecutor } from "../helpers/executor.js";
+import { SmartExecutor } from "../helpers/executor.js";
 import { version } from "../version.js";
 /**
  * Represents a database management class for performing CRUD operations.
  * @class
  */
 export class ValtheraClass {
+    options;
     dbAction;
     executor;
     emitter = new VEE();
@@ -14,18 +15,27 @@ export class ValtheraClass {
     emiter = this.emitter;
     version = version;
     constructor(options) {
-        this.dbAction = options.dbAction;
-        this.executor = options.executor || new (this.dbAction.smartExecutor ? SmartExecutor : Executor)();
-        if (options.numberId)
-            this.dbAction.numberId = true;
+        this.options = options;
+        this.executor = options.executor || new SmartExecutor(undefined, false);
+        if (typeof options.dbAction === "function")
+            return;
+        else
+            this.dbAction = options.dbAction;
     }
     async init(...args) {
-        if (this.dbAction._inited)
+        if (this.dbAction?._inited)
             return;
         const self = this;
         return await this.executor.addOp(async () => {
-            if (self.dbAction._inited)
+            if (self.dbAction?._inited)
                 return;
+            if (typeof self.options.dbAction === "function")
+                self.dbAction = await self.options.dbAction();
+            // if the executor is not set, and the action wants a smart executor
+            if (!self.options.executor && self.dbAction.smartExecutor && self.executor instanceof SmartExecutor)
+                self.executor.aware = true;
+            if (self.options.numberId)
+                self.dbAction.numberId = true;
             await self.dbAction.init(...args);
             self.dbAction._inited = true;
         });

package/dist/helpers/executor.d.ts

@@ -31,8 +31,9 @@ export declare class Executor implements ExecutorInterface {
  */
 export declare class SmartExecutor implements ExecutorInterface {
     ttl: number;
+    aware: boolean;
     collections: Map<string, SmartExecutorEntry>;
-    constructor(ttl?: number);
+    constructor(ttl?: number, aware?: boolean);
     addOp(func: Function, query: any, collection: string): Promise<any>;
     scheduleCleanup(key: string, entry: SmartExecutorEntry): number;
 }

package/dist/helpers/executor.js

@@ -1,3 +1,4 @@
+const defaultCollection = "__default__";
 /**
  * A simple executor for queuing and executing asynchronous operations sequentially.
  */
@@ -38,12 +39,16 @@ export class Executor {
  */
 export class SmartExecutor {
     ttl;
+    aware;
     collections = new Map();
-    constructor(ttl = 5 * 60 * 1000) {
+    constructor(ttl = 5 * 60 * 1000, aware = true) {
         this.ttl = ttl;
+        this.aware = aware;
     }
     async addOp(func, query, collection) {
-        const key = collection ?? "__default__";
+        const key = this.aware ?
+            collection ?? defaultCollection :
+            defaultCollection;
         let entry = this.collections.get(key);
         if (!entry) {
             entry = {

package/dist/types/options.d.ts

@@ -2,7 +2,7 @@ import { ActionsBase } from "../base/actions.js";
 import { Executor } from "../helpers/executor.js";
 import { KeysMatching } from "./utils.js";
 export interface DbOpts {
-    dbAction: ActionsBase;
+    dbAction: ActionsBase | (() => Promise<ActionsBase>);
     executor?: Executor;
     numberId?: boolean;
 }

package/dist/version.js

@@ -1 +1 @@
-export const version = "0.11.3";
+export const version = "0.11.4-alpha.1";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wxn0brp/db-core",
-  "version": "0.11.3",
+  "version": "0.11.4-alpha.1",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "author": "wxn0brP",