datafolder 1.0.16 → 1.0.17

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "datafolder",
-	"version": "1.0.16",
+	"version": "1.0.17",
 	"author": {
 		"name": "lysh",
 		"email": "datafolderdev@outlook.com"

package/src/QyAcl.js

@@ -2,7 +2,7 @@ import h from "node:fs/promises";
 
 import {
     mergeContent as g,
-    mergeContentChanges as s,
+    mergeChanges as s,
     setValByNamePath as a
 } from "./QyFileContentUtils.js";
 

package/src/QyFileContentUtils.d.ts

@@ -1,5 +1,5 @@
 export declare function mergeContent(oldContent: any, newContent: any): any;
-export declare function mergeContentChanges(oldChanges: any, newChanges: any): any;
+export declare function mergeChanges(oldChanges: any, newChanges: any): any;
 export declare function mergeContentAndGenDelta(oldContent: any, newContent: any): {
     merged: any;
     delta: any;
@@ -7,5 +7,5 @@ export declare function mergeContentAndGenDelta(oldContent: any, newContent: any
 export declare function setValByNamePath(rootObj: any, namePath: any, value: any): any;
 export declare function getValByNamePath(obj: any, namePath: any): any;
 export declare function delValByNamePath(obj: any, propPath: any, keepEmptyObj?: boolean, idx?: number): any;
-export declare function cleanContent(obj: any, shouldCleanMark?: boolean, strict?: boolean): any;
+export declare function cleanContent(obj: any, shouldCleanMark?: boolean): any;
 export declare function objToDelMarks(obj: any): any;

package/src/QyFileContentUtils.js

@@ -1,5 +1,5 @@
 import {
-    isNotNullObj as a,
+    isNotNullObj as f,
     trimArrayTail as g,
     isSimpleType as h,
     SpecialOperators as r,
@@ -12,7 +12,7 @@ let p = Array.isArray, {
     $ext: y
 } = r;
 
-function f(r, n) {
+function a(r, n) {
     if (null == n) return r;
     if (n !== m) {
         if (h(n)) return n;
@@ -22,7 +22,7 @@ function f(r, n) {
         if (r != n) {
             var l, t = p(r);
             for (l in n) {
-                var u = f(r[l], n[l]);
+                var u = a(r[l], n[l]);
                 null == u ? (delete r[l], t && g(r)) : r[l] = u;
             }
         }
@@ -34,7 +34,7 @@ function o(r, n) {
     if (n == m) return m;
     if (null != n[w]) return n;
     var e = r[w];
-    if (null != e) r[w] = f(e, n); else {
+    if (null != e) r[w] = a(e, n); else {
         if (r == m) return {
             [w]: O(n)
         };
@@ -53,8 +53,7 @@ function n(r, n) {
         newValue: {}
     };
     r = S(r, n, [], 0, e);
-    return e.oldValue = O(e.oldValue, !0, !0), e.newValue = O(e.newValue, !1, !1), 
-    {
+    return e.oldValue = O(e.oldValue, !0), e.newValue = O(e.newValue, !1), {
         merged: r,
         delta: e = e.oldValue || e.newValue ? e : void 0
     };
@@ -65,7 +64,7 @@ function t(r, n, e) {
     let l = r;
     for (let r = 0; r < n.length - 1; ++r) {
         var t = n[r];
-        a(l[t]) || (l[t] = {}), l = l[t];
+        f(l[t]) || (l[t] = {}), l = l[t];
     }
     var u = n.at(-1);
     return void 0 === e ? delete l[u] : l[u] = e, r;
@@ -83,7 +82,7 @@ function v(r, n, e = !1, l = 0) {
     var t = n[l];
     if (l == n.length - 1) return delete r[t], !e && i(r) ? void 0 : r;
     var u = r[t];
-    if (a(u)) {
+    if (f(u)) {
         u = v(u, n, e, l + 1);
         if (null == u && !e) return delete r[t], i(r) ? void 0 : r;
         r[t] = u;
@@ -91,25 +90,24 @@ function v(r, n, e = !1, l = 0) {
     return r;
 }
 
-function O(r, n = !0, e = !1) {
-    return function e(l, t, u) {
+function O(r, n = !0) {
+    return function e(l, t) {
         if (l instanceof Date) return l.toISOString();
-        if (!a(l)) return (u ? void 0 === l : null == l) || t && l === m ? void 0 : l;
+        if (!f(l)) return t && l === m ? void 0 : l;
         if (t) {
             let r = l[w];
-            if (null != r) return e(r, t, u);
+            if (null != r) return e(r, t);
             let n = l[y];
-            if (null != n) return e(p(n) ? n : [ n ], t, u);
+            if (null != n) return e(p(n) ? n : [ n ], t);
         }
         let n = p(l);
-        let i = !0;
-        for (var f in l) {
-            let r = e(l[f], t, u);
-            (u ? void 0 === r : null == r) ? (delete l[f], n && g(l)) : (l[f] = r, 
-            i = !1);
+        let u = !0;
+        for (var i in l) {
+            let r = e(l[i], t);
+            void 0 === r ? (delete l[i], n && g(l)) : (l[i] = r, u = !1);
         }
-        return i ? void 0 : l;
-    }(r, n, e);
+        return u ? void 0 : l;
+    }(r, n);
 }
 
 function l(r) {
@@ -122,8 +120,8 @@ function l(r) {
 }
 
 function S(n, e, l, t, u) {
-    if (null == e) return n;
-    if (e !== m) {
+    if (void 0 === e) return n;
+    if (e !== m && null !== e) {
         if (null == n || h(n) || h(e)) return j(n, e, l, u);
         var i = e[w];
         if (null != i) return j(n, i, l, u);
@@ -175,8 +173,8 @@ function u(r) {
 }
 
 export {
-    f as mergeContent,
-    o as mergeContentChanges,
+    a as mergeContent,
+    o as mergeChanges,
     n as mergeContentAndGenDelta,
     t as setValByNamePath,
     e as getValByNamePath,

package/test/testQyNorthwind.js

@@ -0,0 +1,206 @@
+import test from "node:test";
+import { deepEqual, partialDeepStrictEqual } from "node:assert/strict";
+import { QyDB } from "../src/QyDB.js";
+import { QyJsonSaver } from "../src/QyJsonSaver.js";
+import { logger } from "../src/QyLogger.js";
+logger.level = "warn";
+test("test QyNorthwind", { skip: false }, async (context) => {
+    context.after(async (t) => {
+        await qyDB.stop();
+    });
+    const qyDB = new QyDB("./tmp/QyNorthwind", { dumpStructureAtStart: false });
+    const [dbValuesJson] = await Promise.all([new QyJsonSaver("./data").loadFromFile("northwind.json"), qyDB.start()]);
+    inputTables(qyDB, dbValuesJson);
+    inputEmployeeTerritories(qyDB, dbValuesJson);
+    inputOrderDetails(qyDB, dbValuesJson);
+    await qyDB.stop();
+    await qyDB.start();
+    deepEqual(getProductSoldAllPrices(qyDB, dbValuesJson), {
+        1: 12788.1,
+        2: 16355.96,
+        3: 3044,
+        4: 8567.900000000001,
+        5: 5347.200000000001,
+        6: 7137,
+        7: 22044.3,
+        8: 12772,
+        9: 7226.5,
+        10: 20867.340000000004,
+        11: 12901.77,
+        12: 12257.660000000002,
+        13: 4960.4400000000005,
+        14: 7991.489999999999,
+        15: 1784.825,
+        16: 17215.775499999996,
+        17: 32698.379999999997,
+        18: 29171.875,
+        19: 5862.619999999998,
+        20: 22563.359999999997,
+        21: 9104,
+        22: 7122.360000000001,
+        23: 4601.7,
+        24: 4504.365,
+        25: 3704.3999999999996,
+        26: 19849.144500000002,
+        27: 15099.875,
+        28: 25696.640000000007,
+        29: 80368.672,
+        30: 13424.197500000002,
+        31: 14920.875,
+        32: 8404.16,
+        33: 1648.125,
+        34: 6350.4,
+        35: 13643.999999999998,
+        36: 13458.460000000001,
+        37: 2688.3999999999996,
+        38: 141396.735,
+        39: 12294.54,
+        40: 17910.63,
+        41: 8680.345000000005,
+        42: 8575,
+        43: 23526.699999999997,
+        44: 9915.945000000002,
+        45: 4338.175,
+        46: 5882.999999999999,
+        47: 3958.08,
+        48: 1368.7125,
+        49: 9244.6,
+        50: 3437.6875,
+        51: 41819.65,
+        52: 3232.9500000000003,
+        53: 20574.170000000006,
+        54: 4728.2375,
+        55: 17426.4,
+        56: 42593.06,
+        57: 7661.549999999999,
+        58: 5881.674999999999,
+        59: 71155.7,
+        60: 46825.48,
+        61: 14352.6,
+        62: 47234.97,
+        63: 16701.095,
+        64: 21957.967500000002,
+        65: 13869.890000000001,
+        66: 3383,
+        67: 2396.8,
+        68: 8714,
+        69: 21942.36,
+        70: 10672.65,
+        71: 19551.024999999998,
+        72: 24900.13,
+        73: 3997.2,
+        74: 2432.5,
+        75: 8177.489999999999,
+        76: 15760.44,
+        77: 9171.63,
+    });
+    for (const tableName in dbValuesJson) {
+        if (tableName.indexOf("_") < 0) {
+            const table = dbValuesJson[tableName];
+            for (const id in table) {
+                partialDeepStrictEqual(qyDB.view([tableName, id]), table[id]);
+            }
+        }
+    }
+    deepEqual(qyDB.view(["employees", "6"], {
+        $all: 1,
+        last_name: 0,
+        reports_to: { $link: "employees", $spec: { first_name: 1, postal_code: 1 } },
+        territories: {
+            $link: "territories",
+            $spec: { "**": 1, region_id: { $link: "region", region_description: 1 } },
+        },
+    }), {
+        employee_id: 6,
+        region: null,
+        first_name: "Michael",
+        title: "Sales Representative",
+        title_of_courtesy: "Mr.",
+        birth_date: "1963-07-02",
+        hire_date: "1993-10-17",
+        address: "Coventry House\\nMiner Rd.",
+        city: "London",
+        postal_code: "EC2 7JR",
+        country: "UK",
+        home_phone: "(71) 555-7773",
+        extension: "428",
+        photo: "\\x",
+        notes: "Michael is a graduate of Sussex University (MA, economics, 1983) and the University of California at Los Angeles (MBA, marketing, 1986).  He has also taken the courses Multi-Cultural Selling and Time Management for the Sales Professional.  He is fluent in Japanese and can read and write French, Portuguese, and Spanish.",
+        reports_to: { first_name: "Steven", postal_code: "SW1 8JR" },
+        photo_path: "http://accweb/emmployees/davolio.bmp",
+        territories: {
+            85014: {
+                territory_id: "85014",
+                territory_description: "Phoenix",
+                region_id: { region_id: 2, region_description: "Western" },
+            },
+            85251: {
+                territory_id: "85251",
+                territory_description: "Scottsdale",
+                region_id: { region_id: 2, region_description: "Western" },
+            },
+            98004: {
+                territory_id: "98004",
+                territory_description: "Bellevue",
+                region_id: { region_id: 2, region_description: "Western" },
+            },
+            98052: {
+                territory_id: "98052",
+                territory_description: "Redmond",
+                region_id: { region_id: 2, region_description: "Western" },
+            },
+            98104: {
+                territory_id: "98104",
+                territory_description: "Seattle",
+                region_id: { region_id: 2, region_description: "Western" },
+            },
+        },
+    });
+});
+function inputTables(qyDB, dbValuesJson) {
+    qyDB.createIndex("customers", ["city", "postal_code", "country"]);
+    const { batch } = qyDB;
+    for (const tableName in dbValuesJson) {
+        if (tableName.indexOf("_") < 0) {
+            logger.log(`inserting ${tableName}`);
+            const table = dbValuesJson[tableName];
+            batch.cd(["/", tableName]);
+            for (const id in table) {
+                batch.insert(id, table[id]);
+            }
+        }
+    }
+    batch.run();
+}
+function inputEmployeeTerritories(qyDB, dbValuesJson) {
+    const employeeTerritoriesTable = dbValuesJson.employee_territories;
+    const { batch } = qyDB;
+    batch.cd("employees");
+    for (const prop in employeeTerritoriesTable) {
+        const { employee_id, territory_id } = employeeTerritoriesTable[prop];
+        batch.insert(`${employee_id}`, { territories: { [territory_id]: 1 } });
+    }
+    batch.run();
+}
+function inputOrderDetails(qyDB, dbValuesJson) {
+    qyDB.createIndex("orderDetails", ["order_id", "product_id"]);
+    const orderDetailsTable = dbValuesJson.order_details;
+    const { batch } = qyDB;
+    batch.cd("orderDetails");
+    for (const key in orderDetailsTable) {
+        batch.insert(`${key}`, orderDetailsTable[key]);
+    }
+    batch.run();
+}
+function getProductSoldAllPrices(qyDB, dbValuesJson) {
+    const totalPriceMap = {};
+    for (const product_id in dbValuesJson.products) {
+        let totalPrices = 0;
+        qyDB.queryFiles("orderDetails", { product_id }).forEach((x) => {
+            const { unit_price, quantity, discount } = x.view();
+            totalPrices += unit_price * quantity * (1 - discount);
+        });
+        totalPriceMap[product_id] = totalPrices;
+    }
+    return totalPriceMap;
+}