corebasic 1.0.231 → 1.0.233

package/libs/dip/suffix/tests/policy.applySuffixPolicy.test.ts

@@ -2,6 +2,8 @@ import { describe, test } from "node:test";
 import assert from "node:assert/strict";
 import {applySuffixPolicy} from "../policy.ts";
 
+let insertMode = false
+const arg = {db: "test-db", collection: ["test-collection"]}
 // -----------------------------------------------------------------------------
 // applySuffixPolicy()
 // -----------------------------------------------------------------------------
@@ -10,7 +12,7 @@ describe("applySuffixPolicy()", () => {
     test("no collection", async () => {
         const collections = {};
 
-        const result = await applySuffixPolicy(collections, "missing", {});
+        const result = await applySuffixPolicy(collections, "missing", {}, insertMode, arg);
 
         assert.deepEqual(result, []);
     });
@@ -20,7 +22,7 @@ describe("applySuffixPolicy()", () => {
             invoices: {}
         };
 
-        const result = await applySuffixPolicy(collections, "invoices", {});
+        const result = await applySuffixPolicy(collections, "invoices", {}, insertMode, arg);
 
         assert.deepEqual(result, []);
     });
@@ -32,7 +34,7 @@ describe("applySuffixPolicy()", () => {
             }
         };
 
-        const result = await applySuffixPolicy(collections, "invoices", {});
+        const result = await applySuffixPolicy(collections, "invoices", {}, insertMode, arg);
 
         assert.deepEqual(result, []);
     });
@@ -48,13 +50,7 @@ describe("applySuffixPolicy()", () => {
             }
         };
 
-        const result = await applySuffixPolicy(
-            collections as any,
-            "invoices",
-            {
-                type: "Sales"
-            }
-        );
+        const result = await applySuffixPolicy(collections as any, "invoices", {type: "Sales"}, insertMode, arg);
 
         assert.deepEqual(result, [
             "/Sales"
@@ -74,17 +70,8 @@ describe("applySuffixPolicy()", () => {
             }
         };
 
-        const result = await applySuffixPolicy(
-            collections as any,
-            "invoices",
-            {
-                type: "Sales"
-            }
-        );
-
-        assert.deepEqual(result, [
-            "/Sales"
-        ]);
+        const result = await applySuffixPolicy(collections as any, "invoices", { type: "Sales" }, insertMode, arg);
+        assert.deepEqual(result, ["/Sales"]);
     });
 
     test("unconditional policy", async () => {
@@ -99,13 +86,7 @@ describe("applySuffixPolicy()", () => {
             }
         };
 
-        const result = await applySuffixPolicy(
-            collections as any,
-            "invoices",
-            {
-                type: "Sales"
-            }
-        );
+        const result = await applySuffixPolicy(collections as any, "invoices", {type: "Sales"}, insertMode, arg);
 
         assert.deepEqual(result, [
             "/Sales"
@@ -126,14 +107,7 @@ describe("applySuffixPolicy()", () => {
             }
         };
 
-        const result = await applySuffixPolicy(
-            collections as any,
-            "invoices",
-            {
-                status: "Active",
-                type: "Sales"
-            }
-        );
+        const result = await applySuffixPolicy(collections as any, "invoices", {status: "Active", type: "Sales"}, insertMode, arg);
 
         assert.deepEqual(result, [
             "/Sales"
@@ -154,14 +128,7 @@ describe("applySuffixPolicy()", () => {
             }
         };
 
-        const result = await applySuffixPolicy(
-            collections as any,
-            "invoices",
-            {
-                status: "Deleted",
-                type: "Sales"
-            }
-        );
+        const result = await applySuffixPolicy(collections as any, "invoices", {status: "Deleted", type: "Sales"}, insertMode, arg);
 
         assert.deepEqual(result, []);
     });
@@ -180,14 +147,7 @@ describe("applySuffixPolicy()", () => {
             }
         };
 
-        const result = await applySuffixPolicy(
-            collections as any,
-            "invoices",
-            {
-                status: {$in: ["Active", "Pending"]},
-                type: "Sales"
-            }
-        );
+        const result = await applySuffixPolicy(collections as any, "invoices", {status: {$in: ["Active", "Pending"]}, type: "Sales"}, insertMode, arg);
 
         assert.deepEqual(result, [
             "/Sales"
@@ -218,15 +178,7 @@ describe("applySuffixPolicy()", () => {
             }
         };
 
-        const result = await applySuffixPolicy(
-            collections as any,
-            "invoices",
-            {
-                status: "Active",
-                type: "Sales",
-                region: "IN"
-            }
-        );
+        const result = await applySuffixPolicy(collections as any, "invoices", {status: "Active", type: "Sales", region: "IN"}, insertMode, arg);
 
         assert.deepEqual(
             result.sort(),
@@ -261,15 +213,7 @@ describe("applySuffixPolicy()", () => {
             }
         };
 
-        const result = await applySuffixPolicy(
-            collections as any,
-            "invoices",
-            {
-                status: "Active",
-                type: "Sales",
-                region: "IN"
-            }
-        );
+        const result = await applySuffixPolicy(collections as any, "invoices", {status: "Active", type: "Sales", region: "IN"}, insertMode, arg);
 
         assert.deepEqual(result, [
             "/Sales"
@@ -294,13 +238,7 @@ describe("applySuffixPolicy()", () => {
             }
         };
 
-        const result = await applySuffixPolicy(
-            collections as any,
-            "invoices",
-            {
-                type: "Sales"
-            }
-        );
+        const result = await applySuffixPolicy(collections as any, "invoices", {type: "Sales"}, insertMode, arg);
 
         assert.deepEqual(result, [
             "/Sales"
@@ -321,13 +259,7 @@ describe("applySuffixPolicy()", () => {
             }
         };
 
-        const result = await applySuffixPolicy(
-            collections as any,
-            "invoices",
-            {
-                date: new Date(2026, 4, 3).getTime()
-            }
-        );
+        const result = await applySuffixPolicy(collections as any, "invoices", {date: new Date(2026, 4, 3).getTime()}, insertMode, arg);
 
         assert.deepEqual(result, [
             "/2026"
@@ -349,14 +281,7 @@ describe("applySuffixPolicy()", () => {
             }
         };
 
-        const result = await applySuffixPolicy(
-            collections as any,
-            "invoices",
-            {
-                type: "Sales",
-                date: new Date(2026, 4, 3).getTime()
-            }
-        );
+        const result = await applySuffixPolicy(collections as any, "invoices", {type: "Sales", date: new Date(2026, 4, 3).getTime()}, insertMode, arg);
 
         assert.deepEqual(result, [
             "/Sales/2026"
@@ -379,16 +304,7 @@ describe("applySuffixPolicy()", () => {
             }
         };
 
-        const result = await applySuffixPolicy(
-            collections as any,
-            "invoices",
-            {
-                age: {
-                    $gt: 20
-                },
-                type: "Sales"
-            }
-        );
+        const result = await applySuffixPolicy(collections as any, "invoices", {age: {$gt: 20}, type: "Sales"}, insertMode, arg);
 
         assert.deepEqual(result, [
             "/Sales"
@@ -411,16 +327,7 @@ describe("applySuffixPolicy()", () => {
             }
         };
 
-        const result = await applySuffixPolicy(
-            collections as any,
-            "invoices",
-            {
-                age: {
-                    $lt: 10
-                },
-                type: "Sales"
-            }
-        );
+        const result = await applySuffixPolicy(collections as any, "invoices", {age: {$lt: 10}, type: "Sales"}, insertMode, arg);
 
         assert.deepEqual(result, []);
     });
@@ -442,14 +349,7 @@ describe("applySuffixPolicy()", () => {
         };
 
         await assert.rejects(async () => {
-            await applySuffixPolicy(
-                collections as any,
-                "invoices",
-                {
-                    status: "Active",
-                    type: "Sales"
-                }
-            );
+            await applySuffixPolicy(collections as any, "invoices", {status: "Active", type: "Sales"}, insertMode, arg);
         });
     });
 
@@ -467,17 +367,7 @@ describe("applySuffixPolicy()", () => {
             }
         };
 
-        const result = await applySuffixPolicy(
-            collections as any,
-            "invoices",
-            {
-                age: {
-                    $gt: 5,
-                    $lt: 15
-                },
-                type: "Sales"
-            }
-        );
+        const result = await applySuffixPolicy(collections as any, "invoices", {age: {$gt: 5, $lt: 15}, type: "Sales"}, insertMode, arg);
 
         assert.deepEqual(result, [
             "/Sales"
@@ -498,17 +388,7 @@ describe("applySuffixPolicy()", () => {
             }
         };
 
-        const result = await applySuffixPolicy(
-            collections as any,
-            "invoices",
-            {
-                age: {
-                    $gt: 5,
-                    $lt: 15
-                },
-                type: "Sales"
-            }
-        );
+        const result = await applySuffixPolicy(collections as any, "invoices", {age: {$gt: 5,$lt: 15}, type: "Sales"}, insertMode, arg);
 
         assert.deepEqual(result, []);
     });
@@ -530,14 +410,7 @@ describe("applySuffixPolicy()", () => {
             }
         };
 
-        const result = await applySuffixPolicy(
-            collections as any,
-            "invoices",
-            {
-                age: { $in: [10] },
-                type: "Sales"
-            }
-        );
+        const result = await applySuffixPolicy(collections as any, "invoices", {age: { $in: [10] }, type: "Sales"}, insertMode, arg);
 
         assert.deepEqual(result, [
             "/Sales"
@@ -561,14 +434,7 @@ describe("applySuffixPolicy()", () => {
             }
         };
 
-        const result = await applySuffixPolicy(
-            collections as any,
-            "invoices",
-            {
-                age: { $in: [10] },
-                type: "Sales"
-            }
-        );
+        const result = await applySuffixPolicy(collections as any, "invoices", {age: { $in: [10] }, type: "Sales"}, insertMode, arg);
 
         assert.deepEqual(result, []);
     });
@@ -590,17 +456,7 @@ describe("applySuffixPolicy()", () => {
             }
         };
 
-        const result = await applySuffixPolicy(
-            collections as any,
-            "invoices",
-            {
-                age: {
-                    $gt: 20,
-                    $lt: 40
-                },
-                type: "Sales"
-            }
-        );
+        const result = await applySuffixPolicy(collections as any, "invoices",{age: {$gt: 20, $lt: 40}, type: "Sales"}, insertMode, arg);
 
         assert.deepEqual(result, [
             "/Sales"
@@ -624,17 +480,7 @@ describe("applySuffixPolicy()", () => {
             }
         };
 
-        const result = await applySuffixPolicy(
-            collections as any,
-            "invoices",
-            {
-                age: {
-                    $gt: 10,
-                    $lt: 20
-                },
-                type: "Sales"
-            }
-        );
+        const result = await applySuffixPolicy(collections as any, "invoices", {age: {$gt: 10, $lt: 20}, type: "Sales"}, insertMode, arg);
 
         assert.deepEqual(result, []);
     });

package/libs/dip/suffix/tests/policy.test.ts

@@ -1,6 +1,6 @@
 import { describe, test } from "node:test";
 import assert from "node:assert/strict";
-import {matchPolicy, overlaps, contains, intersects, applySuffixPolicy} from "../policy.ts";
+import {matchPolicy, overlaps, contains, intersects} from "../policy.ts";
 
 const defaultBounds = {values: [], from: -Infinity, to: Infinity, fromOp: "$gte", toOp: "$lte"}
 

package/libs/dip.ts

@@ -18,6 +18,8 @@ export const companyMeta = Elabase.companyMeta
 export const outletMeta = Elabase.outletMeta
 export const customMeta = Elabase.customMeta
 export const schema = Elabase.schema
+export type DipMeta = Elabase.DipMeta;
+export const DipMeta = Elabase.DipMeta;
 export const isDipMeta = Elabase.isDipMeta
 export const excludeCollectionConfig = Elabase.excludeCollectionConfig
 export const includeCollectionConfig = Elabase.includeCollectionConfig
@@ -62,14 +64,14 @@ export const IdempotentDip = (): IdempotentDip => {
     }
 
     idip.insert = async function (collection, query, data) {
-        await Elabase.update(state.meta, collection, query, { $setOnInsert: data }, {upsert: true})
+        await Elabase.update(state.meta!, collection, query, { $setOnInsert: data }, {upsert: true})
     }
 
     idip.update = async function (collection, query, data, rollback) {
         let token = { [state.txn]: true }
         let idempotent = { [state.txn]: { $exists: rollback ?? false } }
-        let result = await Elabase.update(state.meta, collection, {...query, ...idempotent}, {...data, $setOnInsert: undefined, $set: {...(data.$set ?? {}), ...token} })
-        return result.count ? true : (await Elabase.query(state.meta, collection, {...query, ...idempotent})).length
+        let result = await Elabase.update(state.meta!, collection, {...query, ...idempotent}, {...data, $setOnInsert: undefined, $set: {...(data.$set ?? {}), ...token} })
+        return result.count ? true : (await Elabase.query(state.meta!, collection, {...query, ...idempotent})).length
     }
 
     idip.upsert = async function (collection, query, data, rollback) {
@@ -78,11 +80,11 @@ export const IdempotentDip = (): IdempotentDip => {
     }
 
     idip.cleanup = async function (collection, query) {
-        await Elabase.update(state.meta, collection, query, { $unset: { [state.txn]: true } })
+        await Elabase.update(state.meta!, collection, query, { $unset: { [state.txn]: true } })
     }
 
     idip.finish = async function () {
-        return await Elabase.update(state.meta, "txns",{_id: state.txn}, {}, {upsert: true})
+        return await Elabase.update(state.meta!, "txns",{_id: state.txn}, {}, {upsert: true})
     }
 
     return idip

package/libs/dipper.ts

@@ -6,7 +6,6 @@ import axios from 'axios'
 type DipperIdQuery = string | string[] | { $in: string[] }
 
 type DipperArg = {
-    mode: string
     query?: {
         _id?: DipperIdQuery
     }
@@ -25,16 +24,16 @@ function hashStr(str: string) {
     return hash;
 }
 
-function hash(string: string, digits: number) {
-    digits = digits || 6;
-    var m = Math.pow(10, digits+1) - 1;
-    var phi = Math.pow(10, digits) / 2 - 1;
-    var n = 0;
-    for (var i = 0; i < string.length; i++) {
-      n = (n + phi * string.charCodeAt(i)) % m;
-    }
-    return n.toString();
-}
+// function hash(string: string, digits: number) {
+//     digits = digits || 6;
+//     var m = Math.pow(10, digits+1) - 1;
+//     var phi = Math.pow(10, digits) / 2 - 1;
+//     var n = 0;
+//     for (var i = 0; i < string.length; i++) {
+//       n = (n + phi * string.charCodeAt(i)) % m;
+//     }
+//     return n.toString();
+// }
 let shards: string[] = []
 let shardCount = 20
 
@@ -67,6 +66,8 @@ async function postDip(url: string | URL, arg: unknown) {
 
 export default async function dipper(arg: DipperArg) {
 
+    const mode: string = arg.insert || arg.update || arg.delete ? "query" : "command" // TODO: batch
+
     let result = []
 
     let _id = arg.query?._id ?? arg.insert?._id ?? undefined
@@ -90,12 +91,12 @@ export default async function dipper(arg: DipperArg) {
        }
     }
 
-    if (arg.mode ===  "query")
+    if (mode ===  "query")
         result = result.reduce( (partial, item) =>  partial.concat(item), [])
 
 
 
-    return arg.mode ===  "query" ? result : result[0]
+    return mode ===  "query" ? result : result[0]
 }