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

package/dist/customFileCpu.js

@@ -1,6 +1,6 @@
 import { matchObj, findObj, updateObj } from "./utils/process.js";
 export function pathRepair(path) {
-    return path.replaceAll("//", "/");
+    return path.replace(/\/+/g, "/");
 }
 export class CustomFileCpu {
     _readFile;

package/dist/db/memory.js

@@ -40,7 +40,7 @@ export class MemoryAction extends CustomActionsBase {
 }
 export class ValtheraMemory extends ValtheraClass {
     constructor(...args) {
-        super({ dbAction: new MemoryAction() });
+        super({ adapter: new MemoryAction() });
     }
 }
 export function createMemoryValthera(data) {
@@ -48,7 +48,7 @@ export function createMemoryValthera(data) {
     if (!data)
         return forgeValthera(db);
     for (const collection of Object.keys(data)) {
-        db.dbAction.memory.set(collection, data[collection]);
+        db.adapter.memory.set(collection, data[collection]);
     }
     return forgeValthera(db);
 }

package/dist/db/valthera.d.ts

@@ -12,7 +12,7 @@ import { ValtheraCompatible } from "../types/valthera.js";
  */
 export declare class ValtheraClass implements ValtheraCompatible {
     options: DbOpts;
-    dbAction: ActionsBase;
+    adapter: ActionsBase;
     executor: ExecutorInterface;
     emitter: VEE<{
         [K in keyof ValtheraCompatible]: (query: VQuery, result: Awaited<ReturnType<ValtheraCompatible[K]>>) => void;
@@ -39,6 +39,10 @@ export declare class ValtheraClass implements ValtheraCompatible {
         "*": (name: keyof ValtheraCompatible, query: VQuery, result: any) => void;
     }>;
     version: string;
+    /** @deprecated use `adapter` */
+    get dbAction(): ActionsBase;
+    /** @deprecated use `adapter` */
+    set dbAction(action: ActionsBase);
     constructor(options: DbOpts);
     init(...args: any[]): Promise<any>;
     close(...args: any[]): Promise<any>;

package/dist/db/valthera.js

@@ -8,52 +8,62 @@ import { version } from "../version.js";
  */
 export class ValtheraClass {
     options;
-    dbAction;
+    adapter;
     executor;
     emitter = new VEE();
     /** @deprecated typo */
     emiter = this.emitter;
     version = version;
+    /** @deprecated use `adapter` */
+    get dbAction() {
+        return this.adapter;
+    }
+    /** @deprecated use `adapter` */
+    set dbAction(action) {
+        this.adapter = action;
+    }
     constructor(options) {
         this.options = options;
         this.executor = options.executor || new SmartExecutor(undefined, false);
-        if (typeof options.dbAction === "function")
+        options.adapter ??= options.dbAction;
+        options.dbAction ??= options.adapter;
+        if (typeof options.adapter === "function")
             return;
         else
-            this.dbAction = options.dbAction;
+            this.adapter = options.adapter;
     }
     async init(...args) {
-        if (this.dbAction?._inited)
+        if (this.adapter?._inited)
             return;
         const self = this;
         return await this.executor.addOp(async () => {
-            if (self.dbAction?._inited)
+            if (self.adapter?._inited)
                 return;
-            if (typeof self.options.dbAction === "function")
-                self.dbAction = await self.options.dbAction();
+            if (typeof self.options.adapter === "function")
+                self.adapter = await self.options.adapter();
             // if the executor is not set, and the action wants a smart executor
-            if (!self.options.executor && self.dbAction.smartExecutor && self.executor instanceof SmartExecutor)
+            if (!self.options.executor && self.adapter.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;
+                self.adapter.numberId = true;
+            await self.adapter.init(...args);
+            self.adapter._inited = true;
         });
     }
     async close(...args) {
-        if (!this.dbAction._inited)
+        if (!this.adapter._inited)
             return;
         const self = this;
         return await this.executor.addOp(async () => {
-            if (!self.dbAction._inited)
+            if (!self.adapter._inited)
                 return;
-            await self.dbAction.close(...args);
-            self.dbAction._inited = false;
+            await self.adapter.close(...args);
+            self.adapter._inited = false;
         });
     }
     async execute(name, query) {
         await this.init();
-        const result = await this.executor.addOp(this.dbAction[name].bind(this.dbAction), query, typeof query === "string" ? query : query.collection);
+        const result = await this.executor.addOp(this.adapter[name].bind(this.adapter), query, typeof query === "string" ? query : query.collection);
         this.emitter.emit(name, query, result);
         return result;
     }

package/dist/helpers/executor.js

@@ -27,9 +27,8 @@ export class Executor {
             return;
         this.isExecuting = true;
         while (this.queue.length > 0) {
-            let q = this.queue.shift();
-            let res = await q.func(...q.param);
-            q.resolve(res);
+            const q = this.queue.shift();
+            await q.func(...q.param).then(q.resolve).catch(q.reject);
         }
         this.isExecuting = false;
     }

package/dist/types/options.d.ts

@@ -1,11 +1,20 @@
 import { ActionsBase } from "../base/actions.js";
 import { Executor } from "../helpers/executor.js";
 import { KeysMatching } from "./utils.js";
-export interface DbOpts {
-    dbAction: ActionsBase | (() => Promise<ActionsBase>);
+export type AdapterValue = ActionsBase | (() => Promise<ActionsBase>);
+type AdapterOption = {
+    adapter: AdapterValue;
+    /** @deprecated use `adapter` */
+    dbAction?: AdapterValue;
+} | {
+    adapter?: AdapterValue;
+    /** @deprecated use `adapter` */
+    dbAction: AdapterValue;
+};
+export type DbOpts = AdapterOption & {
     executor?: Executor;
     numberId?: boolean;
-}
+};
 export interface DbFindOpts<T = any> {
     reverse?: boolean;
     limit?: number;
@@ -23,3 +32,4 @@ export interface FindOpts<T = any> {
     exclude?: KeysMatching<T, any>[];
     transform?: Function;
 }
+export {};

package/dist/version.js

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

package/package.json

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