datafolder 1.0.15 → 1.0.16

package/README.md

@@ -4,6 +4,8 @@ datafolder is a lightning fluid JSON database for high speed SSDs, featuring an
 
 ### Changelog
 
+1.0.16 Add GraphQL sample data test (test/testQyGraphQL.js) to show how to write complex queries.
+
 1.0.15 Use [Workers](https://nodejs.org/docs/latest/api/worker_threads.html) to implement snapshot compactor, expire service, outdated data cleaner etc.
 
 1.0.14 Expire supports specifying milliseconds.

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "datafolder",
-	"version": "1.0.15",
+	"version": "1.0.16",
 	"author": {
 		"name": "lysh",
 		"email": "datafolderdev@outlook.com"
@@ -52,7 +52,8 @@
 	"scripts": {
 		"ui": "start http://localhost:3628/datafolderui/index.html && node ./scripts/fastify.js",
 		"airbnb": "node ./scripts/airbnb2.js && start http://localhost:3628/datafolderui/index.html && node ./scripts/fastify.js",
-		"types:check": "tsc --noEmit"
+		"types:check": "tsc --noEmit",
+		"test": "node --test --experimental-test-coverage --test-coverage-exclude \"test/testQyAirBnB_Ubuntu.ts\" \"test/*\""
 	},
 	"type": "module"
 }

package/src/QyExpire.js

@@ -65,9 +65,7 @@ class a extends e {
     onEmptyHashList(e) {
         var t, r = this.expireMap;
         for (t of e) delete r[t];
-        i(r) && Object.assign(this, {
-            roundedStartTime: void 0
-        });
+        i(r) && (this.roundedStartTime = void 0);
     }
     onExpired(e) {
         var t, {

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

@@ -6596,6 +6596,7 @@
               this.cache.reused.set(oldTile, 2 /* Reused.DOM */);
           let text = new TextTile(composition.text, composition.text.nodeValue);
           text.flags |= 8 /* TileFlag.Composition */;
+          this.pos = composition.range.toB;
           head.append(text);
       }
       addInlineWidget(widget, marks, openStart) {
@@ -8120,7 +8121,7 @@
       // (including the position after the last piece). For a text tile,
       // these will be character clusters, for a composite tile, these
       // will be child tiles.
-      scan(positions, getRects) {
+      scan(positions, getRects, recursed = false) {
           let lo = 0, hi = positions.length - 1, seen = new Set();
           let bidi = this.bidiIn(positions[0], positions[hi]);
           let above, below;
@@ -8193,19 +8194,19 @@
           if (!closestRect) {
               let side = above && (!below || (this.y - above.bottom < below.top - this.y)) ? above : below;
               this.y = (side.top + side.bottom) / 2;
-              return this.scan(positions, getRects);
+              return this.scan(positions, getRects, true);
           }
           // Handle the case where closest matched a higher element on the
           // same line as an element below/above the coords
-          if (closestDx) {
+          if (closestDx && !recursed) {
               let { top, bottom } = closestRect;
               if (above && above.bottom > (top + top + bottom) / 3) {
                   this.y = above.bottom - 1;
-                  return this.scan(positions, getRects);
+                  return this.scan(positions, getRects, true);
               }
               if (below && below.top < (top + bottom + bottom) / 3) {
                   this.y = below.top + 1;
-                  return this.scan(positions, getRects);
+                  return this.scan(positions, getRects, true);
               }
           }
           let ltr = (bidi ? this.dirAt(positions[closestI], 1) : this.baseDir) == Direction.LTR;
@@ -9499,7 +9500,7 @@
       view.inputState.compositionFirstChange = null;
       if (browser.chrome && browser.android) {
           // Delay flushing for a bit on Android because it'll often fire a
-          // bunch of contradictory changes in a row at end of compositon
+          // bunch of contradictory changes in a row at end of composition
           view.observer.flushSoon();
       }
       else if (view.inputState.compositionPendingChange) {
@@ -9630,8 +9631,7 @@
       }
       refresh(whiteSpace, lineHeight, charWidth, textHeight, lineLength, knownHeights) {
           let lineWrapping = wrappingWhiteSpace.indexOf(whiteSpace) > -1;
-          let changed = Math.abs(lineHeight - this.lineHeight) > 0.3 || this.lineWrapping != lineWrapping ||
-              Math.abs(charWidth - this.charWidth) > 0.1;
+          let changed = Math.abs(lineHeight - this.lineHeight) > 0.3 || this.lineWrapping != lineWrapping;
           this.lineWrapping = lineWrapping;
           this.lineHeight = lineHeight;
           this.charWidth = charWidth;
@@ -14833,11 +14833,13 @@
           arrow: tooltips.some(t => t.arrow),
       };
   });
+  const hoverPlugin = /*@__PURE__*/Facet.define();
   class HoverPlugin {
-      constructor(view, source, field, setHover, hoverTime) {
+      constructor(view, source, field, locked, setHover, hoverTime) {
           this.view = view;
           this.source = source;
           this.field = field;
+          this.locked = locked;
           this.setHover = setHover;
           this.hoverTime = hoverTime;
           this.hoverTimeout = -1;
@@ -14848,7 +14850,7 @@
           view.dom.addEventListener("mouseleave", this.mouseleave = this.mouseleave.bind(this));
           view.dom.addEventListener("mousemove", this.mousemove = this.mousemove.bind(this));
       }
-      update() {
+      update(update) {
           if (this.pending) {
               this.pending = null;
               clearTimeout(this.restartTimeout);
@@ -14892,19 +14894,29 @@
               let rtl = bidi && bidi.dir == Direction.RTL ? -1 : 1;
               side = (lastMove.x < posCoords.left ? -rtl : rtl);
           }
+          this.activateHover(view, pos, side);
+      }
+      activateHover(view, pos, side, locked) {
           let open = this.source(view, pos, side);
-          if (open === null || open === void 0 ? void 0 : open.then) {
+          let done = (value) => {
+              if (value && !(Array.isArray(value) && !value.length)) {
+                  let tooltips = Array.isArray(value) ? value : [value];
+                  if (locked)
+                      this.locked.set(tooltips, locked);
+                  view.dispatch({ effects: this.setHover.of(tooltips) });
+              }
+          };
+          if (open && "then" in open) {
               let pending = this.pending = { pos };
               open.then(result => {
                   if (this.pending == pending) {
                       this.pending = null;
-                      if (result && !(Array.isArray(result) && !result.length))
-                          view.dispatch({ effects: this.setHover.of(Array.isArray(result) ? result : [result]) });
+                      done(result);
                   }
               }, e => logException(view.state, e, "hover tooltip"));
           }
-          else if (open && !(Array.isArray(open) && !open.length)) {
-              view.dispatch({ effects: this.setHover.of(Array.isArray(open) ? open : [open]) });
+          else {
+              done(open);
           }
       }
       get tooltip() {
@@ -14918,7 +14930,7 @@
           if (this.hoverTimeout < 0)
               this.hoverTimeout = setTimeout(this.checkHover, this.hoverTime);
           let { active, tooltip } = this;
-          if (active.length && tooltip && !isInTooltip(tooltip.dom, event) || this.pending) {
+          if (active.length && !this.locked.has(active) && tooltip && !isInTooltip(tooltip.dom, event) || this.pending) {
               let { pos } = active[0] || this.pending, end = (_b = (_a = active[0]) === null || _a === void 0 ? void 0 : _a.end) !== null && _b !== void 0 ? _b : pos;
               if ((pos == end ? this.view.posAtCoords(this.lastMove) != pos
                   : !isOverRange(this.view, pos, end, event.clientX, event.clientY))) {
@@ -14931,7 +14943,7 @@
           clearTimeout(this.hoverTimeout);
           this.hoverTimeout = -1;
           let { active } = this;
-          if (active.length) {
+          if (active.length && !this.locked.has(active)) {
               let { tooltip } = this;
               let inTooltip = tooltip && tooltip.dom.contains(event.relatedTarget);
               if (!inTooltip)
@@ -14943,7 +14955,8 @@
       watchTooltipLeave(tooltip) {
           let watch = (event) => {
               tooltip.removeEventListener("mouseleave", watch);
-              if (this.active.length && !this.view.dom.contains(event.relatedTarget))
+              let { active } = this;
+              if (active.length && !this.locked.has(active) && !this.view.dom.contains(event.relatedTarget))
                   this.view.dispatch({ effects: this.setHover.of([]) });
           };
           tooltip.addEventListener("mouseleave", watch);
@@ -14994,49 +15007,85 @@
   */
   function hoverTooltip(source, options = {}) {
       let setHover = StateEffect.define();
+      // This would be better stored in the state field, but we've set
+      // down the type of the field in our interface, so it's indirectly
+      // stored by array identity.
+      let locked = new WeakMap();
       let hoverState = StateField.define({
           create() { return []; },
           update(value, tr) {
+              let lock = locked.get(value);
               if (value.length) {
                   if (options.hideOnChange && (tr.docChanged || tr.selection))
                       value = [];
+                  else if (lock && lock(tr))
+                      value = [];
                   else if (options.hideOn)
                       value = value.filter(v => !options.hideOn(tr, v));
-                  if (tr.docChanged) {
-                      let mapped = [];
-                      for (let tooltip of value) {
-                          let newPos = tr.changes.mapPos(tooltip.pos, -1, MapMode.TrackDel);
-                          if (newPos != null) {
-                              let copy = Object.assign(Object.create(null), tooltip);
-                              copy.pos = newPos;
-                              if (copy.end != null)
-                                  copy.end = tr.changes.mapPos(copy.end);
-                              mapped.push(copy);
-                          }
+              }
+              if (tr.docChanged && value.length) {
+                  let mapped = [];
+                  for (let tooltip of value) {
+                      let newPos = tr.changes.mapPos(tooltip.pos, -1, MapMode.TrackDel);
+                      if (newPos != null) {
+                          let copy = Object.assign(Object.create(null), tooltip);
+                          copy.pos = newPos;
+                          if (copy.end != null)
+                              copy.end = tr.changes.mapPos(copy.end);
+                          mapped.push(copy);
                       }
-                      value = mapped;
                   }
+                  value = mapped;
               }
               for (let effect of tr.effects) {
-                  if (effect.is(setHover))
+                  if (effect.is(setHover)) {
                       value = effect.value;
-                  if (effect.is(closeHoverTooltipEffect))
+                      lock = undefined;
+                  }
+                  if (effect.is(closeHoverTooltipEffect) && !effect.value || effect.value == hoverState)
                       value = [];
               }
+              if (value.length && lock)
+                  locked.set(value, lock);
               return value;
           },
           provide: f => showHoverTooltip.from(f)
       });
+      const plugin = ViewPlugin.define(view => new HoverPlugin(view, source, hoverState, locked, setHover, options.hoverTime || 300 /* Hover.Time */));
       return {
           active: hoverState,
           extension: [
               hoverState,
-              ViewPlugin.define(view => new HoverPlugin(view, source, hoverState, setHover, options.hoverTime || 300 /* Hover.Time */)),
+              plugin,
+              hoverPlugin.of(plugin),
               showHoverTooltipHost
           ]
       };
   }
   /**
+  Activate hover tooltips for the given position and side. If you
+  provide a specific hover tooltip (the value returned from
+  [`hoverTooltip`](https://codemirror.net/6/docs/ref/#view.hoverTooltip)), only that one will be
+  activated. If not given, all hover tooltips at the given position
+  are triggered.
+
+  Note that tooltips opened this way don't close automatically, and
+  you'll want to pass an `until` callback or use
+  [`closeHoverTooltip`](https://codemirror.net/6/docs/ref/#view.closeHoverTooltip)/[`closeHoverTooltips`](https://codemirror.net/6/docs/ref/#view.closeHoverTooltips)
+  to deactivate them.
+  */
+  function activateHover(view, pos, side, options = {}) {
+      var _a;
+      let plugins = view.state.facet(hoverPlugin).map(p => view.plugin(p)).filter((p) => !!p);
+      if (options.tooltip && options.tooltip.active) {
+          let found = plugins.find(p => p.field == options.tooltip.active);
+          if (found)
+              plugins = [found];
+      }
+      for (let plugin of plugins)
+          plugin.activateHover(view, pos, side, (_a = options.until) !== null && _a !== void 0 ? _a : (() => false));
+  }
+  /**
   Get the active tooltip view for a given tooltip, if available.
   */
   function getTooltip(view, tooltip) {
@@ -23521,8 +23570,8 @@
           let off = Math.floor(selected / max);
           return { from: off * max, to: (off + 1) * max };
       }
-      let off = Math.floor((total - selected) / max);
-      return { from: total - (off + 1) * max, to: total - off * max };
+      let off = Math.ceil((total - selected) / max);
+      return { from: total - off * max, to: total - (off - 1) * max };
   }
   class CompletionTooltip {
       constructor(view, stateField, applyCompletion) {
@@ -24381,7 +24430,8 @@
           content: '"···"',
           opacity: 0.5,
           display: "block",
-          textAlign: "center"
+          textAlign: "center",
+          cursor: "pointer",
       },
       ".cm-tooltip.cm-completionInfo": {
           position: "absolute",
@@ -25229,6 +25279,10 @@
               return false;
       }
       view.dispatch({ selection: { anchor: next.from, head: next.to }, scrollIntoView: true });
+      activateHover(view, next.from, 1, {
+          tooltip: lintHover,
+          until: tr => tr.docChanged || tr.newSelection.main.head < next.from || tr.newSelection.main.head > next.to
+      });
       return true;
   };
   /**
@@ -25538,7 +25592,7 @@
           backgroundRepeat: "repeat-x",
           paddingBottom: "0.7px",
       },
-      ".cm-lintRange-error": { backgroundImage: /*@__PURE__*/underline("#d11") },
+      ".cm-lintRange-error": { backgroundImage: /*@__PURE__*/underline("#f11") },
       ".cm-lintRange-warning": { backgroundImage: /*@__PURE__*/underline("orange") },
       ".cm-lintRange-info": { backgroundImage: /*@__PURE__*/underline("#999") },
       ".cm-lintRange-hint": { backgroundImage: /*@__PURE__*/underline("#66d") },
@@ -25619,6 +25673,7 @@
       }
       return sev;
   }
+  const lintHover = /*@__PURE__*/hoverTooltip(lintTooltip, { hideOn: hideTooltip });
   const lintExtensions = [
       lintState,
       /*@__PURE__*/EditorView.decorations.compute([lintState], state => {
@@ -25627,7 +25682,7 @@
               activeMark.range(selected.from, selected.to)
           ]);
       }),
-      /*@__PURE__*/hoverTooltip(lintTooltip, { hideOn: hideTooltip }),
+      lintHover,
       baseTheme
   ];
 

package/test/testQyGraphQL.js

@@ -0,0 +1,198 @@
+import test from "node:test";
+import { deepEqual } from "node:assert/strict";
+import { QyDB } from "../src/QyDB.js";
+import { logger } from "../src/QyLogger.js";
+logger.level = "warn";
+const graphQLData = {
+    Characters: {
+        luke: {
+            type: "Human",
+            id: "1000",
+            name: "Luke Skywalker",
+            friends: ["1002", "1003", "2000", "2001"],
+            appearsIn: [4, 5, 6],
+            homePlanet: "Tatooine",
+        },
+        vader: {
+            type: "Human",
+            id: "1001",
+            name: "Darth Vader",
+            friends: ["1004"],
+            appearsIn: [4, 5, 6],
+            homePlanet: "Tatooine",
+        },
+        han: {
+            type: "Human",
+            id: "1002",
+            name: "Han Solo",
+            friends: ["1000", "1003", "2001"],
+            appearsIn: [4, 5, 6],
+        },
+        leia: {
+            type: "Human",
+            id: "1003",
+            name: "Leia Organa",
+            friends: ["1000", "1002", "2000", "2001"],
+            appearsIn: [4, 5, 6],
+            homePlanet: "Alderaan",
+        },
+        tarkin: {
+            type: "Human",
+            id: "1004",
+            name: "Wilhuff Tarkin",
+            friends: ["1001"],
+            appearsIn: [4],
+        },
+        threepio: {
+            type: "Droid",
+            id: "2000",
+            name: "C-3PO",
+            friends: ["1000", "1002", "1003", "2001"],
+            appearsIn: [4, 5, 6],
+            primaryFunction: "Protocol",
+        },
+        artoo: {
+            type: "Droid",
+            id: "2001",
+            name: "R2-D2",
+            friends: ["1000", "1002", "1003"],
+            appearsIn: [4, 5],
+            primaryFunction: "Astromech",
+        },
+    },
+};
+function insertData(qyDB) {
+    const { batch } = qyDB;
+    const { Characters } = graphQLData;
+    for (const key in Characters) {
+        const character = Characters[key];
+        const { id } = character;
+        batch.put(["Characters", id], character);
+    }
+    batch.run();
+}
+function query1(qyDB) {
+    deepEqual(qyDB.queryFiles("Characters", { friends: { $or: ["1000", "1004"] } }).map((x) => x.view(["id", "name"])), [
+        { id: "1002", name: "Han Solo" },
+        { id: "1003", name: "Leia Organa" },
+        { id: "2000", name: "C-3PO" },
+        { id: "2001", name: "R2-D2" },
+        { id: "1001", name: "Darth Vader" },
+    ]);
+    deepEqual(qyDB.queryFiles("Characters", { friends: { $and: ["1002", "2001"] } }).map((x) => x.view(["id", "name"])), [
+        { id: "1000", name: "Luke Skywalker" },
+        { id: "1003", name: "Leia Organa" },
+        { id: "2000", name: "C-3PO" },
+    ]);
+    deepEqual(qyDB.queryFiles("Characters", { friends: ["1002", "2001"] }).map((x) => x.view(["id", "name"])), [
+        { id: "1000", name: "Luke Skywalker" },
+        { id: "1003", name: "Leia Organa" },
+        { id: "2000", name: "C-3PO" },
+    ]);
+}
+function query2(qyDB) {
+    deepEqual(qyDB.queryFiles("Characters", { friends: { $or: ["1000"] } }).map((x) => x.view(["id", "name"])), [
+        { id: "1002", name: "Han Solo" },
+        { id: "1003", name: "Leia Organa" },
+        { id: "2000", name: "C-3PO" },
+        { id: "2001", name: "R2-D2" },
+    ]);
+    deepEqual(qyDB.queryFiles("Characters", { friends: { $or: ["1002", "1003"] } }).map((x) => x.view(["id", "name"])), [
+        { id: "1000", name: "Luke Skywalker" },
+        { id: "1003", name: "Leia Organa" },
+        { id: "2000", name: "C-3PO" },
+        { id: "2001", name: "R2-D2" },
+        { id: "1002", name: "Han Solo" },
+    ]);
+    deepEqual(qyDB
+        .queryFiles("Characters", {
+        friends: { $link: "Characters", $spec: { friends: { $link: "Characters", $spec: { friends: "1003" } } } },
+    })
+        .map((x) => x.view(["id", "name"])), [
+        { id: "1002", name: "Han Solo" },
+        { id: "1003", name: "Leia Organa" },
+        { id: "2000", name: "C-3PO" },
+        { id: "2001", name: "R2-D2" },
+        { id: "1000", name: "Luke Skywalker" },
+    ]);
+    deepEqual(qyDB
+        .queryFiles("Characters", {
+        friends: { $link: "Characters", $spec: { friends: [{ $link: "Characters", $spec: { friends: "1003" } }] } },
+    })
+        .map((x) => x.view(["id", "name"])), [
+        { id: "1002", name: "Han Solo" },
+        { id: "1003", name: "Leia Organa" },
+        { id: "2000", name: "C-3PO" },
+        { id: "2001", name: "R2-D2" },
+        { id: "1000", name: "Luke Skywalker" },
+    ]);
+}
+function query3(qyDB) {
+    deepEqual(qyDB.queryFiles("Characters", { friends: { $or: ["1000"] } }).map((x) => x.view(["id", "name"])), [
+        { id: "1002", name: "Han Solo" },
+        { id: "1003", name: "Leia Organa" },
+        { id: "2000", name: "C-3PO" },
+        { id: "2001", name: "R2-D2" },
+    ]);
+    deepEqual(qyDB
+        .queryFiles("Characters", { friends: (x) => x.includes("1002") || x.includes("1003") })
+        .map((x) => x.view(["id", "name"])), [
+        { id: "1000", name: "Luke Skywalker" },
+        { id: "1003", name: "Leia Organa" },
+        { id: "2000", name: "C-3PO" },
+        { id: "2001", name: "R2-D2" },
+        { id: "1002", name: "Han Solo" },
+    ]);
+    deepEqual(qyDB
+        .queryFiles("Characters", {
+        appearsIn: 6,
+        friends: {
+            $link: "Characters",
+            $spec: {
+                friends: {
+                    $link: "Characters",
+                    $spec: { friends: (x) => x.includes("1003"), appearsIn: (x) => x.includes(6) },
+                },
+            },
+        },
+    })
+        .map((x) => x.view(["id", "name"])), [
+        { id: "1000", name: "Luke Skywalker" },
+        { id: "1002", name: "Han Solo" },
+        { id: "1003", name: "Leia Organa" },
+        { id: "2000", name: "C-3PO" },
+    ]);
+    deepEqual(qyDB
+        .queryFiles("Characters", {
+        appearsIn: 6,
+        type: "Droid",
+        friends: {
+            $link: "Characters",
+            $spec: {
+                type: "Droid",
+                friends: {
+                    $link: "Characters",
+                    $spec: { friends: (x) => x.includes("1003"), appearsIn: (x) => x.includes(6) },
+                },
+            },
+        },
+    })
+        .map((x) => x.view(["id", "name"])), [{ id: "2000", name: "C-3PO" }]);
+}
+test("test QyGraphQL", { skip: false }, async (context) => {
+    context.after(async (t) => {
+        await qyDB.stop();
+    });
+    const dataFolder = "./tmp/QyGraphQL/1";
+    const qyDB = new QyDB(dataFolder);
+    await qyDB.start();
+    insertData(qyDB);
+    query1(qyDB);
+    query2(qyDB);
+    query3(qyDB);
+    await qyDB.stop();
+    await qyDB.start();
+    query1(qyDB);
+    query2(qyDB);
+    query3(qyDB);
+});