@sakuzu/maplibre-gl-draw 1.0.0 → 2.0.0

package/dist/store/draw-store.js

@@ -11,31 +11,38 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _DrawStore_instances, _DrawStore_document, _DrawStore_bus, _DrawStore_ui, _DrawStore_write, _DrawStore_receive, _DrawStore_forget, _DrawStore_pruneInvisible, _DrawStore_pruneVertices;
+var _DrawStore_instances, _DrawStore_contract, _DrawStore_bus, _DrawStore_drawing, _DrawStore_normalized, _DrawStore_write, _DrawStore_local, _DrawStore_receive, _DrawStore_feature, _DrawStore_features, _DrawStore_layer, _DrawStore_normalizeChanges, _DrawStore_forget, _DrawStore_pruneInvisible, _DrawStore_pruneVertices, _DrawStore_endVertexSelection;
 /**
  * DrawStore
  *
- * The Store core works with: a DocumentStore (the in-memory one, or one the host gave) and
- * the local UiState of this client behind one gate.
+ * The Store core works with: a {@link StoreContract} (the in-memory one, or one the host gave)
+ * and the state only the drawing reads, behind one gate. It reaches the contract only through
+ * the members of the public `Store`.
  *
- *   - Read-only is enforced here, at the write methods, and nowhere else. A refused write
- *     returns false and touches nothing. The DocumentStore never sees the gate, so changes
- *     applied to the document from elsewhere are not stopped by it.
- *   - The notifications of the document are forwarded into the ChangeBus of the local state,
- *     so a listener gets one StateChanges per transaction with both kinds of change.
- *   - Deletions reach the local state: the id of a deleted feature, group or layer leaves the
- *     selection, the features being edited and the locally hidden set, whatever deleted it.
+ *   - Read-only is enforced here, at the write methods of the document. A refused write
+ *     returns false and touches nothing. Changes applied to the contract from elsewhere are not
+ *     stopped by it.
+ *   - The notifications of the contract are forwarded into the ChangeBus of this Store, so a
+ *     listener gets one StoreChange per transaction with every kind of change.
+ *   - What the contract returns and notifies is read in the shape of the public types: an
+ *     optional field it gives as `null` (`Feature.groupId`, `Layer.metadata`,
+ *     `Layer.styleRule`) is read as `undefined`. The normalized object is kept per object of
+ *     the contract, so the same object of the contract always reads as the same object here.
+ *   - Deletions reach the state of this client: the id of a deleted feature, group or layer
+ *     leaves the selection, the features being edited and the locally hidden set, whatever
+ *     deleted it, through the writes of the contract.
  *   - The selection holds only what can be seen: a change that hides a selected item (its own
  *     visible flag, the one of its group or layer, or local hiding) takes it out of the
  *     selection, and the vertex selection ends when its feature is deleted or its coordinates
  *     change other than by a drag. This is the only place that keeps these invariants; the
  *     modes and the public API rely on it.
  */
+import { coordinatesOf } from '../shared/utils/coordinates.js';
 import { ChangeBus } from './memory/change-bus.js';
-import { MemoryUiState } from './memory/ui-state.js';
+import { MemoryDrawingState } from './memory/ui-state.js';
 /**
- * Returns the Store for a store option: a Store is used as it is, a DocumentStore gets the
- * local state and the read-only gate of core around it
+ * Returns the Store for a store option: a Store of core is used as it is, a Store of the host
+ * gets the drawing state and the read-only gate of core around it
  *
  * @internal
  */
@@ -43,188 +50,204 @@ export function toStore(store) {
     return store instanceof DrawStore ? store : new DrawStore(store);
 }
 /**
- * The Store of core over a DocumentStore
+ * The Store of core over a {@link StoreContract}
  *
  * @internal
  */
 export class DrawStore {
-    constructor(document) {
+    constructor(contract) {
         _DrawStore_instances.add(this);
-        _DrawStore_document.set(this, void 0);
+        _DrawStore_contract.set(this, void 0);
         _DrawStore_bus.set(this, new ChangeBus());
-        _DrawStore_ui.set(this, new MemoryUiState(__classPrivateFieldGet(this, _DrawStore_bus, "f")));
-        __classPrivateFieldSet(this, _DrawStore_document, document, "f");
-        document.subscribe((changes) => __classPrivateFieldGet(this, _DrawStore_instances, "m", _DrawStore_receive).call(this, changes));
+        _DrawStore_drawing.set(this, new MemoryDrawingState(__classPrivateFieldGet(this, _DrawStore_bus, "f")));
+        /** The normalized copy of each object of the contract that gave `null` for an optional field */
+        _DrawStore_normalized.set(this, new WeakMap());
+        __classPrivateFieldSet(this, _DrawStore_contract, contract, "f");
+        contract.subscribe((changes) => __classPrivateFieldGet(this, _DrawStore_instances, "m", _DrawStore_receive).call(this, changes));
     }
     // ============================================================================
     // The document: reads
     // ============================================================================
     getFeature(id) {
-        return __classPrivateFieldGet(this, _DrawStore_document, "f").getFeature(id);
+        const feature = __classPrivateFieldGet(this, _DrawStore_contract, "f").getFeature(id);
+        return feature && __classPrivateFieldGet(this, _DrawStore_instances, "m", _DrawStore_feature).call(this, feature);
     }
-    getAllFeatures() {
-        return __classPrivateFieldGet(this, _DrawStore_document, "f").getAllFeatures();
+    listFeatures() {
+        return __classPrivateFieldGet(this, _DrawStore_instances, "m", _DrawStore_features).call(this, __classPrivateFieldGet(this, _DrawStore_contract, "f").listFeatures());
     }
-    getOrderedFeatures() {
-        return __classPrivateFieldGet(this, _DrawStore_document, "f").getOrderedFeatures();
+    listFeaturesInOrder() {
+        return __classPrivateFieldGet(this, _DrawStore_instances, "m", _DrawStore_features).call(this, __classPrivateFieldGet(this, _DrawStore_contract, "f").listFeaturesInOrder());
     }
     getLayer(id) {
-        return __classPrivateFieldGet(this, _DrawStore_document, "f").getLayer(id);
+        const layer = __classPrivateFieldGet(this, _DrawStore_contract, "f").getLayer(id);
+        return layer && __classPrivateFieldGet(this, _DrawStore_instances, "m", _DrawStore_layer).call(this, layer);
     }
-    getAllLayers() {
-        return __classPrivateFieldGet(this, _DrawStore_document, "f").getAllLayers();
+    listLayers() {
+        const layers = __classPrivateFieldGet(this, _DrawStore_contract, "f").listLayers();
+        return layers.some(hasNullLayerField) ? layers.map((layer) => __classPrivateFieldGet(this, _DrawStore_instances, "m", _DrawStore_layer).call(this, layer)) : layers;
     }
     getLayerOrder() {
-        return __classPrivateFieldGet(this, _DrawStore_document, "f").getLayerOrder();
+        return __classPrivateFieldGet(this, _DrawStore_contract, "f").getLayerOrder();
     }
     getGroup(id) {
-        return __classPrivateFieldGet(this, _DrawStore_document, "f").getGroup(id);
+        return __classPrivateFieldGet(this, _DrawStore_contract, "f").getGroup(id);
     }
-    getAllGroups() {
-        return __classPrivateFieldGet(this, _DrawStore_document, "f").getAllGroups();
+    listGroups() {
+        return __classPrivateFieldGet(this, _DrawStore_contract, "f").listGroups();
     }
     getFile(id) {
-        return __classPrivateFieldGet(this, _DrawStore_document, "f").getFile(id);
+        return __classPrivateFieldGet(this, _DrawStore_contract, "f").getFile(id);
     }
-    getAllFiles() {
-        return __classPrivateFieldGet(this, _DrawStore_document, "f").getAllFiles();
+    listFiles() {
+        return __classPrivateFieldGet(this, _DrawStore_contract, "f").listFiles();
     }
     getMetadata() {
-        return __classPrivateFieldGet(this, _DrawStore_document, "f").getMetadata();
+        return __classPrivateFieldGet(this, _DrawStore_contract, "f").getMetadata();
     }
     // ============================================================================
     // The document: writes (gated by read-only)
     // ============================================================================
     createFeature(feature) {
-        return __classPrivateFieldGet(this, _DrawStore_instances, "m", _DrawStore_write).call(this, () => __classPrivateFieldGet(this, _DrawStore_document, "f").createFeature(feature));
+        return __classPrivateFieldGet(this, _DrawStore_instances, "m", _DrawStore_write).call(this, () => __classPrivateFieldGet(this, _DrawStore_contract, "f").createFeature(feature));
     }
     updateFeature(id, updates, options) {
-        return __classPrivateFieldGet(this, _DrawStore_instances, "m", _DrawStore_write).call(this, () => __classPrivateFieldGet(this, _DrawStore_document, "f").updateFeature(id, updates, options));
+        return __classPrivateFieldGet(this, _DrawStore_instances, "m", _DrawStore_write).call(this, () => __classPrivateFieldGet(this, _DrawStore_contract, "f").updateFeature(id, updates, options));
     }
     abortIntermediateUpdates(ids) {
-        __classPrivateFieldGet(this, _DrawStore_document, "f").abortIntermediateUpdates?.(ids);
+        __classPrivateFieldGet(this, _DrawStore_contract, "f").abortIntermediateUpdates?.(ids);
     }
     deleteFeature(id) {
         return __classPrivateFieldGet(this, _DrawStore_instances, "m", _DrawStore_write).call(this, () => {
-            __classPrivateFieldGet(this, _DrawStore_document, "f").deleteFeature(id);
+            const deleted = __classPrivateFieldGet(this, _DrawStore_contract, "f").deleteFeature(id);
             // At once, so that the rest of a transaction already sees the selection without it
-            __classPrivateFieldGet(this, _DrawStore_instances, "m", _DrawStore_forget).call(this, id);
+            if (deleted)
+                __classPrivateFieldGet(this, _DrawStore_instances, "m", _DrawStore_forget).call(this, id);
+            return deleted;
         });
     }
     createLayer(layer) {
-        return __classPrivateFieldGet(this, _DrawStore_instances, "m", _DrawStore_write).call(this, () => __classPrivateFieldGet(this, _DrawStore_document, "f").createLayer(layer));
+        return __classPrivateFieldGet(this, _DrawStore_instances, "m", _DrawStore_write).call(this, () => __classPrivateFieldGet(this, _DrawStore_contract, "f").createLayer(layer));
     }
     updateLayer(id, updates) {
-        return __classPrivateFieldGet(this, _DrawStore_instances, "m", _DrawStore_write).call(this, () => __classPrivateFieldGet(this, _DrawStore_document, "f").updateLayer(id, updates));
+        return __classPrivateFieldGet(this, _DrawStore_instances, "m", _DrawStore_write).call(this, () => __classPrivateFieldGet(this, _DrawStore_contract, "f").updateLayer(id, updates));
     }
     deleteLayer(id) {
-        return __classPrivateFieldGet(this, _DrawStore_instances, "m", _DrawStore_write).call(this, () => __classPrivateFieldGet(this, _DrawStore_document, "f").deleteLayer(id));
+        return __classPrivateFieldGet(this, _DrawStore_instances, "m", _DrawStore_write).call(this, () => __classPrivateFieldGet(this, _DrawStore_contract, "f").deleteLayer(id));
     }
     setLayerOrder(order) {
-        return __classPrivateFieldGet(this, _DrawStore_instances, "m", _DrawStore_write).call(this, () => __classPrivateFieldGet(this, _DrawStore_document, "f").setLayerOrder(order));
+        return __classPrivateFieldGet(this, _DrawStore_instances, "m", _DrawStore_write).call(this, () => __classPrivateFieldGet(this, _DrawStore_contract, "f").setLayerOrder(order));
     }
     reorderInLayer(itemId, layerId, newIndex) {
-        return __classPrivateFieldGet(this, _DrawStore_instances, "m", _DrawStore_write).call(this, () => __classPrivateFieldGet(this, _DrawStore_document, "f").reorderInLayer(itemId, layerId, newIndex));
+        return __classPrivateFieldGet(this, _DrawStore_instances, "m", _DrawStore_write).call(this, () => __classPrivateFieldGet(this, _DrawStore_contract, "f").reorderInLayer(itemId, layerId, newIndex));
     }
     reorderInGroup(featureId, groupId, newIndex) {
-        return __classPrivateFieldGet(this, _DrawStore_instances, "m", _DrawStore_write).call(this, () => __classPrivateFieldGet(this, _DrawStore_document, "f").reorderInGroup(featureId, groupId, newIndex));
+        return __classPrivateFieldGet(this, _DrawStore_instances, "m", _DrawStore_write).call(this, () => __classPrivateFieldGet(this, _DrawStore_contract, "f").reorderInGroup(featureId, groupId, newIndex));
     }
     createGroup(group) {
-        return __classPrivateFieldGet(this, _DrawStore_instances, "m", _DrawStore_write).call(this, () => __classPrivateFieldGet(this, _DrawStore_document, "f").createGroup(group));
+        return __classPrivateFieldGet(this, _DrawStore_instances, "m", _DrawStore_write).call(this, () => __classPrivateFieldGet(this, _DrawStore_contract, "f").createGroup(group));
     }
     updateGroup(id, updates) {
-        return __classPrivateFieldGet(this, _DrawStore_instances, "m", _DrawStore_write).call(this, () => __classPrivateFieldGet(this, _DrawStore_document, "f").updateGroup(id, updates));
+        return __classPrivateFieldGet(this, _DrawStore_instances, "m", _DrawStore_write).call(this, () => __classPrivateFieldGet(this, _DrawStore_contract, "f").updateGroup(id, updates));
     }
     deleteGroup(id) {
-        return __classPrivateFieldGet(this, _DrawStore_instances, "m", _DrawStore_write).call(this, () => __classPrivateFieldGet(this, _DrawStore_document, "f").deleteGroup(id));
+        return __classPrivateFieldGet(this, _DrawStore_instances, "m", _DrawStore_write).call(this, () => __classPrivateFieldGet(this, _DrawStore_contract, "f").deleteGroup(id));
     }
     createFile(file) {
-        return __classPrivateFieldGet(this, _DrawStore_instances, "m", _DrawStore_write).call(this, () => __classPrivateFieldGet(this, _DrawStore_document, "f").createFile(file));
+        return __classPrivateFieldGet(this, _DrawStore_instances, "m", _DrawStore_write).call(this, () => __classPrivateFieldGet(this, _DrawStore_contract, "f").createFile(file));
     }
     deleteFile(id) {
-        return __classPrivateFieldGet(this, _DrawStore_instances, "m", _DrawStore_write).call(this, () => __classPrivateFieldGet(this, _DrawStore_document, "f").deleteFile(id));
+        return __classPrivateFieldGet(this, _DrawStore_instances, "m", _DrawStore_write).call(this, () => __classPrivateFieldGet(this, _DrawStore_contract, "f").deleteFile(id));
     }
     setMetadata(metadata) {
-        return __classPrivateFieldGet(this, _DrawStore_instances, "m", _DrawStore_write).call(this, () => __classPrivateFieldGet(this, _DrawStore_document, "f").setMetadata(metadata));
+        return __classPrivateFieldGet(this, _DrawStore_instances, "m", _DrawStore_write).call(this, () => __classPrivateFieldGet(this, _DrawStore_contract, "f").setMetadata(metadata));
     }
     // ============================================================================
-    // The local state
+    // The state of this client (kept by the contract)
     // ============================================================================
     getSelection() {
-        return __classPrivateFieldGet(this, _DrawStore_ui, "f").getSelection();
+        return __classPrivateFieldGet(this, _DrawStore_contract, "f").getSelection();
     }
     setSelection(type, ids) {
-        __classPrivateFieldGet(this, _DrawStore_ui, "f").setSelection(type, ids);
+        __classPrivateFieldGet(this, _DrawStore_instances, "m", _DrawStore_local).call(this, () => __classPrivateFieldGet(this, _DrawStore_contract, "f").setSelection(type, ids));
     }
     getEditingIds() {
-        return __classPrivateFieldGet(this, _DrawStore_ui, "f").getEditingIds();
+        return __classPrivateFieldGet(this, _DrawStore_contract, "f").getEditingIds();
     }
     startEditing(ids) {
-        __classPrivateFieldGet(this, _DrawStore_ui, "f").startEditing(ids);
+        __classPrivateFieldGet(this, _DrawStore_instances, "m", _DrawStore_local).call(this, () => __classPrivateFieldGet(this, _DrawStore_contract, "f").startEditing(ids));
     }
     endEditing(ids) {
-        __classPrivateFieldGet(this, _DrawStore_ui, "f").endEditing(ids);
+        __classPrivateFieldGet(this, _DrawStore_instances, "m", _DrawStore_local).call(this, () => __classPrivateFieldGet(this, _DrawStore_contract, "f").endEditing(ids));
     }
-    getTentative() {
-        return __classPrivateFieldGet(this, _DrawStore_ui, "f").getTentative();
-    }
-    setTentative(state) {
-        __classPrivateFieldGet(this, _DrawStore_ui, "f").setTentative(state);
-    }
-    getBoxSelection() {
-        return __classPrivateFieldGet(this, _DrawStore_ui, "f").getBoxSelection();
-    }
-    setBoxSelection(box) {
-        __classPrivateFieldGet(this, _DrawStore_ui, "f").setBoxSelection(box);
-    }
-    getDragState() {
-        return __classPrivateFieldGet(this, _DrawStore_ui, "f").getDragState();
-    }
-    setDragState(state) {
-        __classPrivateFieldGet(this, _DrawStore_ui, "f").setDragState(state);
-    }
-    getSelectedVertices() {
-        return __classPrivateFieldGet(this, _DrawStore_ui, "f").getSelectedVertices();
+    getVertexSelection() {
+        return __classPrivateFieldGet(this, _DrawStore_contract, "f").getVertexSelection();
     }
     setSelectedVertices(selection) {
-        __classPrivateFieldGet(this, _DrawStore_ui, "f").setSelectedVertices(selection);
-    }
-    getFollowedVertices() {
-        return __classPrivateFieldGet(this, _DrawStore_ui, "f").getFollowedVertices();
-    }
-    setFollowedVertices(selections) {
-        __classPrivateFieldGet(this, _DrawStore_ui, "f").setFollowedVertices(selections);
+        __classPrivateFieldGet(this, _DrawStore_instances, "m", _DrawStore_local).call(this, () => __classPrivateFieldGet(this, _DrawStore_contract, "f").setSelectedVertices(selection), true);
     }
     getMode() {
-        return __classPrivateFieldGet(this, _DrawStore_ui, "f").getMode();
+        return __classPrivateFieldGet(this, _DrawStore_contract, "f").getMode();
     }
     setMode(mode) {
-        __classPrivateFieldGet(this, _DrawStore_ui, "f").setMode(mode);
+        __classPrivateFieldGet(this, _DrawStore_instances, "m", _DrawStore_local).call(this, () => __classPrivateFieldGet(this, _DrawStore_contract, "f").setMode(mode));
     }
     isReadOnly() {
-        return __classPrivateFieldGet(this, _DrawStore_ui, "f").isReadOnly();
+        return __classPrivateFieldGet(this, _DrawStore_contract, "f").isReadOnly();
     }
     setReadOnly(value) {
-        __classPrivateFieldGet(this, _DrawStore_ui, "f").setReadOnly(value);
+        if (__classPrivateFieldGet(this, _DrawStore_contract, "f").isReadOnly() === value)
+            return;
+        __classPrivateFieldGet(this, _DrawStore_instances, "m", _DrawStore_local).call(this, () => __classPrivateFieldGet(this, _DrawStore_contract, "f").setReadOnly(value), true);
     }
     isInteractionLocked() {
-        return __classPrivateFieldGet(this, _DrawStore_ui, "f").isInteractionLocked();
+        return __classPrivateFieldGet(this, _DrawStore_contract, "f").isInteractionLocked();
     }
     setInteractionLock(value) {
-        __classPrivateFieldGet(this, _DrawStore_ui, "f").setInteractionLock(value);
+        if (__classPrivateFieldGet(this, _DrawStore_contract, "f").isInteractionLocked() === value)
+            return;
+        __classPrivateFieldGet(this, _DrawStore_instances, "m", _DrawStore_local).call(this, () => __classPrivateFieldGet(this, _DrawStore_contract, "f").setInteractionLock(value), true);
     }
-    isLocallyHidden(id) {
-        return __classPrivateFieldGet(this, _DrawStore_ui, "f").isLocallyHidden(id);
+    isHidden(id) {
+        return __classPrivateFieldGet(this, _DrawStore_contract, "f").isHidden(id);
     }
-    getLocallyHidden() {
-        return __classPrivateFieldGet(this, _DrawStore_ui, "f").getLocallyHidden();
+    listHidden() {
+        return __classPrivateFieldGet(this, _DrawStore_contract, "f").listHidden();
     }
     setLocallyHidden(id, hidden) {
-        __classPrivateFieldGet(this, _DrawStore_bus, "f").transact(() => {
-            __classPrivateFieldGet(this, _DrawStore_ui, "f").setLocallyHidden(id, hidden);
+        if (__classPrivateFieldGet(this, _DrawStore_contract, "f").isHidden(id) === hidden)
+            return;
+        __classPrivateFieldGet(this, _DrawStore_instances, "m", _DrawStore_local).call(this, () => {
+            __classPrivateFieldGet(this, _DrawStore_contract, "f").setLocallyHidden(id, hidden);
             if (hidden)
                 __classPrivateFieldGet(this, _DrawStore_instances, "m", _DrawStore_pruneInvisible).call(this);
-        }, 'local');
+        }, true);
+    }
+    // ============================================================================
+    // The state only the drawing reads (kept here)
+    // ============================================================================
+    getTentative() {
+        return __classPrivateFieldGet(this, _DrawStore_drawing, "f").getTentative();
+    }
+    setTentative(state) {
+        __classPrivateFieldGet(this, _DrawStore_drawing, "f").setTentative(state);
+    }
+    getBoxSelection() {
+        return __classPrivateFieldGet(this, _DrawStore_drawing, "f").getBoxSelection();
+    }
+    setBoxSelection(box) {
+        __classPrivateFieldGet(this, _DrawStore_drawing, "f").setBoxSelection(box);
+    }
+    getDragState() {
+        return __classPrivateFieldGet(this, _DrawStore_drawing, "f").getDragState();
+    }
+    setDragState(state) {
+        __classPrivateFieldGet(this, _DrawStore_drawing, "f").setDragState(state);
+    }
+    getFollowedVertices() {
+        return __classPrivateFieldGet(this, _DrawStore_drawing, "f").getFollowedVertices();
+    }
+    setFollowedVertices(selections) {
+        __classPrivateFieldGet(this, _DrawStore_drawing, "f").setFollowedVertices(selections);
     }
     // ============================================================================
     // Subscription and transactions
@@ -233,17 +256,22 @@ export class DrawStore {
         return __classPrivateFieldGet(this, _DrawStore_bus, "f").subscribe(listener);
     }
     transact(fn, source = 'local') {
-        return __classPrivateFieldGet(this, _DrawStore_bus, "f").transact(() => __classPrivateFieldGet(this, _DrawStore_document, "f").transact(fn, source), source);
+        return __classPrivateFieldGet(this, _DrawStore_bus, "f").transact(() => __classPrivateFieldGet(this, _DrawStore_contract, "f").transact(fn, source), source);
     }
 }
-_DrawStore_document = new WeakMap(), _DrawStore_bus = new WeakMap(), _DrawStore_ui = new WeakMap(), _DrawStore_instances = new WeakSet(), _DrawStore_write = function _DrawStore_write(fn) {
-    if (__classPrivateFieldGet(this, _DrawStore_ui, "f").isReadOnly())
+_DrawStore_contract = new WeakMap(), _DrawStore_bus = new WeakMap(), _DrawStore_drawing = new WeakMap(), _DrawStore_normalized = new WeakMap(), _DrawStore_instances = new WeakSet(), _DrawStore_write = function _DrawStore_write(fn) {
+    if (__classPrivateFieldGet(this, _DrawStore_contract, "f").isReadOnly())
         return false;
-    this.transact(fn);
-    return true;
+    return this.transact(fn);
+}, _DrawStore_local = function _DrawStore_local(fn, redraw = false) {
+    __classPrivateFieldGet(this, _DrawStore_bus, "f").transact(() => {
+        fn();
+        if (redraw)
+            __classPrivateFieldGet(this, _DrawStore_bus, "f").merge({ uiStateChanged: true });
+    }, 'local');
 }, _DrawStore_receive = function _DrawStore_receive(changes) {
     __classPrivateFieldGet(this, _DrawStore_bus, "f").transact(() => {
-        __classPrivateFieldGet(this, _DrawStore_bus, "f").merge(documentPart(changes));
+        __classPrivateFieldGet(this, _DrawStore_bus, "f").merge(__classPrivateFieldGet(this, _DrawStore_instances, "m", _DrawStore_normalizeChanges).call(this, withoutSource(changes)));
         for (const feature of changes.features?.deleted ?? [])
             __classPrivateFieldGet(this, _DrawStore_instances, "m", _DrawStore_forget).call(this, feature.id);
         for (const group of changes.groups?.deleted ?? [])
@@ -254,31 +282,96 @@ _DrawStore_document = new WeakMap(), _DrawStore_bus = new WeakMap(), _DrawStore_
             __classPrivateFieldGet(this, _DrawStore_instances, "m", _DrawStore_pruneInvisible).call(this);
         __classPrivateFieldGet(this, _DrawStore_instances, "m", _DrawStore_pruneVertices).call(this, changes);
     }, changes.source ?? 'local');
+}, _DrawStore_feature = function _DrawStore_feature(feature) {
+    if (!hasNullFeatureField(feature))
+        return feature;
+    const known = __classPrivateFieldGet(this, _DrawStore_normalized, "f").get(feature);
+    if (known)
+        return known;
+    const normalized = { ...feature, groupId: undefined };
+    __classPrivateFieldGet(this, _DrawStore_normalized, "f").set(feature, normalized);
+    return normalized;
+}, _DrawStore_features = function _DrawStore_features(features) {
+    return features.some(hasNullFeatureField)
+        ? features.map((feature) => __classPrivateFieldGet(this, _DrawStore_instances, "m", _DrawStore_feature).call(this, feature))
+        : features;
+}, _DrawStore_layer = function _DrawStore_layer(layer) {
+    if (!hasNullLayerField(layer))
+        return layer;
+    const known = __classPrivateFieldGet(this, _DrawStore_normalized, "f").get(layer);
+    if (known)
+        return known;
+    const normalized = {
+        ...layer,
+        metadata: layer.metadata ?? undefined,
+        styleRule: layer.styleRule ?? undefined,
+    };
+    __classPrivateFieldGet(this, _DrawStore_normalized, "f").set(layer, normalized);
+    return normalized;
+}, _DrawStore_normalizeChanges = function _DrawStore_normalizeChanges(changes) {
+    const { features, layers } = changes;
+    const normalized = { ...changes };
+    if (features) {
+        normalized.features = {
+            ...features,
+            ...(features.created && { created: features.created.map((f) => __classPrivateFieldGet(this, _DrawStore_instances, "m", _DrawStore_feature).call(this, f)) }),
+            ...(features.updated && {
+                updated: features.updated.map((entry) => ({
+                    ...entry,
+                    feature: __classPrivateFieldGet(this, _DrawStore_instances, "m", _DrawStore_feature).call(this, entry.feature),
+                    previous: __classPrivateFieldGet(this, _DrawStore_instances, "m", _DrawStore_feature).call(this, entry.previous),
+                })),
+            }),
+            ...(features.deleted && { deleted: features.deleted.map((f) => __classPrivateFieldGet(this, _DrawStore_instances, "m", _DrawStore_feature).call(this, f)) }),
+        };
+    }
+    if (layers) {
+        normalized.layers = {
+            ...layers,
+            ...(layers.created && { created: layers.created.map((l) => __classPrivateFieldGet(this, _DrawStore_instances, "m", _DrawStore_layer).call(this, l)) }),
+            ...(layers.updated && {
+                updated: layers.updated.map((entry) => ({
+                    ...entry,
+                    layer: __classPrivateFieldGet(this, _DrawStore_instances, "m", _DrawStore_layer).call(this, entry.layer),
+                    previous: __classPrivateFieldGet(this, _DrawStore_instances, "m", _DrawStore_layer).call(this, entry.previous),
+                })),
+            }),
+            ...(layers.deleted && { deleted: layers.deleted.map((l) => __classPrivateFieldGet(this, _DrawStore_instances, "m", _DrawStore_layer).call(this, l)) }),
+        };
+    }
+    return normalized;
 }, _DrawStore_forget = function _DrawStore_forget(id) {
-    if (__classPrivateFieldGet(this, _DrawStore_document, "f").getFeature(id) || __classPrivateFieldGet(this, _DrawStore_document, "f").getGroup(id))
+    const contract = __classPrivateFieldGet(this, _DrawStore_contract, "f");
+    if (contract.getFeature(id) || contract.getGroup(id) || contract.getLayer(id))
         return;
-    if (__classPrivateFieldGet(this, _DrawStore_document, "f").getLayer(id))
-        return;
-    __classPrivateFieldGet(this, _DrawStore_ui, "f").removeFromSelection(id);
-    __classPrivateFieldGet(this, _DrawStore_ui, "f").removeFromEditing(id);
-    __classPrivateFieldGet(this, _DrawStore_ui, "f").removeFromLocallyHidden(id);
+    const selection = contract.getSelection();
+    if (selection.ids.includes(id)) {
+        const ids = selection.ids.filter((selected) => selected !== id);
+        contract.setSelection(ids.length === 0 ? null : selection.type, ids);
+    }
+    if (contract.getEditingIds().includes(id))
+        contract.endEditing([id]);
+    if (contract.isHidden(id)) {
+        contract.setLocallyHidden(id, false);
+        __classPrivateFieldGet(this, _DrawStore_bus, "f").merge({ uiStateChanged: true });
+    }
 }, _DrawStore_pruneInvisible = function _DrawStore_pruneInvisible() {
-    const selection = __classPrivateFieldGet(this, _DrawStore_ui, "f").getSelection();
+    const selection = __classPrivateFieldGet(this, _DrawStore_contract, "f").getSelection();
     const type = selection.type;
     if (type === null || selection.ids.length === 0)
         return;
-    const shown = createShownLookup(__classPrivateFieldGet(this, _DrawStore_document, "f"), __classPrivateFieldGet(this, _DrawStore_ui, "f"));
+    const shown = createShownLookup(__classPrivateFieldGet(this, _DrawStore_contract, "f"));
     const kept = selection.ids.filter((id) => shown(type, id));
     if (kept.length !== selection.ids.length) {
-        __classPrivateFieldGet(this, _DrawStore_ui, "f").setSelection(kept.length > 0 ? type : null, kept);
+        __classPrivateFieldGet(this, _DrawStore_contract, "f").setSelection(kept.length > 0 ? type : null, kept);
     }
 }, _DrawStore_pruneVertices = function _DrawStore_pruneVertices(changes) {
-    const vertices = __classPrivateFieldGet(this, _DrawStore_ui, "f").getSelectedVertices();
+    const vertices = __classPrivateFieldGet(this, _DrawStore_contract, "f").getVertexSelection();
     if (!vertices)
         return;
     const featureId = vertices.featureId;
-    if (!__classPrivateFieldGet(this, _DrawStore_document, "f").getFeature(featureId)) {
-        __classPrivateFieldGet(this, _DrawStore_ui, "f").setSelectedVertices(null);
+    if (!__classPrivateFieldGet(this, _DrawStore_contract, "f").getFeature(featureId)) {
+        __classPrivateFieldGet(this, _DrawStore_instances, "m", _DrawStore_endVertexSelection).call(this);
         return;
     }
     const local = changes.source !== 'remote';
@@ -286,13 +379,16 @@ _DrawStore_document = new WeakMap(), _DrawStore_bus = new WeakMap(), _DrawStore_
         if (entry.id !== featureId)
             continue;
         // The frames and the commit of a local drag keep the vertices being dragged selected
-        if (local && (entry.isIntermediate || __classPrivateFieldGet(this, _DrawStore_ui, "f").getDragState() !== null))
+        if (local && (entry.isIntermediate || __classPrivateFieldGet(this, _DrawStore_drawing, "f").getDragState() !== null))
             continue;
-        if (sameCoordinates(entry.feature.coordinates, entry.previous.coordinates))
+        if (sameCoordinates(coordinatesOf(entry.feature), coordinatesOf(entry.previous)))
             continue;
-        __classPrivateFieldGet(this, _DrawStore_ui, "f").setSelectedVertices(null);
+        __classPrivateFieldGet(this, _DrawStore_instances, "m", _DrawStore_endVertexSelection).call(this);
         return;
     }
+}, _DrawStore_endVertexSelection = function _DrawStore_endVertexSelection() {
+    __classPrivateFieldGet(this, _DrawStore_contract, "f").setSelectedVertices(null);
+    __classPrivateFieldGet(this, _DrawStore_bus, "f").merge({ uiStateChanged: true });
 };
 /**
  * Whether a notification can hide something that was visible: a change of the visible flag
@@ -316,14 +412,15 @@ function mayHide(changes) {
  * Each layer and group is looked up once per call site (a document can take time to read a
  * layer).
  */
-function createShownLookup(document, ui) {
+function createShownLookup(document) {
+    const ui = document;
     const layers = new Map();
     const groups = new Map();
     const layerShown = (id) => {
         let shown = layers.get(id);
         if (shown === undefined) {
             const layer = document.getLayer(id);
-            shown = layer?.visible === true && !ui.isLocallyHidden(id);
+            shown = layer?.visible === true && !ui.isHidden(id);
             layers.set(id, shown);
         }
         return shown;
@@ -335,7 +432,7 @@ function createShownLookup(document, ui) {
             const layerId = group ? groupLayerId(document, group) : undefined;
             shown =
                 group?.visible === true &&
-                    !ui.isLocallyHidden(id) &&
+                    !ui.isHidden(id) &&
                     (layerId === undefined || layerShown(layerId));
             groups.set(id, shown);
         }
@@ -347,7 +444,7 @@ function createShownLookup(document, ui) {
         if (type === 'group')
             return groupShown(id);
         const feature = document.getFeature(id);
-        if (!feature?.visible || ui.isLocallyHidden(id))
+        if (!feature?.visible || ui.isHidden(id))
             return false;
         if (feature.groupId && !groupShown(feature.groupId))
             return false;
@@ -361,7 +458,7 @@ function groupLayerId(document, group) {
         if (feature)
             return feature.layerId;
     }
-    return document.getAllLayers().find((layer) => layer.order.includes(group.id))?.id;
+    return document.listLayers().find((layer) => layer.items.includes(group.id))?.id;
 }
 /** Whether two coordinate values are equal, position by position */
 function sameCoordinates(a, b) {
@@ -375,22 +472,16 @@ function sameCoordinates(a, b) {
     }
     return true;
 }
-/** The categories of a notification that belong to the document */
-function documentPart(changes) {
-    const part = {};
-    if (changes.features)
-        part.features = changes.features;
-    if (changes.layers)
-        part.layers = changes.layers;
-    if (changes.groups)
-        part.groups = changes.groups;
-    if (changes.layerReorder)
-        part.layerReorder = changes.layerReorder;
-    if (changes.groupReorder)
-        part.groupReorder = changes.groupReorder;
-    if (changes.metadata)
-        part.metadata = changes.metadata;
-    if (changes.uiStateChanged)
-        part.uiStateChanged = true;
-    return part;
+/** Whether a feature of the contract gives `null` for an optional field */
+function hasNullFeatureField(feature) {
+    return feature.groupId === null;
+}
+/** Whether a layer of the contract gives `null` for an optional field */
+function hasNullLayerField(layer) {
+    return layer.metadata === null || layer.styleRule === null;
+}
+/** A notification of the contract without its source (the transaction here carries it) */
+function withoutSource(changes) {
+    const { source: _source, ...rest } = changes;
+    return rest;
 }

package/dist/store/local-visibility.d.ts

@@ -7,15 +7,20 @@
  * visible, and rendering, hit testing and box selection respect it.
  *
  * A pure function with the same standing as lock.ts (isFeatureLocked). It does not change
- * the shared data (feature.visible and so on) at all. getOrderedFeatures is kept pure and
- * this is derived separately here.
+ * the shared data (feature.visible and so on) at all. listFeaturesInOrder lists every feature,
+ * and the visible flags and local hiding are applied here.
  */
-import type { Feature } from './types.js';
+import type { Feature, Group, Layer } from './types.js';
 /** The minimal interface that isLocallyHidden requires. */
 export interface LocalHiddenStore {
-    isLocallyHidden(id: string): boolean;
+    isHidden(id: string): boolean;
+}
+/** The minimal interface that listShownFeatures requires. */
+export interface OrderedStore {
+    listFeaturesInOrder(): Feature[];
+    getLayer(id: string): Layer | undefined;
+    getGroup(id: string): Group | undefined;
 }
 /** The minimal interface that getDisplayFeatures requires. */
-export interface DisplayStore extends LocalHiddenStore {
-    getOrderedFeatures(): Feature[];
+export interface DisplayStore extends LocalHiddenStore, OrderedStore {
 }