@codemirror/state 0.19.6 → 0.19.7

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.19.7 (2022-02-11)
+
+### Bug fixes
+
+Avoid recomputing facets on state reconfiguration if that facet's inputs stayed precisely the same.
+
+Selection ranges created with `EditorSelection.range` will now have an assoc pointing at their anchor, when non-empty.
+
 ## 0.19.6 (2021-11-19)
 
 ### Bug fixes

package/dist/index.cjs

@@ -265,7 +265,9 @@ class ChangeSet extends ChangeDesc {
     map(other, before = false) { return other.empty ? this : mapSet(this, other, before, true); }
     /**
     Iterate over the changed ranges in the document, calling `f` for
-    each.
+    each, with the range in the original document (`fromA`-`toA`)
+    and the range that replaces it in the new document
+    (`fromB`-`toB`).
     
     When `individual` is true, adjacent changes are reported
     separately.
@@ -835,7 +837,8 @@ class EditorSelection {
     */
     static range(anchor, head, goalColumn) {
         let goal = (goalColumn !== null && goalColumn !== void 0 ? goalColumn : 33554431 /* NoGoalColumn */) << 5 /* GoalColumnOffset */;
-        return head < anchor ? new SelectionRange(head, anchor, 16 /* Inverted */ | goal) : new SelectionRange(anchor, head, goal);
+        return head < anchor ? new SelectionRange(head, anchor, 16 /* Inverted */ | goal | 8 /* AssocAfter */)
+            : new SelectionRange(anchor, head, goal | (head > anchor ? 4 /* AssocBefore */ : 0));
     }
 }
 function normalized(ranges, mainIndex = 0) {
@@ -1001,7 +1004,7 @@ function dynamicFacetSlot(addresses, facet, providers) {
     let dynamic = providerAddrs.filter(p => !(p & 1));
     let idx = addresses[facet.id] >> 1;
     return (state, tr) => {
-        let oldVal = state.values[idx], changed = oldVal === Uninitialized || !tr;
+        let oldVal = state.values[idx], changed = oldVal === Uninitialized;
         for (let dynAddr of dynamic) {
             if (ensureAddr(state, dynAddr) & 1 /* Changed */)
                 changed = true;
@@ -1192,12 +1195,13 @@ class CompartmentInstance {
     }
 }
 class Configuration {
-    constructor(base, compartments, dynamicSlots, address, staticValues) {
+    constructor(base, compartments, dynamicSlots, address, staticValues, facets) {
         this.base = base;
         this.compartments = compartments;
         this.dynamicSlots = dynamicSlots;
         this.address = address;
         this.staticValues = staticValues;
+        this.facets = facets;
         this.statusTemplate = [];
         while (this.statusTemplate.length < dynamicSlots.length)
             this.statusTemplate.push(0 /* Unresolved */);
@@ -1219,27 +1223,44 @@ class Configuration {
         let address = Object.create(null);
         let staticValues = [];
         let dynamicSlots = [];
-        let dynamicDeps = [];
+        let dynamicValues = [];
         for (let field of fields) {
             address[field.id] = dynamicSlots.length << 1;
             dynamicSlots.push(a => field.slot(a));
-            dynamicDeps.push([]);
+            dynamicValues.push(oldState && oldState.config.address[field.id] != null ? oldState.field(field) : Uninitialized);
         }
+        let canReuseCache = new Map;
+        let canReuseDep = (dep) => {
+            if (!(dep instanceof Facet))
+                return true;
+            let cached = canReuseCache.get(dep);
+            if (cached != null)
+                return cached;
+            canReuseCache.set(dep, false);
+            if (!oldFacets || !sameArray(oldFacets[dep.id] || [], facets[dep.id] || []))
+                return;
+            for (let input of facets[dep.id] || [])
+                if (!input.dependencies.every(canReuseDep))
+                    return;
+            canReuseCache.set(dep, true);
+        };
+        let oldFacets = oldState === null || oldState === void 0 ? void 0 : oldState.config.facets;
         for (let id in facets) {
             let providers = facets[id], facet = providers[0].facet;
+            let oldProviders = oldFacets && oldFacets[id] || [];
+            let canReuse = sameArray(providers, oldProviders);
             if (providers.every(p => p.type == 0 /* Static */)) {
                 address[facet.id] = (staticValues.length << 1) | 1;
-                let value = facet.combine(providers.map(p => p.value));
-                let oldAddr = oldState ? oldState.config.address[facet.id] : null;
-                if (oldAddr != null) {
-                    let oldVal = getAddr(oldState, oldAddr);
-                    if (facet.compare(value, oldVal))
-                        value = oldVal;
-                }
+                let value = canReuse ? oldState.facet(facet) : facet.combine(providers.map(p => p.value)), oldValue;
+                if (!canReuse && oldState && facet.compare(value, oldValue = oldState.facet(facet)))
+                    value = oldValue;
                 staticValues.push(value);
             }
             else {
                 for (let p of providers) {
+                    let canReuseThis = p.dependencies.every(canReuseDep);
+                    if (!canReuseThis)
+                        canReuse = false;
                     if (p.type == 0 /* Static */) {
                         address[p.id] = (staticValues.length << 1) | 1;
                         staticValues.push(p.value);
@@ -1247,35 +1268,18 @@ class Configuration {
                     else {
                         address[p.id] = dynamicSlots.length << 1;
                         dynamicSlots.push(a => p.dynamicSlot(a));
-                        dynamicDeps.push(p.dependencies.filter(d => typeof d != "string").map(d => d.id));
+                        let oldAddr = oldState && canReuseThis ? oldState.config.address[p.id] : null;
+                        dynamicValues.push(oldAddr != null ? getAddr(oldState, oldAddr) : Uninitialized);
                     }
                 }
                 address[facet.id] = dynamicSlots.length << 1;
                 dynamicSlots.push(a => dynamicFacetSlot(a, facet, providers));
-                dynamicDeps.push(providers.filter(p => p.type != 0 /* Static */).map(d => d.id));
-            }
-        }
-        let dynamicValues = dynamicSlots.map(_ => Uninitialized);
-        if (oldState) {
-            let canReuse = (id, depth) => {
-                if (depth > 7)
-                    return false;
-                let addr = address[id];
-                if (!(addr & 1))
-                    return dynamicDeps[addr >> 1].every(id => canReuse(id, depth + 1));
-                let oldAddr = oldState.config.address[id];
-                return oldAddr != null && getAddr(oldState, oldAddr) == staticValues[addr >> 1];
-            };
-            // Copy over old values for shared facets/fields, if we can
-            // prove that they don't need to be recomputed.
-            for (let id in address) {
-                let cur = address[id], prev = oldState.config.address[id];
-                if (prev != null && (cur & 1) == 0 && canReuse(+id, 0))
-                    dynamicValues[cur >> 1] = getAddr(oldState, prev);
+                dynamicValues.push(canReuse || oldProviders.length ? oldState.facet(facet) : Uninitialized);
             }
         }
+        let dynamic = dynamicSlots.map(f => f(address));
         return {
-            configuration: new Configuration(base, newCompartments, dynamicSlots.map(f => f(address)), address, staticValues),
+            configuration: new Configuration(base, newCompartments, dynamic, address, staticValues, facets),
             values: dynamicValues
         };
     }
@@ -2285,9 +2289,7 @@ combine = {}) {
 
 Object.defineProperty(exports, 'Text', {
     enumerable: true,
-    get: function () {
-        return text.Text;
-    }
+    get: function () { return text.Text; }
 });
 exports.Annotation = Annotation;
 exports.AnnotationType = AnnotationType;

package/dist/index.d.ts

@@ -163,7 +163,9 @@ declare class ChangeSet extends ChangeDesc {
     map(other: ChangeDesc, before?: boolean): ChangeSet;
     /**
     Iterate over the changed ranges in the document, calling `f` for
-    each.
+    each, with the range in the original document (`fromA`-`toA`)
+    and the range that replaces it in the new document
+    (`fromB`-`toB`).
     
     When `individual` is true, adjacent changes are reported
     separately.

package/dist/index.js

@@ -261,7 +261,9 @@ class ChangeSet extends ChangeDesc {
     map(other, before = false) { return other.empty ? this : mapSet(this, other, before, true); }
     /**
     Iterate over the changed ranges in the document, calling `f` for
-    each.
+    each, with the range in the original document (`fromA`-`toA`)
+    and the range that replaces it in the new document
+    (`fromB`-`toB`).
     
     When `individual` is true, adjacent changes are reported
     separately.
@@ -831,7 +833,8 @@ class EditorSelection {
     */
     static range(anchor, head, goalColumn) {
         let goal = (goalColumn !== null && goalColumn !== void 0 ? goalColumn : 33554431 /* NoGoalColumn */) << 5 /* GoalColumnOffset */;
-        return head < anchor ? new SelectionRange(head, anchor, 16 /* Inverted */ | goal) : new SelectionRange(anchor, head, goal);
+        return head < anchor ? new SelectionRange(head, anchor, 16 /* Inverted */ | goal | 8 /* AssocAfter */)
+            : new SelectionRange(anchor, head, goal | (head > anchor ? 4 /* AssocBefore */ : 0));
     }
 }
 function normalized(ranges, mainIndex = 0) {
@@ -997,7 +1000,7 @@ function dynamicFacetSlot(addresses, facet, providers) {
     let dynamic = providerAddrs.filter(p => !(p & 1));
     let idx = addresses[facet.id] >> 1;
     return (state, tr) => {
-        let oldVal = state.values[idx], changed = oldVal === Uninitialized || !tr;
+        let oldVal = state.values[idx], changed = oldVal === Uninitialized;
         for (let dynAddr of dynamic) {
             if (ensureAddr(state, dynAddr) & 1 /* Changed */)
                 changed = true;
@@ -1188,12 +1191,13 @@ class CompartmentInstance {
     }
 }
 class Configuration {
-    constructor(base, compartments, dynamicSlots, address, staticValues) {
+    constructor(base, compartments, dynamicSlots, address, staticValues, facets) {
         this.base = base;
         this.compartments = compartments;
         this.dynamicSlots = dynamicSlots;
         this.address = address;
         this.staticValues = staticValues;
+        this.facets = facets;
         this.statusTemplate = [];
         while (this.statusTemplate.length < dynamicSlots.length)
             this.statusTemplate.push(0 /* Unresolved */);
@@ -1215,27 +1219,44 @@ class Configuration {
         let address = Object.create(null);
         let staticValues = [];
         let dynamicSlots = [];
-        let dynamicDeps = [];
+        let dynamicValues = [];
         for (let field of fields) {
             address[field.id] = dynamicSlots.length << 1;
             dynamicSlots.push(a => field.slot(a));
-            dynamicDeps.push([]);
+            dynamicValues.push(oldState && oldState.config.address[field.id] != null ? oldState.field(field) : Uninitialized);
         }
+        let canReuseCache = new Map;
+        let canReuseDep = (dep) => {
+            if (!(dep instanceof Facet))
+                return true;
+            let cached = canReuseCache.get(dep);
+            if (cached != null)
+                return cached;
+            canReuseCache.set(dep, false);
+            if (!oldFacets || !sameArray(oldFacets[dep.id] || [], facets[dep.id] || []))
+                return;
+            for (let input of facets[dep.id] || [])
+                if (!input.dependencies.every(canReuseDep))
+                    return;
+            canReuseCache.set(dep, true);
+        };
+        let oldFacets = oldState === null || oldState === void 0 ? void 0 : oldState.config.facets;
         for (let id in facets) {
             let providers = facets[id], facet = providers[0].facet;
+            let oldProviders = oldFacets && oldFacets[id] || [];
+            let canReuse = sameArray(providers, oldProviders);
             if (providers.every(p => p.type == 0 /* Static */)) {
                 address[facet.id] = (staticValues.length << 1) | 1;
-                let value = facet.combine(providers.map(p => p.value));
-                let oldAddr = oldState ? oldState.config.address[facet.id] : null;
-                if (oldAddr != null) {
-                    let oldVal = getAddr(oldState, oldAddr);
-                    if (facet.compare(value, oldVal))
-                        value = oldVal;
-                }
+                let value = canReuse ? oldState.facet(facet) : facet.combine(providers.map(p => p.value)), oldValue;
+                if (!canReuse && oldState && facet.compare(value, oldValue = oldState.facet(facet)))
+                    value = oldValue;
                 staticValues.push(value);
             }
             else {
                 for (let p of providers) {
+                    let canReuseThis = p.dependencies.every(canReuseDep);
+                    if (!canReuseThis)
+                        canReuse = false;
                     if (p.type == 0 /* Static */) {
                         address[p.id] = (staticValues.length << 1) | 1;
                         staticValues.push(p.value);
@@ -1243,35 +1264,18 @@ class Configuration {
                     else {
                         address[p.id] = dynamicSlots.length << 1;
                         dynamicSlots.push(a => p.dynamicSlot(a));
-                        dynamicDeps.push(p.dependencies.filter(d => typeof d != "string").map(d => d.id));
+                        let oldAddr = oldState && canReuseThis ? oldState.config.address[p.id] : null;
+                        dynamicValues.push(oldAddr != null ? getAddr(oldState, oldAddr) : Uninitialized);
                     }
                 }
                 address[facet.id] = dynamicSlots.length << 1;
                 dynamicSlots.push(a => dynamicFacetSlot(a, facet, providers));
-                dynamicDeps.push(providers.filter(p => p.type != 0 /* Static */).map(d => d.id));
-            }
-        }
-        let dynamicValues = dynamicSlots.map(_ => Uninitialized);
-        if (oldState) {
-            let canReuse = (id, depth) => {
-                if (depth > 7)
-                    return false;
-                let addr = address[id];
-                if (!(addr & 1))
-                    return dynamicDeps[addr >> 1].every(id => canReuse(id, depth + 1));
-                let oldAddr = oldState.config.address[id];
-                return oldAddr != null && getAddr(oldState, oldAddr) == staticValues[addr >> 1];
-            };
-            // Copy over old values for shared facets/fields, if we can
-            // prove that they don't need to be recomputed.
-            for (let id in address) {
-                let cur = address[id], prev = oldState.config.address[id];
-                if (prev != null && (cur & 1) == 0 && canReuse(+id, 0))
-                    dynamicValues[cur >> 1] = getAddr(oldState, prev);
+                dynamicValues.push(canReuse || oldProviders.length ? oldState.facet(facet) : Uninitialized);
             }
         }
+        let dynamic = dynamicSlots.map(f => f(address));
         return {
-            configuration: new Configuration(base, newCompartments, dynamicSlots.map(f => f(address)), address, staticValues),
+            configuration: new Configuration(base, newCompartments, dynamic, address, staticValues, facets),
             values: dynamicValues
         };
     }

package/package.json

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