datafolder 1.0.1 → 1.0.3

package/scripts/flights2_queries.js

@@ -1,4 +1,4 @@
-const assert = require("node:assert/strict");
+import { deepEqual } from "node:assert/strict";
 
 // Return the names of all airports one can reach
 // directly (1 step) from Los Angeles International
@@ -10,7 +10,7 @@ function query1(qyDB) {
     for (const x of qyDB.queryFiles("flights/**", { _from: "airports/LAX" })) {
         resultMap[x.fileContent._to] = 1;
     }
-    assert.deepEqual(Object.keys(resultMap), [
+    deepEqual(Object.keys(resultMap), [
         "airports/CVG",
         "airports/SMF",
         "airports/ATL",
@@ -111,24 +111,25 @@ function query1(qyDB) {
 
 function query2(qyDB) {
     console.time("query2");
-    assert.deepEqual(
+    deepEqual(
         qyDB
             .queryFiles(["flights", "*", 1, (x) => x >= 5 && x <= 7], {
                 $or: [{ _from: "airports/BIS" }, { _to: "airports/BIS" }],
             })
-            .map((x) => x.fileContent.FlightNum),
+            .map((x) => x.fileContent.FlightNum)
+            .sort((x, y) => x - y),
         [
             6635, 646, 6541, 5651, 6541, 5648, 687, 309, 6678, 6678, 6636, 439, 1567, 6635, 5647, 6541, 5660, 6541,
             6553, 687, 6553, 309, 5649, 5650, 6636, 439, 6635, 574, 6541, 5651, 5648, 6541, 1705, 1535, 5649, 6678,
             5650, 6636, 6678, 1087,
-        ],
+        ].sort((x, y) => x - y),
     );
     console.timeEnd("query2");
 }
 
 function query3(qyDB) {
     console.time("query3");
-    assert.deepEqual(
+    deepEqual(
         qyDB
             .queryFiles(["flights", "*", 1, (x) => x >= 1 && x <= 7], {
                 $or: [
@@ -136,7 +137,8 @@ function query3(qyDB) {
                     { _from: "airports/MSP", _to: "airports/BOI" },
                 ],
             })
-            .map((x) => x.view(["_from", "_to", "ArrTimeUTC"])),
+            .map((x) => x.view(["_from", "_to", "ArrTimeUTC"]))
+            .sort((x, y) => (x.ArrTimeUTC > y.ArrTimeUTC ? 1 : x.ArrTimeUTC == y.ArrTimeUTC ? 0 : -1)),
         [
             {
                 _from: "airports/BOI",
@@ -333,7 +335,7 @@ function query3(qyDB) {
                 _to: "airports/BOI",
                 ArrTimeUTC: "2008-01-08T06:29:00.000Z",
             },
-        ],
+        ].sort((x, y) => (x.ArrTimeUTC > y.ArrTimeUTC ? 1 : x.ArrTimeUTC == y.ArrTimeUTC ? 0 : -1)),
     );
 
     console.timeEnd("query3");
@@ -350,7 +352,7 @@ function query3(qyDB) {
 
 function query4(qyDB) {
     console.time("query4");
-    assert.deepEqual(
+    deepEqual(
         qyDB.queryFiles(["flights", "*", 1, 5], { FlightNum: 860 }).map((x) => x.view(["_from", "_to"])),
         [
             { _from: "airports/IAD", _to: "airports/BOS" },
@@ -365,7 +367,7 @@ function query4(qyDB) {
 
 function query5(qyDB) {
     console.time("query5");
-    assert.deepEqual(
+    deepEqual(
         qyDB
             .queryFiles("**", { vip: true })
             .map((x) => x.fileContent.name)
@@ -390,7 +392,7 @@ function query5(qyDB) {
 
 function query6(qyDB) {
     console.time("query6");
-    assert.deepEqual(
+    deepEqual(
         qyDB
             .queryFiles("flights/**", {
                 FlightNum: { $or: [859, 860] },
@@ -407,24 +409,25 @@ function query6(qyDB) {
 
 function query7(qyDB) {
     console.time("query7");
-    assert.deepEqual(
+    deepEqual(
         qyDB
             .queryFiles(["flights", "*", { $or: [1] }, [5, 6, 7]], {
                 $or: [{ _from: "airports/BIS" }, { _to: "airports/BIS" }],
             })
-            .map((x) => x.fileContent.FlightNum),
+            .map((x) => x.fileContent.FlightNum)
+            .sort((x, y) => x - y),
         [
             6635, 646, 6541, 5651, 6541, 5648, 687, 309, 6678, 6678, 6636, 439, 1567, 6635, 5647, 6541, 5660, 6541,
             6553, 687, 6553, 309, 5649, 5650, 6636, 439, 6635, 574, 6541, 5651, 5648, 6541, 1705, 1535, 5649, 6678,
             5650, 6636, 6678, 1087,
-        ],
+        ].sort((x, y) => x - y),
     );
     console.timeEnd("query7");
 }
 
 function query8(qyDB) {
     console.time("query8");
-    assert.deepEqual(
+    deepEqual(
         qyDB.queryFiles("**", { name: "Thigpen " }).map((x) => x.fileContent.name),
         ["Thigpen "],
     );
@@ -450,4 +453,4 @@ function runQueries(qyDB) {
     query8(qyDB);
 }
 
-Object.assign(module.exports, { runQueries });
+export { runQueries };

package/scripts/flights_queries.js

@@ -1,4 +1,4 @@
-const assert = require("node:assert/strict");
+import { deepEqual } from "node:assert/strict";
 
 // Return the names of all airports one can reach
 // directly (1 step) from Los Angeles International
@@ -10,7 +10,7 @@ function query1(qyDB) {
     for (const x of qyDB.queryFiles("flights", { _from: "airports/LAX" })) {
         resultMap[x.fileContent._to] = 1;
     }
-    assert.deepEqual(Object.keys(resultMap), [
+    deepEqual(Object.keys(resultMap), [
         "airports/CVG",
         "airports/SMF",
         "airports/ATL",
@@ -111,7 +111,7 @@ function query1(qyDB) {
 
 function query2(qyDB) {
     console.time("query2");
-    assert.deepEqual(
+    deepEqual(
         qyDB
             .queryFiles("flights", {
                 $and: [
@@ -120,19 +120,20 @@ function query2(qyDB) {
                     { Day: (x) => x >= 5 && x <= 7 },
                 ],
             })
-            .map((x) => x.fileContent.FlightNum),
+            .map((x) => x.fileContent.FlightNum)
+            .sort((x, y) => x - y),
         [
             6635, 646, 6541, 5651, 6541, 5648, 687, 309, 6678, 6678, 6636, 439, 1567, 6635, 5647, 6541, 5660, 6541,
             6553, 687, 6553, 309, 5649, 5650, 6636, 439, 6635, 574, 6541, 5651, 5648, 6541, 1705, 1535, 5649, 6678,
             5650, 6636, 6678, 1087,
-        ],
+        ].sort((x, y) => x - y),
     );
     console.timeEnd("query2");
 }
 
 function query3(qyDB) {
     console.time("query3");
-    assert.deepEqual(
+    deepEqual(
         qyDB
             .queryFiles("flights", {
                 $or: [
@@ -142,7 +143,8 @@ function query3(qyDB) {
                 Month: 1,
                 Day: (x) => x >= 1 && x <= 7,
             })
-            .map((x) => x.view(["_from", "_to", "ArrTimeUTC"])),
+            .map((x) => x.view(["_from", "_to", "ArrTimeUTC"]))
+            .sort((x, y) => (x.ArrTimeUTC > y.ArrTimeUTC ? 1 : x.ArrTimeUTC == y.ArrTimeUTC ? 0 : -1)),
         [
             {
                 _from: "airports/BOI",
@@ -339,7 +341,7 @@ function query3(qyDB) {
                 _to: "airports/BOI",
                 ArrTimeUTC: "2008-01-08T06:29:00.000Z",
             },
-        ],
+        ].sort((x, y) => (x.ArrTimeUTC > y.ArrTimeUTC ? 1 : x.ArrTimeUTC == y.ArrTimeUTC ? 0 : -1)),
     );
 
     console.timeEnd("query3");
@@ -359,7 +361,7 @@ function query4(qyDB) {
     const result = qyDB
         .queryFiles("flights", { Month: 1, Day: 5, FlightNum: 860 })
         .map((x) => x.view(["_from", "_to"]));
-    assert.deepEqual(result, [
+    deepEqual(result, [
         { _from: "airports/IAD", _to: "airports/BOS" },
         { _from: "airports/PBI", _to: "airports/JFK" },
         { _from: "airports/ORD", _to: "airports/DTW" },
@@ -372,8 +374,11 @@ function query4(qyDB) {
 function query5(qyDB) {
     logger.info("Query begins");
     console.time("query5");
-    assert.deepEqual(
-        qyDB.queryFiles("airports", { vip: true }).map((x) => x.view(["name"]).name),
+    deepEqual(
+        qyDB
+            .queryFiles("airports", { vip: true })
+            .map((x) => x.view(["name"]).name)
+            .sort(),
         [
             "Amarillo International",
             "William B Hartsfield-Atlanta Intl",
@@ -382,7 +387,7 @@ function query5(qyDB) {
             "Los Angeles International",
             "Chicago O'Hare International",
             "San Francisco International",
-        ],
+        ].sort(),
     );
     console.timeEnd("query5");
 }
@@ -400,4 +405,4 @@ function runQueries(qyDB) {
     query5(qyDB);
 }
 
-Object.assign(module.exports, { runQueries });
+export { runQueries };

package/src/QyAcl.js

@@ -1,59 +1,67 @@
-let fsPromises = require("node:fs/promises"), {
-    mergeContent,
-    mergeContentChanges,
-    setValByNamePath
-} = require("./QyFileContentUtils.js"), {
-    isEmptyObj,
-    arrayLast
-} = require("./QyUtils.js"), logger = require("./QyLogger.js").logger;
-
-function delCmdKey(e, r) {
+import u from "node:fs/promises";
+
+import {
+    mergeContent as m,
+    mergeContentChanges as s,
+    setValByNamePath as a
+} from "./QyFileContentUtils.js";
+
+import {
+    isEmptyObj as g,
+    arrayLast as n
+} from "./QyUtils.js";
+
+import {
+    logger as d
+} from "./QyLogger.js";
+
+function r(r, e) {
     var {
-        A: e,
+        A: r,
         R: t,
         M: a,
         D: n
-    } = e;
-    n && delete n[r], r.startsWith("c") ? a && delete a[r] : (e && delete e[r], 
-    t && delete t[r]);
+    } = r;
+    n && delete n[e], e.startsWith("c") ? a && delete a[e] : (r && delete r[e], 
+    t && delete t[e]);
 }
 
-function applyAclChange(e, r) {
+function e(r, e) {
     var t, a, n, s, {
-        D: r,
+        D: e,
         A: i,
         R: o,
-        M: l
-    } = r;
-    for (t in r) null != e[t] && (e[t] = void 0);
+        M: f
+    } = e;
+    for (t in e) null != r[t] && (r[t] = void 0);
     for (a in i) {
-        var f, u = e[a] || (e[a] = {});
-        for (f of i[a]) u[f] = 1;
+        var c, l = r[a] || (r[a] = {});
+        for (c of i[a]) l[c] = 1;
     }
     for (n in o) {
-        var d = e[n];
-        if (d) {
-            var c = o[n];
-            if (c) {
-                for (var m of c) delete d[m];
-                isEmptyObj(d) && (e[n] = void 0);
+        var u = r[n];
+        if (u) {
+            var d = o[n];
+            if (d) {
+                for (var h of d) delete u[h];
+                g(u) && (r[n] = void 0);
             }
         }
     }
-    for (s in l) e[s] = mergeContent(e[s], l[s]);
+    for (s in f) r[s] = m(r[s], f[s]);
 }
 
-function iterCmdKeys(e, r) {
+function t(r, e) {
     var t, {
-        D: e,
+        D: r,
         A: a,
         R: n,
         M: s
-    } = e;
-    for (t of [ e, a, n, s ]) for (var i in t) r(i);
+    } = r;
+    for (t of [ r, a, n, s ]) for (var i in t) e(i);
 }
 
-class QyAclCmdGenerator {
+class i {
     constructor() {
         Object.assign(this, {
             cmdArgAsMapObj: {},
@@ -61,192 +69,185 @@ class QyAclCmdGenerator {
             batchSize: 0
         });
     }
-    pushCmd(e, r, t) {
-        switch (++this.cmdCount, e) {
+    pushCmd(r, e, t) {
+        switch (++this.cmdCount, r) {
           case "A":
-            this._setCmdByNamePath([ "A", r, t ]), this._delCmdByNamePath([ "R", r, t ]);
+            o(this, [ "A", e, t ]), f(this, [ "R", e, t ]);
             break;
 
           case "R":
-            this._setCmdByNamePath([ "R", r, t ]), this._delCmdByNamePath([ "A", r, t ]);
+            o(this, [ "R", e, t ]), f(this, [ "A", e, t ]);
             break;
 
           case "D":
-            if (this._setCmdByNamePath([ "D", r ]), r.startsWith("c")) this._delCmdByNamePath([ "M", r ]); else for (var a of [ "A", "R" ]) this._delCmdByNamePath([ a, r ]);
+            if (o(this, [ "D", e ]), e.startsWith("c")) f(this, [ "M", e ]); else for (var a of [ "A", "R" ]) f(this, [ a, e ]);
             break;
 
           case "M":
             {
                 var n = this.cmdArgAsMapObj;
-                let e = n.M;
-                n = (e = null == e ? n.M = {} : e)[r];
-                e[r] = null != n ? mergeContentChanges(n, t) : t;
+                let r = n.M;
+                n = (r = null == r ? n.M = {} : r)[e];
+                r[e] = null != n ? s(n, t) : t;
                 break;
             }
 
           default:
-            logger.error(`unsupported cmdName:${e}, called with ${r} ` + t), --this.cmdCount;
+            d.error(`unsupported cmdName:${r}, called with ${e} ` + t), --this.cmdCount;
         }
     }
-    pushCmdArgAsListObj(e) {
-        if (e) {
+    pushCmdArgAsListObj(r) {
+        if (r) {
             ++this.batchSize;
-            var r, t, a, {
+            var e, t, a, {
                 D: n,
                 M: s
-            } = e;
-            for (r in n) this.pushCmd("D", r);
+            } = r;
+            for (e in n) this.pushCmd("D", e);
             for (t of [ "A", "R" ]) {
-                var i, o = e[t];
-                for (i in o) for (var l of o[i]) this.pushCmd(t, i, l);
+                var i, o = r[t];
+                for (i in o) for (var f of o[i]) this.pushCmd(t, i, f);
             }
             for (a in s) this.pushCmd("M", a, s[a]);
         }
         return this;
     }
     takeCmdArgAsListObj() {
-        var e, r = this.cmdArgAsMapObj;
+        var r, e = this.cmdArgAsMapObj;
         Object.assign(this, {
             cmdArgAsMapObj: {},
             cmdCount: 0,
             batchSize: 0
         });
-        for (e of [ "A", "R" ]) {
-            var t, a = r[e];
+        for (r of [ "A", "R" ]) {
+            var t, a = e[r];
             for (t in a) {
                 var n = Object.keys(a[t]);
                 0 < n.length ? a[t] = n : delete a[t];
             }
-            isEmptyObj(a) && delete r[e];
+            g(a) && delete e[r];
         }
         var {
             D: s,
             M: i
-        } = r;
-        return s && isEmptyObj(s) && delete r.D, i && isEmptyObj(i) && delete r.M, 
-        r;
-    }
-    toAclBuffer(e) {
-        var r = this.batchSize;
-        if (0 < r) return _toAclBuffer(e, r, this.takeCmdArgAsListObj());
+        } = e;
+        return s && g(s) && delete e.D, i && g(i) && delete e.M, e;
     }
-    _setCmdByNamePath(e, r = 1) {
-        setValByNamePath(this.cmdArgAsMapObj, e, r);
+    toAclBuffer(r) {
+        var e, t = this.batchSize;
+        if (0 < t) return r = r, t = t, e = this.takeCmdArgAsListObj(), e = Buffer.from(JSON.stringify(e) + "\n"), 
+        Buffer.concat([ l([ r, t, e.length ]), e ]);
     }
-    _delCmdByNamePath(r) {
-        let t = this.cmdArgAsMapObj;
-        if (t && r && !(r.length <= 1)) {
-            for (let e = 0; e < r.length - 1; ++e) if (null == (t = t[r[e]])) return;
-            delete t[arrayLast(r)];
-        }
+}
+
+function o(r, e, t = 1) {
+    a(r.cmdArgAsMapObj, e, t);
+}
+
+function f(r, e) {
+    let t = r.cmdArgAsMapObj;
+    if (t && e && !(e.length <= 1)) {
+        for (let r = 0; r < e.length - 1; ++r) if (null == (t = t[e[r]])) return;
+        delete t[n(e)];
     }
 }
 
-async function readAclFile(r, e = !1, t = 0) {
+async function c(e, r = !1, t = 0) {
     try {
-        return await readAclBuffer(r, await fsPromises.readFile(r), e, t);
-    } catch (e) {
-        throw logger.error(`Reading ${r} failed:`, e), e;
+        return await v(e, await u.readFile(e), r, t);
+    } catch (r) {
+        throw d.error(`Reading ${e} failed:`, r), r;
     }
 }
 
-let ByteCountList = [ 1, 2, 4, 8 ];
+let A = [ 1, 2, 4, 8 ];
 
-function numsToBuffer(r) {
-    var t = r.length, a = new Array(t), n = new Array(t);
+function l(e) {
+    var t = e.length, a = new Array(t), n = new Array(t);
     let s = t << 6, i = 1;
-    for (let e = 0; e < t; ++e) {
-        var o = a[e] = _getByteCountType(r[e]), o = (s |= o << (e << 1), n[e] = ByteCountList[o]);
+    for (let r = 0; r < t; ++r) {
+        var o = a[r] = (o = e[r]) <= 255 ? 0 : o <= 65535 ? 1 : o <= 4294967295 ? 2 : 3, o = (s |= o << (r << 1), 
+        n[r] = A[o]);
         i += o;
     }
-    var l = Buffer.allocUnsafe(i);
-    l.writeUInt8(s);
-    let f = 1;
-    for (let e = 0; e < t; ++e) _writeNum(l, r[e], n[e], f), f += n[e];
-    return l;
-}
+    var f = Buffer.allocUnsafe(i);
+    f.writeUInt8(s);
+    let c = 1;
+    for (let r = 0; r < t; ++r) {
+        h = d = u = l = void 0;
+        var [ l, u, d, h = 0 ] = [ f, e[r], n[r], c ];
+        switch (d) {
+          case 1:
+            l.writeUInt8(u, h);
+            break;
 
-function bufferToNums(r, t, a) {
-    var n = r.readUInt8(t), s = (++t, n >> 6 & 3);
-    for (let e = 0; e < s; ++e) {
-        var i = ByteCountList[n >> (e << 1) & 3];
-        a[e] = _readNum(r, i, t), t += i;
-    }
-    return t;
-}
+          case 2:
+            l.writeUInt16BE(u, h);
+            break;
 
-function _toAclBuffer(e, r, t) {
-    t = Buffer.from(JSON.stringify(t) + "\n");
-    return Buffer.concat([ numsToBuffer([ e, r, t.length ]), t ]);
-}
+          case 4:
+            l.writeUInt32BE(u, h);
+            break;
 
-async function readAclBuffer(t, e, a, n) {
-    var s = [];
-    for (let r = 0; r < e.length; ) {
-        var i = [], o = bufferToNums(e, r, i), [ i, l, f ] = i;
-        if (i <= n) logger.warn(`changeId ${i} <= currentChangeId ${n} at ${t}:${r}. Ignored.`), 
-        r = o + f; else {
-            n + l != i && logger.warn(`currentChangeId ${n} + batchSize ${l} != changeId ` + i);
-            try {
-                var u = JSON.parse(e.subarray(o, o + f));
-                s.push([ i, u ]), n = i, r = o + f;
-            } catch (e) {
-                if (logger.error(`Parse ${t} failed at ${r}:`, e), a) return logger.warn(`Autorepair by truncating ${t} to ` + r), 
-                null == (l = await fsPromises.truncate(t, r)) ? logger.log("truncate success") : logger.error("truncate failed:", l), 
-                s;
-                throw e;
-            }
+          default:
+            l.writeBigUInt64BE(BigInt(u), h);
         }
+        c += n[r];
     }
-    return s;
+    return f;
 }
 
-function _writeNum(e, r, t, a = 0) {
-    switch (t) {
-      case 1:
-        e.writeUInt8(r, a);
-        break;
+function h(e, t, a) {
+    var n = e.readUInt8(t), s = (++t, n >> 6 & 3);
+    for (let r = 0; r < s; ++r) {
+        var i = A[n >> (r << 1) & 3];
+        a[r] = ((r, e, t = 0) => {
+            switch (e) {
+              case 1:
+                return r.readUInt8(t);
 
-      case 2:
-        e.writeUInt16BE(r, a);
-        break;
+              case 2:
+                return r.readUInt16BE(t);
 
-      case 4:
-        e.writeUInt32BE(r, a);
-        break;
+              case 4:
+                return r.readUInt32BE(t);
 
-      default:
-        e.writeBigUInt64BE(BigInt(r), a);
+              default:
+                return Number(r.readBigUInt64BE(t));
+            }
+        })(e, i, t), t += i;
     }
+    return t;
 }
 
-function _readNum(e, r, t = 0) {
-    switch (r) {
-      case 1:
-        return e.readUInt8(t);
-
-      case 2:
-        return e.readUInt16BE(t);
-
-      case 4:
-        return e.readUInt32BE(t);
-
-      default:
-        return Number(e.readBigUInt64BE(t));
+async function v(t, r, a, n) {
+    var s = [];
+    for (let e = 0; e < r.length; ) {
+        var i = [], o = h(r, e, i), [ i, f, c ] = i;
+        if (i <= n) d.warn(`changeId ${i} <= currentChangeId ${n} at ${t}:${e}. Ignored.`), 
+        e = o + c; else {
+            n + f != i && d.warn(`currentChangeId ${n} + batchSize ${f} != changeId ` + i);
+            try {
+                var l = JSON.parse(r.subarray(o, o + c));
+                s.push([ i, l ]), n = i, e = o + c;
+            } catch (r) {
+                if (d.error(`Parse ${t} failed at ${e}:`, r), a) return d.warn(`Autorepair by truncating ${t} to ` + e), 
+                null == (f = await u.truncate(t, e)) ? d.log("truncate success") : d.error("truncate failed:", f), 
+                s;
+                throw r;
+            }
+        }
     }
+    return s;
 }
 
-function _getByteCountType(e) {
-    return e <= 255 ? 0 : e <= 65535 ? 1 : e <= 4294967295 ? 2 : 3;
-}
-
-Object.assign(module.exports, {
-    QyAclCmdGenerator: QyAclCmdGenerator,
-    applyAclChange: applyAclChange,
-    iterCmdKeys: iterCmdKeys,
-    readAclFile: readAclFile,
-    readAclBuffer: readAclBuffer,
-    numsToBuffer: numsToBuffer,
-    bufferToNums: bufferToNums,
-    delCmdKey: delCmdKey
-});
+export {
+    i as QyAclCmdGenerator,
+    e as applyAclChange,
+    t as iterCmdKeys,
+    c as readAclFile,
+    v as readAclBuffer,
+    l as numsToBuffer,
+    h as bufferToNums,
+    r as delCmdKey
+};

package/src/QyAclSaver.js

@@ -1,14 +1,20 @@
-let QyMessager = require("./QyMessager.js").QyMessager, getDefaultOptions = require("./QyDefaultOptions.js").getDefaultOptions;
+import {
+    QyMessager as s
+} from "./QyMessager.js";
 
-class QyAclSaver extends QyMessager {
-    constructor(e, s) {
-        super(e, "QyAclSaver_Worker.js", s = {
-            ...getDefaultOptions("QyAclSaver"),
-            ...s
-        }, s, [ "callSave" ], [ "switch", "castSave" ]);
+import {
+    getDefaultOptions as a
+} from "./QyDefaultOptions.js";
+
+class e extends s {
+    constructor(s, e) {
+        super(s, "QyAclSaver_Worker.js", e = {
+            ...a("QyAclSaver"),
+            ...e
+        }, e, [ "callSave" ], [ "switch", "castSave" ]);
     }
 }
 
-Object.assign(module.exports, {
-    QyAclSaver: QyAclSaver
-});
+export {
+    e as QyAclSaver
+};