@codemirror/state 0.18.3 → 0.18.7

package/CHANGELOG.md

@@ -1,3 +1,27 @@
+## 0.18.7 (2021-05-04)
+
+### Bug fixes
+
+Fix an issue where state fields might be initialized with a state that they aren't actually part of during reconfiguration.
+
+## 0.18.6 (2021-04-12)
+
+### New features
+
+The new `EditorState.wordAt` method finds the word at a given position.
+
+## 0.18.5 (2021-04-08)
+
+### Bug fixes
+
+Fix an issue in the compiled output that would break the code when minified with terser.
+
+## 0.18.4 (2021-04-06)
+
+### New features
+
+The new `Transaction.remote` annotation can be used to mark and recognize transactions created by other actors.
+
 ## 0.18.3 (2021-03-23)
 
 ### New features

package/dist/index.cjs

@@ -1071,14 +1071,13 @@ class StateField {
     slot(addresses) {
         let idx = addresses[this.id] >> 1;
         return (state, tr) => {
-            if (!tr) {
+            if (!tr || (tr.reconfigured && maybeIndex(tr.startState, this.id) == null)) {
                 state.values[idx] = this.create(state);
                 return 1 /* Changed */;
             }
             let oldVal, changed = 0;
             if (tr.reconfigured) {
-                let oldIdx = maybeIndex(tr.startState, this.id);
-                oldVal = oldIdx == null ? this.create(tr.startState) : tr.startState.values[oldIdx];
+                oldVal = tr.startState.values[maybeIndex(tr.startState, this.id)];
                 changed = 1 /* Changed */;
             }
             else {
@@ -1588,6 +1587,13 @@ Annotation indicating whether a transaction should be added to
 the undo history or not.
 */
 Transaction.addToHistory = Annotation.define();
+/**
+Annotation indicating (when present and true) that a transaction
+represents a change made by some other actor, not the user. This
+is used, for example, to tag other people's changes in
+collaborative editing.
+*/
+Transaction.remote = Annotation.define();
 function joinRanges(a, b) {
     let result = [];
     for (let iA = 0, iB = 0;;) {
@@ -2047,6 +2053,30 @@ class EditorState {
     charCategorizer(at) {
         return makeCategorizer(this.languageDataAt("wordChars", at).join(""));
     }
+    /**
+    Find the word at the given position, meaning the range
+    containing all [word](https://codemirror.net/6/docs/ref/#state.CharCategory.Word) characters
+    around it. If no word characters are adjacent to the position,
+    this returns null.
+    */
+    wordAt(pos) {
+        let { text: text$1, from, length } = this.doc.lineAt(pos);
+        let cat = this.charCategorizer(pos);
+        let start = pos - from, end = pos - from;
+        while (start > 0) {
+            let prev = text.findClusterBreak(text$1, start, false);
+            if (cat(text$1.slice(prev, start)) != exports.CharCategory.Word)
+                break;
+            start = prev;
+        }
+        while (end < length) {
+            let next = text.findClusterBreak(text$1, end);
+            if (cat(text$1.slice(end, next)) != exports.CharCategory.Word)
+                break;
+            end = next;
+        }
+        return start == end ? EditorSelection.range(start + from, end + from) : null;
+    }
 }
 /**
 A facet that, when enabled, causes the editor to allow multiple

package/dist/index.d.ts

@@ -794,6 +794,13 @@ declare class Transaction {
     the undo history or not.
     */
     static addToHistory: AnnotationType<boolean>;
+    /**
+    Annotation indicating (when present and true) that a transaction
+    represents a change made by some other actor, not the user. This
+    is used, for example, to tag other people's changes in
+    collaborative editing.
+    */
+    static remote: AnnotationType<boolean>;
 }
 
 /**
@@ -1036,6 +1043,13 @@ declare class EditorState {
     */
     charCategorizer(at: number): (char: string) => CharCategory;
     /**
+    Find the word at the given position, meaning the range
+    containing all [word](https://codemirror.net/6/docs/ref/#state.CharCategory.Word) characters
+    around it. If no word characters are adjacent to the position,
+    this returns null.
+    */
+    wordAt(pos: number): SelectionRange | null;
+    /**
     Facet used to register change filters, which are called for each
     transaction (unless explicitly
     [disabled](https://codemirror.net/6/docs/ref/#state.TransactionSpec.filter)), and can suppress

package/dist/index.js

@@ -1,12 +1,11 @@
-import { Text } from '@codemirror/text';
+import { Text, findClusterBreak } from '@codemirror/text';
 export { Text } from '@codemirror/text';
 
 const DefaultSplit = /\r\n?|\n/;
 /**
 Distinguishes different ways in which positions can be mapped.
 */
-var MapMode;
-(function (MapMode) {
+var MapMode = /*@__PURE__*/(function (MapMode) {
     /**
     Map a position to a valid new position, even when its context
     was deleted.
@@ -24,7 +23,7 @@ var MapMode;
     Return null if the character _after_ the position is deleted.
     */
     MapMode[MapMode["TrackAfter"] = 3] = "TrackAfter";
-})(MapMode || (MapMode = {}));
+return MapMode})(MapMode || (MapMode = {}));
 /**
 A change description is a variant of [change set](https://codemirror.net/6/docs/ref/#state.ChangeSet)
 that doesn't store the inserted text. As such, it can't be
@@ -1024,7 +1023,7 @@ function maybeIndex(state, id) {
     let found = state.config.address[id];
     return found == null ? null : found >> 1;
 }
-const initField = Facet.define({ static: true });
+const initField = /*@__PURE__*/Facet.define({ static: true });
 /**
 Fields can store additional information in an editor state, and
 keep it in sync with the rest of the state.
@@ -1068,14 +1067,13 @@ class StateField {
     slot(addresses) {
         let idx = addresses[this.id] >> 1;
         return (state, tr) => {
-            if (!tr) {
+            if (!tr || (tr.reconfigured && maybeIndex(tr.startState, this.id) == null)) {
                 state.values[idx] = this.create(state);
                 return 1 /* Changed */;
             }
             let oldVal, changed = 0;
             if (tr.reconfigured) {
-                let oldIdx = maybeIndex(tr.startState, this.id);
-                oldVal = oldIdx == null ? this.create(tr.startState) : tr.startState.values[oldIdx];
+                oldVal = tr.startState.values[maybeIndex(tr.startState, this.id)];
                 changed = 1 /* Changed */;
             }
             else {
@@ -1124,19 +1122,19 @@ const Prec = {
     default-precedence extensions to override it even if they are
     specified later in the extension ordering.
     */
-    fallback: prec(Prec_.fallback),
+    fallback: /*@__PURE__*/prec(Prec_.fallback),
     /**
     The regular default precedence.
     */
-    default: prec(Prec_.default),
+    default: /*@__PURE__*/prec(Prec_.default),
     /**
     A higher-than-default precedence.
     */
-    extend: prec(Prec_.extend),
+    extend: /*@__PURE__*/prec(Prec_.extend),
     /**
     Precedence above the `default` and `extend` precedences.
     */
-    override: prec(Prec_.override)
+    override: /*@__PURE__*/prec(Prec_.override)
 };
 class PrecExtension {
     constructor(inner, prec) {
@@ -1307,18 +1305,18 @@ function getAddr(state, addr) {
     return addr & 1 ? state.config.staticValues[addr >> 1] : state.values[addr >> 1];
 }
 
-const languageData = Facet.define();
-const allowMultipleSelections = Facet.define({
+const languageData = /*@__PURE__*/Facet.define();
+const allowMultipleSelections = /*@__PURE__*/Facet.define({
     combine: values => values.some(v => v),
     static: true
 });
-const lineSeparator = Facet.define({
+const lineSeparator = /*@__PURE__*/Facet.define({
     combine: values => values.length ? values[0] : undefined,
     static: true
 });
-const changeFilter = Facet.define();
-const transactionFilter = Facet.define();
-const transactionExtender = Facet.define();
+const changeFilter = /*@__PURE__*/Facet.define();
+const transactionFilter = /*@__PURE__*/Facet.define();
+const transactionExtender = /*@__PURE__*/Facet.define();
 
 /**
 Annotations are tagged values that are used to add metadata to
@@ -1449,11 +1447,11 @@ the editor. Doing this will discard any extensions
 the content of [reconfigured](https://codemirror.net/6/docs/ref/#state.Compartment.reconfigure)
 compartments.
 */
-StateEffect.reconfigure = StateEffect.define();
+StateEffect.reconfigure = /*@__PURE__*/StateEffect.define();
 /**
 Append extensions to the top-level configuration of the editor.
 */
-StateEffect.appendConfig = StateEffect.define();
+StateEffect.appendConfig = /*@__PURE__*/StateEffect.define();
 /**
 Changes to the editor state are grouped into transactions.
 Typically, a user action creates a single transaction, which may
@@ -1566,7 +1564,7 @@ class Transaction {
 /**
 Annotation used to store transaction timestamps.
 */
-Transaction.time = Annotation.define();
+Transaction.time = /*@__PURE__*/Annotation.define();
 /**
 Annotation used to associate a transaction with a user interface
 event. The view will set this to...
@@ -1579,12 +1577,19 @@ event. The view will set this to...
  - `"cut"` when cutting
  - `"drop"` when content is inserted via drag-and-drop
 */
-Transaction.userEvent = Annotation.define();
+Transaction.userEvent = /*@__PURE__*/Annotation.define();
 /**
 Annotation indicating whether a transaction should be added to
 the undo history or not.
 */
-Transaction.addToHistory = Annotation.define();
+Transaction.addToHistory = /*@__PURE__*/Annotation.define();
+/**
+Annotation indicating (when present and true) that a transaction
+represents a change made by some other actor, not the user. This
+is used, for example, to tag other people's changes in
+collaborative editing.
+*/
+Transaction.remote = /*@__PURE__*/Annotation.define();
 function joinRanges(a, b) {
     let result = [];
     for (let iA = 0, iB = 0;;) {
@@ -1709,8 +1714,7 @@ The categories produced by a [character
 categorizer](https://codemirror.net/6/docs/ref/#state.EditorState.charCategorizer). These are used
 do things like selecting by word.
 */
-var CharCategory;
-(function (CharCategory) {
+var CharCategory = /*@__PURE__*/(function (CharCategory) {
     /**
     Word characters.
     */
@@ -1723,11 +1727,11 @@ var CharCategory;
     Anything else.
     */
     CharCategory[CharCategory["Other"] = 2] = "Other";
-})(CharCategory || (CharCategory = {}));
+return CharCategory})(CharCategory || (CharCategory = {}));
 const nonASCIISingleCaseWordChar = /[\u00df\u0587\u0590-\u05f4\u0600-\u06ff\u3040-\u309f\u30a0-\u30ff\u3400-\u4db5\u4e00-\u9fcc\uac00-\ud7af]/;
 let wordChar;
 try {
-    wordChar = new RegExp("[\\p{Alphabetic}\\p{Number}_]", "u");
+    wordChar = /*@__PURE__*/new RegExp("[\\p{Alphabetic}\\p{Number}_]", "u");
 }
 catch (_) { }
 function hasWordChar(str) {
@@ -2044,6 +2048,30 @@ class EditorState {
     charCategorizer(at) {
         return makeCategorizer(this.languageDataAt("wordChars", at).join(""));
     }
+    /**
+    Find the word at the given position, meaning the range
+    containing all [word](https://codemirror.net/6/docs/ref/#state.CharCategory.Word) characters
+    around it. If no word characters are adjacent to the position,
+    this returns null.
+    */
+    wordAt(pos) {
+        let { text, from, length } = this.doc.lineAt(pos);
+        let cat = this.charCategorizer(pos);
+        let start = pos - from, end = pos - from;
+        while (start > 0) {
+            let prev = findClusterBreak(text, start, false);
+            if (cat(text.slice(prev, start)) != CharCategory.Word)
+                break;
+            start = prev;
+        }
+        while (end < length) {
+            let next = findClusterBreak(text, end);
+            if (cat(text.slice(end, next)) != CharCategory.Word)
+                break;
+            end = next;
+        }
+        return start == end ? EditorSelection.range(start + from, end + from) : null;
+    }
 }
 /**
 A facet that, when enabled, causes the editor to allow multiple
@@ -2059,7 +2087,7 @@ Configures the tab size to use in this state. The first
 (highest-precedence) value of the facet is used. If no value is
 given, this defaults to 4.
 */
-EditorState.tabSize = Facet.define({
+EditorState.tabSize = /*@__PURE__*/Facet.define({
     combine: values => values.length ? values[0] : 4
 });
 /**
@@ -2078,7 +2106,7 @@ Registers translation phrases. The
 all objects registered with this facet to find translations for
 its argument.
 */
-EditorState.phrases = Facet.define();
+EditorState.phrases = /*@__PURE__*/Facet.define();
 /**
 A facet used to register [language
 data](https://codemirror.net/6/docs/ref/#state.EditorState.languageDataAt) providers.
@@ -2132,7 +2160,7 @@ but do want to process every transaction.
 Extenders run _after_ filters, when both are applied.
 */
 EditorState.transactionExtender = transactionExtender;
-Compartment.reconfigure = StateEffect.define();
+Compartment.reconfigure = /*@__PURE__*/StateEffect.define();
 
 /**
 Utility function for combining behaviors to fill in a config

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@codemirror/state",
-  "version": "0.18.3",
+  "version": "0.18.7",
   "description": "Editor state data structures for the CodeMirror code editor",
   "scripts": {
-    "test": "mocha test/test-*.js",
+    "test": "cm-runtests",
     "prepare": "cm-buildhelper src/index.ts"
   },
   "keywords": [
@@ -29,10 +29,7 @@
     "@codemirror/text": "^0.18.0"
   },
   "devDependencies": {
-    "@codemirror/buildhelper": "^0.1.0",
-    "@types/mocha": "^5.2.0",
-    "ist": "^1.1.6",
-    "mocha": "^7.1.1"
+    "@codemirror/buildhelper": "^0.1.5"
   },
   "repository": {
     "type": "git",