datafolder 1.0.8 → 1.0.9

package/README.md

@@ -4,7 +4,7 @@ datafolder is a lightning fluid JSON database for SSD, featuring an AI-friendly
 
 ### Changelog
 
-1.0.8 Added Typescript type declarations.
+1.0.9 Added Typescript type declarations.
 
 1.0.7 Added trigger editor and [internal.md](https://github.com/datafolderdev/datafolder/wiki/Internals-of-datafolder)
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "datafolder",
-	"version": "1.0.8",
+	"version": "1.0.9",
 	"author": {
 		"name": "lysh",
 		"email": "datafolderdev@outlook.com"

package/scripts/fastify.js

@@ -13,8 +13,8 @@ const config = {
 };
 const { port, staticRoot } = config;
 const fastify = Fastify({ logger: false, forceCloseConnections: true });
-const qyDB = new QyDB(join(__dirname, "../tmp/simulate2"));
-// const qyDB = new QyDB();
+// const qyDB = new QyDB(join(__dirname, "../tmp/simulate2"));
+const qyDB = new QyDB();
 let sigintReceived = false;
 process.on("SIGINT", async () => {
     logger.log("SIGINT signal received: closing HTTP server");

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

@@ -1406,11 +1406,11 @@
       /**
       Extend this range to cover at least `from` to `to`.
       */
-      extend(from, to = from) {
+      extend(from, to = from, assoc = 0) {
           if (from <= this.anchor && to >= this.anchor)
-              return EditorSelection.range(from, to);
+              return EditorSelection.range(from, to, undefined, undefined, assoc);
           let head = Math.abs(from - this.anchor) > Math.abs(to - this.anchor) ? from : to;
-          return EditorSelection.range(this.anchor, head);
+          return EditorSelection.range(this.anchor, head, undefined, undefined, assoc);
       }
       /**
       Compare this range to another range.
@@ -1557,11 +1557,13 @@
       /**
       Create a selection range.
       */
-      static range(anchor, head, goalColumn, bidiLevel) {
+      static range(anchor, head, goalColumn, bidiLevel, assoc) {
           let flags = ((goalColumn !== null && goalColumn !== void 0 ? goalColumn : 16777215 /* RangeFlag.NoGoalColumn */) << 6 /* RangeFlag.GoalColumnOffset */) |
               (bidiLevel == null ? 7 : Math.min(6, bidiLevel));
+          if (!assoc && anchor != head)
+              assoc = head < anchor ? 1 : -1;
           return head < anchor ? SelectionRange.create(head, anchor, 32 /* RangeFlag.Inverted */ | 16 /* RangeFlag.AssocAfter */ | flags)
-              : SelectionRange.create(anchor, head, (head > anchor ? 8 /* RangeFlag.AssocBefore */ : 0) | flags);
+              : SelectionRange.create(anchor, head, (!assoc ? 0 : assoc < 0 ? 8 /* RangeFlag.AssocBefore */ : 16 /* RangeFlag.AssocAfter */) | flags);
       }
       /**
       @internal
@@ -4418,7 +4420,7 @@
       couldn't (in which case the widget will be redrawn). The default
       implementation just returns false.
       */
-      updateDOM(dom, view) { return false; }
+      updateDOM(dom, view, from) { return false; }
       /**
       @internal
       */
@@ -6821,7 +6823,7 @@
                   let tile = widgets[i];
                   if (!this.reused.has(tile) &&
                       (pass == 0 ? tile.widget.compare(widget)
-                          : tile.widget.constructor == widget.constructor && widget.updateDOM(tile.dom, this.view))) {
+                          : tile.widget.constructor == widget.constructor && widget.updateDOM(tile.dom, this.view, tile.widget))) {
                       widgets.splice(i, 1);
                       if (i < this.index[0])
                           this.index[0]--;
@@ -7677,6 +7679,7 @@
           this.blockWrappers = this.view.state.facet(blockWrappers).map(v => typeof v == "function" ? v(this.view) : v);
       }
       scrollIntoView(target) {
+          var _a;
           if (target.isSnapshot) {
               let ref = this.view.viewState.lineBlockAt(target.range.head);
               this.view.scrollDOM.scrollTop = ref.top - target.yMargin;
@@ -7693,7 +7696,7 @@
               }
           }
           let { range } = target;
-          let rect = this.coordsAt(range.head, range.empty ? range.assoc : range.head > range.anchor ? -1 : 1), other;
+          let rect = this.coordsAt(range.head, (_a = range.assoc) !== null && _a !== void 0 ? _a : (range.empty ? 0 : range.head > range.anchor ? -1 : 1)), other;
           if (!rect)
               return;
           if (!range.empty && (other = this.coordsAt(range.anchor, range.anchor > range.head ? -1 : 1)))
@@ -7960,7 +7963,8 @@
           return EditorSelection.cursor(startPos, start.assoc);
       let goal = start.goalColumn, startY;
       let rect = view.contentDOM.getBoundingClientRect();
-      let startCoords = view.coordsAtPos(startPos, (start.empty ? start.assoc : 0) || (forward ? 1 : -1)), docTop = view.documentTop;
+      let startCoords = view.coordsAtPos(startPos, start.assoc || ((start.empty ? forward : start.head == start.from) ? 1 : -1));
+      let docTop = view.documentTop;
       if (startCoords) {
           if (goal == null)
               goal = startCoords.left - rect.left;
@@ -7973,9 +7977,16 @@
           startY = (dir < 0 ? line.top : line.bottom) + docTop;
       }
       let resolvedGoal = rect.left + goal;
-      let dist = distance !== null && distance !== void 0 ? distance : (view.viewState.heightOracle.textHeight >> 1);
-      let pos = posAtCoords(view, { x: resolvedGoal, y: startY + dist * dir }, false, dir);
-      return EditorSelection.cursor(pos.pos, pos.assoc, undefined, goal);
+      let halfText = view.viewState.heightOracle.textHeight >> 1, dist = distance !== null && distance !== void 0 ? distance : halfText;
+      for (let scan = 0;; scan += halfText) {
+          let y = startY + (dist + scan) * dir;
+          let pos = posAtCoords(view, { x: resolvedGoal, y }, false, dir);
+          if (forward ? y > rect.bottom : y < rect.top)
+              return EditorSelection.cursor(pos.pos, pos.assoc);
+          let posCoords = view.coordsAtPos(pos.pos, pos.assoc), mid = posCoords ? (posCoords.top + posCoords.bottom) / 2 : 0;
+          if (!posCoords || (forward ? mid > startY : mid < startY))
+              return EditorSelection.cursor(pos.pos, pos.assoc, undefined, goal);
+      }
   }
   function skipAtomicRanges(atoms, pos, bias) {
       for (;;) {
@@ -8834,9 +8845,9 @@
           // applyDOMChange, notify key handlers of it and reset to
           // the state they produce.
           let pending;
-          if (browser.ios && !event.synthetic && !event.altKey && !event.metaKey &&
+          if (browser.ios && !event.synthetic && !event.altKey && !event.metaKey && !event.shiftKey &&
               ((pending = PendingKeys.find(key => key.keyCode == event.keyCode)) && !event.ctrlKey ||
-                  EmacsyPendingKeys.indexOf(event.key) > -1 && event.ctrlKey && !event.shiftKey)) {
+                  EmacsyPendingKeys.indexOf(event.key) > -1 && event.ctrlKey)) {
               this.pendingIOSKey = pending || event;
               setTimeout(() => this.flushIOSKey(), 250);
               return true;
@@ -9240,10 +9251,10 @@
               if (start.pos != cur.pos && !extend) {
                   let startRange = rangeForClick(view, start.pos, start.assoc, type);
                   let from = Math.min(startRange.from, range.from), to = Math.max(startRange.to, range.to);
-                  range = from < range.from ? EditorSelection.range(from, to) : EditorSelection.range(to, from);
+                  range = from < range.from ? EditorSelection.range(from, to, range.assoc) : EditorSelection.range(to, from, range.assoc);
               }
               if (extend)
-                  return startSel.replaceRange(startSel.main.extend(range.from, range.to));
+                  return startSel.replaceRange(startSel.main.extend(range.from, range.to, range.assoc));
               else if (multiple && type == 1 && startSel.ranges.length > 1 && (removed = removeRangeAround(startSel, cur.pos)))
                   return removed;
               else if (multiple)
@@ -13727,7 +13738,7 @@
               let prim = r == state.selection.main;
               if (r.empty || conf.drawRangeCursor && !(prim && browser.ios && conf.iosSelectionHandles)) {
                   let className = prim ? "cm-cursor cm-cursor-primary" : "cm-cursor cm-cursor-secondary";
-                  let cursor = r.empty ? r : EditorSelection.cursor(r.head, r.head > r.anchor ? -1 : 1);
+                  let cursor = r.empty ? r : EditorSelection.cursor(r.head, r.assoc);
                   for (let piece of RectangleMarker.forRange(view, className, cursor))
                       cursors.push(piece);
               }
@@ -21035,7 +21046,7 @@
   function extendSel(target, how) {
       let selection = updateSel(target.state.selection, range => {
           let head = how(range);
-          return EditorSelection.range(range.anchor, head.head, head.goalColumn, head.bidiLevel || undefined);
+          return EditorSelection.range(range.anchor, head.head, head.goalColumn, head.bidiLevel || undefined, head.assoc);
       });
       if (selection.eq(target.state.selection))
           return false;