datafolder 1.0.6 → 1.0.8

package/src/QyFileContentUtils.js

@@ -1,172 +1,172 @@
 import {
-    isNotNullObj as f,
-    arrayLast as u,
-    trimArrayTail as V,
+    isNotNullObj as a,
+    arrayLast as t,
+    trimArrayTail as g,
     isSimpleType as h,
-    SpecialOperators as n
+    SpecialOperators as r
 } from "./QyUtils.js";
 
-let m = Array.isArray, {
-    $del: y,
-    $rpl: p,
-    $ext: w
-} = n;
+let p = Array.isArray, {
+    $del: w,
+    $rpl: y,
+    $ext: m
+} = r;
 
-function i(n, e) {
-    if (null == e) return n;
-    if (e !== y) {
-        if (h(e)) return e;
-        var r = e[p];
-        if (null != r) return r;
-        if (null == n || h(n)) return e;
-        if (n != e) {
-            var l, t = m(n);
-            for (l in e) {
-                var u = i(n[l], e[l]);
-                null == u ? (delete n[l], t && V(n)) : n[l] = u;
+function i(r, n) {
+    if (null == n) return r;
+    if (n !== w) {
+        if (h(n)) return n;
+        var l = n[y];
+        if (null != l) return l;
+        if (null == r || h(r)) return n;
+        if (r != n) {
+            var e, u = p(r);
+            for (e in n) {
+                var t = i(r[e], n[e]);
+                null == t ? (delete r[e], u && g(r)) : r[e] = t;
             }
         }
-        return n;
+        return r;
     }
 }
 
-function a(n, e) {
-    if (e == y) return y;
-    if (null != e[p]) return e;
-    var r = n[p];
-    if (null != r) n[p] = i(r, e); else {
-        if (n == y) return {
-            [p]: S(e)
+function f(r, n) {
+    if (n == w) return w;
+    if (null != n[y]) return n;
+    var l = r[y];
+    if (null != l) r[y] = i(l, n); else {
+        if (r == w) return {
+            [y]: S(n)
         };
-        if (h(n) || h(e)) return e;
-        for (var l in e) {
-            var t = e[l], u = n[l];
-            n[l] = null == u ? t : a(u, t);
+        if (h(r) || h(n)) return n;
+        for (var e in n) {
+            var u = n[e], t = r[e];
+            r[e] = null == t ? u : f(t, u);
         }
     }
-    return n;
+    return r;
 }
 
-function e(n, e) {
-    let r = {
+function n(r, n) {
+    let l = {
         oldValue: {},
         newValue: {}
     };
-    n = C(n, e, [], 0, r);
-    return r.oldValue = S(r.oldValue, !0, !0), r.newValue = S(r.newValue, !1, !1), 
+    r = A(r, n, [], 0, l);
+    return l.oldValue = S(l.oldValue, !0, !0), l.newValue = S(l.newValue, !1, !1), 
     {
-        merged: n,
-        delta: r = r.oldValue || r.newValue ? r : void 0
+        merged: r,
+        delta: l = l.oldValue || l.newValue ? l : void 0
     };
 }
 
-function C(e, r, l, t, u) {
-    if (null == r) return e;
-    if (r !== y) {
-        if (null == e || h(e) || h(r)) return A(e, r, l, u);
-        var i = r[p];
-        if (null != i) return A(e, i, l, u);
-        let n = r[w];
-        if (null != n) return m(n) || (n = [ n ]), (m(e) ? (e, r, n, l) => {
-            r = S(r);
-            var t = {};
-            for (let n = 0; n < r.length; ++n) {
-                var u = r[n];
-                null != u && (t[n + e.length] = h(u) ? u : {
-                    [p]: u
-                });
-            }
-            return N(l, n, e, t), e.concat(r);
-        } : A)(e, n, l, u);
-        if (m(e) && !m(r) || !m(e) && m(r)) return A(e, r, l, u);
-        var a = e, f = r, o = l, v = t, s = u;
-        if (a != f) {
-            var d, c = m(a);
-            for (d in f) {
-                o[v] = d, o.length = v + 1;
-                var g = C(a[d], f[d], o, v + 1, s);
-                null == g ? (delete a[d], c && V(a)) : a[d] = g;
-            }
-        }
-        return a;
+function u(r, n, l) {
+    if (!n || 0 == n.length) return l;
+    let e = r;
+    for (let r = 0; r < n.length - 1; ++r) {
+        var u = n[r];
+        a(e[u]) || (e[u] = {}), e = e[u];
     }
-    null != e && N(u, l, e, y);
+    return e[t(n)] = l, r;
 }
 
-function A(n, e, r, l) {
-    e = S(e);
-    return n === e ? n : null != e ? (null == n ? N(l, r, 0 == r.length ? void 0 : null, h(e) ? e : {
-        [p]: e
-    }) : N(l, r, n, h(n) ? e : {
-        [p]: e
-    }), e) : void N(l, r, n, y);
+function l(r, n) {
+    if (null != n && null != (r = o(r))) {
+        if (!p(n)) return "" == n ? r : o(r[n]);
+        if (0 != n.length && (1 != n.length || "" != n[0])) for (var l of n) if (null == (r = o(r[l]))) return;
+        return r;
+    }
 }
 
-function N(n, e, r, l) {
-    n.oldValue = t(n.oldValue, e, r), n.newValue = t(n.newValue, e, l);
+function S(r, n = !0, l = !1) {
+    return function l(e, u, t) {
+        if (e instanceof Date) return e.toISOString();
+        if (!a(e)) return (t ? void 0 === e : null == e) || u && e === w ? void 0 : e;
+        if (u) {
+            let r = e[y];
+            if (null != r) return l(r, u, t);
+            let n = e[m];
+            if (null != n) return l(p(n) ? n : [ n ], u, t);
+        }
+        let n = p(e);
+        let i = !0;
+        for (var f in e) {
+            let r = l(e[f], u, t);
+            (t ? void 0 === r : null == r) ? (delete e[f], n && g(e)) : (e[f] = r, 
+            i = !1);
+        }
+        return i ? void 0 : e;
+    }(r, n, l);
 }
 
-function t(n, e, r) {
-    if (!e || 0 == e.length) return r;
-    let l = n;
-    for (let n = 0; n < e.length - 1; ++n) {
-        var t = e[n];
-        f(l[t]) || (l[t] = {}), l = l[t];
+function e(r) {
+    if (h(r)) return r ? w : void 0;
+    for (var n in r) {
+        var l = e(r[n]);
+        l ? r[n] = l : delete r[n];
     }
-    return l[u(e)] = r, n;
+    return p(r) && g(r), r;
 }
 
-function r(n, e) {
-    if (null != e && null != (n = l(n))) {
-        if (!m(e)) return "" == e ? n : l(n[e]);
-        if (0 != e.length && (1 != e.length || "" != e[0])) for (var r of e) if (null == (n = l(n[r]))) return;
-        return n;
+function A(n, l, e, u, t) {
+    if (null == l) return n;
+    if (l !== w) {
+        if (null == n || h(n) || h(l)) return O(n, l, e, t);
+        var i = l[y];
+        if (null != i) return O(n, i, e, t);
+        let r = l[m];
+        if (null != r) return p(r) || (r = [ r ]), (p(n) ? (n, l, r, e) => {
+            l = S(l);
+            var u = {};
+            for (let r = 0; r < l.length; ++r) {
+                var t = l[r];
+                null != t && (u[r + n.length] = h(t) ? t : {
+                    [y]: t
+                });
+            }
+            return $(e, r, n, u), n.concat(l);
+        } : O)(n, r, e, t);
+        if (p(n) && !p(l) || !p(n) && p(l)) return O(n, l, e, t);
+        var f = n, a = l, o = e, v = u, d = t;
+        if (f != a) {
+            var c, s = p(f);
+            for (c in a) {
+                o[v] = c, o.length = v + 1;
+                var V = A(f[c], a[c], o, v + 1, d);
+                null == V ? (delete f[c], s && g(f)) : f[c] = V;
+            }
+        }
+        return f;
     }
+    null != n && $(t, e, n, w);
 }
 
-function l(n) {
-    if (null != n && n != y) {
-        for (;null != n[p]; ) if ((n = n[p]) == y) return;
-        return n;
-    }
+function O(r, n, l, e) {
+    n = S(n);
+    return r === n ? r : null != n ? (null == r ? $(e, l, 0 == l.length ? void 0 : null, h(n) ? n : {
+        [y]: n
+    }) : $(e, l, r, h(r) ? n : {
+        [y]: n
+    }), n) : void $(e, l, r, w);
 }
 
-function S(n, e = !0, r = !1) {
-    return function r(l, t, u) {
-        if (l instanceof Date) return l.toISOString();
-        if (!f(l)) return (u ? void 0 === l : null == l) || t && l === y ? void 0 : l;
-        if (t) {
-            let n = l[p];
-            if (null != n) return r(n, t, u);
-            let e = l[w];
-            if (null != e) return r(m(e) ? e : [ e ], t, u);
-        }
-        let e = m(l);
-        let i = !0;
-        for (var a in l) {
-            let n = r(l[a], t, u);
-            (u ? void 0 === n : null == n) ? (delete l[a], e && V(l)) : (l[a] = n, 
-            i = !1);
-        }
-        return i ? void 0 : l;
-    }(n, e, r);
+function $(r, n, l, e) {
+    r.oldValue = u(r.oldValue, n, l), r.newValue = u(r.newValue, n, e);
 }
 
-function o(n) {
-    if (h(n)) return n ? y : void 0;
-    for (var e in n) {
-        var r = o(n[e]);
-        r ? n[e] = r : delete n[e];
+function o(r) {
+    if (null != r && r != w) {
+        for (;null != r[y]; ) if ((r = r[y]) == w) return;
+        return r;
     }
-    return m(n) && V(n), n;
 }
 
 export {
     i as mergeContent,
-    e as mergeContentAndGenDelta,
-    a as mergeContentChanges,
-    t as setValByNamePath,
-    r as getValByNamePath,
+    f as mergeContentChanges,
+    n as mergeContentAndGenDelta,
+    u as setValByNamePath,
+    l as getValByNamePath,
     S as cleanContent,
-    o as objToDelMarks
+    e as objToDelMarks
 };

package/src/QyFileLogger.d.ts

@@ -0,0 +1,11 @@
+import { QyOpRunner } from "./QyOpRunner.ts";
+export declare class QyFileLogger extends QyOpRunner {
+    constructor(logFileFolder: any, options: any);
+    save(changeId: any, data: any): any;
+    getDateDirPath(): any;
+    _op_start(): Promise<void>;
+    switch(): this;
+    _op_startFileConsole(dateDirPath: any): Promise<void>;
+    _op_stop(): Promise<void>;
+    _op_switchFileConsole(dateDirPath: any): Promise<void>;
+}

package/src/QyIndex.d.ts

@@ -0,0 +1,6 @@
+export declare function getIndexPropPaths(queryObj: any): any[] | undefined;
+export declare function calDifferenceList(indexPropDir: any, indexPropPath: any, fileName: any, oldValue: any, newValue: any, rawContent: any): {
+    toAddFileList: never[];
+    toDelFileList: never[];
+} | undefined;
+export declare function parseNamePathAndQuery(indexHostDirNamePath: any, parentDir: any, indexPropPaths: any, queryObj: any, resultList: any, queryCounter: any): void;

package/src/QyIndex.js

@@ -5,13 +5,13 @@ import {
     isString as s,
     isNotNullObj as c,
     SpecialOperators as i,
-    getSuffix as p,
+    getSuffix as v,
     fromSingleName as r,
     toSingleName as o
 } from "./QyUtils.js";
 
 import {
-    getValByNamePath as v
+    getValByNamePath as p
 } from "./QyFileContentUtils.js";
 
 import {
@@ -22,26 +22,26 @@ import {
     QyIntersectNode as y
 } from "./QyIntersectNode.js";
 
-let h = Array.isArray, {
-    $or: b,
-    $and: S
-} = i, N = new m(), l = [];
+let b = Array.isArray, {
+    $or: S,
+    $and: h
+} = i, N = new m(), t = [];
 
 function e(e) {
-    if (null != e && !s(e)) return function r(i, n, t, l) {
-        if (H(i)) 0 < t.length && (n[o(t)] = 1); else {
-            let e = i[b] || i[S];
-            if (null != e) if (h(e)) for (var f of e) r(f, n, t, l), t.length = l; else r(e, n, t, l), 
-            t.length = l; else for (var u in i) t.push(u), r(i[u], n, t, l + 1), 
-            t.length = l;
+    if (null != e && !s(e)) return function r(i, n, l, t) {
+        if (H(i)) 0 < l.length && (n[o(l)] = 1); else {
+            let e = i[S] || i[h];
+            if (null != e) if (b(e)) for (var f of e) r(f, n, l, t), l.length = t; else r(e, n, l, t), 
+            l.length = t; else for (var u in i) l.push(u), r(i[u], n, l, t + 1), 
+            l.length = t;
         }
     }(e, e = {}, [], 0), Object.keys(e).map(e => r(e));
 }
 
-function n(e, r, i, n, t, l) {
-    n = v(n, r), t = v(t, r);
-    if (n !== t) {
-        var f, u, o, a, l = h(t) || h(v(l, r)), s = Object.fromEntries(R(n, l).map(e => [ JSON.stringify(e), e ])), d = Object.fromEntries(R(t, l).map(e => [ JSON.stringify(e), e ])), g = [], c = [];
+function n(e, r, i, n, l, t) {
+    n = p(n, r), l = p(l, r);
+    if (n !== l) {
+        var f, u, o, a, t = b(l) || b(p(t, r)), s = Object.fromEntries(D(n, t).map(e => [ JSON.stringify(e), e ])), d = Object.fromEntries(D(l, t).map(e => [ JSON.stringify(e), e ])), g = [], c = [];
         for (f in s) d[f] || (u = s[f], (u = e.searchSubdir(u)) && (u = u.getFile(i)) && c.push(u));
         for (o in d) s[o] || (a = d[o], a = e.searchOrCreateSubdir(a), g.push(a.getOrCreateFile(i)));
         return {
@@ -51,38 +51,38 @@ function n(e, r, i, n, t, l) {
     }
 }
 
-function $(e, r, i, n, t, l) {
-    if (s(n) || c(n)) if (e.isDir) L(e, i, n, t, l); else {
+function $(e, r, i, n, l, t) {
+    if (s(n) || c(n)) if (e.isDir) L(e, i, n, l, t); else {
         var f = e.$or;
         if (f) {
-            for (var u of f) if ($(u, r, i, n, t, l), l?.isFull) return;
-        } else for (var o of F(e = s(e) ? a(e) : e, r)) if (L(o, i, n, t, l), l?.isFull) return;
+            for (var u of f) if ($(u, r, i, n, l, t), t?.isFull) return;
+        } else for (var o of F(e = s(e) ? a(e) : e, r)) if (L(o, i, n, l, t), t?.isFull) return;
     }
 }
 
 function* F(e, r, i = 0) {
-    i == e.length ? yield r : yield* function* r(i, n, t, l) {
+    i == e.length ? yield r : yield* function* r(i, n, l, t) {
         if (null == n) return;
         if ("**" == n) {
-            t.isHiddenFolder || (yield t);
-            for (var e of t.allSubdirs()) yield e;
-        } else if ("*" == n) for (var f of t.subdirList) yield* F(i, f, l + 1); else if (g(n)) for (var u of t.filterSubdirNames(n)) yield* F(i, u, l + 1); else if (h(n)) for (var o of n) yield* r(i, o, t, l); else {
+            l.isHiddenFolder || (yield l);
+            for (var e of l.allSubdirs()) yield e;
+        } else if ("*" == n) for (var f of l.subdirList) yield* F(i, f, t + 1); else if (g(n)) for (var u of l.filterSubdirNames(n)) yield* F(i, u, t + 1); else if (b(n)) for (var o of n) yield* r(i, o, l, t); else {
             let e = n.$or || n.$in;
-            if (h(e)) for (var a of e) yield* r(i, a, t, l); else if (j(n)) for (var s of C(t, n)) yield* F(i, s, l + 1); else {
-                let e = t.getSubdir(n);
-                e && (yield* F(i, e, l + 1));
+            if (b(e)) for (var a of e) yield* r(i, a, l, t); else if (j(n)) for (var s of C(l, n)) yield* F(i, s, t + 1); else {
+                let e = l.getSubdir(n);
+                e && (yield* F(i, e, t + 1));
             }
         }
     }(e, e[i], r, i);
 }
 
-function L(r, i, n, t, l) {
+function L(r, i, n, l, t) {
     var f = r.fileCount;
     if (!(f <= 0)) {
         let e = 0;
         if (s(n)) {
             var u = r.getFile(n);
-            u && l.countOne() && (t.push(u), ++e);
+            u && t.countOne() && (l.push(u), ++e);
         } else {
             var o, u = r.qyCache, i = (0 < i?.length && u.qyDB.createIndex(r, i), 
             u.getIndexDir(r));
@@ -93,34 +93,34 @@ function L(r, i, n, t, l) {
                 if (g(e)) return O(n.filterSubdirNames(e));
                 if (j(e)) return O(C(n, e));
                 let {
-                    $link: t,
-                    $spec: l
+                    $link: l,
+                    $spec: t
                 } = e;
-                if (null != t) {
+                if (null != l) {
                     let e = new m(), {
                         qyCache: r,
                         subdirList: i
                     } = n;
-                    for (var f of i) D(r, t, f.name, l) && e.addDir(f);
+                    for (var f of i) R(r, l, f.name, t) && e.addDir(f);
                     return e;
                 }
                 let u = new y();
-                if (h(e)) for (var r of e) u.addNode(i(n, r)); else for (var o in e) {
+                if (b(e)) for (var r of e) u.addNode(i(n, r)); else for (var o in e) {
                     let r = e[o];
-                    if (o == b) if (h(r)) {
+                    if (o == S) if (b(r)) {
                         let e = new m();
                         for (var a of r) e.addNode(i(n, a));
                         u.addNode(e);
-                    } else u.addNode(i(n, r)); else if (o == S) if (h(r)) for (var s of r) u.addNode(i(n, s)); else u.addNode(i(n, r)); else {
+                    } else u.addNode(i(n, r)); else if (o == h) if (b(r)) for (var s of r) u.addNode(i(n, s)); else u.addNode(i(n, r)); else {
                         let e = n.getSubdir(o);
                         if (null == e) return N;
                         u.addNode(i(e, r));
                     }
                 }
                 return u;
-            }(i, n).getFiles(l)) t.push(r.getFile(o)), ++e;
+            }(i, n).getFiles(t)) l.push(r.getFile(o)), ++e;
         }
-        logger.info(`Checking ${f} file${p(f)}, result: ${e} file` + p(e));
+        logger.info(`Checking ${f} file${v(f)}, result: ${e} file` + v(e));
     }
 }
 
@@ -148,68 +148,66 @@ function C(e, {
     $gt: r,
     $gte: i,
     $lte: n,
-    $lt: t
+    $lt: l
 }) {
-    if (null != r && null != i && (i <= r ? i = void 0 : r = void 0), null != t && null != n && (t <= n ? n = void 0 : t = void 0), 
-    null != r) if (null != t) {
-        if (r < t) return e.compareSubdirRangeL2H(e => r < e && e < t);
+    if (null != r && null != i && (i <= r ? i = void 0 : r = void 0), null != l && null != n && (l <= n ? n = void 0 : l = void 0), 
+    null != r) if (null != l) {
+        if (r < l) return e.compareSubdirRangeL2H(e => r < e && e < l);
     } else {
         if (null == n) return e.compareSubdirRangeH2L(e => r < e);
         if (r < n) return e.compareSubdirRangeL2H(e => r < e && e <= n);
-    } else if (null != i) if (null != t) {
-        if (i < t) return e.compareSubdirRangeL2H(e => i <= e && e < t);
+    } else if (null != i) if (null != l) {
+        if (i < l) return e.compareSubdirRangeL2H(e => i <= e && e < l);
     } else {
         if (null == n) return e.compareSubdirRangeH2L(e => i <= e);
         if (i < n) return e.compareSubdirRangeL2H(e => i <= e && e <= n);
         if (i == n) return [ e.getSubdir(i) ];
     } else {
-        if (null != t) return e.compareSubdirRangeL2H(e => e < t);
+        if (null != l) return e.compareSubdirRangeL2H(e => e < l);
         if (null != n) return e.compareSubdirRangeL2H(e => e <= n);
     }
-    return l;
+    return t;
 }
 
-function D(e, r, i, n) {
+function R(e, r, i, n) {
     var r = e.getDir(r);
-    return !!r && !!(r = r.getFile(i)) && (null == n || function r(i, n, t) {
+    return !!r && !!(r = r.getFile(i)) && (null == n || function r(i, n, l) {
         if (null == n) return !1;
-        if (d(t)) return h(n) ? n.includes(t) : c(n) ? n[t] : n == t;
-        if (g(t)) return t(n);
-        if (h(t)) {
-            if (h(n)) {
-                for (let e = 0; e < t.length; ++e) if (!r(i, n[e], t[e])) return !1;
-                return !0;
+        if (d(l)) return b(n) ? n.includes(l) : c(n) ? n[l] : n == l;
+        if (g(l)) return l(n);
+        if (b(l)) {
+            if (!b(n)) return !1;
+            for (let e = 0; e < l.length; ++e) if (!r(i, n[e], l[e])) return !1;
+        } else {
+            var e, {
+                $link: t,
+                $spec: f
+            } = l;
+            if (t) {
+                if (d(n)) return R(i, t, n, f);
+                if (b(n)) {
+                    for (var u of n) if (R(i, t, u, f)) return !0;
+                } else for (var o in n) if (R(i, t, o, f)) return !0;
+                return !1;
             }
-            return !1;
-        }
-        var e, {
-            $link: l,
-            $spec: f
-        } = t;
-        if (l) {
-            if (d(n)) return D(i, l, n, f);
-            if (h(n)) {
-                for (var u of n) if (D(i, l, u, f)) return !0;
-            } else for (var o in n) if (D(i, l, o, f)) return !0;
-            return !1;
+            if (d(n) || b(n)) return !1;
+            for (e in l) if (!r(i, n[e], l[e])) return !1;
         }
-        if (d(n) || h(n)) return !1;
-        for (e in t) if (!r(i, n[e], t[e])) return !1;
         return !0;
     }(e, r.fileContent, n));
 }
 
-function R(e, r, i = [], n = [], t = 0) {
-    if (null != e) if (u(e = c(e) && r ? Object.values(e) : e)) n[t] = e, n.length = t + 1, 
-    i.push([ ...n ]); else if (h(e)) {
-        n.length = t + 1;
-        for (var l of e.filter(e => u(e))) n[t] = l, i.push([ ...n ]);
-    } else if (c(e)) for (var f in e) n[t] = f, n.length = t + 1, R(e[f], !1, i, n, t + 1);
+function D(e, r, i = [], n = [], l = 0) {
+    if (null != e) if (u(e = c(e) && r ? Object.values(e) : e)) n[l] = e, n.length = l + 1, 
+    i.push([ ...n ]); else if (b(e)) {
+        n.length = l + 1;
+        for (var t of e.filter(e => u(e))) n[l] = t, i.push([ ...n ]);
+    } else if (c(e)) for (var f in e) n[l] = f, n.length = l + 1, D(e[f], !1, i, n, l + 1);
     return i;
 }
 
 export {
-    n as calDifferenceList,
     e as getIndexPropPaths,
+    n as calDifferenceList,
     $ as parseNamePathAndQuery
 };

package/src/QyIndexPropTree.d.ts

@@ -0,0 +1,7 @@
+export declare class QyIndexPropTree {
+    constructor();
+    insert(indexPropPath: any): void;
+    remove(indexPropPath: any): any;
+    getAllIndexPropPaths(): any;
+}
+export declare function getPrefixPropPaths(propPathList: any): any;