@codemirror/state 0.19.5 → 0.19.6

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.19.6 (2021-11-19)
+
+### Bug fixes
+
+Fix a bug that caused facet compare functions to be called with an invalid value in some situations.
+
+Fix a bug that caused dynamic facet values to be incorrectly kept unchanged when reconfiguration changed one of their dependencies.
+
 ## 0.19.5 (2021-11-10)
 
 ### Bug fixes

package/dist/index.cjs

@@ -1018,7 +1018,7 @@ function dynamicFacetSlot(addresses, facet, providers) {
                 values.push(value);
         }
         let value = facet.combine(values);
-        if (facet.compare(value, oldVal))
+        if (oldVal !== Uninitialized && facet.compare(value, oldVal))
             return 0;
         state.values[idx] = value;
         return 1 /* Changed */;
@@ -1219,9 +1219,11 @@ class Configuration {
         let address = Object.create(null);
         let staticValues = [];
         let dynamicSlots = [];
+        let dynamicDeps = [];
         for (let field of fields) {
             address[field.id] = dynamicSlots.length << 1;
             dynamicSlots.push(a => field.slot(a));
+            dynamicDeps.push([]);
         }
         for (let id in facets) {
             let providers = facets[id], facet = providers[0].facet;
@@ -1245,13 +1247,37 @@ 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));
                     }
                 }
                 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));
             }
         }
-        return new Configuration(base, newCompartments, dynamicSlots.map(f => f(address)), address, staticValues);
+        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);
+            }
+        }
+        return {
+            configuration: new Configuration(base, newCompartments, dynamicSlots.map(f => f(address)), address, staticValues),
+            values: dynamicValues
+        };
     }
 }
 function flatten(extension, compartments, newCompartments) {
@@ -1905,15 +1931,9 @@ class EditorState {
         }
         let startValues;
         if (!conf) {
-            conf = Configuration.resolve(base, compartments, this);
-            let updatedValues = conf.dynamicSlots.map(_ => Uninitialized);
-            // Copy over old values for shared facets/fields
-            for (let id in conf.address) {
-                let cur = conf.address[id], prev = this.config.address[id];
-                if (prev != null && (cur & 1) == 0)
-                    updatedValues[cur >> 1] = getAddr(this, prev);
-            }
-            let intermediateState = new EditorState(conf, this.doc, this.selection, updatedValues, null);
+            let resolved = Configuration.resolve(base, compartments, this);
+            conf = resolved.configuration;
+            let intermediateState = new EditorState(conf, this.doc, this.selection, resolved.values, null);
             startValues = intermediateState.values;
         }
         else {
@@ -2043,7 +2063,7 @@ class EditorState {
     transactions.
     */
     static create(config = {}) {
-        let configuration = Configuration.resolve(config.extensions || [], new Map);
+        let { configuration, values } = Configuration.resolve(config.extensions || [], new Map);
         let doc = config.doc instanceof text.Text ? config.doc
             : text.Text.of((config.doc || "").split(configuration.staticFacet(EditorState.lineSeparator) || DefaultSplit));
         let selection = !config.selection ? EditorSelection.single(0)
@@ -2052,7 +2072,7 @@ class EditorState {
         checkSelection(selection, doc.length);
         if (!configuration.staticFacet(allowMultipleSelections))
             selection = selection.asSingle();
-        return new EditorState(configuration, doc, selection, configuration.dynamicSlots.map(_ => Uninitialized));
+        return new EditorState(configuration, doc, selection, values);
     }
     /**
     The size (in columns) of a tab in the document, determined by

package/dist/index.js

@@ -1014,7 +1014,7 @@ function dynamicFacetSlot(addresses, facet, providers) {
                 values.push(value);
         }
         let value = facet.combine(values);
-        if (facet.compare(value, oldVal))
+        if (oldVal !== Uninitialized && facet.compare(value, oldVal))
             return 0;
         state.values[idx] = value;
         return 1 /* Changed */;
@@ -1215,9 +1215,11 @@ class Configuration {
         let address = Object.create(null);
         let staticValues = [];
         let dynamicSlots = [];
+        let dynamicDeps = [];
         for (let field of fields) {
             address[field.id] = dynamicSlots.length << 1;
             dynamicSlots.push(a => field.slot(a));
+            dynamicDeps.push([]);
         }
         for (let id in facets) {
             let providers = facets[id], facet = providers[0].facet;
@@ -1241,13 +1243,37 @@ 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));
                     }
                 }
                 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));
             }
         }
-        return new Configuration(base, newCompartments, dynamicSlots.map(f => f(address)), address, staticValues);
+        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);
+            }
+        }
+        return {
+            configuration: new Configuration(base, newCompartments, dynamicSlots.map(f => f(address)), address, staticValues),
+            values: dynamicValues
+        };
     }
 }
 function flatten(extension, compartments, newCompartments) {
@@ -1900,15 +1926,9 @@ class EditorState {
         }
         let startValues;
         if (!conf) {
-            conf = Configuration.resolve(base, compartments, this);
-            let updatedValues = conf.dynamicSlots.map(_ => Uninitialized);
-            // Copy over old values for shared facets/fields
-            for (let id in conf.address) {
-                let cur = conf.address[id], prev = this.config.address[id];
-                if (prev != null && (cur & 1) == 0)
-                    updatedValues[cur >> 1] = getAddr(this, prev);
-            }
-            let intermediateState = new EditorState(conf, this.doc, this.selection, updatedValues, null);
+            let resolved = Configuration.resolve(base, compartments, this);
+            conf = resolved.configuration;
+            let intermediateState = new EditorState(conf, this.doc, this.selection, resolved.values, null);
             startValues = intermediateState.values;
         }
         else {
@@ -2038,7 +2058,7 @@ class EditorState {
     transactions.
     */
     static create(config = {}) {
-        let configuration = Configuration.resolve(config.extensions || [], new Map);
+        let { configuration, values } = Configuration.resolve(config.extensions || [], new Map);
         let doc = config.doc instanceof Text ? config.doc
             : Text.of((config.doc || "").split(configuration.staticFacet(EditorState.lineSeparator) || DefaultSplit));
         let selection = !config.selection ? EditorSelection.single(0)
@@ -2047,7 +2067,7 @@ class EditorState {
         checkSelection(selection, doc.length);
         if (!configuration.staticFacet(allowMultipleSelections))
             selection = selection.asSingle();
-        return new EditorState(configuration, doc, selection, configuration.dynamicSlots.map(_ => Uninitialized));
+        return new EditorState(configuration, doc, selection, values);
     }
     /**
     The size (in columns) of a tab in the document, determined by

package/package.json

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