datafolder 1.0.18 → 1.0.20

package/src/QyIndex.js

@@ -5,14 +5,14 @@ import {
     isString as s,
     isNotNullObj as c,
     SpecialOperators as i,
-    getSuffix as p,
+    getSuffix as m,
     fromSingleName as r,
-    toSingleName as o,
+    toSingleName as u,
     isArray as v
 } from "./QyUtils.js";
 
 import {
-    getValByNamePath as m
+    getValByNamePath as p
 } from "./QyFileContentUtils.js";
 
 import {
@@ -20,83 +20,83 @@ import {
 } from "./QyUnionNode.js";
 
 import {
-    QyIntersectNode as b
+    QyIntersectNode as h
 } from "./QyIntersectNode.js";
 
 import {
-    logger as S
+    logger as N
 } from "./QyLogger.js";
 
 let {
-    $or: h,
-    $and: N
-} = i, $ = new y(), l = [];
+    $or: $,
+    $and: F
+} = i, I = new y(), o = [];
 
 function e(e) {
     if (null != e && !s(e)) return function r(i, n, t, l) {
-        if (C(i)) 0 < t.length && (n[o(t)] = 1); else {
-            let e = i[h] || i[N];
+        if (Q(i)) 0 < t.length && (n[u(t)] = 1); else {
+            let e = i[$] || i[F];
             if (null != e) if (v(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; else for (var o in i) t.push(o), r(i[o], n, t, l + 1), 
             t.length = l;
         }
     }(e, e = {}, [], 0), Object.keys(e).map(e => r(e));
 }
 
-function n(e, r, i, n, t, l) {
-    n = m(n, r), t = m(t, r);
-    if (n !== t) {
-        var f, u, o, a, l = v(t) || v(m(l, r)), s = Object.fromEntries(Q(n, l).map(e => [ JSON.stringify(e), e ])), d = Object.fromEntries(Q(t, l).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)));
+function n(e, r, i, n, t) {
+    i = p(i, r), n = p(n, r);
+    if (i !== n) {
+        var l, f, o, u, t = v(n) || v(p(t, r)), a = Object.fromEntries(L(i, t).map(e => [ JSON.stringify(e), e ])), s = Object.fromEntries(L(n, t).map(e => [ JSON.stringify(e), e ])), d = [], g = [];
+        for (l in a) !s[l] && (f = a[l], f = e.searchFile(f)) && g.push(f);
+        for (o in s) a[o] || (u = s[o], d.push(e.searchOrCreateFile(u)));
         return {
-            toAddFileList: g,
-            toDelFileList: c
+            toAddFileList: d,
+            toDelFileList: g
         };
     }
 }
 
-function F(e, r, i, n, t, l) {
-    if (s(n) || c(n)) if (e.isDir) O(e, i, n, t, l); else {
+function S(e, r, i, n, t, l) {
+    if (s(n) || c(n)) if (e.isDir) j(e, i, n, t, l); else {
         var f = e.$or;
         if (f) {
-            for (var u of f) if (F(u, r, i, n, t, l), l?.isFull) return;
-        } else for (var o of L(e = s(e) ? a(e) : e, r)) if (O(o, i, n, t, l), l?.isFull) return;
+            for (var o of f) if (S(o, r, i, n, t, l), l?.isFull) return;
+        } else for (var u of b(e = s(e) ? a(e) : e, r)) if (j(u, i, n, t, l), l?.isFull) return;
     }
 }
 
-function* L(e, r, i = 0) {
+function* b(e, r, i = 0) {
     i == e.length ? yield r : yield* function* r(i, n, t, l) {
         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* L(i, f, l + 1); else if (g(n)) for (var u of t.filterSubdirNames(n)) yield* L(i, u, l + 1); else if (v(n)) for (var o of n) yield* r(i, o, t, l); else {
+        } else if ("*" == n) for (var f of t.subdirList) yield* b(i, f, l + 1); else if (g(n)) for (var o of t.filterSubdirNames(n)) yield* b(i, o, l + 1); else if (v(n)) for (var u of n) yield* r(i, u, t, l); else {
             let e = n.$or || n.$in;
-            if (v(e)) for (var a of e) yield* r(i, a, t, l); else if (H(n)) for (var s of R(t, n)) yield* L(i, s, l + 1); else {
+            if (v(e)) for (var a of e) yield* r(i, a, t, l); else if (C(n)) for (var s of w(t, n)) yield* b(i, s, l + 1); else {
                 let e = t.getSubdir(n);
-                e && (yield* L(i, e, l + 1));
+                e && (yield* b(i, e, l + 1));
             }
         }
     }(e, e[i], r, i);
 }
 
-function O(r, i, n, t, l) {
+function j(r, i, n, t, l) {
     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);
+            var o = r.getFile(n);
+            o && l.countOne() && (t.push(o), ++e);
         } else {
-            var o, u = r.qyCache, i = (0 < i?.length && u.qyDB.createIndex(r, i), 
-            u.getIndexDir(r));
+            var u, o = r.qyCache, i = (0 < i?.length && o.qyDB.createIndex(r, i), 
+            o.getIndexDir(r));
             if (!i) return;
-            for (o of function i(n, e) {
-                if (null == e) return $;
-                if (d(e)) return new y(n.getSubdir(e));
-                if (g(e)) return j(n.filterSubdirNames(e));
-                if (H(e)) return j(R(n, e));
+            for (u of function i(n, e) {
+                if (null == e) return I;
+                if (d(e)) return new y(n.getFile(e));
+                if (g(e)) return R(n.filterFileNames(e));
+                if (C(e)) return R(w(n, e, !0));
                 let {
                     $link: t,
                     $spec: l
@@ -104,74 +104,75 @@ function O(r, i, n, t, l) {
                 if (null != t) {
                     let e = new y(), {
                         qyCache: r,
-                        subdirList: i
+                        fileList: i
                     } = n;
-                    for (var f of i) D(r, t, f.name, l) && e.addDir(f);
+                    for (var f of i) D(r, t, f.name, l) && e.addItem(f);
                     return e;
                 }
-                let u = new b();
-                if (v(e)) for (var r of e) u.addNode(i(n, r)); else for (var o in e) {
-                    let r = e[o];
-                    if (o == h) if (v(r)) {
+                let o = new h();
+                if (v(e)) for (var r of e) o.addNode(i(n, r)); else for (var u in e) {
+                    let r = e[u];
+                    if (u == $) if (v(r)) {
                         let e = new y();
                         for (var a of r) e.addNode(i(n, a));
-                        u.addNode(e);
-                    } else u.addNode(i(n, r)); else if (o == N) if (v(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 $;
-                        u.addNode(i(e, r));
+                        o.addNode(e);
+                    } else o.addNode(i(n, r)); else if (u == F) if (v(r)) for (var s of r) o.addNode(i(n, s)); else o.addNode(i(n, r)); else {
+                        let e = n.getSubdir(u);
+                        if (null == e) return I;
+                        o.addNode(i(e, r));
                     }
                 }
-                return u;
-            }(i, n).getFiles(l)) t.push(r.getFile(o)), ++e;
+                return o;
+            }(i, n).getFiles(l)) t.push(r.getFile(u)), ++e;
         }
-        S.info(`Checking ${f} file${p(f)}, result: ${e} file` + p(e));
+        N.info(`Checking ${f} file${m(f)}, result: ${e} file` + m(e));
     }
 }
 
-function u(e) {
+function O(e) {
     var r = typeof e;
     return "number" == r || "boolean" == r || "string" == r && !(e in i);
 }
 
-function j(e) {
-    if (0 == e.length) return $;
+function R(e) {
+    if (0 == e.length) return I;
     var r, i = new y();
-    for (r of e) i.addDir(r);
+    for (r of e) i.addItem(r);
     return i;
 }
 
-function H(e) {
+function C(e) {
     return null != e && null != (e.$gt ?? e.$lt ?? e.$gte ?? e.$lte);
 }
 
-function C(e) {
-    return null == e || d(e) || g(e) || H(e);
+function Q(e) {
+    return null == e || d(e) || g(e) || C(e);
 }
 
-function R(e, {
+function w(e, {
     $gt: r,
     $gte: i,
     $lte: n,
     $lt: t
-}) {
+}, l = !1) {
     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 (r < t) return e.compareItemRange(e => r < e && e < t, l);
     } else {
-        if (null == n) return e.compareSubdirRangeH2L(e => r < e);
-        if (r < n) return e.compareSubdirRangeL2H(e => r < e && e <= n);
+        if (null == n) return e.compareItemRange(e => r < e, l, !0);
+        if (r < n) return e.compareItemRange(e => r < e && e <= n, l);
     } else if (null != i) if (null != t) {
-        if (i < t) return e.compareSubdirRangeL2H(e => i <= e && e < t);
+        if (i < t) return e.compareItemRange(e => i <= e && e < t, 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) ];
+        if (null == n) return e.compareItemRange(e => i <= e, l, !0);
+        if (i < n) return e.compareItemRange(e => i <= e && e <= n, l);
+        var f;
+        if (i == n) return (f = l ? e.getFile(i) : e.getSubdir(i)) ? [ f ] : o;
     } else {
-        if (null != t) return e.compareSubdirRangeL2H(e => e < t);
-        if (null != n) return e.compareSubdirRangeL2H(e => e <= n);
+        if (null != t) return e.compareItemRange(e => e < t, l);
+        if (null != n) return e.compareItemRange(e => e <= n, l);
     }
-    return l;
+    return o;
 }
 
 function D(e, r, i, n) {
@@ -191,8 +192,8 @@ function D(e, r, i, n) {
             if (l) {
                 if (d(n)) return D(i, l, n, f);
                 if (v(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;
+                    for (var o of n) if (D(i, l, o, f)) return !0;
+                } else for (var u in n) if (D(i, l, u, f)) return !0;
                 return !1;
             }
             if (d(n) || v(n)) return !1;
@@ -202,17 +203,17 @@ function D(e, r, i, n) {
     }(e, r.fileContent, n));
 }
 
-function Q(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 (v(e)) {
+function L(e, r, i = [], n = [], t = 0) {
+    if (null != e && "" !== e) if (O(e = c(e) && r ? Object.values(e) : e)) n[t] = e, 
+    n.length = t + 1, i.push([ ...n ]); else if (v(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, Q(e[f], !1, i, n, t + 1);
+        for (var l of e.filter(e => O(e))) n[t] = l, i.push([ ...n ]);
+    } else if (c(e)) for (var f in e) n[t] = f, n.length = t + 1, L(e[f], !1, i, n, t + 1);
     return i;
 }
 
 export {
     e as getIndexPropPaths,
     n as calDifferenceList,
-    F as parseNamePathAndQuery
+    S as parseNamePathAndQuery
 };

package/src/QyIntersectNode.js

@@ -14,14 +14,14 @@ class n extends t {
             nodeList: e,
             fileCount: i
         } = this;
-        if (0 != e.length && 0 != i) return s(this), e[0].containsFile(t) && l(e, t);
+        if (0 != i && 0 != e.length) return s(this), e[0].containsFile(t) && l(e, t);
     }
     *getFiles(t, e = {}) {
         var {
             nodeList: i,
             fileCount: n
         } = this;
-        if (0 != i.length && 0 != n) {
+        if (0 != n && 0 != i.length) {
             s(this);
             for (var o of i[0].getFiles()) if (!(o in e) && l(i, o) && this.encounterOne(e, o, t) && (yield o, 
             t?.isFull)) return;
@@ -32,7 +32,7 @@ class n extends t {
         t && null != t.fileCount && ({
             fileCount: e,
             nodeList: i
-        } = this, 0 < i.length && 0 == e || (t instanceof n ? (i.push(...t.nodeList), 
+        } = this, 0 == e && 0 < i.length || (t instanceof n ? (i.push(...t.nodeList), 
         this.sorted = !1) : i.push(t), (null == e || e > t.fileCount) && (this.fileCount = t.fileCount)));
     }
 }