datafolder 1.0.19 → 1.0.20

package/src/QyDir.js

@@ -6,8 +6,8 @@ import {
     getSubdirMapKey as i,
     getFileMapKey as t,
     SpecialFilePaths as r,
-    isString as d,
-    getNowTime as l
+    isString as h,
+    getNowTime as n
 } from "./QyUtils.js";
 
 import {
@@ -20,7 +20,7 @@ import {
 
 let s = r.HiddenFolderName;
 
-class u extends e {
+class d extends e {
     _subdirCount = 0;
     _fileCount = 0;
     subdirMapChangeCount = 0;
@@ -43,7 +43,7 @@ class u extends e {
         return f(this), this._fileCount;
     }
     get subdirCount() {
-        return n(this), this._subdirCount;
+        return l(this), this._subdirCount;
     }
     get isDir() {
         return !0;
@@ -61,7 +61,7 @@ class u extends e {
         return this._fileMapKey || (this._fileMapKey = t(this.fullPathHash));
     }
     get subdirMap() {
-        return n(this), this._subdirMap;
+        return l(this), this._subdirMap;
     }
     get fileMap() {
         return f(this), this._fileMap;
@@ -84,7 +84,7 @@ class u extends e {
         if ("/" === e) return this.qyCache?.rootDir || this;
         let t = this.subdirMap;
         var r = (t = t || (this._subdirMap = {}))[e];
-        return r || (r = t[e] = new u(e, i, this), this.setChildTriggerNodes(r)), 
+        return r || (r = t[e] = new d(e, i, this), this.setChildTriggerNodes(r)), 
         r;
     }
     getOrCreateFile(e, i = !1) {
@@ -117,28 +117,28 @@ class u extends e {
         return this.searchOrCreateSubdir(e, i, e.length - 1).getOrCreateFile(e.at(-1), i);
     }
     get subdirList() {
-        return h(this, "_subdirList", this.subdirMapChangeCount, () => this.created && this.subdirMap ? Object.values(this.subdirMap).filter(e => e.created) : []);
+        return u(this, "_subdirList", this.subdirMapChangeCount, () => this.created && this.subdirMap ? Object.values(this.subdirMap).filter(e => e.created) : []);
     }
     get subdirNameList() {
-        return h(this, "_subdirNameList", this.subdirMapChangeCount, () => this.subdirList.map(e => e.name));
+        return u(this, "_subdirNameList", this.subdirMapChangeCount, () => this.subdirList.map(e => e.name));
     }
     get sortedSubdirList() {
-        return h(this, "_sortedSubdirList", this.subdirMapChangeCount, () => this.subdirList.sort((e, i) => e.cmp(i)));
+        return u(this, "_sortedSubdirList", this.subdirMapChangeCount, () => this.subdirList.sort((e, i) => e.cmp(i)));
     }
     get sortedSubdirNameList() {
-        return h(this, "_sortedSubdirNameList", this.subdirMapChangeCount, () => this.sortedSubdirList.map(e => e.nameNum));
+        return u(this, "_sortedSubdirNameList", this.subdirMapChangeCount, () => this.sortedSubdirList.map(e => e.nameNum));
     }
     get fileList() {
-        return h(this, "_fileList", this.fileMapChangeCount, () => this.created && this.fileMap ? Object.values(this.fileMap).filter(e => e.created) : []);
+        return u(this, "_fileList", this.fileMapChangeCount, () => this.created && this.fileMap ? Object.values(this.fileMap).filter(e => e.created) : []);
     }
     get fileNameList() {
-        return h(this, "_fileNameList", this.fileMapChangeCount, () => this.fileList.map(e => e.name));
+        return u(this, "_fileNameList", this.fileMapChangeCount, () => this.fileList.map(e => e.name));
     }
     get sortedFileList() {
-        return h(this, "_sortedFileList", this.fileMapChangeCount, () => this.fileList.sort((e, i) => e.cmp(i)));
+        return u(this, "_sortedFileList", this.fileMapChangeCount, () => this.fileList.sort((e, i) => e.cmp(i)));
     }
     get sortedFileNameList() {
-        return h(this, "_sortedFileNameList", this.fileMapChangeCount, () => this.sortedFileList.map(e => e.nameNum));
+        return u(this, "_sortedFileNameList", this.fileMapChangeCount, () => this.sortedFileList.map(e => e.nameNum));
     }
     *allSubdirs() {
         var e, i, t = this.subdirList;
@@ -172,24 +172,18 @@ class u extends e {
     *filterSubdirNames(e) {
         for (var i of this.subdirList) e(i.name) && (yield i);
     }
-    *compareSubdirRangeL2H(e) {
-        var i, t = this.sortedSubdirList;
-        let r = !1;
-        for (i of t) {
-            var s = i.nameNum;
-            if (d(s)) {
-                if (r) return;
-            } else if (e(s)) yield i, r = !0; else if (r) return;
-        }
-    }
-    *compareSubdirRangeH2L(i) {
-        var t = this.sortedSubdirList;
-        let r = !1;
-        for (let e = t.length - 1; 0 <= e; --e) {
-            var s = t[e], a = s.nameNum;
-            if (d(a)) {
-                if (r) return;
-            } else if (i(a)) yield s, r = !0; else if (r) return;
+    *filterFileNames(e) {
+        for (var i of this.fileList) e(i.name) && (yield i);
+    }
+    *compareItemRange(i, e = !1, t = !1) {
+        var r = e ? this.sortedFileList : this.sortedSubdirList;
+        let s = !1;
+        var a = r.length;
+        for (let e = t ? a - 1 : 0; t ? 0 <= e : e < a; t ? --e : ++e) {
+            var d = r[e], u = d.nameNum;
+            if (h(u)) {
+                if (s) return;
+            } else if (i(u)) yield d, s = !0; else if (s) return;
         }
     }
     ensureAllLoaded() {
@@ -198,12 +192,12 @@ class u extends e {
     }
 }
 
-function h(e, i, t, r) {
+function u(e, i, t, r) {
     var e = e.cache, s = i + "ChangeCount";
     return e[i] && e[s] == t || (e[i] = r(), e[s] = t), e[i];
 }
 
-function n(e) {
+function l(e) {
     if (e.created && !e.subdirMapLoaded) {
         e.subdirMapLoaded = !0;
         var i = e.qyCache;
@@ -211,7 +205,7 @@ function n(e) {
             var t = i.qyKVData.getValueSync(e.subdirMapKey);
             if (t) {
                 var r, s = e._subdirMap || (e._subdirMap = {});
-                for (r in t) r in s || (s[r] = new u(r, !0, e));
+                for (r in t) r in s || (s[r] = new d(r, !0, e));
                 e.underHiddenFolder || p(e, i, "d");
             }
         }
@@ -243,14 +237,14 @@ function p(e, i, t) {
     }
     var r = i.getExpireInfoFile(e.fullPathHash, t);
     if (r) {
-        var s, a = r.fileContent, d = l(), u = i.qyDB;
+        var s, a = r.fileContent, d = n(), u = i.qyDB;
         for (s in a) {
-            var h = "d" == t ? e.getOrCreateSubdir(s) : e.getOrCreateFile(s), n = a[s];
-            n <= d ? o(u, h) : i.monitorItemExpire(h, n);
+            var h = "d" == t ? e.getOrCreateSubdir(s) : e.getOrCreateFile(s), l = a[s];
+            l <= d ? o(u, h) : i.monitorItemExpire(h, l);
         }
     }
 }
 
 export {
-    u as QyDir
+    d as QyDir
 };

package/src/QyIndex.d.ts

@@ -1,5 +1,5 @@
 export declare function getIndexPropPaths(queryObj: any): any[] | undefined;
-export declare function calDifferenceList(indexPropDir: any, indexPropPath: any, fileName: any, oldValue: any, newValue: any, rawContent: any): {
+export declare function calDifferenceList(indexPropDir: any, indexPropPath: any, oldValue: any, newValue: any, rawContent: any): {
     toAddFileList: any[];
     toDelFileList: any[];
 } | undefined;

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)));
     }
 }

package/src/QyUnionNode.d.ts

@@ -16,11 +16,11 @@ export declare class QyQueryNode {
     encounterOne(resultMap: any, fileName: any, queryCounter: any): true | undefined;
 }
 export declare class QyUnionNode extends QyQueryNode {
-    dirMap: any;
+    fileMap: any;
     checkedDirMap: any;
-    constructor(dir?: undefined);
+    constructor(item?: undefined);
     containsFile(fileName: any): boolean;
     getFiles(queryCounter?: any, resultMap?: {}): Generator<any, void, any>;
     addNode(node: any): void;
-    addDir(dir: any): void;
+    addItem(item: any): void;
 }

package/src/QyUnionNode.js

@@ -16,9 +16,9 @@ class i {
     encounterOne(i) {
         var {
             encounteredMap: e,
-            isFull: r
+            isFull: t
         } = this;
-        if (!(r || i in e)) return e[i] = 1, this.countOne();
+        if (!(t || i in e)) return e[i] = 1, this.countOne();
     }
     countOne() {
         if (this.count++ >= this.cursor) return ++this.added, !0;
@@ -29,67 +29,67 @@ class e {
     fileCount = 0;
     nodeList = [];
     constructor() {}
-    encounterOne(i, e, r) {
-        if (!r || r.encounterOne(e)) return i[e] = 1, !0;
+    encounterOne(i, e, t) {
+        if (!t || t.encounterOne(e)) return i[e] = 1, !0;
     }
 }
 
 class o extends e {
-    dirMap = {};
+    fileMap = {};
     checkedDirMap = {};
     constructor(i = void 0) {
-        super(), i && this.addDir(i);
+        super(), i && this.addItem(i);
     }
-    containsFile(e) {
+    containsFile(i) {
         var {
-            fileCount: i,
-            dirMap: r,
-            nodeList: t
+            fileCount: e,
+            fileMap: t,
+            nodeList: n
         } = this;
-        if (0 < i) {
-            for (var n in r) if (null != r[n].getFile(e)) return !0;
-            for (let i = 0; i < t.length; ++i) if (t[i].containsFile(e)) return !0;
+        if (0 < e) {
+            for (var r in t) {
+                r = t[r].fileContent;
+                if (r && Object.hasOwn(r, i)) return !0;
+            }
+            for (var s of n) if (s.containsFile(i)) return !0;
         }
         return !1;
     }
     *getFiles(i = void 0, e = {}) {
-        var r, t, {
-            dirMap: n,
+        var t, n, {
+            fileMap: r,
             nodeList: s
         } = this;
-        for (r in n) {
-            var o = n[r];
-            if (0 != o.fileCount) for (var u of o.fileNameList) if (!(u in e) && this.encounterOne(e, u, i) && (yield u, 
-            i?.isFull)) return;
-        }
-        for (t of s) if (yield* t.getFiles(i, e), i?.isFull) return;
+        for (t in r) for (var o in r[t].fileContent) if (!(o in e) && this.encounterOne(e, o, i) && (yield o, 
+        i?.isFull)) return;
+        for (n of s) if (yield* n.getFiles(i, e), i?.isFull) return;
     }
     addNode(i) {
         if (i) {
             var {
-                dirMap: e,
-                checkedDirMap: r,
-                nodeList: t
+                fileMap: e,
+                checkedDirMap: t,
+                nodeList: n
             } = this;
             if (i instanceof o) {
-                for (var n in i.dirMap) e[n] = i.dirMap[n];
-                for (var s in t.push(...i.nodeList), i.checkedDirMap) r[s] = 1;
-            } else t.push(i);
+                for (var r in i.fileMap) e[r] = i.fileMap[r];
+                for (var s in n.push(...i.nodeList), i.checkedDirMap) t[s] = 1;
+            } else n.push(i);
             this.fileCount += i.fileCount;
         }
     }
-    addDir(i) {
+    addItem(i) {
         var {
-            dirMap: e,
-            checkedDirMap: r
+            fileMap: e,
+            checkedDirMap: t
         } = this, {
-            fileCount: t,
-            subdirCount: n,
-            fullPathHash: s
+            isFile: n,
+            fullPathHash: r
         } = i;
-        if (!(s in e || s in r)) {
-            if (0 < n) for (var o of i.subdirList) this.addDir(o);
-            0 < t ? (e[s] = i, this.fileCount += t) : r[s] = 1;
+        if (n) e[r] = i, ++this.fileCount; else if (!(r in t)) {
+            for (var s of i.subdirList) this.addItem(s);
+            for (var o of i.fileList) this.addItem(o);
+            t[r] = 1;
         }
     }
 }