datafolder 1.0.14 → 1.0.15

package/src/QySnapshotCompactor_Worker.js

@@ -43,7 +43,7 @@ export default class extends a {
         super(s = {
             ...e("QySnapshotCompactor_Worker"),
             ...s
-        }, [], [ "compactSnapshots", "saveSnapshotInfos" ]);
+        });
         var o = t(a, "snapshot");
         Object.assign(this, {
             kvFolder: a,
@@ -82,7 +82,7 @@ export default class extends a {
                     qySnapshots: e,
                     vLInfoMap: p
                 } = a;
-                await M(a, s) && (await m(a, s), await e.saveKeyValueMap(s), {
+                await M(a, s) && (await y(a, s), await e.saveKeyValueMap(s), {
                     snapshotNum: a,
                     info: e,
                     posMap: s,
@@ -102,13 +102,13 @@ export default class extends a {
                 snapshotNum: i,
                 info: r,
                 keyValueMap: f
-            } = (await m(t, n), n);
+            } = (await y(t, n), n);
             Object.assign(n, {
                 posMap: void 0,
                 prefixPM: void 0
             });
             for (var h of a) if (h != n) {
-                await m(t, h);
+                await y(t, h);
                 let {
                     snapshotNum: a,
                     info: s,
@@ -169,7 +169,7 @@ async function M(a, s) {
     return n.close(), !0;
 }
 
-async function m(a, s) {
+async function y(a, s) {
     var o, a = a.qySnapshots, t = s.posMap, e = s.keyValueMap = {}, p = a.getVLFilePath(s), n = await f(p);
     for (o of Object.keys(t).sort()) {
         var [ i, r ] = t[o];

package/src/QySnapshotSaver_Worker.d.ts

@@ -12,7 +12,7 @@ export default class QySnapshotSaver_Worker extends QyMessageWorker {
         options: any;
     });
     _op_start(maxChangeId: any, loadedMaxAclNum: any, aclKeyValueMap: any): void;
-    castSave(changeId: any, cmdArgAsListObj: any, syncList: any): void;
+    castSave(changeId: any, cmdArgAsListObjStr: any, syncListStr: any): void;
     saveSnapshot(maxSnapshotNum: any): Promise<void>;
     releaseSnapshot(snapshotNum: any): void;
     _op_stop(): Promise<number>;

package/src/QySnapshotSaver_Worker.js

@@ -37,7 +37,7 @@ export default class extends a {
         super(s = {
             ...o("QySnapshotSaver_Worker"),
             ...s
-        }, [], [ "waitForSnapshotSaved" ]);
+        });
         var e = t(a, "snapshot");
         Object.assign(this, {
             kvFolder: a,
@@ -54,7 +54,7 @@ export default class extends a {
             aclKeyValueMap: t,
             qySnapshots: o
         } = this;
-        o.applyCmdObj(s, t, e), this.maxChangeId = a;
+        o.applyCmdObj(JSON.parse(s), t, e ? JSON.parse(e) : void 0), this.maxChangeId = a;
     }
     async saveSnapshot(a) {
         var {

package/src/QySnapshots.d.ts

@@ -10,7 +10,7 @@ export declare class QySnapshots {
     snapshotMaxChangeId: number;
     maxSnapshotNum: number;
     snapshotCount: number;
-    constructor(snapshotFolder: any, options: any);
+    constructor(snapshotFolder: any, options?: any);
     loadSnapshotInfos(): Promise<void>;
     closeAllFDs(): void;
     saveKeyValueMap(snapshot: any): Promise<[[any, any], any]>;

package/src/QySnapshots.js

@@ -13,7 +13,7 @@ import {
     join as n
 } from "node:path";
 
-import m from "node:zlib";
+import d from "node:zlib";
 
 import {
     getDefaultOptions as s
@@ -21,7 +21,7 @@ import {
 
 import {
     Hash_Key_Length as u,
-    folderOrFileExists as d,
+    folderOrFileExists as m,
     listToMap as f,
     isEmptyObj as h,
     isString as v
@@ -60,7 +60,7 @@ class t {
     snapshotMaxChangeId = 0;
     maxSnapshotNum = 0;
     snapshotCount = 0;
-    constructor(t, o) {
+    constructor(t, o = void 0) {
         (o = {
             ...s("QySnapshots"),
             ...o
@@ -79,7 +79,7 @@ class t {
             qyJsonSaver: s,
             numToSnapshotMap: r
         } = this;
-        if (await d(t)) {
+        if (await m(t)) {
             var o = await (async (t, o) => {
                 var a = {};
                 for (s of await l(o)) {
@@ -131,7 +131,7 @@ class t {
             var l = e[o];
             let t;
             null == l ? t = K : (h = Buffer.isBuffer(l) ? (f = l, 0) : v(l) ? (f = l.length >= a ? (s.save(O), 
-            m.zstdCompressSync(l)) : (s.save(L), Buffer.from(l)), 1) : (f = Buffer.from(JSON.stringify(I(o) && !x(l) ? Object.keys(l) : l)), 
+            d.zstdCompressSync(l)) : (s.save(L), Buffer.from(l)), 1) : (f = Buffer.from(JSON.stringify(I(o) && !x(l) ? Object.keys(l) : l)), 
             0), s.save([ f, F ]), l = h + f.length, t = [ p, l ], p += l + 1), i[o] = t, 
             ++u;
         }
@@ -207,7 +207,7 @@ class t {
                 var [ e, a ] = a;
                 if (0 != a) {
                     var n = this;
-                    if (o = n.getVLFilePath(o), n = T(n, o, e, a)) return (o = n[0]) == j ? n.toString("utf8", 1) : o == J ? m.zstdDecompressSync(n.subarray(1)).toString() : (e = JSON.parse(n), 
+                    if (o = n.getVLFilePath(o), n = T(n, o, e, a)) return (o = n[0]) == j ? n.toString("utf8", 1) : o == J ? d.zstdDecompressSync(n.subarray(1)).toString() : (e = JSON.parse(n), 
                     I(t) ? f(e) : e);
                 }
             }

package/src/QyUnionNode.d.ts

@@ -20,7 +20,7 @@ export declare class QyUnionNode extends QyQueryNode {
     checkedDirMap: any;
     constructor(dir?: undefined);
     containsFile(fileName: any): boolean;
-    getFiles(queryCounter: any, resultMap?: {}): Generator<any, void, any>;
+    getFiles(queryCounter?: any, resultMap?: {}): Generator<any, void, any>;
     addNode(node: any): void;
     addDir(dir: any): void;
 }

package/src/QyUnionNode.js

@@ -52,7 +52,7 @@ class o extends e {
         }
         return !1;
     }
-    *getFiles(i, e = {}) {
+    *getFiles(i = void 0, e = {}) {
         var r, t, {
             dirMap: n,
             nodeList: s

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

@@ -8198,11 +8198,12 @@
           // 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) {
+              let { top, bottom } = closestRect;
+              if (above && above.bottom > (top + top + bottom) / 3) {
                   this.y = above.bottom - 1;
                   return this.scan(positions, getRects);
               }
-              if (below && below.top < closestRect.bottom) {
+              if (below && below.top < (top + bottom + bottom) / 3) {
                   this.y = below.top + 1;
                   return this.scan(positions, getRects);
               }
@@ -9573,8 +9574,8 @@
   const appliedFirefoxHack = /*@__PURE__*/new Set;
   // In Firefox, when cut/copy handlers are added to the document, that
   // somehow avoids a bug where those events aren't fired when the
-  // selection is empty. See https://github.com/codemirror/dev/issues/1082
-  // and https://bugzilla.mozilla.org/show_bug.cgi?id=995961
+  // selection is empty. See issue #1082 and
+  // https://bugzilla.mozilla.org/show_bug.cgi?id=995961
   function firefoxCopyCutHack(doc) {
       if (!appliedFirefoxHack.has(doc)) {
           appliedFirefoxHack.add(doc);
@@ -11060,7 +11061,7 @@
           flexShrink: 0,
           display: "block",
           whiteSpace: "pre",
-          wordWrap: "normal", // https://github.com/codemirror/dev/issues/456
+          wordWrap: "normal", // Issue #456
           boxSizing: "border-box",
           minHeight: "100%",
           padding: "4px 0",
@@ -11479,7 +11480,7 @@
       readSelectionRange() {
           let { view } = this;
           // The Selection object is broken in shadow roots in Safari. See
-          // https://github.com/codemirror/dev/issues/414
+          // issue #414
           let selection = getSelection(view.root);
           if (!selection)
               return false;
@@ -12948,7 +12949,7 @@
       }
       /**
       Create a theme extension. The first argument can be a
-      [`style-mod`](https://github.com/marijnh/style-mod#documentation)
+      [`style-mod`](https://code.haverbeke.berlin/marijn/style-mod#documentation)
       style spec providing the styles for the theme. These will be
       prefixed with a generated class for the style.
       
@@ -12994,7 +12995,7 @@
   }
   /**
   Facet to add a [style
-  module](https://github.com/marijnh/style-mod#documentation) to
+  module](https://code.haverbeke.berlin/marijn/style-mod#documentation) to
   an editor view. The view will ensure that the module is
   mounted in its [document
   root](https://codemirror.net/6/docs/ref/#view.EditorView.constructor^config.root).
@@ -21869,8 +21870,13 @@
           The current match (only holds a meaningful value after
           [`next`](https://codemirror.net/6/docs/ref/#search.SearchCursor.next) has been called and when
           `done` is false).
+          
+          The `precise` flag will be set to false if the match starts or
+          ends _inside_ a character that, when normalized, expands to
+          multiple characters. It indicates that the `from`-`to` range
+          covers content that isn't part of the actual match.
           */
-          this.value = { from: 0, to: 0 };
+          this.value = { from: 0, to: 0, precise: false };
           /**
           Whether the end of the iterated region has been reached.
           */
@@ -21921,44 +21927,45 @@
               this.bufferPos += codePointSize(next);
               let norm = this.normalize(str);
               if (norm.length)
-                  for (let i = 0, pos = start;; i++) {
+                  for (let i = 0, pos = start, posPrecise = true;; i++) {
                       let code = norm.charCodeAt(i);
-                      let match = this.match(code, pos, this.bufferPos + this.bufferStart);
-                      if (i == norm.length - 1) {
-                          if (match) {
-                              this.value = match;
-                              return this;
-                          }
-                          break;
+                      let match = this.match(code, pos, posPrecise, this.bufferPos + this.bufferStart, i == norm.length - 1);
+                      if (match) {
+                          this.value = match;
+                          return this;
                       }
-                      if (pos == start && i < str.length && str.charCodeAt(i) == code)
+                      if (i == norm.length - 1)
+                          break;
+                      if (posPrecise && i < str.length && str.charCodeAt(i) == code)
                           pos++;
+                      else
+                          posPrecise = false;
                   }
           }
       }
-      match(code, pos, end) {
+      match(code, pos, posPrecise, end, endPrecise) {
           let match = null;
-          for (let i = 0; i < this.matches.length; i += 2) {
-              let index = this.matches[i], keep = false;
-              if (this.query.charCodeAt(index) == code) {
-                  if (index == this.query.length - 1) {
-                      match = { from: this.matches[i + 1], to: end };
+          for (let i = 0; i < this.matches.length;) {
+              let partial = this.matches[i], keep = false;
+              if (this.query.charCodeAt(partial.index) == code) {
+                  if (partial.index == this.query.length - 1) {
+                      match = { from: partial.from, to: end, precise: endPrecise && partial.precise };
                   }
                   else {
-                      this.matches[i]++;
+                      partial.index++;
                       keep = true;
                   }
               }
-              if (!keep) {
-                  this.matches.splice(i, 2);
-                  i -= 2;
-              }
+              if (keep)
+                  i++;
+              else
+                  this.matches.splice(i, 1);
           }
           if (this.query.charCodeAt(0) == code) {
               if (this.query.length == 1)
-                  match = { from: pos, to: end };
+                  match = { from: pos, to: end, precise: posPrecise && endPrecise };
               else
-                  this.matches.push(1, pos);
+                  this.matches.push({ from: pos, index: 1, precise: posPrecise });
           }
           if (match && this.test && !this.test(match.from, match.to, this.buffer, this.bufferStart))
               match = null;
@@ -21968,7 +21975,7 @@
   if (typeof Symbol != "undefined")
       SearchCursor.prototype[Symbol.iterator] = function () { return this; };
 
-  const empty = { from: -1, to: -1, match: /*@__PURE__*//.*/.exec("") };
+  const empty = { from: -1, to: -1, match: /*@__PURE__*//.*/.exec(""), precise: true };
   const baseFlags = "gm" + (/x/.unicode == null ? "" : "u");
   /**
   This class is similar to [`SearchCursor`](https://codemirror.net/6/docs/ref/#search.SearchCursor)
@@ -21993,7 +22000,9 @@
           /**
           Will contain an object with the extent of the match and the
           match object when [`next`](https://codemirror.net/6/docs/ref/#search.RegExpCursor.next)
-          sucessfully finds a match.
+          sucessfully finds a match. The `precise` flag is always true for
+          this type of cursor, and only there to make sure this cursor is
+          a subtype of `SearchCursor`.
           */
           this.value = empty;
           if (/\\[sWDnr]|\n|\r|\[\^/.test(query))
@@ -22038,7 +22047,7 @@
                   if (from == this.curLineStart + this.curLine.length)
                       this.nextLine();
                   if ((from < to || from > this.value.to) && (!this.test || this.test(from, to, match))) {
-                      this.value = { from, to, match };
+                      this.value = { from, to, precise: true, match };
                       return this;
                   }
                   off = this.matchPos - this.curLineStart;
@@ -22111,7 +22120,7 @@
                   // again, since it'll likely be able to match more
                   if ((this.flat.to >= this.to || match.index + match[0].length <= this.flat.text.length - 10) &&
                       (!this.test || this.test(from, to, match))) {
-                      this.value = { from, to, match };
+                      this.value = { from, to, precise: true, match };
                       this.matchPos = toCharEnd(this.text, to + (from == to ? 1 : 0));
                       return this;
                   }
@@ -22730,10 +22739,12 @@
       let next = match;
       let changes = [], selection, replacement;
       let effects = [];
-      if (next.from == from && next.to == to) {
+      if (!next.precise) {
+          next = query.nextMatch(state, next.from, next.to);
+      }
+      else if (next.from == from && next.to == to) {
           replacement = state.toText(query.getReplacement(next));
           changes.push({ from: next.from, to: next.to, insert: replacement });
-          next = query.nextMatch(state, next.from, next.to);
           effects.push(EditorView.announce.of(state.phrase("replaced match on line $", state.doc.lineAt(from).number) + "."));
       }
       let changeSet = view.state.changes(changes);
@@ -22757,10 +22768,12 @@
   const replaceAll = /*@__PURE__*/searchCommand((view, { query }) => {
       if (view.state.readOnly)
           return false;
-      let changes = query.matchAll(view.state, 1e9).map(match => {
-          let { from, to } = match;
-          return { from, to, insert: query.getReplacement(match) };
-      });
+      let changes = [];
+      for (let match of query.matchAll(view.state, 1e9)) {
+          let { from, to, precise } = match;
+          if (precise)
+              changes.push({ from, to, insert: query.getReplacement(match) });
+      }
       if (!changes.length)
           return false;
       let announceText = view.state.phrase("replaced $ matches", changes.length) + ".";
@@ -25874,16 +25887,12 @@
           if (term == 0 /* Term.Err */ &&
               (!this.stack.length || this.stack[this.stack.length - 1] < this.buffer.length + this.bufferBase)) {
               // Try to omit/merge adjacent error nodes
-              let cur = this, top = this.buffer.length;
-              if (top == 0 && cur.parent) {
-                  top = cur.bufferBase - cur.parent.bufferBase;
-                  cur = cur.parent;
-              }
-              if (top > 0 && cur.buffer[top - 4] == 0 /* Term.Err */ && cur.buffer[top - 1] > -1) {
+              let top = this.buffer.length;
+              if (top > 0 && this.buffer[top - 4] == 0 /* Term.Err */ && this.buffer[top - 1] > -1) {
                   if (start == end)
                       return;
-                  if (cur.buffer[top - 2] >= start) {
-                      cur.buffer[top - 2] = end;
+                  if (this.buffer[top - 2] >= start) {
+                      this.buffer[top - 2] = end;
                       return;
                   }
               }
@@ -25982,6 +25991,10 @@
       split() {
           let parent = this;
           let off = parent.buffer.length;
+          // Leave off top error node, if there, because that might be
+          // merged with other nodes.
+          if (off && parent.buffer[off - 4] == 0 /* Term.Err */)
+              off -= 4;
           // Because the top of the buffer (after this.pos) may be mutated
           // to reorder reductions and skipped tokens, and shared buffers
           // should be immutable, this copies any outstanding skipped tokens