@wxn0brp/db-core 0.12.5 → 0.12.6

package/dist/db/multiStorage.js

@@ -8,7 +8,13 @@ export class MultiBackend extends ActionsBase {
         this.primaryBackend = backends[primaryIndex] || backends[0];
     }
     async init(...args) {
-        await Promise.all(this.backends.map(b => b.init?.(...args)));
+        for (const b of this.backends) {
+            b.adapterOpts = {
+                ...b.adapterOpts,
+                ...this.adapterOpts,
+            };
+        }
+        await Promise.all(this.backends.map(b => b.init(...args)));
     }
     async close(...args) {
         await Promise.all(this.backends.map(b => b.close(...args)));

package/dist/db/routedStorage.js

@@ -43,7 +43,16 @@ export class RoutedStorage extends ActionsBase {
         return await fn(first);
     }
     async init(...args) {
-        const all = new Set(this.rules.flatMap(r => r.backends));
+        const all = new Set([
+            ...this.rules.flatMap(r => r.backends),
+            ...this.defaultBackend,
+        ]);
+        for (const b of all) {
+            b.adapterOpts = {
+                ...b.adapterOpts,
+                ...this.adapterOpts,
+            };
+        }
         await Promise.all(Array.from(all).map(b => b.init?.(...args)));
     }
     async close(...args) {
@@ -54,14 +63,15 @@ export class RoutedStorage extends ActionsBase {
         await Promise.all(Array.from(all).map(b => b.close(...args)));
     }
     async add(config) {
-        const res = await this._withFirst(config, b => b.add(config));
-        await this._withAll({
-            ...config,
-            data: res,
-        }, b => b.add({
-            ...config,
-            data: res,
-        }));
+        const backends = this._matchBackends(config);
+        const [first, ...rest] = backends;
+        const res = await first.add(config);
+        if (rest.length > 0) {
+            await Promise.all(rest.map(b => b.add({
+                ...config,
+                data: res,
+            })));
+        }
         return res;
     }
     async find(config) {
@@ -92,7 +102,10 @@ export class RoutedStorage extends ActionsBase {
         return this._withAll(collection, b => b.removeCollection(collection), true);
     }
     async getCollections() {
-        const all = await Promise.all(Array.from(new Set(this.rules.flatMap(r => r.backends))).map(b => b.getCollections()));
+        const all = await Promise.all(Array.from(new Set([
+            ...this.rules.flatMap(r => r.backends),
+            ...this.defaultBackend,
+        ])).map(b => b.getCollections()));
         const merged = new Set(all.flat());
         return Array.from(merged);
     }

package/dist/db/valthera.d.ts

@@ -26,7 +26,7 @@ export declare class ValtheraClass implements ValtheraCompatible {
     version: string;
     _plugins: ValtheraPlugin[];
     _collections: Map<string, Collection<any>>;
-    plugin(p: ValtheraPlugin): () => void;
+    plugin(p: ValtheraPlugin, collections?: string[] | string): () => void;
     constructor(options: DbOpts);
     init(...args: any[]): Promise<any>;
     close(...args: any[]): Promise<any>;

package/dist/db/valthera.js

@@ -17,7 +17,14 @@ export class ValtheraClass {
     version = version;
     _plugins = [];
     _collections = new Map();
-    plugin(p) {
+    plugin(p, collections) {
+        if (collections) {
+            p.collections = Array.isArray(collections)
+                ? collections
+                : [
+                    collections,
+                ];
+        }
         p.init?.(this);
         this._plugins.push(p);
         return () => {
@@ -29,15 +36,13 @@ export class ValtheraClass {
     constructor(options) {
         this.options = options;
         this.executor = options.executor || new SmartExecutor(undefined, false);
-        if (typeof options.adapter === "function")
-            return;
-        else {
+        options.executorAware ??= true;
+        if (typeof options.adapter !== "function") {
             this.adapter = options.adapter;
             if (options.adapterOpts) {
                 this.adapter.adapterOpts = options.adapterOpts;
             }
         }
-        options.executorAware ??= true;
     }
     async init(...args) {
         if (this.adapter?._inited)
@@ -65,11 +70,11 @@ export class ValtheraClass {
         });
     }
     async close(...args) {
-        if (!this.adapter._inited)
+        if (!this.adapter?._inited)
             return;
         const self = this;
         return await this.executor.addOp(async () => {
-            if (!self.adapter._inited)
+            if (!self.adapter?._inited)
                 return;
             await self.adapter.close(...args);
             self.adapter._inited = false;
@@ -79,7 +84,8 @@ export class ValtheraClass {
         await this.init();
         if (txHandle && typeof query === "object")
             query.transaction = txHandle;
-        const plugins = this._plugins;
+        const collection = typeof query === "string" ? query : query.collection;
+        const plugins = this._plugins.filter(p => !p.collections || p.collections.includes(collection));
         const self = this;
         let idx = 0;
         const ctx = {

package/dist/helpers/forge.js

@@ -1,13 +1,10 @@
-import { Collection } from "./collection.js";
 export function forgeTypedValthera(target) {
     return new Proxy(target, {
         get(target, prop, receiver) {
             if (prop in target) {
                 return Reflect.get(target, prop, receiver);
             }
-            const collection = new Collection(target, prop);
-            target[prop] = collection;
-            return collection;
+            return target.c(prop);
         },
         set(target, prop, value, receiver) {
             return Reflect.set(target, prop, value, receiver);

package/dist/helpers/relation.js

@@ -88,6 +88,7 @@ export async function processRelations(dbs, cfg, data, parentList = null) {
                         [fk]: keys,
                     },
                 },
+                dbFindOpts,
                 findOpts: {
                     select: selectSafe,
                 },
@@ -180,6 +181,7 @@ export async function processRelations(dbs, cfg, data, parentList = null) {
             const allTargetIds = [
                 ...new Set(allPivots.map(p => p[through.fk])),
             ];
+            const [selectSafe, deleteSelect] = autoSelect(rel, fk);
             const allRelated = await db.find({
                 collection,
                 search: {
@@ -187,8 +189,9 @@ export async function processRelations(dbs, cfg, data, parentList = null) {
                         [fk]: allTargetIds,
                     },
                 },
+                dbFindOpts,
                 findOpts: {
-                    select,
+                    select: selectSafe,
                 },
             });
             const targetMap = new Map(allRelated.map(r => [
@@ -203,6 +206,9 @@ export async function processRelations(dbs, cfg, data, parentList = null) {
                     await Promise.all(related.map(row => processRelations(dbs, rel.relations, row)));
                 }
             }
+            if (deleteSelect)
+                for (const r of allRelated)
+                    delete r[fk];
         }
         else if (type === "n1") {
             const allFkIds = [
@@ -221,6 +227,7 @@ export async function processRelations(dbs, cfg, data, parentList = null) {
                             [fk]: allFkIds,
                         },
                     },
+                    dbFindOpts,
                     findOpts: {
                         select: selectSafe,
                     },

package/dist/types/plugin.d.ts

@@ -8,4 +8,5 @@ export interface ValtheraPlugin {
     name: string;
     execute(ctx: PluginContext): Promise<any>;
     init?: (db: ValtheraClass) => void;
+    collections?: string[];
 }

package/dist/utils/hasFieldsAdvanced.js

@@ -53,14 +53,16 @@ function mainCheck(obj, fields) {
         in: (data, value) => value.includes(data),
         nin: (data, value) => !value.includes(data),
         type: (data, value) => typeof data === value,
-        exists: (_, shouldExist, key) => {
-            if (shouldExist && !(key in obj))
+        exists: (targetObj, shouldExist, key) => {
+            if (shouldExist && !(key in targetObj))
                 return false;
-            if (!shouldExist && key in obj)
+            if (!shouldExist && key in targetObj)
                 return false;
             return true;
         },
         regex: (data, regexData) => {
+            if (typeof data !== "string")
+                return false;
             const regex = typeof regexData === "string" ? new RegExp(regexData) : regexData;
             return regex.test(data);
         },
@@ -101,30 +103,48 @@ function _for(fields, obj, opts) {
             continue;
         for (const [key, val] of Object.entries(value)) {
             const targetValue = obj?.[key];
-            if (typeof val === "object" && val !== null && !Array.isArray(val)) {
-                if (!deepCheck(val, targetValue, fieldFn))
+            if (typeof val === "object" &&
+                val !== null &&
+                !Array.isArray(val) &&
+                !(val instanceof RegExp)) {
+                if (!deepCheck(val, targetValue, fieldFn, fieldRaw))
                     return false;
             }
             else {
-                if (!fieldFn(targetValue, val, key))
-                    return false;
+                if (fieldRaw === "exists") {
+                    if (!fieldFn(obj, val, key))
+                        return false;
+                }
+                else {
+                    if (!fieldFn(targetValue, val, key))
+                        return false;
+                }
             }
         }
     }
     return true;
 }
-function deepCheck(valueObj, targetObj, fieldFn) {
+function deepCheck(valueObj, targetObj, fieldFn, fieldRaw) {
     if (typeof targetObj !== "object" || targetObj === null)
         return false;
     for (const [k, v] of Object.entries(valueObj)) {
         const targetValue = targetObj[k];
-        if (typeof v === "object" && v !== null && !Array.isArray(v)) {
-            if (!deepCheck(v, targetValue, fieldFn))
+        if (typeof v === "object" &&
+            v !== null &&
+            !Array.isArray(v) &&
+            !(v instanceof RegExp)) {
+            if (!deepCheck(v, targetValue, fieldFn, fieldRaw))
                 return false;
         }
         else {
-            if (!fieldFn(targetValue, v, k))
-                return false;
+            if (fieldRaw === "exists") {
+                if (!fieldFn(targetObj, v, k))
+                    return false;
+            }
+            else {
+                if (!fieldFn(targetValue, v, k))
+                    return false;
+            }
         }
     }
     return true;

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const version = "0.12.5";
+export declare const version = "0.12.6";

package/dist/version.js

@@ -1 +1 @@
-export const version = "0.12.5";
+export const version = "0.12.6";

package/package.json

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