@codemirror/state 0.19.2 → 0.19.6

package/CHANGELOG.md

@@ -1,3 +1,29 @@
+## 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
+
+Fix a bug that would cause dynamic facet values influenced by a state reconfiguration to not properly recompute.
+
+## 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
+
+The precedence levels (under `Prec`) now have more generic names, because their 'meaningful' names were entirely inappropriate in many situations.
+
 ## 0.19.2 (2021-09-13)
 
 ### 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;
         };
     }
 }
@@ -999,8 +1001,7 @@ function dynamicFacetSlot(addresses, facet, providers) {
     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;
+        let oldVal = state.values[idx], changed = oldVal === Uninitialized || !tr;
         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 (oldVal !== Uninitialized && 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;
         };
     }
     /**
@@ -1106,7 +1098,7 @@ class StateField {
     */
     get extension() { return this; }
 }
-const Prec_ = { fallback: 3, default: 2, extend: 1, override: 0 };
+const Prec_ = { lowest: 4, low: 3, default: 2, high: 1, highest: 0 };
 function prec(value) {
     return (ext) => new PrecExtension(ext, value);
 }
@@ -1122,23 +1114,42 @@ precedence and then by order within each precedence.
 */
 const Prec = {
     /**
-    A precedence below the default precedence, which will cause
-    default-precedence extensions to override it even if they are
-    specified later in the extension ordering.
+    The lowest precedence level. Meant for things that should end up
+    near the end of the extension order.
+    */
+    lowest: prec(Prec_.lowest),
+    /**
+    A lower-than-default precedence, for extensions.
     */
-    fallback: prec(Prec_.fallback),
+    low: prec(Prec_.low),
     /**
-    The regular default precedence.
+    The default precedence, which is also used for extensions
+    without an explicit precedence.
     */
     default: prec(Prec_.default),
     /**
-    A higher-than-default precedence.
+    A higher-than-default precedence, for extensions that should
+    come before those with default precedence.
+    */
+    high: prec(Prec_.high),
+    /**
+    The highest precedence level, for extensions that should end up
+    near the start of the precedence ordering.
+    */
+    highest: prec(Prec_.highest),
+    // FIXME Drop these in some future breaking version
+    /**
+    Backwards-compatible synonym for `Prec.lowest`.
     */
-    extend: prec(Prec_.extend),
+    fallback: prec(Prec_.lowest),
     /**
-    Precedence above the `default` and `extend` precedences.
+    Backwards-compatible synonym for `Prec.high`.
     */
-    override: prec(Prec_.override)
+    extend: prec(Prec_.high),
+    /**
+    Backwards-compatible synonym for `Prec.highest`.
+    */
+    override: prec(Prec_.highest)
 };
 class PrecExtension {
     constructor(inner, prec) {
@@ -1189,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];
@@ -1208,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;
@@ -1234,17 +1247,41 @@ 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));
+            }
+        }
+        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 new Configuration(base, newCompartments, dynamicSlots.map(f => f(address)), address, staticValues);
+        return {
+            configuration: new Configuration(base, newCompartments, dynamicSlots.map(f => f(address)), address, staticValues),
+            values: dynamicValues
+        };
     }
 }
 function flatten(extension, compartments, newCompartments) {
-    let result = [[], [], [], []];
+    let result = [[], [], [], [], []];
     let seen = new Map();
     function inner(ext, prec) {
         let known = seen.get(ext);
@@ -1292,6 +1329,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 */;
@@ -1576,7 +1614,7 @@ class Transaction {
     */
     isUserEvent(event) {
         let e = this.annotation(Transaction.userEvent);
-        return e && (e == event || e.length > event.length && e.slice(0, event.length) == event && e[event.length] == ".");
+        return !!(e && (e == event || e.length > event.length && e.slice(0, event.length) == event && e[event.length] == "."));
     }
 }
 /**
@@ -1817,28 +1855,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
@@ -1899,7 +1929,17 @@ 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) {
+            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 {
+            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
@@ -2023,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)
@@ -2032,7 +2072,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, values);
     }
     /**
     The size (in columns) of a tab in the document, determined by

package/dist/index.d.ts

@@ -509,21 +509,39 @@ precedence and then by order within each precedence.
 */
 declare const Prec: {
     /**
-    A precedence below the default precedence, which will cause
-    default-precedence extensions to override it even if they are
-    specified later in the extension ordering.
+    The lowest precedence level. Meant for things that should end up
+    near the end of the extension order.
     */
-    fallback: (ext: Extension) => Extension;
+    lowest: (ext: Extension) => Extension;
+    /**
+    A lower-than-default precedence, for extensions.
+    */
+    low: (ext: Extension) => Extension;
     /**
-    The regular default precedence.
+    The default precedence, which is also used for extensions
+    without an explicit precedence.
     */
     default: (ext: Extension) => Extension;
     /**
-    A higher-than-default precedence.
+    A higher-than-default precedence, for extensions that should
+    come before those with default precedence.
+    */
+    high: (ext: Extension) => Extension;
+    /**
+    The highest precedence level, for extensions that should end up
+    near the start of the precedence ordering.
+    */
+    highest: (ext: Extension) => Extension;
+    /**
+    Backwards-compatible synonym for `Prec.lowest`.
+    */
+    fallback: (ext: Extension) => Extension;
+    /**
+    Backwards-compatible synonym for `Prec.high`.
     */
     extend: (ext: Extension) => Extension;
     /**
-    Precedence above the `default` and `extend` precedences.
+    Backwards-compatible synonym for `Prec.highest`.
     */
     override: (ext: Extension) => Extension;
 };
@@ -783,7 +801,7 @@ declare class Transaction {
     has `"select.pointer"` as user event, `"select"` and
     `"select.pointer"` will match it.
     */
-    isUserEvent(event: string): boolean | "" | undefined;
+    isUserEvent(event: string): boolean;
     /**
     Annotation used to store transaction timestamps.
     */

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;
         };
     }
 }
@@ -995,8 +997,7 @@ function dynamicFacetSlot(addresses, facet, providers) {
     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;
+        let oldVal = state.values[idx], changed = oldVal === Uninitialized || !tr;
         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 (oldVal !== Uninitialized && 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;
         };
     }
     /**
@@ -1102,7 +1094,7 @@ class StateField {
     */
     get extension() { return this; }
 }
-const Prec_ = { fallback: 3, default: 2, extend: 1, override: 0 };
+const Prec_ = { lowest: 4, low: 3, default: 2, high: 1, highest: 0 };
 function prec(value) {
     return (ext) => new PrecExtension(ext, value);
 }
@@ -1118,23 +1110,42 @@ precedence and then by order within each precedence.
 */
 const Prec = {
     /**
-    A precedence below the default precedence, which will cause
-    default-precedence extensions to override it even if they are
-    specified later in the extension ordering.
+    The lowest precedence level. Meant for things that should end up
+    near the end of the extension order.
+    */
+    lowest: /*@__PURE__*/prec(Prec_.lowest),
+    /**
+    A lower-than-default precedence, for extensions.
     */
-    fallback: /*@__PURE__*/prec(Prec_.fallback),
+    low: /*@__PURE__*/prec(Prec_.low),
     /**
-    The regular default precedence.
+    The default precedence, which is also used for extensions
+    without an explicit precedence.
     */
     default: /*@__PURE__*/prec(Prec_.default),
     /**
-    A higher-than-default precedence.
+    A higher-than-default precedence, for extensions that should
+    come before those with default precedence.
+    */
+    high: /*@__PURE__*/prec(Prec_.high),
+    /**
+    The highest precedence level, for extensions that should end up
+    near the start of the precedence ordering.
+    */
+    highest: /*@__PURE__*/prec(Prec_.highest),
+    // FIXME Drop these in some future breaking version
+    /**
+    Backwards-compatible synonym for `Prec.lowest`.
     */
-    extend: /*@__PURE__*/prec(Prec_.extend),
+    fallback: /*@__PURE__*/prec(Prec_.lowest),
     /**
-    Precedence above the `default` and `extend` precedences.
+    Backwards-compatible synonym for `Prec.high`.
     */
-    override: /*@__PURE__*/prec(Prec_.override)
+    extend: /*@__PURE__*/prec(Prec_.high),
+    /**
+    Backwards-compatible synonym for `Prec.highest`.
+    */
+    override: /*@__PURE__*/prec(Prec_.highest)
 };
 class PrecExtension {
     constructor(inner, prec) {
@@ -1185,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];
@@ -1204,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;
@@ -1230,17 +1243,41 @@ 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));
+            }
+        }
+        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 new Configuration(base, newCompartments, dynamicSlots.map(f => f(address)), address, staticValues);
+        return {
+            configuration: new Configuration(base, newCompartments, dynamicSlots.map(f => f(address)), address, staticValues),
+            values: dynamicValues
+        };
     }
 }
 function flatten(extension, compartments, newCompartments) {
-    let result = [[], [], [], []];
+    let result = [[], [], [], [], []];
     let seen = new Map();
     function inner(ext, prec) {
         let known = seen.get(ext);
@@ -1288,6 +1325,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 */;
@@ -1572,7 +1610,7 @@ class Transaction {
     */
     isUserEvent(event) {
         let e = this.annotation(Transaction.userEvent);
-        return e && (e == event || e.length > event.length && e.slice(0, event.length) == event && e[event.length] == ".");
+        return !!(e && (e == event || e.length > event.length && e.slice(0, event.length) == event && e[event.length] == "."));
     }
 }
 /**
@@ -1812,28 +1850,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
@@ -1894,7 +1924,17 @@ 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) {
+            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 {
+            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
@@ -2018,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)
@@ -2027,7 +2067,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, 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.2",
+  "version": "0.19.6",
   "description": "Editor state data structures for the CodeMirror code editor",
   "scripts": {
     "test": "cm-runtests",