@nerd-bible/wordgard 0.5.2-beta4 → 0.5.2-beta5

package/README.md

@@ -1,14 +1,20 @@
 # Wordgard
 
-[ [**WEBSITE**](https://wordgard.net/) | [**DOCS**](https://wordgard.net/docs/) | [**ISSUES**](https://code.haverbeke.berlin/wordgard/wordgard/issues) | [**FORUM**](https://discuss.wordgard.net/) ]
+This is a downstream fork of
+[Wordgard](https://code.haverbeke.berlin/wordgard/wordgard). 
 
-This is the [Wordgard](https://wordgard.net) package. It implements a
-rich text editor framework for the browser.
+It follows these tagging rules:
+
+- If this upstream repo tagged the latest commit, it'll publish that version.
+- Otherwise, it'll add a -beta1 suffix. If the last tag already has such a suffix, it'll bump it.
+- The beta tag is always latest rather than prerelease. If you want only the upstream tagged versions, use the [official package](https://www.npmjs.com/package/@nerd-bible/wordgard).
 
 ```bash
-npm i wordgard
+npm install wordgard@npm:@nerd-bible/wordgard
 ```
 
+The upstream support has been so excellent that I currently don't plan on doing anything with my fork besides CI.
+
 ```javascript
 import {Wordgard, menuBar} from "wordgard/editor"
 import {fullSchema} from "wordgard/schema"
@@ -20,5 +26,3 @@ const myEditor = Wordgard.create({
   config: [fullSchema(), history(), menuBar()]
 })
 ```
-
-This project is licensed under an MIT license.

package/dist/editor.js

@@ -643,7 +643,6 @@ class PointSet {
 }
 class PointIterator {
     set;
-    done = false;
     constructor(set) {
         this.set = set;
         this.fill(0);
@@ -658,18 +657,16 @@ class PointIterator {
         else {
             this.from = 1e8;
             this.value = null;
-            this.done = true;
         }
     }
     next() {
-        if (!this.done)
+        if (this.value)
             this.fill(this.i + 1);
     }
     get side() {
-        return this.done ? 1 : this.value.side;
+        return this.value ? this.value.side : 1;
     }
     goto(pos, inclusive) {
-        this.done = false;
         let i = findAbove(this.set.positions, 0, pos - 1);
         if (!inclusive) {
             while (i < this.set.values.length && this.set.values[i].side < 1000000000)
@@ -844,7 +841,6 @@ class RangeSet {
 }
 class RangeIterator {
     set;
-    done = false;
     constructor(set) {
         this.set = set;
         this.fill(0);
@@ -859,101 +855,16 @@ class RangeIterator {
         else {
             this.from = this.to = 1e8;
             this.value = null;
-            this.done = true;
         }
     }
     next() {
-        if (!this.done)
+        if (this.value)
             this.fill(this.i + 1);
     }
     goto(pos) {
-        this.done = false;
         this.fill(findAbove(this.set.to, 0, pos));
     }
 }
-class MultiSet {
-    sets;
-    pos;
-    constructor(sets, pos) {
-        this.sets = sets;
-        this.pos = pos;
-    }
-    map(changes) {
-        if (changes.empty)
-            return this;
-        let pos = this.pos.slice(), sets = this.sets.slice(), i = 0;
-        changes.iterGaps((fromA, toA, fromB, _toB, last) => {
-            while (i < sets.length && (last || pos[i] + sets[i].length < fromA)) {
-                pos[i++] += fromB - fromA;
-            }
-        }, (_fromA, toA) => {
-            while (i < sets.length && pos[i] <= toA) {
-                sets[i] = sets[i].map(changes, pos[i]);
-                pos[i] = changes.mapPos(pos[i], -1);
-                i++;
-            }
-        });
-        return new MultiSet(sets, pos);
-    }
-    iter() {
-        return new MultiIterator(this);
-    }
-    static empty = /*@__PURE__*/(() => new MultiSet([], []))();
-    static create(f) {
-        let sets = [], pos = [], at = 0;
-        f((p, set) => {
-            if (p < at)
-                throw new Error("Overlapping sets in MultiSet.create");
-            sets.push(set);
-            pos.push(p);
-            at = p + set.size;
-        });
-        return sets.length ? new MultiSet(sets, pos) : MultiSet.empty;
-    }
-}
-const empty = {
-    from: 1e9, to: 1e9,
-    value: null,
-    done: true,
-    next() { },
-    goto() { }
-};
-class MultiIterator {
-    set;
-    get value() { return this.cur.value; }
-    get done() { return this.cur.done; }
-    get from() { return this.cur.from + this.offset; }
-    get to() { return this.cur.to + this.offset; }
-    i = 0;
-    constructor(set) {
-        this.set = set;
-        this.nextSet();
-    }
-    next() {
-        this.cur.next();
-        while (this.cur != empty && this.cur.done)
-            this.nextSet();
-    }
-    nextSet() {
-        if (this.i == this.set.sets.length) {
-            this.offset = 0;
-            this.cur = empty;
-        }
-        else {
-            this.offset = this.set.pos[this.i];
-            this.cur = this.set.sets[this.i].iter();
-            this.i++;
-        }
-    }
-    goto(pos, inclusive = false) {
-        let i = 0;
-        while (i < this.set.pos.length && this.set.pos[i] + this.set.sets[i].size)
-            i++;
-        this.i = i;
-        this.nextSet();
-        this.cur.goto(pos - this.offset, inclusive);
-    }
-}
 function compareDecoSet(setA, setB, cmp) {
     for (let [srcA, valA] of setA)
         cmp(valA, setB.get(srcA) || null);
@@ -1076,7 +987,7 @@ class HeapIterator {
             return this;
         if (this.point) {
             this.point.next();
-            if (this.point.done)
+            if (!this.point.value)
                 popHeap(this.pointHeap, cmpPoint);
             else
                 bubble(this.pointHeap, 0, cmpPoint);
@@ -1112,7 +1023,7 @@ class HeapIterator {
             else {
                 let first = active[0];
                 first.next();
-                if (!first.done)
+                if (first.value)
                     sink(rangeHeap, rangeHeap.push(first) - 1, cmpRangeFrom);
                 popHeap(active, cmpRangeTo);
             }
@@ -1256,7 +1167,7 @@ class DecoIterator {
             i.goto(from);
         for (let i of this.pointIter)
             i.goto(from, inclusiveStart);
-        let iter = new HeapIterator(this.rangeIter.filter(i => !i.done), this.pointIter.filter(i => !i.done), from, to);
+        let iter = new HeapIterator(this.rangeIter.filter(i => i.value), this.pointIter.filter(i => i.value), from, to);
         let pos = this.pos.advance(from - this.pos.pos), started = inclusiveStart;
         let atomParent;
         for (let p = pos.parent; p; p = p.parent)
@@ -6300,7 +6211,7 @@ class MenuBar {
         }
         if (update && selection.some(e => e.flags & 32)) {
             let reset = selection[0].flags & 32 ? findChild(this.children, true) : selection[0];
-            this.setSelection(reset ? [reset] : [], this.dom.contains(document.activeElement));
+            this.setSelection(reset ? [reset] : [], this.dom.contains(this.wg.root.activeElement));
         }
     }
     setSelection(selection, focus = true) {
@@ -6399,7 +6310,7 @@ class MenuBar {
         event.preventDefault();
     }
     globalClick(event) {
-        if (!this.dom.contains(event.target)) {
+        if (!event.composedPath().includes(this.dom)) {
             this.dom.ownerDocument.removeEventListener("mousedown", this.globalClick);
             if (this.selection.length > 1)
                 this.setSelection([this.selection[0]], false);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nerd-bible/wordgard",
-  "version": "0.5.2-beta4",
+  "version": "0.5.2-beta5",
   "description": "Semantic rich text editor system",
   "type": "module",
   "main": "dist/index.js",
@@ -36,7 +36,7 @@
     "style-mod": "^4.1.3"
   },
   "devDependencies": {
-    "@nerd-bible/config": "^0.2.4",
+    "@nerd-bible/config": "^0.2.5",
     "@swc/wasm-typescript": "^1.15.3",
     "@types/mocha": "^10.0.10",
     "@types/node": "^24.10.2",