datafolder 1.0.11 → 1.0.13

package/src/QyUtils.js

@@ -6,9 +6,9 @@ import e from "node:process";
 
 import l from "node:fs/promises";
 
-import o from "node:fs";
+import i from "node:fs";
 
-import i from "node:timers/promises";
+import o from "node:timers/promises";
 
 import {
     fileURLToPath as r
@@ -18,53 +18,53 @@ import {
     logger as u
 } from "../src/QyLogger.js";
 
-var a = t.dirname(r(import.meta.url)), f = Object.fromEntries([ "$del", "$link", "$rpl", "$spec", "$raw", "$all", "$clone", "$ext", "$or", "$and", "$gt", "$lt", "$gte", "$lte" ].map(r => [ r, r ])), c = "%", c = {
-    HiddenFolderName: c,
-    TriggerDirPath: [ c, "trigger" ],
-    RpcDirPath: [ c, "rpc" ],
-    IndexDirPath: [ c, "index" ],
+let a = Array.isArray;
+
+var f = t.dirname(r(import.meta.url)), c = Object.fromEntries([ "$del", "$link", "$rpl", "$spec", "$raw", "$all", "$clone", "$ext", "$or", "$and", "$gt", "$lt", "$gte", "$lte" ].map(r => [ r, r ])), s = "%", s = {
+    HiddenFolderName: s,
+    TriggerDirPath: [ s, "trigger" ],
+    RpcDirPath: [ s, "rpc" ],
+    IndexDirPath: [ s, "index" ],
+    ExpireDirPath: [ s, "expire" ],
+    MetaFilePath: [ s, "meta" ],
     IndexPropPathsFileName: "propPaths"
 };
 
-function s(r) {
+function m(r) {
     return r.startsWith("{") && r.endsWith("}");
 }
 
 function d(r) {
-    return s(r) && r.substring(1, r.length - 1);
+    return m(r) && r.substring(1, r.length - 1);
 }
 
-function m(r) {
+function p(r) {
     return 1e12 < r ? Math.round(100 * r / 1e12) / 100 + "TB" : 1e9 < r ? Math.round(100 * r / 1e9) / 100 + "GB" : 1e6 < r ? Math.round(100 * r / 1e6) / 100 + "MB" : 1e3 < r ? Math.round(100 * r / 1e3) / 100 + "KB" : r.toString();
 }
 
-function p(r, t = 10) {
+function h(r, t = 10) {
     return n.createHash("sha256").update(r, "utf8").digest("base64url").slice(0, t);
 }
 
-var h = 11;
+var g = 11;
 
-function g(r) {
+function y(r) {
     return "d" + r;
 }
 
-function y(r) {
+function v(r) {
     return "f" + r;
 }
 
-function v(r) {
+function b(r) {
     return "c" + r;
 }
 
-function b(r = 8) {
+function w(r = 8) {
     return n.randomBytes(r).toString("hex");
 }
 
 function $(r) {
-    return r[r.length - 1];
-}
-
-function w(r) {
     if (null != r) for (var t in r) if (null != r[t]) return !1;
     return !0;
 }
@@ -73,28 +73,28 @@ function P(r) {
     return null != r && "object" == typeof r && !(r instanceof Date);
 }
 
-function S(r) {
+function x(r) {
     return "string" == typeof r;
 }
 
-function j(r) {
+function S(r) {
     return "number" == typeof r;
 }
 
-function x(r) {
+function j(r) {
     return "boolean" == typeof r;
 }
 
-function B(r) {
+function M(r) {
     return "function" == typeof r;
 }
 
-function M(r) {
+function B(r) {
     var t = typeof r;
     return "string" == t || "number" == t || "boolean" == t || r instanceof Date;
 }
 
-function O(r) {
+function D(r) {
     let t = r.length;
     for (;null == r[t - 1] && 0 < t; ) --t;
     return r.length = t, r;
@@ -107,25 +107,25 @@ function T(n) {
     }))), n;
 }
 
-function k(r) {
+function A(r) {
     return Buffer.isBuffer(r) ? r : Buffer.from(r);
 }
 
-function A(r) {
+function E(r) {
     return 1 < r ? "s" : "";
 }
 
-function D(r) {
+function F(r) {
     return l.mkdir(r, {
         recursive: !0
     });
 }
 
-function F(r) {
-    return D(t.dirname(r));
+function O(r) {
+    return F(t.dirname(r));
 }
 
-async function I(r) {
+async function k(r) {
     try {
         return (await l.stat(r)).size;
     } catch (r) {
@@ -134,29 +134,29 @@ async function I(r) {
 }
 
 async function W(r) {
-    return !1 !== await I(r);
+    return !1 !== await k(r);
 }
 
-function E(r, t = void 0) {
+function L(r, t = void 0) {
     r *= 1e3;
-    return t ? i.setTimeout(r, !0, {
+    return t ? o.setTimeout(r, !0, {
         signal: t
-    }) : i.setTimeout(r);
+    }) : o.setTimeout(r);
 }
 
-let N;
+let I;
 
-async function L(t) {
+async function R(t) {
     try {
-        await F(t);
+        await O(t);
         var r = new Date().toISOString() + ": " + e.argv.join(" ");
         function n() {
-            for (var r of Object.keys(N)) U(r);
+            for (var r of Object.keys(I)) N(r);
         }
         await l.writeFile(t, r, {
             flag: "wx",
             flush: !0
-        }), u.info("Locked " + t), N ? N[t] = 1 : (N = {
+        }), u.info("Locked " + t), I ? I[t] = 1 : (I = {
             [t]: 1
         }, e.on("exit", n), e.on("SIGINT", n));
     } catch (r) {
@@ -165,66 +165,70 @@ async function L(t) {
     }
 }
 
-function U(r) {
+function N(r) {
     try {
-        o.unlinkSync(r), u.info("Unlocked " + r);
+        i.unlinkSync(r), u.info("Unlocked " + r);
     } catch (r) {}
 }
 
-function R(r) {
+function G(r) {
     return r.startsWith("[") && r.endsWith("]") ? JSON.parse(r) : r;
 }
 
-function G(r) {
-    return Array.isArray(r) ? 1 == r.length ? r[0] : JSON.stringify(r) : r;
+function H(r) {
+    return a(r) ? 1 == r.length ? r[0] : JSON.stringify(r) : r;
 }
 
-function H(r) {
+function J(r) {
     r = r.split("/");
     return r[0] || (r[0] = "/"), r;
 }
 
-function J(r) {
+function U(r) {
     return r.split(".");
 }
 
 function Q(r) {
+    return x(r) ? [ U(r) ] : a(r) ? r.map(r => x(r) ? U(r) : r) : void 0;
+}
+
+function z(r) {
     return r.join(".");
 }
 
-function z(r, t = 0) {
+function K(r, t = 0) {
     return Math.floor(Math.random() * (r - t)) + t;
 }
 
-function K(r) {
+function X(r) {
     var t, n = {};
     for (t of r) n[t] = 1;
     return n;
 }
 
-async function X(t, n, e, o) {
-    var i = Buffer.allocUnsafe(o);
-    for (let r = 0; r < o; ) {
-        var a = (await n.read(i, r, o - r, e + r)).bytesRead;
+async function q(t, n, e, i) {
+    var o = Buffer.allocUnsafe(i);
+    for (let r = 0; r < i; ) {
+        var a = (await n.read(o, r, i - r, e + r)).bytesRead;
         if (0 == a) return void u.error(`read ${t} at ${e + r} returning 0 byte`);
         r += a;
     }
-    return i;
+    return o;
 }
 
-function q() {
+function C() {
     var r = e.availableMemory();
     return Math.round(r / (e.memoryUsage.rss() + r) * 100);
 }
 
-async function* C(e, t = 3) {
-    var n = e.length, o = (n < t && (t = n), new Array(n));
+async function* V(e, t = 3) {
+    var n = e.length, i = (n < t && (t = n), new Array(n));
     for (let r = 0; r < t; ++r) {
-        var i = o[r] = {};
-        s(r, i);
+        var o = i[r] = {};
+        s(r, o);
     }
     for (let r = 0; r < n; ++r) {
-        var a = o[r % t], {
+        var a = i[r % t], {
             filePath: u,
             bin: f
         } = (a.bin || await a.promise, a), c = r + t;
@@ -243,48 +247,58 @@ async function* C(e, t = 3) {
     }
 }
 
+function Y(r = new Date()) {
+    return r.getTime();
+}
+
+function Z(r = new Date()) {
+    r = r.getTime();
+    return r - r % 1e3;
+}
+
 export * as default from "./QyUtils.js";
 
 export {
-    a as __dirname,
-    f as SpecialOperators,
-    c as SpecialFilePaths,
-    s as isMatchName,
+    f as __dirname,
+    c as SpecialOperators,
+    s as SpecialFilePaths,
+    m as isMatchName,
     d as getMatchParam,
-    m as getSizeStr,
-    p as calHash,
-    h as Hash_Key_Length,
-    g as getSubdirMapKey,
-    y as getFileMapKey,
-    v as getContentKey,
-    b as getRandomStr,
-    $ as arrayLast,
-    w as isEmptyObj,
+    p as getSizeStr,
+    h as calHash,
+    g as Hash_Key_Length,
+    y as getSubdirMapKey,
+    v as getFileMapKey,
+    b as getContentKey,
+    w as getRandomStr,
+    $ as isEmptyObj,
     P as isNotNullObj,
-    S as isString,
-    j as isNumber,
-    x as isBoolean,
-    B as isFunction,
-    M as isSimpleType,
-    O as trimArrayTail,
+    x as isString,
+    S as isNumber,
+    j as isBoolean,
+    M as isFunction,
+    B as isSimpleType,
+    D as trimArrayTail,
     T as setPromise,
-    k as toBuffer,
-    A as getSuffix,
-    D as ensureDir,
-    F as ensureParentDir,
-    I as getSize,
+    A as toBuffer,
+    E as getSuffix,
+    F as ensureDir,
+    O as ensureParentDir,
+    k as getSize,
     W as folderOrFileExists,
-    E as sleep,
-    L as lockExclusiveFilePath,
-    U as unlockExclusiveFilePath,
-    R as fromSingleName,
-    G as toSingleName,
-    H as pathSplit,
-    J as propNameSplit,
-    Q as propNameJoin,
-    z as randomInt,
-    K as listToMap,
-    X as readBufferAsync,
-    q as memoryPercent,
-    C as loadFileList
+    L as sleep,
+    R as lockExclusiveFilePath,
+    N as unlockExclusiveFilePath,
+    G as fromSingleName,
+    H as toSingleName,
+    J as pathSplit,
+    Q as ensurePropNamePathList,
+    z as propNameJoin,
+    K as randomInt,
+    X as listToMap,
+    q as readBufferAsync,
+    C as memoryPercent,
+    V as loadFileList,
+    Y as getNowTime,
+    Z as getNowRounded
 };

package/src/hackernews.js

@@ -67,7 +67,7 @@ function c(e, t) {
     let g = 0;
     for (l in c) {
         var w = a[l];
-        j.batch.insert([ "hackernews", ...w, l ], c[l]), ++g >= C && (j.batch.run(), 
+        j.batch.insert([ "hackernews", ...w, l ], c[l], !0), ++g >= C && (j.batch.run(), 
         g = 0);
     }
     for (m in 0 < g && j.batch.run(), c) !function e(t) {

package/src/simulate.js

@@ -36,18 +36,18 @@ async function b(e) {
 function h(e) {
     console.time("insertData");
     var t, s, r, o = e.batch;
-    for (t of d) o.insert([ "hosts", t ], p[t]);
+    for (t of d) o.insert([ "hosts", t ], p[t], !0);
     for (s of g) {
         var i = f[s], {
             property_type: a,
             room_type: n,
             bed_type: l
         } = i;
-        o.insert([ "airbnb", a, n, l, s ], i);
+        o.insert([ "airbnb", a, n, l, s ], i, !0);
     }
     for (r of y) {
         var c = v[r];
-        o.insert([ "reviews", c.listing_id, r ], c);
+        o.insert([ "reviews", c.listing_id, r ], c, !0);
     }
     o.run(), console.timeEnd("insertData");
 }
@@ -71,7 +71,7 @@ async function E(e, t) {
             s = a = i = o = r = void 0;
             var s, r = e, o = _(), i = _(), a = {};
             for (s in i) 1 == u(2) && (a[s] = i[s]);
-            r.insert([ "hosts", o.host_id ], a);
+            r.insert([ "hosts", o.host_id ], a, !0);
             break;
 
           case 1:
@@ -84,14 +84,14 @@ async function E(e, t) {
                 bed_type: p,
                 _id: f
             } = o;
-            r.insert([ "airbnb", o, m, p, f ], c);
+            r.insert([ "airbnb", o, m, p, f ], c, !0);
             break;
 
           case 2:
             v = g = d = p = m = void 0;
             var v, m = e, p = D(), d = D(), g = {};
             for (v in d) 1 == u(2) && (g[v] = d[v]);
-            m.insert([ "reviews", p.listing_id, p._id ], g);
+            m.insert([ "reviews", p.listing_id, p._id ], g, !0);
         }
         await w(u(1e3) / 1e3);
     }

package/src/simulate2.js

@@ -44,7 +44,7 @@ function w(t) {
         Day: i
     } = h[o], a = h[c(h.length)], n = {};
     for (e in a) 1 == c(2) && (n[e] = a[e]);
-    t.insert([ "flights", s, r, i, o ], n);
+    t.insert([ "flights", s, r, i, o ], n, !0);
 }
 
 async function y(t, e) {
@@ -54,7 +54,7 @@ async function y(t, e) {
             o = a = i = r = s = void 0;
             var o, s = t, r = v()._key, i = v(), a = {};
             for (o in i) 1 == c(2) && (a[o] = i[o]);
-            s.insert([ "airports", r ], a);
+            s.insert([ "airports", r ], a, !0);
             break;
 
           case 1:
@@ -68,7 +68,7 @@ function b(t) {
     var e = t;
     console.time("insertAirports");
     var o, s = e.batch;
-    for (o of d) s.insert("airports/" + o._key, o);
+    for (o of d) s.insert("airports/" + o._key, o, !0);
     s.run(), console.timeEnd("insertAirports");
     e = t;
     f.log("insertFlights begin"), console.time("insertFlights");
@@ -79,7 +79,7 @@ function b(t) {
             Month: l,
             Day: c
         } = a;
-        i.insert(`flights/${n}/${l}/${c}/` + t, a);
+        i.insert(`flights/${n}/${l}/${c}/` + t, a, !0);
     }
     i.run(), f.log("insertFlights end"), console.timeEnd("insertFlights"), console.time("createFlightsIndex");
     for (r of e.dir("flights").subdirList) for (var m of r.subdirList) for (var g of m.subdirList) i.createIndex(g, [ "_from", "_to" ]);

package/src/soc_pokec.js

@@ -50,7 +50,7 @@ let d = "./tmp/soc_pokec", w = new e(d);
             let e = w.batch, t = 0;
             for (a in r) {
                 var c = r[a];
-                e.insertP([ "relationships", a ], c), 3e4 < ++t && (await e.run(!0), 
+                e.insertP([ "relationships", a ], c, !0), 3e4 < ++t && (await e.run(!0), 
                 t = 0);
             }
             await e.run(!0), console.timeEnd("insertData"), s.close();

package/static/codemirror.bundle/editor.bundle.js

@@ -4315,6 +4315,7 @@
       chrome_version: chrome ? +chrome[1] : 0,
       ios,
       android: /*@__PURE__*//Android\b/.test(nav.userAgent),
+      webkit,
       webkit_version: webkit ? +(/*@__PURE__*//\bAppleWebKit\/(\d+)/.exec(nav.userAgent) || [0, 0])[1] : 0,
       safari,
       safari_version: safari ? +(/*@__PURE__*//\bVersion\/(\d+(\.\d+)?)/.exec(nav.userAgent) || [0, 0])[1] : 0,
@@ -4833,12 +4834,12 @@
               }
               let moveX = 0, moveY = 0;
               if (y == "nearest") {
-                  if (rect.top < bounding.top) {
+                  if (rect.top < bounding.top + yMargin) {
                       moveY = rect.top - (bounding.top + yMargin);
                       if (side > 0 && rect.bottom > bounding.bottom + moveY)
                           moveY = rect.bottom - bounding.bottom + yMargin;
                   }
-                  else if (rect.bottom > bounding.bottom) {
+                  else if (rect.bottom > bounding.bottom - yMargin) {
                       moveY = rect.bottom - bounding.bottom + yMargin;
                       if (side < 0 && (rect.top - moveY) < bounding.top)
                           moveY = rect.top - (bounding.top + yMargin);
@@ -4852,12 +4853,12 @@
                   moveY = targetTop - bounding.top;
               }
               if (x == "nearest") {
-                  if (rect.left < bounding.left) {
+                  if (rect.left < bounding.left + xMargin) {
                       moveX = rect.left - (bounding.left + xMargin);
                       if (side > 0 && rect.right > bounding.right + moveX)
                           moveX = rect.right - bounding.right + xMargin;
                   }
-                  else if (rect.right > bounding.right) {
+                  else if (rect.right > bounding.right - xMargin) {
                       moveX = rect.right - bounding.right + xMargin;
                       if (side < 0 && rect.left < bounding.left + moveX)
                           moveX = rect.left - (bounding.left + xMargin);
@@ -5597,7 +5598,7 @@
   });
   const scrollHandler = /*@__PURE__*/Facet.define();
   class ScrollTarget {
-      constructor(range, y = "nearest", x = "nearest", yMargin = 5, xMargin = 5, 
+      constructor(range, y, x, yMargin, xMargin, 
       // This data structure is abused to also store precise scroll
       // snapshots, instead of a `scrollIntoView` request. When this
       // flag is `true`, `range` points at a position in the reference
@@ -8194,6 +8195,18 @@
               this.y = (side.top + side.bottom) / 2;
               return this.scan(positions, getRects);
           }
+          // Handle the case where closest matched a higher element on the
+          // same line as an element below/above the coords
+          if (closestDx) {
+              if (above && above.bottom > closestRect.top) {
+                  this.y = above.bottom - 1;
+                  return this.scan(positions, getRects);
+              }
+              if (below && below.top < closestRect.bottom) {
+                  this.y = below.top + 1;
+                  return this.scan(positions, getRects);
+              }
+          }
           let ltr = (bidi ? this.dirAt(positions[closestI], 1) : this.baseDir) == Direction.LTR;
           return {
               i: closestI,
@@ -12210,7 +12223,8 @@
                       scrollTarget = scrollTarget.map(tr.changes);
                   if (tr.scrollIntoView) {
                       let { main } = tr.state.selection;
-                      scrollTarget = new ScrollTarget(main.empty ? main : EditorSelection.cursor(main.head, main.head > main.anchor ? -1 : 1));
+                      let { x, y } = this.state.facet(EditorView.cursorScrollMargin);
+                      scrollTarget = new ScrollTarget(main.empty ? main : EditorSelection.cursor(main.head, main.head > main.anchor ? -1 : 1), "nearest", "nearest", y, x);
                   }
                   for (let e of tr.effects)
                       if (e.is(scrollIntoView$1))
@@ -12867,7 +12881,8 @@
       cause it to scroll the given position or range into view.
       */
       static scrollIntoView(pos, options = {}) {
-          return scrollIntoView$1.of(new ScrollTarget(typeof pos == "number" ? EditorSelection.cursor(pos) : pos, options.y, options.x, options.yMargin, options.xMargin));
+          var _a, _b, _c, _d;
+          return scrollIntoView$1.of(new ScrollTarget(typeof pos == "number" ? EditorSelection.cursor(pos) : pos, (_a = options.y) !== null && _a !== void 0 ? _a : "nearest", (_b = options.x) !== null && _b !== void 0 ? _b : "nearest", (_c = options.yMargin) !== null && _c !== void 0 ? _c : 5, (_d = options.xMargin) !== null && _d !== void 0 ? _d : 5));
       }
       /**
       Return an effect that resets the editor to its current (at the
@@ -13126,11 +13141,30 @@
   */
   EditorView.bidiIsolatedRanges = bidiIsolatedRanges;
   /**
+  Can be used to specify the distance that scrolling cursor into
+  view keeps it away from the sides of the editor, either as a
+  single pixel number or two different values for the different
+  axes. Defaults to 5 pixels on both axes.
+  */
+  EditorView.cursorScrollMargin = /*@__PURE__*/Facet.define({
+      combine: inputs => {
+          let x = 5, y = 5;
+          for (let i of inputs) {
+              if (typeof i == "number")
+                  x = y = i;
+              else
+                  ({ x, y } = i);
+          }
+          return { x, y };
+      }
+  });
+  /**
   Facet that allows extensions to provide additional scroll
   margins (space around the sides of the scrolling element that
   should be considered invisible). This can be useful when the
   plugin introduces elements that cover part of that element (for
-  example a horizontally fixed gutter).
+  example a horizontally fixed gutter). Not to be confused with
+  [`cursorScrollMargin`](https://codemirror.net/6/docs/ref/#view.EditorView^cursorScrollMargin).
   */
   EditorView.scrollMargins = scrollMargins;
   /**
@@ -13666,7 +13700,7 @@
                   old = next;
               }
               this.drawn = markers;
-              if (browser.safari && browser.safari_version >= 26) // Issue #1600, 1627
+              if (browser.webkit) // Issue #1600, 1627, 1686
                   this.dom.style.display = this.dom.firstChild ? "" : "none";
           }
       }
@@ -25781,6 +25815,8 @@
           if (dPrec)
               this.score += dPrec;
           if (depth == 0) {
+              if (type < parser.minRepeatTerm && this.reducePos < this.pos)
+                  this.reducePos = this.pos;
               this.pushState(parser.getGoto(this.state, type, true), this.reducePos);
               // Zero-depth reductions are a special case—they add stuff to
               // the stack without popping anything off.
@@ -25795,7 +25831,10 @@
           // expression and the state that we'll be staying in, which should
           // be moved to `this.state`).
           let base = this.stack.length - ((depth - 1) * 3) - (action & 262144 /* Action.StayFlag */ ? 6 : 0);
-          let start = base ? this.stack[base - 2] : this.p.ranges[0].from, size = this.reducePos - start;
+          let start = base ? this.stack[base - 2] : this.p.ranges[0].from;
+          if (type < parser.minRepeatTerm && start == this.reducePos && this.reducePos < this.pos)
+              this.reducePos = this.pos;
+          let size = this.reducePos - start;
           // This is a kludge to try and detect overly deep left-associative
           // trees, which will not increase the parse stack depth and thus
           // won't be caught by the regular stack-depth limit check.

package/static/datafolderui/QyUIFolderViewer.js

@@ -160,11 +160,7 @@ class t extends HTMLElement {
             } = n = this;
             i.hidden = !0, r.hidden = !1, e || n.codeMirrorDiv.append(e = n.code_mirror = c("code-mirror")), 
             t || n.codeMirrorDiv.append(t = n.code_mirror2 = c("code-mirror"));
-            var {
-                fileNamePath: n,
-                propNamePathList: s,
-                modCode: l
-            } = s;
+            var [ n, s, l ] = s;
             e.text = JSON.stringify({
                 fileNamePath: n,
                 propNamePathList: s

package/src/rpc/evalCode.js

@@ -1,9 +0,0 @@
-module.exports = r => {
-    try {
-        return new Function("dataFolder", `return (${r})();`)(dataFolder);
-    } catch (r) {
-        return {
-            error: r.message
-        };
-    }
-};

package/src/rpc/getFileContent.js

@@ -1,16 +0,0 @@
-let a = new Error("No such file");
-
-module.exports = ({
-    filePath: e,
-    cChangeId: n
-}) => {
-    var t, l, o, e = dataFolder.fileP(e);
-    return e ? ({
-        fileContent: e,
-        cChangeId: t,
-        fileContentKey: l
-    } = e, o = {}, n != t && (Object.assign(o, {
-        fileContent: e,
-        cChangeId: t
-    }), null == n) && (o.fileContentKey = l), o) : a;
-};

package/src/rpc/getRpcFiles.js

@@ -1 +0,0 @@
-module.exports = () => dataFolder.fileListToTree(dataFolder.rpcFileList);