@codemirror/state 6.3.0 → 6.3.2

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 6.3.2 (2023-11-27)
+
+### Bug fixes
+
+Make sure transactions cannot add multiple selections when `allowMultipleSelections` is false.
+
+Fix a bug that caused `Text.iterLines` to not return empty lines at the end of the iterated ranges.
+
+## 6.3.1 (2023-10-18)
+
+### Bug fixes
+
+Give the tag property on `FacetReader` the type of the output type parameter to force TypeScript to infer the proper type when converting from `Facet` to `FacetReader`.
+
 ## 6.3.0 (2023-10-12)
 
 ### New features

package/dist/index.cjs

@@ -485,7 +485,11 @@ class LineCursor {
     }
     next(skip = 0) {
         let { done, lineBreak, value } = this.inner.next(skip);
-        if (done) {
+        if (done && this.afterBreak) {
+            this.value = "";
+            this.afterBreak = false;
+        }
+        else if (done) {
             this.done = true;
             this.value = "";
         }
@@ -2643,7 +2647,8 @@ class EditorState {
         else {
             startValues = tr.startState.values.slice();
         }
-        new EditorState(conf, tr.newDoc, tr.newSelection, startValues, (state, slot) => slot.update(state, tr), tr);
+        let selection = tr.startState.facet(allowMultipleSelections) ? tr.newSelection : tr.newSelection.asSingle();
+        new EditorState(conf, tr.newDoc, selection, startValues, (state, slot) => slot.update(state, tr), tr);
     }
     /**
     Create a [transaction spec](https://codemirror.net/6/docs/ref/#state.TransactionSpec) that

package/dist/index.d.cts

@@ -571,11 +571,10 @@ declare class Facet<Input, Output = readonly Input[]> implements FacetReader<Out
     */
     from<T extends Input>(field: StateField<T>): Extension;
     from<T>(field: StateField<T>, get: (value: T) => Input): Extension;
-    tag: typeof FacetTag;
+    tag: Output;
 }
-declare const FacetTag: unique symbol;
 /**
-A facet reader can be used to fetch the value of a facet, though
+A facet reader can be used to fetch the value of a facet, through
 [`EditorState.facet`](https://codemirror.net/6/docs/ref/#state.EditorState.facet) or as a dependency
 in [`Facet.compute`](https://codemirror.net/6/docs/ref/#state.Facet.compute), but not to define new
 values for the facet.
@@ -583,9 +582,10 @@ values for the facet.
 type FacetReader<Output> = {
     /**
     Dummy tag that makes sure TypeScript doesn't consider all object
-    types as conforming to this type.
+    types as conforming to this type. Not actually present on the
+    object.
     */
-    tag: typeof FacetTag;
+    tag: Output;
 };
 type Slot<T> = FacetReader<T> | StateField<T> | "doc" | "selection";
 type StateFieldSpec<Value> = {

package/dist/index.d.ts

@@ -571,11 +571,10 @@ declare class Facet<Input, Output = readonly Input[]> implements FacetReader<Out
     */
     from<T extends Input>(field: StateField<T>): Extension;
     from<T>(field: StateField<T>, get: (value: T) => Input): Extension;
-    tag: typeof FacetTag;
+    tag: Output;
 }
-declare const FacetTag: unique symbol;
 /**
-A facet reader can be used to fetch the value of a facet, though
+A facet reader can be used to fetch the value of a facet, through
 [`EditorState.facet`](https://codemirror.net/6/docs/ref/#state.EditorState.facet) or as a dependency
 in [`Facet.compute`](https://codemirror.net/6/docs/ref/#state.Facet.compute), but not to define new
 values for the facet.
@@ -583,9 +582,10 @@ values for the facet.
 type FacetReader<Output> = {
     /**
     Dummy tag that makes sure TypeScript doesn't consider all object
-    types as conforming to this type.
+    types as conforming to this type. Not actually present on the
+    object.
     */
-    tag: typeof FacetTag;
+    tag: Output;
 };
 type Slot<T> = FacetReader<T> | StateField<T> | "doc" | "selection";
 type StateFieldSpec<Value> = {

package/dist/index.js

@@ -483,7 +483,11 @@ class LineCursor {
     }
     next(skip = 0) {
         let { done, lineBreak, value } = this.inner.next(skip);
-        if (done) {
+        if (done && this.afterBreak) {
+            this.value = "";
+            this.afterBreak = false;
+        }
+        else if (done) {
             this.done = true;
             this.value = "";
         }
@@ -2639,7 +2643,8 @@ class EditorState {
         else {
             startValues = tr.startState.values.slice();
         }
-        new EditorState(conf, tr.newDoc, tr.newSelection, startValues, (state, slot) => slot.update(state, tr), tr);
+        let selection = tr.startState.facet(allowMultipleSelections) ? tr.newSelection : tr.newSelection.asSingle();
+        new EditorState(conf, tr.newDoc, selection, startValues, (state, slot) => slot.update(state, tr), tr);
     }
     /**
     Create a [transaction spec](https://codemirror.net/6/docs/ref/#state.TransactionSpec) that

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codemirror/state",
-  "version": "6.3.0",
+  "version": "6.3.2",
   "description": "Editor state data structures for the CodeMirror code editor",
   "scripts": {
     "test": "cm-runtests",