@nerd-bible/wordgard 0.6.2-beta1 → 0.6.2-beta11

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))
@@ -808,7 +809,7 @@ function figure(conf = {}) {
 function imageResizing() {
     return [GardState.schemaElement.of(ImageSize), imageResizing.keyBindings, imageResizing.dragHandle];
 }
-const resizeTheme = /*@__PURE__*/Wordgard.theme({
+const resizeStyle = /*@__PURE__*/Wordgard.styles({
     ".wg-resize-hover": {
         display: "inline-block",
         lineHeight: "0.1",
@@ -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) {
@@ -936,7 +939,7 @@ const resizeHandlers = /*@__PURE__*/(() => [
         GardState.prec.high(resizeHandlers),
         resizeState,
         Decoration.Point.source.of(s => s.field(resizeState).deco),
-        resizeTheme
+        resizeStyle
     ];
 ;return imageResizing})(imageResizing);
 ;image = /*@__PURE__*/(function (image) {
@@ -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.d.ts

@@ -195,9 +195,10 @@ declare class PointSet<T extends PointSet.Value> implements Set<T> {
     /**
     Get the value at the given position, if any. If there's multiple
     values at that position, the one with the lowest side is
-    returned.
+    returned. If a predicate is given, only points that satisfy it
+    are returned.
     */
-    at(pos: number): T | undefined;
+    at(pos: number, pred?: (value: T) => boolean): T | undefined;
     /**
     Adjust the points for a set of document changes. Returns a new
     set with the adjusted points. May delete points when the content

package/dist/set.js

@@ -137,6 +137,7 @@ let SetBuilder$1 = class SetBuilder {
     spilled = null;
     lastTo = -1;
     lastFrom = -1;
+    closed = false;
     get next() {
         return this.spilled || (this.spilled = new SetBuilder());
     }
@@ -147,6 +148,7 @@ let SetBuilder$1 = class SetBuilder {
         else {
             this.chunks.push(chunk);
             this.lastTo = chunk.end;
+            this.closed = true;
         }
     }
     add(source, pre) {
@@ -164,17 +166,22 @@ 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;
-        if (this.chunks.length) {
+        if (this.chunks.length && !this.closed) {
             chunk = this.chunks[this.chunks.length - 1];
             if (chunk.value.length >= 512)
                 chunk = undefined;
         }
         if (!chunk) {
             this.chunks.push(chunk = new Chunk$1(from, [], [], []));
+            this.closed = false;
         }
         chunk.from.push(from - chunk.start);
         chunk.to.push(to - chunk.start);
@@ -246,13 +253,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 +284,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));
     }
@@ -466,10 +473,12 @@ class SetBuilder {
     chunks = [];
     lastPos = -1;
     lastSide = -1;
+    closed = false;
     addChunk(chunk) {
         this.chunks.push(chunk);
         this.lastPos = chunk.end;
         this.lastSide = chunk.endSide;
+        this.closed = true;
     }
     add(source, pre) {
         if (typeof source != "function") {
@@ -487,13 +496,15 @@ class SetBuilder {
     }
     addPoint(value, pos) {
         let chunk;
-        if (this.chunks.length) {
+        let wasClosed = this.closed;
+        if (this.chunks.length && !wasClosed) {
             chunk = this.chunks[this.chunks.length - 1];
             if (chunk.value.length >= 512)
                 chunk = undefined;
         }
         if (!chunk) {
             this.chunks.push(chunk = new Chunk(pos, [], []));
+            this.closed = false;
         }
         chunk.pos.push(pos - chunk.start);
         chunk.value.push(value);
@@ -508,6 +519,8 @@ class SetBuilder {
                     if (!chunkI)
                         break;
                     nextChunk = this.chunks[--chunkI];
+                    if (wasClosed)
+                        nextChunk = this.chunks[chunkI] = new Chunk(nextChunk.start, nextChunk.pos.slice(), nextChunk.value.slice());
                     nextI = nextChunk.value.length - 1;
                 }
                 if ((pos - nextChunk.pos[nextI] || value.side - nextChunk.value[nextI].side) >= 0)
@@ -556,15 +569,16 @@ class PointSet {
                 cursors.push(set.cursor(from, side));
         return cursors.length == 0 ? PointSet.empty.cursor() : cursors.length == 1 ? cursors[0] : new HeapCursor(cmpCursor, cursors);
     }
-    at(pos) {
+    at(pos, pred) {
         for (let chunk of this.chunks) {
             if (chunk.start > pos)
                 break;
             if (chunk.end < pos)
                 continue;
-            let index = findAbove(chunk.pos, 0, pos - chunk.start - 1);
-            if (index < chunk.pos.length && chunk.pos[index] + chunk.start == pos)
-                return chunk.value[index];
+            for (let index = findAbove(chunk.pos, 0, pos - chunk.start - 1); index < chunk.pos.length && chunk.pos[index] + chunk.start == pos; index++) {
+                if (!pred || pred(chunk.value[index]))
+                    return chunk.value[index];
+            }
         }
         return undefined;
     }

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.
     */
@@ -492,7 +496,7 @@ declare namespace Transaction {
         scrollIntoView?: boolean;
         /**
         Only meaningful for specs that are combined with another
-        transaction spec (via {@link Transaction.merge or by being
+        transaction spec (via {@link Transaction.merge} or by being
         returned from an {@link Transaction.extender extender}.
         Normally, when specs are combined, the positions in `changes`
         are taken to refer to the document positions in the initial
@@ -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.
@@ -913,9 +930,9 @@ declare class GardState {
     isAtom(type: Node.Type): boolean;
     /**
     Return the extent of the word around the given position, as a
-    text selection.
+    text selection, or null if there is no word there.
     */
-    wordAt(pos: number, bias?: -1 | 1): GardSelection.Text;
+    wordAt(pos: number, bias?: -1 | 1): GardSelection.Text | null;
     /**
     This effect can be used to reconfigure the root extensions of
     the editor. Doing this will discard any extensions {@link
@@ -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}.