@scalar/api-client 0.9.0 → 0.9.1

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @scalar/api-client
 
+## 0.9.1
+
+### Patch Changes
+
+- 479a7e3e: fix: bumped @codemirror/state dependency
+- Updated dependencies [479a7e3e]
+  - @scalar/use-codemirror@0.7.18
+
 ## 0.9.0
 
 ### Minor Changes

package/dist/index.js

@@ -5130,6 +5130,7 @@ class Text {
   Replace a range of the text with the given content.
   */
   replace(from, to, text) {
+    [from, to] = clip(this, from, to);
     let parts = [];
     this.decompose(
       0,
@@ -5165,6 +5166,7 @@ class Text {
   Retrieve the text between the given points.
   */
   slice(from, to = this.length) {
+    [from, to] = clip(this, from, to);
     let parts = [];
     this.decompose(from, to, parts, 0);
     return TextNode.from(parts, to - from);
@@ -5295,6 +5297,7 @@ class TextLeaf extends Text {
   replace(from, to, text) {
     if (!(text instanceof TextLeaf))
       return super.replace(from, to, text);
+    [from, to] = clip(this, from, to);
     let lines = appendText(this.text, appendText(text.text, sliceText(this.text, 0, from)), to);
     let newLen = this.length + text.length - (to - from);
     if (lines.length <= 32)
@@ -5302,6 +5305,7 @@ class TextLeaf extends Text {
     return TextNode.from(TextLeaf.split(lines, []), newLen);
   }
   sliceString(from, to = this.length, lineSep = "\n") {
+    [from, to] = clip(this, from, to);
     let result = "";
     for (let pos = 0, i = 0; pos <= to && i < this.text.length; i++) {
       let line = this.text[i], end = pos + line.length;
@@ -5368,6 +5372,7 @@ class TextNode extends Text {
     }
   }
   replace(from, to, text) {
+    [from, to] = clip(this, from, to);
     if (text.lines < this.lines)
       for (let i = 0, pos = 0; i < this.children.length; i++) {
         let child = this.children[i], end = pos + child.length;
@@ -5386,6 +5391,7 @@ class TextNode extends Text {
     return super.replace(from, to, text);
   }
   sliceString(from, to = this.length, lineSep = "\n") {
+    [from, to] = clip(this, from, to);
     let result = "";
     for (let i = 0, pos = 0; i < this.children.length && pos <= to; i++) {
       let child = this.children[i], end = pos + child.length;
@@ -5601,7 +5607,10 @@ 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 = "";
     } else if (lineBreak) {
@@ -5646,6 +5655,10 @@ class Line {
     return this.to - this.from;
   }
 }
+function clip(text, from, to) {
+  from = Math.max(0, Math.min(text.length, from));
+  return [from, Math.max(from, Math.min(text.length, to))];
+}
 let extend = /* @__PURE__ */ "lc,34,7n,7,7b,19,,,,2,,2,,,20,b,1c,l,g,,2t,7,2,6,2,2,,4,z,,u,r,2j,b,1m,9,9,,o,4,,9,,3,,5,17,3,3b,f,,w,1j,,,,4,8,4,,3,7,a,2,t,,1m,,,,2,4,8,,9,,a,2,q,,2,2,1l,,4,2,4,2,2,3,3,,u,2,3,,b,2,1l,,4,5,,2,4,,k,2,m,6,,,1m,,,2,,4,8,,7,3,a,2,u,,1n,,,,c,,9,,14,,3,,1l,3,5,3,,4,7,2,b,2,t,,1m,,2,,2,,3,,5,2,7,2,b,2,s,2,1l,2,,,2,4,8,,9,,a,2,t,,20,,4,,2,3,,,8,,29,,2,7,c,8,2q,,2,9,b,6,22,2,r,,,,,,1j,e,,5,,2,5,b,,10,9,,2u,4,,6,,2,2,2,p,2,4,3,g,4,d,,2,2,6,,f,,jj,3,qa,3,t,3,t,2,u,2,1s,2,,7,8,,2,b,9,,19,3,3b,2,y,,3a,3,4,2,9,,6,3,63,2,2,,1m,,,7,,,,,2,8,6,a,2,,1c,h,1r,4,1c,7,,,5,,14,9,c,2,w,4,2,2,,3,1k,,,2,3,,,3,1m,8,2,2,48,3,,d,,7,4,,6,,3,2,5i,1m,,5,ek,,5f,x,2da,3,3x,,2o,w,fe,6,2x,2,n9w,4,,a,w,2,28,2,7k,,3,,4,,p,2,5,,47,2,q,i,d,,12,8,p,b,1a,3,1c,,2,4,2,2,13,,1v,6,2,2,2,2,c,,8,,1b,,1f,,,3,2,2,5,2,,,16,2,8,,6m,,2,,4,,fn4,,kh,g,g,g,a6,2,gt,,6a,,45,5,1ae,3,,2,5,4,14,3,4,,4l,2,fx,4,ar,2,49,b,4w,,1i,f,1k,3,1d,4,2,2,1x,3,10,5,,8,1q,,c,2,1g,9,a,4,2,,2n,3,2,,,2,6,,4g,,3,8,l,2,1l,2,,,,,m,,e,7,3,5,5f,8,2,3,,,n,,29,,2,6,,,2,,,2,,2,6j,,2,4,6,2,,2,r,2,2d,8,2,,,2,2y,,,,2,6,,,2t,3,2,4,,5,77,9,,2,6t,,a,2,,,4,,40,4,2,2,4,,w,a,14,6,2,4,8,,9,6,2,3,1a,d,,2,ba,7,,6,,,2a,m,2,7,,2,,2,3e,6,3,,,2,,7,,,20,2,3,,,,9n,2,f0b,5,1n,7,t4,,1r,4,29,,f5k,2,43q,,,3,4,5,8,8,2,7,u,4,44,3,1iz,1j,4,1e,8,,e,,m,5,,f,11s,7,,h,2,7,,2,,5,79,7,c5,4,15s,7,31,7,240,5,gx7k,2o,3k,6o".split(",").map((s) => s ? parseInt(s, 36) : 1);
 for (let i = 1; i < extend.length; i++)
   extend[i] += extend[i - 1];
@@ -6319,14 +6332,14 @@ class SelectionRange {
   extend it.
   */
   get anchor() {
-    return this.flags & 16 ? this.to : this.from;
+    return this.flags & 32 ? this.to : this.from;
   }
   /**
   The head of the range, which is moved when the range is
   [extended](https://codemirror.net/6/docs/ref/#state.SelectionRange.extend).
   */
   get head() {
-    return this.flags & 16 ? this.from : this.to;
+    return this.flags & 32 ? this.from : this.to;
   }
   /**
   True when `anchor` and `head` are at the same position.
@@ -6341,15 +6354,15 @@ class SelectionRange {
   means no association.
   */
   get assoc() {
-    return this.flags & 4 ? -1 : this.flags & 8 ? 1 : 0;
+    return this.flags & 8 ? -1 : this.flags & 16 ? 1 : 0;
   }
   /**
   The bidirectional text level associated with this cursor, if
   any.
   */
   get bidiLevel() {
-    let level = this.flags & 3;
-    return level == 3 ? null : level;
+    let level = this.flags & 7;
+    return level == 7 ? null : level;
   }
   /**
   The goal column (stored vertical offset) associated with a
@@ -6358,8 +6371,8 @@ class SelectionRange {
   lines of different length.
   */
   get goalColumn() {
-    let value = this.flags >> 5;
-    return value == 33554431 ? void 0 : value;
+    let value = this.flags >> 6;
+    return value == 16777215 ? void 0 : value;
   }
   /**
   Map this range through a change, producing a valid range in the
@@ -6387,8 +6400,8 @@ class SelectionRange {
   /**
   Compare this range to another range.
   */
-  eq(other) {
-    return this.anchor == other.anchor && this.head == other.head;
+  eq(other, includeAssoc = false) {
+    return this.anchor == other.anchor && this.head == other.head && (!includeAssoc || !this.empty || this.assoc == other.assoc);
   }
   /**
   Return a JSON-serializable object representing the range.
@@ -6427,13 +6440,16 @@ class EditorSelection {
     return EditorSelection.create(this.ranges.map((r2) => r2.map(change, assoc)), this.mainIndex);
   }
   /**
-  Compare this selection to another selection.
+  Compare this selection to another selection. By default, ranges
+  are compared only by position. When `includeAssoc` is true,
+  cursor ranges must also have the same
+  [`assoc`](https://codemirror.net/6/docs/ref/#state.SelectionRange.assoc) value.
   */
-  eq(other) {
+  eq(other, includeAssoc = false) {
     if (this.ranges.length != other.ranges.length || this.mainIndex != other.mainIndex)
       return false;
     for (let i = 0; i < this.ranges.length; i++)
-      if (!this.ranges[i].eq(other.ranges[i]))
+      if (!this.ranges[i].eq(other.ranges[i], includeAssoc))
         return false;
     return true;
   }
@@ -6508,14 +6524,14 @@ class EditorSelection {
   safely ignore the optional arguments in most situations.
   */
   static cursor(pos, assoc = 0, bidiLevel, goalColumn) {
-    return SelectionRange.create(pos, pos, (assoc == 0 ? 0 : assoc < 0 ? 4 : 8) | (bidiLevel == null ? 3 : Math.min(2, bidiLevel)) | (goalColumn !== null && goalColumn !== void 0 ? goalColumn : 33554431) << 5);
+    return SelectionRange.create(pos, pos, (assoc == 0 ? 0 : assoc < 0 ? 8 : 16) | (bidiLevel == null ? 7 : Math.min(6, bidiLevel)) | (goalColumn !== null && goalColumn !== void 0 ? goalColumn : 16777215) << 6);
   }
   /**
   Create a selection range.
   */
   static range(anchor, head, goalColumn, bidiLevel) {
-    let flags = (goalColumn !== null && goalColumn !== void 0 ? goalColumn : 33554431) << 5 | (bidiLevel == null ? 3 : Math.min(2, bidiLevel));
-    return head < anchor ? SelectionRange.create(head, anchor, 16 | 8 | flags) : SelectionRange.create(anchor, head, (head > anchor ? 4 : 0) | flags);
+    let flags = (goalColumn !== null && goalColumn !== void 0 ? goalColumn : 16777215) << 6 | (bidiLevel == null ? 7 : Math.min(6, bidiLevel));
+    return head < anchor ? SelectionRange.create(head, anchor, 32 | 16 | flags) : SelectionRange.create(anchor, head, (head > anchor ? 8 : 0) | flags);
   }
   /**
   @internal
@@ -6553,6 +6569,13 @@ class Facet {
     this.extensions = typeof enables == "function" ? enables(this) : enables;
   }
   /**
+  Returns a facet reader for this facet, which can be used to
+  [read](https://codemirror.net/6/docs/ref/#state.EditorState.facet) it but not to define values for it.
+  */
+  get reader() {
+    return this;
+  }
+  /**
   Define a new facet.
   */
   static define(config = {}) {
@@ -7391,7 +7414,8 @@ class EditorState {
     } else {
       startValues = tr.startState.values.slice();
     }
-    new EditorState(conf, tr.newDoc, tr.newSelection, startValues, (state2, slot) => slot.update(state2, tr), tr);
+    let selection = tr.startState.facet(allowMultipleSelections) ? tr.newSelection : tr.newSelection.asSingle();
+    new EditorState(conf, tr.newDoc, selection, startValues, (state2, slot) => slot.update(state2, tr), tr);
   }
   /**
   Create a [transaction spec](https://codemirror.net/6/docs/ref/#state.TransactionSpec) that
@@ -7990,6 +8014,19 @@ class RangeSet {
       build.add(range.from, range.to, range.value);
     return build.finish();
   }
+  /**
+  Join an array of range sets into a single set.
+  */
+  static join(sets) {
+    if (!sets.length)
+      return RangeSet.empty;
+    let result = sets[sets.length - 1];
+    for (let i = sets.length - 2; i >= 0; i--) {
+      for (let layer = sets[i]; layer != RangeSet.empty; layer = layer.nextLayer)
+        result = new RangeSet(layer.chunkPos, layer.chunk, result, Math.max(layer.maxPoint, result.maxPoint));
+    }
+    return result;
+  }
 }
 RangeSet.empty = /* @__PURE__ */ new RangeSet([], [], null, -1);
 function lazySort(ranges) {
@@ -8297,7 +8334,7 @@ class SpanCursor {
   }
   addActive(trackOpen) {
     let i = 0, { value, to, rank } = this.cursor;
-    while (i < this.activeRank.length && this.activeRank[i] <= rank)
+    while (i < this.activeRank.length && (rank - this.activeRank[i] || to - this.activeTo[i]) > 0)
       i++;
     insert(this.active, i, value);
     insert(this.activeTo, i, to);

package/package.json

@@ -13,7 +13,7 @@
     "rest",
     "testing"
   ],
-  "version": "0.9.0",
+  "version": "0.9.1",
   "engines": {
     "node": ">=20"
   },
@@ -43,13 +43,12 @@
     "pretty-bytes": "^6.1.1",
     "pretty-ms": "^8.0.0",
     "vue": "^3.3.0",
+    "@scalar/use-codemirror": "0.7.18",
     "@scalar/themes": "0.5.3",
-    "@scalar/use-codemirror": "0.7.17",
-    "@scalar/use-modal": "0.2.2",
-    "@scalar/use-keyboard-event": "0.5.6"
+    "@scalar/use-keyboard-event": "0.5.6",
+    "@scalar/use-modal": "0.2.2"
   },
   "devDependencies": {
-    "@scalar/use-codemirror": "^0.7.17",
     "@types/content-type": "^1.1.6",
     "@vitejs/plugin-vue": "^4.4.0",
     "@vitest/coverage-v8": "^0.34.4",