@codemirror/state 0.19.3 → 0.19.4

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.19.4 (2021-11-05)
+
+### Bug fixes
+
+When reconfiguring a state, effects from the reconfiguring transaction can now be seen by newly added state fields.
+
 ## 0.19.3 (2021-11-03)
 
 ### New features

package/dist/index.cjs

@@ -967,21 +967,23 @@ class FacetProvider {
                 depAddrs.push(addresses[dep.id]);
         }
         return (state, tr) => {
-            if (!tr || tr.reconfigured) {
+            let oldVal = state.values[idx];
+            if (oldVal === Uninitialized) {
                 state.values[idx] = getter(state);
                 return 1 /* Changed */;
             }
-            else {
+            if (tr) {
                 let depChanged = (depDoc && tr.docChanged) || (depSel && (tr.docChanged || tr.selection)) ||
                     depAddrs.some(addr => (ensureAddr(state, addr) & 1 /* Changed */) > 0);
-                if (!depChanged)
-                    return 0;
-                let newVal = getter(state), oldVal = tr.startState.values[idx];
-                if (multi ? compareArray(newVal, oldVal, compare) : compare(newVal, oldVal))
-                    return 0;
-                state.values[idx] = newVal;
-                return 1 /* Changed */;
+                if (depChanged) {
+                    let newVal = getter(state);
+                    if (multi ? !compareArray(newVal, oldVal, compare) : !compare(newVal, oldVal)) {
+                        state.values[idx] = newVal;
+                        return 1 /* Changed */;
+                    }
+                }
             }
+            return 0;
         };
     }
 }
@@ -998,9 +1000,8 @@ function dynamicFacetSlot(addresses, facet, providers) {
     let providerTypes = providers.map(p => p.type);
     let dynamic = providerAddrs.filter(p => !(p & 1));
     let idx = addresses[facet.id] >> 1;
-    return (state, tr) => {
-        let oldAddr = !tr ? null : tr.reconfigured ? tr.startState.config.address[facet.id] : idx << 1;
-        let changed = oldAddr == null;
+    return (state) => {
+        let oldVal = state.values[idx], changed = oldVal === Uninitialized;
         for (let dynAddr of dynamic) {
             if (ensureAddr(state, dynAddr) & 1 /* Changed */)
                 changed = true;
@@ -1016,17 +1017,13 @@ function dynamicFacetSlot(addresses, facet, providers) {
             else
                 values.push(value);
         }
-        let newVal = facet.combine(values);
-        if (oldAddr != null && facet.compare(newVal, getAddr(tr.startState, oldAddr)))
+        let value = facet.combine(values);
+        if (facet.compare(value, oldVal))
             return 0;
-        state.values[idx] = newVal;
+        state.values[idx] = value;
         return 1 /* Changed */;
     };
 }
-function maybeIndex(state, id) {
-    let found = state.config.address[id];
-    return found == null ? null : found >> 1;
-}
 const initField = Facet.define({ static: true });
 /**
 Fields can store additional information in an editor state, and
@@ -1071,24 +1068,19 @@ class StateField {
     slot(addresses) {
         let idx = addresses[this.id] >> 1;
         return (state, tr) => {
-            if (!tr || (tr.reconfigured && maybeIndex(tr.startState, this.id) == null)) {
+            let oldVal = state.values[idx];
+            if (oldVal === Uninitialized) {
                 state.values[idx] = this.create(state);
                 return 1 /* Changed */;
             }
-            let oldVal, changed = 0;
-            if (tr.reconfigured) {
-                oldVal = tr.startState.values[maybeIndex(tr.startState, this.id)];
-                changed = 1 /* Changed */;
-            }
-            else {
-                oldVal = tr.startState.values[idx];
+            if (tr) {
+                let value = this.updateF(oldVal, tr);
+                if (!this.compareF(oldVal, value)) {
+                    state.values[idx] = value;
+                    return 1 /* Changed */;
+                }
             }
-            let value = this.updateF(oldVal, tr);
-            if (!changed && !this.compareF(oldVal, value))
-                changed = 1 /* Changed */;
-            if (changed)
-                state.values[idx] = value;
-            return changed;
+            return 0;
         };
     }
     /**
@@ -1208,7 +1200,7 @@ class Configuration {
         this.staticValues = staticValues;
         this.statusTemplate = [];
         while (this.statusTemplate.length < dynamicSlots.length)
-            this.statusTemplate.push(0 /* Uninitialized */);
+            this.statusTemplate.push(0 /* Unresolved */);
     }
     staticFacet(facet) {
         let addr = this.address[facet.id];
@@ -1311,6 +1303,7 @@ function flatten(extension, compartments, newCompartments) {
     inner(extension, Prec_.default);
     return result.reduce((a, b) => a.concat(b));
 }
+const Uninitialized = {};
 function ensureAddr(state, addr) {
     if (addr & 1)
         return 2 /* Computed */;
@@ -1836,28 +1829,20 @@ class EditorState {
     /**
     The current selection.
     */
-    selection, tr = null) {
+    selection, 
+    /**
+    @internal
+    */
+    values, tr = null) {
         this.config = config;
         this.doc = doc;
         this.selection = selection;
+        this.values = values;
         /**
         @internal
         */
         this.applying = null;
         this.status = config.statusTemplate.slice();
-        if (tr && tr.startState.config == config) {
-            this.values = tr.startState.values.slice();
-        }
-        else {
-            this.values = config.dynamicSlots.map(_ => null);
-            // Copy over old values for shared facets/fields if this is a reconfigure
-            if (tr)
-                for (let id in config.address) {
-                    let cur = config.address[id], prev = tr.startState.config.address[id];
-                    if (prev != null && (cur & 1) == 0)
-                        this.values[cur >> 1] = getAddr(tr.startState, prev);
-                }
-        }
         this.applying = tr;
         // Fill in the computed state immediately, so that further queries
         // for it made during the update return this state
@@ -1918,7 +1903,23 @@ class EditorState {
                 base = asArray(base).concat(effect.value);
             }
         }
-        new EditorState(conf || Configuration.resolve(base, compartments, this), tr.newDoc, tr.newSelection, tr);
+        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);
+            startValues = intermediateState.values;
+        }
+        else {
+            startValues = tr.startState.values.slice();
+        }
+        new EditorState(conf, tr.newDoc, tr.newSelection, startValues, tr);
     }
     /**
     Create a [transaction spec](https://codemirror.net/6/docs/ref/#state.TransactionSpec) that
@@ -2051,7 +2052,7 @@ class EditorState {
         checkSelection(selection, doc.length);
         if (!configuration.staticFacet(allowMultipleSelections))
             selection = selection.asSingle();
-        return new EditorState(configuration, doc, selection);
+        return new EditorState(configuration, doc, selection, configuration.dynamicSlots.map(_ => Uninitialized));
     }
     /**
     The size (in columns) of a tab in the document, determined by

package/dist/index.js

@@ -963,21 +963,23 @@ class FacetProvider {
                 depAddrs.push(addresses[dep.id]);
         }
         return (state, tr) => {
-            if (!tr || tr.reconfigured) {
+            let oldVal = state.values[idx];
+            if (oldVal === Uninitialized) {
                 state.values[idx] = getter(state);
                 return 1 /* Changed */;
             }
-            else {
+            if (tr) {
                 let depChanged = (depDoc && tr.docChanged) || (depSel && (tr.docChanged || tr.selection)) ||
                     depAddrs.some(addr => (ensureAddr(state, addr) & 1 /* Changed */) > 0);
-                if (!depChanged)
-                    return 0;
-                let newVal = getter(state), oldVal = tr.startState.values[idx];
-                if (multi ? compareArray(newVal, oldVal, compare) : compare(newVal, oldVal))
-                    return 0;
-                state.values[idx] = newVal;
-                return 1 /* Changed */;
+                if (depChanged) {
+                    let newVal = getter(state);
+                    if (multi ? !compareArray(newVal, oldVal, compare) : !compare(newVal, oldVal)) {
+                        state.values[idx] = newVal;
+                        return 1 /* Changed */;
+                    }
+                }
             }
+            return 0;
         };
     }
 }
@@ -994,9 +996,8 @@ function dynamicFacetSlot(addresses, facet, providers) {
     let providerTypes = providers.map(p => p.type);
     let dynamic = providerAddrs.filter(p => !(p & 1));
     let idx = addresses[facet.id] >> 1;
-    return (state, tr) => {
-        let oldAddr = !tr ? null : tr.reconfigured ? tr.startState.config.address[facet.id] : idx << 1;
-        let changed = oldAddr == null;
+    return (state) => {
+        let oldVal = state.values[idx], changed = oldVal === Uninitialized;
         for (let dynAddr of dynamic) {
             if (ensureAddr(state, dynAddr) & 1 /* Changed */)
                 changed = true;
@@ -1012,17 +1013,13 @@ function dynamicFacetSlot(addresses, facet, providers) {
             else
                 values.push(value);
         }
-        let newVal = facet.combine(values);
-        if (oldAddr != null && facet.compare(newVal, getAddr(tr.startState, oldAddr)))
+        let value = facet.combine(values);
+        if (facet.compare(value, oldVal))
             return 0;
-        state.values[idx] = newVal;
+        state.values[idx] = value;
         return 1 /* Changed */;
     };
 }
-function maybeIndex(state, id) {
-    let found = state.config.address[id];
-    return found == null ? null : found >> 1;
-}
 const initField = /*@__PURE__*/Facet.define({ static: true });
 /**
 Fields can store additional information in an editor state, and
@@ -1067,24 +1064,19 @@ class StateField {
     slot(addresses) {
         let idx = addresses[this.id] >> 1;
         return (state, tr) => {
-            if (!tr || (tr.reconfigured && maybeIndex(tr.startState, this.id) == null)) {
+            let oldVal = state.values[idx];
+            if (oldVal === Uninitialized) {
                 state.values[idx] = this.create(state);
                 return 1 /* Changed */;
             }
-            let oldVal, changed = 0;
-            if (tr.reconfigured) {
-                oldVal = tr.startState.values[maybeIndex(tr.startState, this.id)];
-                changed = 1 /* Changed */;
-            }
-            else {
-                oldVal = tr.startState.values[idx];
+            if (tr) {
+                let value = this.updateF(oldVal, tr);
+                if (!this.compareF(oldVal, value)) {
+                    state.values[idx] = value;
+                    return 1 /* Changed */;
+                }
             }
-            let value = this.updateF(oldVal, tr);
-            if (!changed && !this.compareF(oldVal, value))
-                changed = 1 /* Changed */;
-            if (changed)
-                state.values[idx] = value;
-            return changed;
+            return 0;
         };
     }
     /**
@@ -1204,7 +1196,7 @@ class Configuration {
         this.staticValues = staticValues;
         this.statusTemplate = [];
         while (this.statusTemplate.length < dynamicSlots.length)
-            this.statusTemplate.push(0 /* Uninitialized */);
+            this.statusTemplate.push(0 /* Unresolved */);
     }
     staticFacet(facet) {
         let addr = this.address[facet.id];
@@ -1307,6 +1299,7 @@ function flatten(extension, compartments, newCompartments) {
     inner(extension, Prec_.default);
     return result.reduce((a, b) => a.concat(b));
 }
+const Uninitialized = {};
 function ensureAddr(state, addr) {
     if (addr & 1)
         return 2 /* Computed */;
@@ -1831,28 +1824,20 @@ class EditorState {
     /**
     The current selection.
     */
-    selection, tr = null) {
+    selection, 
+    /**
+    @internal
+    */
+    values, tr = null) {
         this.config = config;
         this.doc = doc;
         this.selection = selection;
+        this.values = values;
         /**
         @internal
         */
         this.applying = null;
         this.status = config.statusTemplate.slice();
-        if (tr && tr.startState.config == config) {
-            this.values = tr.startState.values.slice();
-        }
-        else {
-            this.values = config.dynamicSlots.map(_ => null);
-            // Copy over old values for shared facets/fields if this is a reconfigure
-            if (tr)
-                for (let id in config.address) {
-                    let cur = config.address[id], prev = tr.startState.config.address[id];
-                    if (prev != null && (cur & 1) == 0)
-                        this.values[cur >> 1] = getAddr(tr.startState, prev);
-                }
-        }
         this.applying = tr;
         // Fill in the computed state immediately, so that further queries
         // for it made during the update return this state
@@ -1913,7 +1898,23 @@ class EditorState {
                 base = asArray(base).concat(effect.value);
             }
         }
-        new EditorState(conf || Configuration.resolve(base, compartments, this), tr.newDoc, tr.newSelection, tr);
+        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);
+            startValues = intermediateState.values;
+        }
+        else {
+            startValues = tr.startState.values.slice();
+        }
+        new EditorState(conf, tr.newDoc, tr.newSelection, startValues, tr);
     }
     /**
     Create a [transaction spec](https://codemirror.net/6/docs/ref/#state.TransactionSpec) that
@@ -2046,7 +2047,7 @@ class EditorState {
         checkSelection(selection, doc.length);
         if (!configuration.staticFacet(allowMultipleSelections))
             selection = selection.asSingle();
-        return new EditorState(configuration, doc, selection);
+        return new EditorState(configuration, doc, selection, configuration.dynamicSlots.map(_ => Uninitialized));
     }
     /**
     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.3",
+  "version": "0.19.4",
   "description": "Editor state data structures for the CodeMirror code editor",
   "scripts": {
     "test": "cm-runtests",