@nerd-bible/wordgard 0.6.2-beta7 → 0.6.2-beta9

package/dist/history.js

@@ -4,6 +4,7 @@ import { Command, undo as undo$1, redo as redo$1, Menu } from 'wordgard/command'
 import { phrases } from 'wordgard/phrases';
 
 const fromHistory = /*@__PURE__*/Transaction.Effect.define({
+    name: "fromHistory",
     map(value, change) {
         return {
             side: value.side,
@@ -13,6 +14,7 @@ const fromHistory = /*@__PURE__*/Transaction.Effect.define({
     }
 });
 const historyConfig = /*@__PURE__*/GardState.Facet.define({
+    name: "historyConfig",
     combine(configs) {
         return GardState.Facet.combineConfig(configs, {
             minDepth: 100,
@@ -26,6 +28,7 @@ const historyConfig = /*@__PURE__*/GardState.Facet.define({
     }
 });
 const historyField_ = /*@__PURE__*/GardState.Field.define({
+    name: "history",
     create() {
         return new HistoryState(null, null);
     },
@@ -88,8 +91,10 @@ function history(config = {}) {
 }
 ;history = /*@__PURE__*/(function (history) {
     history.field = historyField_;
-    history.isolate = Transaction.Annotation.define();
-    history.invertedEffects = GardState.Facet.define();
+    history.isolate = Transaction.Annotation.define("historyIsolate");
+    history.invertedEffects = GardState.Facet.define({
+        name: "invertedEffects"
+    });
 ;return history})(history);
 const undo = ({ state }) => {
     let historyState = state.field(historyField_, false);

package/dist/index.d.ts

@@ -2,7 +2,7 @@ export * as collab from "wordgard/collab"
 export * as command from "wordgard/command"
 export * as doc from "wordgard/doc"
 export * as editor from "wordgard/editor"
-export * as highlight-code from "wordgard/highlight-code"
+export * as highlightCode from "wordgard/highlight-code"
 export * as history from "wordgard/history"
 export * as phrases from "wordgard/phrases"
 export * as schema from "wordgard/schema"

package/dist/index.js

@@ -2,7 +2,7 @@ export * as collab from "wordgard/collab"
 export * as command from "wordgard/command"
 export * as doc from "wordgard/doc"
 export * as editor from "wordgard/editor"
-export * as highlight-code from "wordgard/highlight-code"
+export * as highlightCode from "wordgard/highlight-code"
 export * as history from "wordgard/history"
 export * as phrases from "wordgard/phrases"
 export * as schema from "wordgard/schema"

package/dist/phrases.js

@@ -1,6 +1,7 @@
 import { GardState } from 'wordgard/state';
 
 const phraseOverride = /*@__PURE__*/GardState.Facet.define({
+    name: "phraseOverride",
     combine(records) {
         let map = new Map();
         for (let i = records.length - 1; i >= 0; i--) {

package/dist/schema.js

@@ -365,6 +365,7 @@ const languageStyles = /*@__PURE__*/Wordgard.styles({
     }
 });
 const languageOptions = /*@__PURE__*/GardState.Facet.define({
+    name: "languageOptions",
     combine: input => {
         let options = [];
         for (let arr of input)
@@ -582,7 +583,7 @@ function subscript() {
     });
 ;return subscript})(subscript);
 
-const imageUploader = /*@__PURE__*/GardState.Facet.define();
+const imageUploader = /*@__PURE__*/GardState.Facet.define({ name: "imageUploader" });
 const imageTypes = [Image, Figure, CaptionedFigure];
 function activeImage(sel) {
     if (sel.selection instanceof GardSelection.Node && imageTypes.includes(sel.selection.node.type))
@@ -825,6 +826,7 @@ const resizeTheme = /*@__PURE__*/Wordgard.theme({
     }
 });
 const setResizing = /*@__PURE__*/Transaction.Effect.define({
+    name: "setImageResize",
     map: (value, mapping) => {
         let newPos = mapping.mapPos(value.target, 1, "after");
         return newPos == null ? undefined : { target: newPos, resizing: value.resizing };
@@ -836,6 +838,7 @@ const handleElt = /*@__PURE__*/(() => Elt.mk("svg:svg", { class: "wg-resize-hand
 ]))();
 const resizeWrapper = /*@__PURE__*/(() => Decoration.Point.wrapper(Elt.mk("span", { class: "wg-resize-hover" }, [handleElt, 0]), { target: "img" }))();
 const resizeState = /*@__PURE__*/GardState.Field.define({
+    name: "imageResize",
     create: () => ({ target: -1, resizing: -1, deco: Decoration.Point.none }),
     update: (value, tr) => {
         for (let e of tr.effects) {
@@ -1188,9 +1191,11 @@ class ColorPicker {
         ];
     }
     ColorPicker.width = GardState.Facet.define({
+        name: "colorPickerWidth",
         combine: values => values.length ? values[0] : 10
     });
     ColorPicker.options = GardState.Facet.define({
+        name: "colorPickerOptions",
         combine: values => values.length ? values[0] : defaultColors()
     });
     ColorPicker.theme = Wordgard.styles({
@@ -1329,8 +1334,9 @@ function computeLinkTooltip(state) {
         create: () => renderLinkTooltip(link.value)
     };
 }
-const closeLinkTooltip = /*@__PURE__*/Transaction.Effect.define();
+const closeLinkTooltip = /*@__PURE__*/Transaction.Effect.define({ name: "closeLinkTooltip" });
 const linkTooltipField = /*@__PURE__*/GardState.Field.define({
+    name: "linkTooltip",
     create: computeLinkTooltip,
     update(value, tr) {
         if (tr.effects.some(e => e.is(closeLinkTooltip)))
@@ -1412,12 +1418,9 @@ function link() {
         })),
         linkTooltipTheme
     ];
-    link_1.pasteOver = Wordgard.pasteHandler.of((wg, event) => {
-        let { selection } = wg.state, data = event.dataTransfer;
-        if (!data || selection.empty)
-            return false;
-        let text = data.getData("text/plain") || data.getData("Text") || data.getData("text/uri-list");
-        if (!text || !/^(https?|mailto|xmpp|data):[^ ]+$/.test(text))
+    link_1.pasteOver = Wordgard.pasteHandler.of((wg, event, slice, html, text) => {
+        let { selection } = wg.state;
+        if (selection.empty || !/^(https?|mailto|xmpp|data):[^ ]+$/.test(text))
             return false;
         let link = Link.of(text);
         let changes = ChangeSet.create(wg.state.doc, { from: selection.from, to: selection.to, add: link });

package/dist/set.js

@@ -164,7 +164,11 @@ let SetBuilder$1 = class SetBuilder {
     addRange(value, from, to) {
         if (from >= to)
             throw new Error("Ranges cannot be empty");
-        (this.lastTo <= from ? this : this.next).addInner(value, from, to);
+        for (let target = this;; target = target.next)
+            if (target.lastTo <= from) {
+                target.addInner(value, from, to);
+                break;
+            }
     }
     addInner(value, from, to) {
         let chunk;
@@ -246,13 +250,13 @@ class RangeSet extends Set {
         let replI = 0, posA = 0, posB = 0;
         let build = new SetBuilder$1();
         for (let i = 0; i < sections.length;) {
-            let len = sections[i++], ins = sections[i++];
+            let len = sections[i++], ins = sections[i++], endA = posA + len;
             if (ins < 0) {
                 while (i < sections.length && sections[i + 1] < 0) {
                     len += sections[i];
                     i += 2;
                 }
-                let upto = i == sections.length ? 1e9 : posA + len, off = posB - posA;
+                let upto = i == sections.length ? 1e9 : endA, off = posB - posA;
                 while (cursor.cur) {
                     let chunk = cursor.cur;
                     if (cursor.i == 0 && chunk.end < upto) {
@@ -277,12 +281,12 @@ class RangeSet extends Set {
                     if (repl.add)
                         build.add(repl.add);
                 }
-                if (len)
-                    cursor.goto(posA + len - 1);
-                copyMappedUpto$1(cursor, posA + len, map, build, replace, replStartI);
+                if (len && cursor.to < endA)
+                    cursor.goto(endA - 1);
+                copyMappedUpto$1(cursor, endA, map, build, replace, replStartI);
                 posB = endB;
             }
-            posA += len;
+            posA = endA;
         }
         return build.finish(this.next && this.next.mapInner(sections, map, replace));
     }

package/dist/state.d.ts

@@ -398,6 +398,10 @@ declare class Transaction {
     */
     readonly effects: readonly Transaction.Effect<any>[];
     /**
+    The annotations on this transaction.
+    */
+    readonly annotations: readonly Transaction.Annotation<any>[];
+    /**
     Whether the selection should be scrolled into view after this
     transaction is dispatched.
     */
@@ -569,7 +573,7 @@ declare namespace Transaction {
         /**
         Define a new type of annotation.
         */
-        static define<T>(): Annotation.Type<T>;
+        static define<T>(name?: string): Annotation.Type<T>;
         private _isAnnotation;
     }
     namespace Annotation {
@@ -578,13 +582,17 @@ declare namespace Transaction {
         annotation}.
         */
         class Type<T> {
+            /**
+            This type's debug name.
+            */
+            readonly name: string | null;
+            private constructor();
             /**
             Create an instance of this annotation.
             */
             of(value: T): Transaction.Annotation<T>;
         }
     }
-    const foo: number;
     /**
     Annotation used to store transaction timestamps. Automatically
     added to every transaction, holding `Date.now()`.
@@ -688,6 +696,11 @@ declare namespace Transaction {
             */
             readonly map: (value: any, mapping: ChangeSet) => any | undefined;
             /**
+            The debug name of this effect.
+            */
+            readonly name: string | null;
+            private constructor();
+            /**
             Create an {@link Transaction.Effect effect} instance of this
             type.
             */
@@ -697,6 +710,10 @@ declare namespace Transaction {
         Options passed when defining an effect.
         */
         interface Spec<Value> {
+            /**
+            An optional debug name to assign to this effect.
+            */
+            name?: string;
             /**
             Provides a way to map an effect like this through a position
             mapping. When not given, the effects will simply not be mapped.
@@ -976,6 +993,10 @@ declare namespace GardState {
         Define a state field.
         */
         static define<Value>(config: GardState.Field.Spec<Value>): GardState.Field<Value>;
+        /**
+        The field's debugging name, if given.
+        */
+        name: string | null;
         private create;
         /**
         State field instances can be used as {@link
@@ -995,6 +1016,11 @@ declare namespace GardState {
         The options passed when defining a state field.
         */
         type Spec<Value> = {
+            /**
+            An optional name to associate with this field for debugging
+            purposes.
+            */
+            name?: string;
             /**
             Creates the initial value for the field when a state is created.
             */
@@ -1043,11 +1069,19 @@ declare namespace GardState {
         */
         class Derived<Value> {
             private compareF;
+            /**
+            This field's debugging name, if given.
+            */
+            readonly name: string | null;
             private constructor();
             /**
             Define a derived field.
             */
             static define<Value>(compute: (state: GardState) => Value, spec?: {
+                /**
+                An optional debugging name for this field.
+                */
+                name?: string;
                 /**
                 Optional function used to compare the value of the field,
                 to prevent propagating a change when a recomputed result
@@ -1088,6 +1122,10 @@ declare namespace GardState {
         */
         readonly isStatic: boolean;
         /**
+        The facet's debug name.
+        */
+        readonly name: string | null;
+        /**
         The output of the facet when it has no inputs.
         */
         readonly default: Output;
@@ -1132,7 +1170,6 @@ declare namespace GardState {
         */
         from<T extends Input>(field: GardState.Field<T> | GardState.Field.Derived<T>): GardState.Extension;
         from<T>(field: GardState.Field<T> | GardState.Field.Derived<T>, get: (value: T) => Input): GardState.Extension;
-        tag: Output;
     }
     namespace Facet {
         /**
@@ -1140,6 +1177,10 @@ declare namespace GardState {
         facet.
         */
         type Spec<Input, Output> = {
+            /**
+            And optional name, to recognize the facet when debugging.
+            */
+            name?: string;
             /**
             How to combine the input values into a single output value. When
             not given, the array of input values becomes the output. This
@@ -1286,11 +1327,15 @@ declare namespace GardState {
     transaction.
     */
     class Compartment {
+        /**
+        The compartment's debugging name, if given.
+        */
+        readonly name: string | null;
         private constructor();
         /**
         Define a new compartment.
         */
-        static define(): Compartment;
+        static define(name?: string): Compartment;
         /**
         Create an instance of this compartment to add to your {@link
         GardState.Spec.config state configuration}.

package/dist/state.js

@@ -1,4 +1,4 @@
-import { Leaf, ValidationError, Slice, Pos, ChangeSet, Plot, SchemaError, parse, Schema } from 'wordgard/doc';
+import { Leaf, ValidationError, Slice, Pos, ChangeSet, Plot, SchemaError, parse, Schema, Node } from 'wordgard/doc';
 import { findClusterBreak } from '@marijn/find-cluster-break';
 
 function dec(str) {
@@ -955,6 +955,17 @@ function wordAt(state, pos, bias) {
         : GardSelection.cursor(pos, bias);
 }
 
+function debugString(value) {
+    let tp = typeof value;
+    if (tp == "string")
+        return JSON.stringify(value);
+    if (tp == "function")
+        return /.*?\)/.exec(value.toString())?.[0] || value;
+    if (Array.isArray(value))
+        return `[${value.map(debugString)}]`;
+    return value;
+}
+
 class Transaction {
     startState;
     changes;
@@ -1045,20 +1056,28 @@ class Transaction {
             this.type = type;
             this.value = value;
         }
-        static define() { return new Transaction.Annotation.Type(); }
+        static define(name) { return Transaction.Annotation.Type.new(name || null); }
+        toString() { return `${this.type}(${debugString(this.value)})`; }
     }
     Transaction.Annotation = Annotation;
     (function (Annotation) {
         class Type {
+            name;
+            constructor(
+            name) {
+                this.name = name;
+            }
+            static new(name) { return new Type(name); }
             of(value) { return new Transaction.Annotation(this, value); }
+            toString() { return "Annotation" + (this.name ? ":" + this.name : ""); }
         }
         Annotation.Type = Type;
     })(Annotation = Transaction.Annotation || (Transaction.Annotation = {}));
-    Transaction.time = Transaction.Annotation.define();
-    Transaction.userEvent = Annotation.define();
-    Transaction.addToHistory = Annotation.define();
-    Transaction.remote = Annotation.define();
-    Transaction.appended = Annotation.define();
+    Transaction.time = Transaction.Annotation.define("time");
+    Transaction.userEvent = Annotation.define("userEvent");
+    Transaction.addToHistory = Annotation.define("addToHistory");
+    Transaction.remote = Annotation.define("remote");
+    Transaction.appended = Annotation.define("appended");
     class Effect {
         type;
         value;
@@ -1074,8 +1093,9 @@ class Transaction {
         }
         is(type) { return this.type == type; }
         static define(spec = {}) {
-            return new Transaction.Effect.Type(spec.map || (v => v));
+            return Effect.Type.new(spec.map || (v => v), spec.name || null);
         }
+        toString() { return `${this.type}(${debugString(this.value)})`; }
     }
     Transaction.Effect = Effect;
     (function (Effect) {
@@ -1093,11 +1113,18 @@ class Transaction {
         Effect.mapEffects = mapEffects;
         class Type {
             map;
+            name;
             constructor(
-            map) {
+            map, 
+            name) {
                 this.map = map;
+                this.name = name;
+            }
+            static new(map, name) {
+                return new Type(map, name);
             }
             of(value) { return new Transaction.Effect(this, value); }
+            toString() { return "Effect" + (this.name ? ":" + this.name : ""); }
         }
         Effect.Type = Type;
     })(Effect = Transaction.Effect || (Transaction.Effect = {}));
@@ -1366,8 +1393,8 @@ class GardState {
     wordAt(pos, bias = 1) {
         return wordAt(this, pos, bias);
     }
-    static reconfigure = /*@__PURE__*/Transaction.Effect.define();
-    static appendConfig = /*@__PURE__*/Transaction.Effect.define();
+    static reconfigure = /*@__PURE__*/Transaction.Effect.define({ name: "reconfigure" });
+    static appendConfig = /*@__PURE__*/Transaction.Effect.define({ name: "appendConfig" });
 }
 ;GardState = /*@__PURE__*/(function (GardState) {
     class Field {
@@ -1385,13 +1412,15 @@ class GardState {
             this.updateF = updateF;
             this.compareF = compareF;
             this.spec = spec;
+            this.name = spec.name || null;
         }
         static define(config) {
-            let field = new GardState.Field(nextID++, config.create, config.update, config.compare || ((a, b) => a === b), config);
+            let field = new Field(nextID++, config.create, config.update, config.compare || ((a, b) => a === b), config);
             if (config.provide)
                 field.provides = config.provide(field);
             return field;
         }
+        name;
         create(state) {
             let init = state.facet(initField).find(i => i.field == this);
             return (init?.create || this.createF)(state);
@@ -1425,21 +1454,25 @@ class GardState {
         init(create) {
             return [this, initField.of({ field: this, create })];
         }
+        toString() { return "Field" + (this.name ? ":" + this.name : ""); }
     }
     GardState.Field = Field;
     (function (Field) {
         class Derived {
             value;
             compareF;
+            name;
             id = nextID++;
             dependencies = [];
             constructor(
-            value, compareF) {
+            value, compareF, 
+            name) {
                 this.value = value;
                 this.compareF = compareF;
+                this.name = name;
             }
             static define(compute, spec = {}) {
-                return new Derived(compute, spec.compare || ((a, b) => a === b));
+                return new Derived(compute, spec.compare || ((a, b) => a === b), spec.name || null);
             }
             get extension() { return this; }
             slot(addresses) {
@@ -1483,6 +1516,7 @@ class GardState {
                     }
                 };
             }
+            toString() { return "Field.Derived" + (this.name ? ":" + this.name : ""); }
         }
         Field.Derived = Derived;
     })(Field = GardState.Field || (GardState.Field = {}));
@@ -1491,6 +1525,7 @@ class GardState {
         compareInput;
         compare;
         isStatic;
+        name;
         id = nextID++;
         default;
         extensions;
@@ -1498,17 +1533,19 @@ class GardState {
         combine, 
         compareInput, 
         compare, 
-        isStatic, enables) {
+        isStatic, enables, 
+        name) {
             this.combine = combine;
             this.compareInput = compareInput;
             this.compare = compare;
             this.isStatic = isStatic;
+            this.name = name;
             this.default = combine(none);
             this.extensions = typeof enables == "function" ? enables(this) : enables;
         }
         get reader() { return this; }
         static define(config = {}) {
-            return new GardState.Facet(config.combine || ((a) => a), config.compareInput || ((a, b) => a === b), config.compare || (!config.combine ? sameArray : (a, b) => a === b), !!config.static, config.enables);
+            return new GardState.Facet(config.combine || ((a) => a), config.compareInput || ((a, b) => a === b), config.compare || (!config.combine ? sameArray : (a, b) => a === b), !!config.static, config.enables, config.name || null);
         }
         of(value) {
             return new FacetProvider(this, nextID++, 1, value);
@@ -1533,6 +1570,7 @@ class GardState {
             return this.derive(s => get(s.field(field)));
         }
         tag;
+        toString() { return "Facet" + (this.name ? ":" + this.name : ""); }
     }
     GardState.Facet = Facet;
     (function (Facet) {
@@ -1707,15 +1745,19 @@ class GardState {
         return result.reduce((a, b) => a.concat(b));
     }
     GardState.prec = {
-        highest: mkPrec(0),
-        high: mkPrec(1),
-        default: mkPrec(2),
-        low: mkPrec(3),
-        lowest: mkPrec(4)
+        highest: mkPrec(0, "Highest"),
+        high: mkPrec(1, "High"),
+        default: mkPrec(2, "Default"),
+        low: mkPrec(3, "Low"),
+        lowest: mkPrec(4, "Lowest")
     };
     class Compartment {
-        constructor() { }
-        static define() { return new Compartment; }
+        name;
+        constructor(
+        name) {
+            this.name = name;
+        }
+        static define(name) { return new Compartment(name || null); }
         of(ext) { return new CompartmentInstance(this, ext); }
         reconfigure(content) {
             return GardState.Compartment.reconfigureCompartment.of({ compartment: this, extension: content });
@@ -1723,28 +1765,35 @@ class GardState {
         get(state) {
             return state.config.compartments.get(this);
         }
-        static reconfigureCompartment = Transaction.Effect.define();
+        static reconfigureCompartment = Transaction.Effect.define({ name: "reconfigureCompartment" });
+        toString() { return "Compartment" + (this.name ? ":" + this.name : ""); }
     }
     GardState.Compartment = Compartment;
     GardState.schemaElement = GardState.Facet.define({
+        name: "schemaElement",
         combine: values => values.reduce((set, elt) => set.concat(elt), none),
         static: true
     });
     GardState.readOnly = GardState.Facet.define({
+        name: "readOnly",
         combine: values => values.length ? values[0] : false
     });
     GardState.textLTR = GardState.Facet.define({
+        name: "textLTR",
         combine: values => values.length ? values[0] : true,
         static: true
     });
     GardState.textblockLTR = GardState.Facet.define({
+        name: "textblockLTR",
         static: true
     });
     GardState.visualCursorMotion = GardState.Facet.define({
+        name: "visualCursorMotion",
         combine(values) { return !values.length ? true : values[0]; },
         static: true
     });
     GardState.isAtom = GardState.Facet.define({
+        name: "isAtom",
         static: true,
         combine(inputs) {
             let map = new Map();
@@ -1754,22 +1803,28 @@ class GardState {
         }
     });
 ;return GardState})(GardState);
-const initField = /*@__PURE__*/GardState.Facet.define({ static: true });
+const initField = /*@__PURE__*/GardState.Facet.define({
+    name: "init",
+    static: true
+});
 function addValue(set, value) {
     if (set.indexOf(value) < 0)
         set.push(value);
 }
-function mkPrec(value) {
-    return (ext) => new PrecExtension(ext, value);
+function mkPrec(value, name) {
+    return (ext) => new PrecExtension(ext, value, name);
 }
 class PrecExtension {
     inner;
     prec;
-    constructor(inner, prec) {
+    name;
+    constructor(inner, prec, name) {
         this.inner = inner;
         this.prec = prec;
+        this.name = name;
     }
     extension;
+    toString() { return `Prec.${this.name}(${this.inner})`; }
 }
 function sameArray(a, b) {
     return a == b || a.length == b.length && a.every((e, i) => e === b[i]);
@@ -1807,6 +1862,7 @@ class FacetProvider {
         this.flags = flags;
         this.value = value;
     }
+    toString() { return `${this.facet}(${this.flags & 1 ? debugString(this.value) : "dynamic"})`; }
 }
 function compareArray(a, b, compare) {
     if (a.length != b.length)
@@ -1896,8 +1952,10 @@ class CompartmentInstance {
         this.inner = inner;
     }
     extension;
+    toString() { return `${this.compartment}(${this.inner})`; }
 }
 GardSelection = /*@__PURE__*/(GardSelection => {GardSelection.selectionType = GardState.Facet.define({
+    name: "selectionType",
     combine(values) {
         let types = [GardSelection.Text.type, GardSelection.Node.type, ...values];
         for (let i = 0; i < types.length; i++)
@@ -1909,8 +1967,8 @@ GardSelection = /*@__PURE__*/(GardSelection => {GardSelection.selectionType = Ga
     },
     static: true
 }); return GardSelection})(GardSelection);
-Transaction = /*@__PURE__*/(Transaction => {Transaction.extender = GardState.Facet.define(); return Transaction})(Transaction);
-Transaction = /*@__PURE__*/(Transaction => {Transaction.appender = GardState.Facet.define(); return Transaction})(Transaction);
+Transaction = /*@__PURE__*/(Transaction => {Transaction.extender = GardState.Facet.define({ name: "extender" }); return Transaction})(Transaction);
+Transaction = /*@__PURE__*/(Transaction => {Transaction.appender = GardState.Facet.define({ name: "appender" }); return Transaction})(Transaction);
 
 function scanChanges(changes, doc, corrections) {
     let buckets = [[], [], []], [childList, content, marks] = buckets;
@@ -2003,7 +2061,7 @@ function scanChanges(changes, doc, corrections) {
     }
     return plan;
 }
-const corrections = /*@__PURE__*/GardState.Facet.define();
+const corrections = /*@__PURE__*/GardState.Facet.define({ name: "corrections" });
 const planCache = /*@__PURE__*/(() => new WeakMap())();
 class Correction {
     event;
@@ -2072,6 +2130,7 @@ class Correction {
                 }
         return changed.length ? ChangeSet.create(doc, changed) : null;
     }
+    toString() { return `Correction(${Node.queryToString(this.query)})`; }
 }
 
 export { BidiSpan, Correction, GardSelection, GardState, TextblockMap, Transaction };