datafolder 1.0.2 → 1.0.4

package/src/QyFile.js

@@ -1,19 +1,33 @@
-let QyItem = require("./QyItem.js").QyItem, {
-    SpecialOperators,
-    SpecialFilePaths,
-    getContentKey,
-    isNotNullObj,
-    isSimpleType,
-    fromSingleName
-} = require("./QyUtils.js"), getValByNamePath = require("./QyFileContentUtils.js").getValByNamePath, QyIndexPropTree = require("./QyIndexPropTree.js").QyIndexPropTree, isArray = Array.isArray, IndexPropPathsFileName = SpecialFilePaths.IndexPropPathsFileName, {
-    $spec,
-    $raw,
-    $clone
-} = SpecialOperators;
+import {
+    QyItem as e
+} from "./QyItem.js";
 
-class QyFile extends QyItem {
-    constructor(e, t, i) {
-        super(e, t, i), t && (++i._fileCount, ++i.fileMapChangeCount), this.cChangeId = 0;
+import {
+    SpecialOperators as t,
+    SpecialFilePaths as n,
+    getContentKey as i,
+    isNotNullObj as a,
+    isSimpleType as C,
+    fromSingleName as s
+} from "./QyUtils.js";
+
+import {
+    getValByNamePath as r
+} from "./QyFileContentUtils.js";
+
+import {
+    QyIndexPropTree as f
+} from "./QyIndexPropTree.js";
+
+let d = Array.isArray, u = n.IndexPropPathsFileName, {
+    $spec: h,
+    $raw: c,
+    $clone: l
+} = t;
+
+class o extends e {
+    constructor(e, t, n) {
+        super(e, t, n), t && (++n._fileCount, ++n.fileMapChangeCount), this.cChangeId = 0;
     }
     get created() {
         return this._created;
@@ -24,10 +38,13 @@ class QyFile extends QyItem {
         ++t.fileMapChangeCount);
     }
     get fileContentKey() {
-        return this._fileContentKey || (this._fileContentKey = getContentKey(this.fullPathHash));
+        return this._fileContentKey || (this._fileContentKey = i(this.fullPathHash));
     }
     get fileContent() {
-        return this._ensureFileContentLoaded(), this.visited = !0, this._fileContent;
+        var e, t = this;
+        return t.created && null == t._fileContent && !t.fileContentLoaded && (t.fileContentLoaded = !0, 
+        e = t.qyCache) && (t._fileContent = e.qyKVData.getValueSync(t.fileContentKey)), 
+        this.visited = !0, this._fileContent;
     }
     set fileContent(e) {
         this.visited = !0, this._fileContent = e;
@@ -36,15 +53,15 @@ class QyFile extends QyItem {
         var {
             created: e,
             _qyIndexPropTree: t,
-            name: i,
-            fileContent: n,
+            name: n,
+            fileContent: i,
             underHiddenFolder: r
         } = this;
-        if (e && r && i == IndexPropPathsFileName) {
+        if (e && r && n == u) {
             if (t) return t;
-            var l, s = this._qyIndexPropTree = new QyIndexPropTree();
-            for (l in n) s.insert(fromSingleName(l));
-            return s;
+            var l, o = this._qyIndexPropTree = new f();
+            for (l in i) o.insert(s(l));
+            return o;
         }
     }
     get isFile() {
@@ -52,7 +69,7 @@ class QyFile extends QyItem {
     }
     get contentAsText() {
         var e = this.fileContent;
-        return null == e ? "" : isNotNullObj(e) ? JSON.stringify(e) : e.toString();
+        return null == e ? "" : a(e) ? JSON.stringify(e) : e.toString();
     }
     get clonedContent() {
         return structuredClone(this.fileContent);
@@ -60,65 +77,60 @@ class QyFile extends QyItem {
     setContent(e) {
         this.fileContent = e;
     }
-    view(e = $clone, t) {
-        var i = this.fileContent;
-        return null == i || isSimpleType(i) ? i : this._viewBySpec(i, e, t);
+    view(e = l, t) {
+        var n = this.fileContent;
+        return null == n || C(n) ? n : function t(n, i, r, l) {
+            if (r === c) return i;
+            if (null == r) return;
+            if (C(r)) return r ? l ? i : structuredClone(i) : void 0;
+            let e = r.$link;
+            if (null != e) return y(n, i, e, r[h]);
+            if (C(i)) return i;
+            d(r) && (r = Object.fromEntries(r.filter(e => e).map(e => [ e, 1 ])));
+            let o = d(i) ? [] : {};
+            let {
+                $all: s,
+                "**": a
+            } = r;
+            if (s || a) for (var f in i) {
+                let e = r[f] ?? s ?? a;
+                e && (o[f] = t(n, i[f], e, l));
+            } else for (var u in r) {
+                let e = r[u];
+                e && (o[u] = t(n, i[u], e, l));
+            }
+            return o;
+        }(this, n, e, t);
     }
-    getProp(e, t = $clone, i) {
-        var n;
-        if (t) return e = getValByNamePath(this.fileContent, isArray(e) ? e : [ e ]), 
-        n = t.$link, null != n ? this._link(e, n, t[$spec], i) : i || t === $raw ? e : structuredClone(e);
+    prop(e, t = l, n) {
+        var i;
+        if (t) return e = r(this.fileContent, d(e) ? e : [ e ]), i = t.$link, null != i ? y(this, e, i, t[h], n) : n || t === c ? e : structuredClone(e);
     }
     unloadFileContent() {
         this.created && this.fileContentLoaded && null != this._fileContent && (this._fileContent = void 0, 
         this.fileContentLoaded = !1);
     }
-    _ensureFileContentLoaded() {
-        var e;
-        this.created && null == this._fileContent && !this.fileContentLoaded && (this.fileContentLoaded = !0, 
-        e = this.qyCache, e) && (this._fileContent = e.qyKVData.getValueSync(this.fileContentKey));
-    }
-    _link(e, t, i, n) {
-        let r = this.qyCache.getDir(t);
-        if (isArray(e)) return e.map(e => this._getLinkedFileContent(r, e, i, n));
-        if (isNotNullObj(e)) {
-            var l, s = {};
-            for (l in e) s[l] = this._getLinkedFileContent(r, l, i, n);
-            return s;
-        }
-        return this._getLinkedFileContent(r, e, i, n);
-    }
-    _getLinkedFileContent(e, t, i, n) {
-        if (e) {
-            e = e.getFile(t);
-            if (e) return e.view(i, n);
-        }
-        return t;
-    }
-    _viewBySpec(e, t, i) {
-        if (t === $raw) return e;
-        if (null != t) {
-            if (isSimpleType(t)) return t ? i ? e : structuredClone(e) : void 0;
-            var n = t.$link;
-            if (null != n) return this._link(e, n, t[$spec]);
-            if (isSimpleType(e)) return e;
-            isArray(t) && (t = Object.fromEntries(t.filter(e => e).map(e => [ e, 1 ])));
-            var r = isArray(e) ? [] : {}, {
-                $all: l,
-                "**": s
-            } = t;
-            if (l || s) for (var o in e) {
-                var a = t[o] ?? l ?? s;
-                a && (r[o] = this._viewBySpec(e[o], a, i));
-            } else for (var h in t) {
-                var u = t[h];
-                u && (r[h] = this._viewBySpec(e[h], u, i));
-            }
-            return r;
-        }
+}
+
+function p(e, t, n, i) {
+    if (e) {
+        e = e.getFile(t);
+        if (e) return e.view(n, i);
     }
+    return t;
+}
+
+function y(e, t, n, i, r) {
+    let l = e.qyCache.getDir(n);
+    if (d(t)) return t.map(e => p(l, e, i, r));
+    if (a(t)) {
+        var o, s = {};
+        for (o in t) s[o] = p(l, o, i, r);
+        return s;
+    }
+    return p(l, t, i, r);
 }
 
-Object.assign(module.exports, {
-    QyFile: QyFile
-});
+export {
+    o as QyFile
+};

package/src/QyFileContentUtils.js

@@ -1,175 +1,172 @@
-let {
-    isNotNullObj,
-    arrayLast,
-    trimArrayTail,
-    isSimpleType,
-    SpecialOperators
-} = require("./QyUtils.js"), isArray = Array.isArray, {
-    $del,
-    $rpl,
-    $ext
-} = SpecialOperators;
+import {
+    isNotNullObj as f,
+    arrayLast as u,
+    trimArrayTail as V,
+    isSimpleType as h,
+    SpecialOperators as n
+} from "./QyUtils.js";
 
-function mergeContent(e, n) {
-    if (null == n) return e;
-    if (n !== $del) {
-        if (isSimpleType(n)) return n;
-        var r = n[$rpl];
+let m = Array.isArray, {
+    $del: y,
+    $rpl: p,
+    $ext: w
+} = n;
+
+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 == e || isSimpleType(e)) return n;
-        if (e != n) {
-            var l, t = isArray(e);
-            for (l in n) {
-                var a = mergeContent(e[l], n[l]);
-                null == a ? (delete e[l], t && trimArrayTail(e)) : e[l] = a;
+        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;
             }
         }
-        return e;
+        return n;
     }
 }
 
-function mergeContentChanges(e, n) {
-    if (n == $del) return $del;
-    if (null != n[$rpl]) return n;
-    var r = e[$rpl];
-    if (null != r) e[$rpl] = mergeContent(r, n); else {
-        if (e == $del) return {
-            [$rpl]: cleanContent(n)
+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)
         };
-        if (isSimpleType(e) || isSimpleType(n)) return n;
-        for (var l in n) {
-            var t = n[l], a = e[l];
-            e[l] = null == a ? t : mergeContentChanges(a, t);
+        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);
         }
     }
-    return e;
+    return n;
 }
 
-function mergeContentAndGenDelta(e, n) {
+function e(n, e) {
     let r = {
         oldValue: {},
         newValue: {}
     };
-    e = _mergeContentAndGenDelta_rec(e, n, [], 0, r);
-    return r.oldValue = cleanContent(r.oldValue, !0, !0), r.newValue = cleanContent(r.newValue, !1, !1), 
+    n = C(n, e, [], 0, r);
+    return r.oldValue = S(r.oldValue, !0, !0), r.newValue = S(r.newValue, !1, !1), 
     {
-        merged: e,
+        merged: n,
         delta: r = r.oldValue || r.newValue ? r : void 0
     };
 }
 
-function _mergeArrayOrObj(e, n, r, l, t) {
-    if (e != n) {
-        var a, i = isArray(e);
-        for (a in n) {
-            r[l] = a, r.length = l + 1;
-            var u = _mergeContentAndGenDelta_rec(e[a], n[a], r, l + 1, t);
-            null == u ? (delete e[a], i && trimArrayTail(e)) : e[a] = u;
+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;
     }
-    return e;
-}
-
-function _mergeContentAndGenDelta_rec(n, r, l, t, a) {
-    if (null == r) return n;
-    if (r !== $del) {
-        if (null == n || isSimpleType(n) || isSimpleType(r)) return _genRpl(n, r, l, a);
-        var i = r[$rpl];
-        if (null != i) return _genRpl(n, i, l, a);
-        let e = r[$ext];
-        return null != e ? (isArray(e) || (e = [ e ]), (isArray(n) ? _genExt : _genRpl)(n, e, l, a)) : isArray(n) && !isArray(r) || !isArray(n) && isArray(r) ? _genRpl(n, r, l, a) : _mergeArrayOrObj(n, r, l, t, a);
-    }
-    null != n && setDeltaValues(a, l, n, $del);
+    null != e && N(u, l, e, y);
 }
 
-function _genExt(n, r, e, l) {
-    r = cleanContent(r);
-    var t = {};
-    for (let e = 0; e < r.length; ++e) {
-        var a = r[e];
-        null != a && (t[e + n.length] = isSimpleType(a) ? a : {
-            [$rpl]: a
-        });
-    }
-    return setDeltaValues(l, e, n, t), n.concat(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 _genRpl(e, n, r, l) {
-    n = cleanContent(n);
-    return e === n ? e : null != n ? (null == e ? setDeltaValues(l, r, 0 == r.length ? void 0 : null, isSimpleType(n) ? n : {
-        [$rpl]: n
-    }) : setDeltaValues(l, r, e, isSimpleType(e) ? n : {
-        [$rpl]: n
-    }), n) : void setDeltaValues(l, r, e, $del);
+function N(n, e, r, l) {
+    n.oldValue = t(n.oldValue, e, r), n.newValue = t(n.newValue, e, l);
 }
 
-function setDeltaValues(e, n, r, l) {
-    e.oldValue = setValByNamePath(e.oldValue, n, r), e.newValue = setValByNamePath(e.newValue, n, l);
-}
-
-function setValByNamePath(e, n, r) {
-    if (!n || 0 == n.length) return r;
-    let l = e;
-    for (let e = 0; e < n.length - 1; ++e) {
-        var t = n[e];
-        isNotNullObj(l[t]) || (l[t] = {}), l = l[t];
+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];
     }
-    return l[arrayLast(n)] = r, e;
+    return l[u(e)] = r, n;
 }
 
-function getValByNamePath(e, n) {
-    if (null != n && null != (e = _getValFromObj(e))) {
-        if (!isArray(n)) return "" == n ? e : _getValFromObj(e[n]);
-        if (0 != n.length && (1 != n.length || "" != n[0])) for (var r of n) if (null == (e = _getValFromObj(e[r]))) return;
-        return e;
+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 _getValFromObj(e) {
-    if (null != e && e != $del) {
-        for (;null != e[$rpl]; ) if ((e = e[$rpl]) == $del) return;
-        return e;
+function l(n) {
+    if (null != n && n != y) {
+        for (;null != n[p]; ) if ((n = n[p]) == y) return;
+        return n;
     }
 }
 
-function cleanContent(e, n = !0, r = !1) {
-    return _cleanContent_rec(e, n, r);
-}
-
-function _cleanContent_rec(e, n, r) {
-    if (e instanceof Date) return e.toISOString();
-    if (!isNotNullObj(e)) return (r ? void 0 === e : null == e) || n && e === $del ? void 0 : e;
-    if (n) {
-        var l = e[$rpl];
-        if (null != l) return _cleanContent_rec(l, n, r);
-        l = e[$ext];
-        if (null != l) return _cleanContent_rec(isArray(l) ? l : [ l ], n, r);
-    }
-    var t, a = isArray(e);
-    let i = !0;
-    for (t in e) {
-        var u = _cleanContent_rec(e[t], n, r);
-        (r ? void 0 === u : null == u) ? (delete e[t], a && trimArrayTail(e)) : (e[t] = u, 
-        i = !1);
-    }
-    return i ? void 0 : e;
+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 objToDelMarks(e) {
-    if (isSimpleType(e)) return e ? $del : void 0;
-    for (var n in e) {
-        var r = objToDelMarks(e[n]);
-        r ? e[n] = r : delete e[n];
+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];
     }
-    return isArray(e) && trimArrayTail(e), e;
+    return m(n) && V(n), n;
 }
 
-Object.assign(module.exports, {
-    mergeContent: mergeContent,
-    mergeContentAndGenDelta: mergeContentAndGenDelta,
-    mergeContentChanges: mergeContentChanges,
-    setValByNamePath: setValByNamePath,
-    getValByNamePath: getValByNamePath,
-    cleanContent: cleanContent,
-    objToDelMarks: objToDelMarks
-});
+export {
+    i as mergeContent,
+    e as mergeContentAndGenDelta,
+    a as mergeContentChanges,
+    t as setValByNamePath,
+    r as getValByNamePath,
+    S as cleanContent,
+    o as objToDelMarks
+};

package/src/QyFileLogger.js

@@ -1,58 +1,80 @@
-let path = require("node:path"), {
-    setFileConsoleDateDirPath,
-    closeFileConsole
-} = require("./QyLogger.js"), ensureDir = require("./QyUtils.js").ensureDir, getDefaultOptions = require("./QyDefaultOptions.js").getDefaultOptions, QyOpRunner = require("./QyOpRunner.js").QyOpRunner, QyLogFileSaver = require("./QyLogFileSaver.js").QyLogFileSaver;
-
-class QyFileLogger extends QyOpRunner {
-    constructor(e, t) {
-        (t = {
-            ...getDefaultOptions("QyFileLogger"),
-            ...t
-        }).append = !t.clearLogAtStart, super(t, [ "stop" ], [ "startFileConsole", "switchFileConsole" ]), 
+import {
+    join as a
+} from "node:path";
+
+import {
+    setFileConsoleDateDirPath as e,
+    closeFileConsole as t
+} from "./QyLogger.js";
+
+import {
+    ensureDir as i
+} from "./QyUtils.js";
+
+import {
+    getDefaultOptions as s
+} from "./QyDefaultOptions.js";
+
+import {
+    QyOpRunner as o
+} from "./QyOpRunner.js";
+
+import {
+    QyLogFileSaver as r
+} from "./QyLogFileSaver.js";
+
+class n extends o {
+    constructor(t, e) {
+        (e = {
+            ...s("QyFileLogger"),
+            ...e
+        }).append = !e.clearLogAtStart, super(e, [ "stop" ], [ "startFileConsole", "switchFileConsole" ]), 
         Object.assign(this, {
-            logFileFolder: e,
-            qyLogFileSaver: new QyLogFileSaver(this, t)
+            logFileFolder: t,
+            qyLogFileSaver: new r(this, e)
         });
     }
-    save(e, t) {
-        return this.qyLogFileSaver.save(e, t);
+    save(t, e) {
+        return this.qyLogFileSaver.save(t, e);
     }
     getDateDirPath() {
         return this.dateDirPath;
     }
     async start() {
-        var e = new Date(), e = (this.timeoutRef = setTimeout(() => this.switch(), this._getRemainingMilliSeconds(e)), 
-        this.dateDirPath = this._genDateDirPath(e));
-        this.qyLogFileSaver.start(path.join(e, "change.txt")), await this.startFileConsole(e);
+        var t = new Date(), t = (this.timeoutRef = setTimeout(this.switch.bind(this), g(t)), 
+        this.dateDirPath = h(this, t));
+        this.qyLogFileSaver.start(a(t, "change.txt")), await this.startFileConsole(t);
     }
     switch() {
-        var e = new Date(), e = (this.timeoutRef = setTimeout(() => this.switch(), this._getRemainingMilliSeconds(e)), 
-        this._genDateDirPath(e));
-        return this.dateDirPath != e && (this.dateDirPath = e, this.qyLogFileSaver.switch(path.join(e, "change.txt")), 
-        this.switchFileConsole(e)), this;
+        var t = new Date(), t = (this.timeoutRef = setTimeout(this.switch.bind(this), g(t)), 
+        h(this, t));
+        return this.dateDirPath != t && (this.dateDirPath = t, this.qyLogFileSaver.switch(a(t, "change.txt")), 
+        this.switchFileConsole(t)), this;
     }
-    async _op_startFileConsole(e) {
-        await ensureDir(e), setFileConsoleDateDirPath(e, this.options.clearLogAtStart);
+    async _op_startFileConsole(t) {
+        await i(t), e(t, this.options.clearLogAtStart);
     }
     async _op_stop() {
-        clearTimeout(this.timeoutRef), this.timeoutRef = void 0, closeFileConsole(), 
-        await this.qyLogFileSaver.stop();
-    }
-    async _op_switchFileConsole(e) {
-        await ensureDir(e), setFileConsoleDateDirPath(e, this.options.clearLogAtStart);
-    }
-    _genDateDirPath(e) {
-        var t = e.getUTCFullYear(), i = e.getUTCMonth() + 1, s = e.getUTCDate(), e = e.getUTCHours();
-        return path.join(this.logFileFolder, t.toString(), this._patch(i), this._patch(s), this._patch(e));
+        clearTimeout(this.timeoutRef), this.timeoutRef = void 0, t(), await this.qyLogFileSaver.stop();
     }
-    _patch(e) {
-        return e.toString().padStart(2, "0");
-    }
-    _getRemainingMilliSeconds(e) {
-        return 1e3 * (60 * (60 - e.getUTCMinutes()) - e.getUTCSeconds());
+    async _op_switchFileConsole(t) {
+        await i(t), e(t, this.options.clearLogAtStart);
     }
 }
 
-Object.assign(module.exports, {
-    QyFileLogger: QyFileLogger
-});
+function h(t, e) {
+    var i = e.getUTCFullYear(), s = e.getUTCMonth() + 1, o = e.getUTCDate(), e = e.getUTCHours();
+    return a(t.logFileFolder, i.toString(), l(s), l(o), l(e));
+}
+
+function l(t) {
+    return t.toString().padStart(2, "0");
+}
+
+function g(t) {
+    return 1e3 * (60 * (60 - t.getUTCMinutes()) - t.getUTCSeconds());
+}
+
+export {
+    n as QyFileLogger
+};