@rasamjs/core 0.3.0 → 0.3.1

package/reports/svgjs-comparison.md

@@ -1,26 +1,26 @@
 # Rasam vs SVG.js
 
-SVG.js 3.2.8; Rasam 0.3.0 workspace. CPU: Intel(R) Core(TM) i7-10610U CPU @ 1.80GHz.
+SVG.js 3.2.8; Rasam 0.3.1 workspace. CPU: Intel(R) Core(TM) i7-10610U CPU @ 1.80GHz.
 
 All timings below are medians in milliseconds. Ratios above 1 mean Rasam took longer.
 
 | Browser | Workload | Nodes | Samples | Rasam | SVG.js | Rasam / SVG.js |
 | --- | --- | ---: | ---: | ---: | ---: | ---: |
-| chromium 156.0.8078.4 | creation | 2000 | 15 | 9.40 | 11.70 | 0.80 |
-| chromium 156.0.8078.4 | creation | 8000 | 15 | 36.70 | 39.10 | 0.94 |
-| chromium 156.0.8078.4 | fill | 1000 | 100 | 0.47 | 1.30 | 0.36 |
-| chromium 156.0.8078.4 | repeated-fill | 1000 | 100 | 0.71 | 3.51 | 0.20 |
-| chromium 156.0.8078.4 | pointer-one | 8000 | 40 | 3.82 | 3.66 | 1.04 |
-| chromium 156.0.8078.4 | pointer-all | 8000 | 40 | 3.99 | 3.81 | 1.05 |
-| firefox 157.0 | creation | 2000 | 15 | 19.00 | 21.00 | 0.90 |
-| firefox 157.0 | creation | 8000 | 15 | 92.00 | 86.00 | 1.07 |
-| firefox 157.0 | fill | 1000 | 100 | 1.20 | 1.50 | 0.80 |
-| firefox 157.0 | repeated-fill | 1000 | 100 | 1.70 | 4.90 | 0.35 |
+| chromium 156.0.8078.4 | creation | 2000 | 15 | 9.50 | 10.90 | 0.87 |
+| chromium 156.0.8078.4 | creation | 8000 | 15 | 37.80 | 40.00 | 0.95 |
+| chromium 156.0.8078.4 | fill | 1000 | 100 | 0.49 | 1.31 | 0.37 |
+| chromium 156.0.8078.4 | repeated-fill | 1000 | 100 | 0.70 | 3.56 | 0.20 |
+| chromium 156.0.8078.4 | pointer-one | 8000 | 40 | 3.87 | 3.68 | 1.05 |
+| chromium 156.0.8078.4 | pointer-all | 8000 | 40 | 3.83 | 3.66 | 1.05 |
+| firefox 157.0 | creation | 2000 | 15 | 23.00 | 21.00 | 1.10 |
+| firefox 157.0 | creation | 8000 | 15 | 91.00 | 82.00 | 1.11 |
+| firefox 157.0 | fill | 1000 | 100 | 1.30 | 1.50 | 0.87 |
+| firefox 157.0 | repeated-fill | 1000 | 100 | 1.60 | 4.50 | 0.36 |
 | firefox 157.0 | pointer-one | 8000 | 40 | 4.20 | 3.40 | 1.24 |
 | firefox 157.0 | pointer-all | 8000 | 40 | 4.00 | 3.40 | 1.18 |
-| webkit 27.2 | creation | 2000 | 15 | 13.00 | 18.00 | 0.72 |
-| webkit 27.2 | creation | 8000 | 15 | 66.00 | 84.00 | 0.79 |
-| webkit 27.2 | fill | 1000 | 100 | 0.70 | 1.70 | 0.41 |
+| webkit 27.2 | creation | 2000 | 15 | 14.00 | 18.00 | 0.78 |
+| webkit 27.2 | creation | 8000 | 15 | 58.00 | 73.00 | 0.79 |
+| webkit 27.2 | fill | 1000 | 100 | 0.70 | 1.60 | 0.44 |
 | webkit 27.2 | repeated-fill | 1000 | 100 | 0.90 | 4.90 | 0.18 |
 | webkit 27.2 | pointer-one | 8000 | 40 | 4.20 | 3.40 | 1.24 |
 | webkit 27.2 | pointer-all | 8000 | 40 | 4.20 | 3.40 | 1.24 |

package/reports/svgjs-parity-current.json

@@ -1,31 +1,23 @@
 {
-  "generatedAt": "2026-11-07T18:31:24.666Z",
-  "revision": "8199249715ac19aaa2d8a287b748d8c29d0eceb9",
+  "generatedAt": "2026-11-09T00:19:11.349Z",
+  "revision": "124aaed60d894f51033904e9959bbf4286d0f3e9",
   "dirtyTree": [
-    "M apps/circuit/package.json",
-    " M apps/playground/package.json",
-    " M apps/react-example/package.json",
-    " M bun.lock",
-    " M packages/boolean/package.json",
-    " M packages/clipboard/package.json",
-    " M packages/connectors/API.md",
-    " M packages/connectors/CHANGELOG.md",
-    " M packages/connectors/README.md",
-    " M packages/connectors/RELEASING.md",
-    " M packages/connectors/package.json",
-    " M packages/editor/package.json",
-    " M packages/history/package.json",
-    " M packages/rasam/CHANGELOG.md",
-    " M packages/rasam/RELEASING.md",
-    " M packages/rasam/package.json",
+    "M packages/editor/reports/release-readiness.json",
+    " M packages/history/reports/history-performance.json",
+    " M packages/history/reports/release-readiness.json",
     " M packages/rasam/reports/adoption.json",
+    " M packages/rasam/reports/animation-benchmark.json",
+    " M packages/rasam/reports/benchmark.json",
     " M packages/rasam/reports/creation.json",
     " M packages/rasam/reports/interchange-benchmark.json",
-    " M packages/react/package.json",
-    " M packages/selection/package.json",
-    " M packages/tools/package.json",
-    " M packages/transformer/package.json",
-    " M packages/viewport/package.json"
+    " M packages/rasam/reports/release-readiness.json",
+    " M packages/rasam/reports/svgjs-comparison.json",
+    " M packages/rasam/reports/svgjs-comparison.md",
+    " M packages/rasam/reports/svgjs-parity-current.json",
+    " M packages/selection/reports/marquee-benchmark.json",
+    " M packages/selection/reports/release-readiness.json",
+    " M packages/tools/reports/drag-benchmark.json",
+    " M packages/tools/reports/release-readiness.json"
   ],
   "sourceFiles": [
     {
@@ -98,7 +90,7 @@
     },
     {
       "path": "src/changes.ts",
-      "sha256": "3c1270b193852d88350c84c66453bba1601a4ec6da8263c20e7a4a482982738b"
+      "sha256": "5195b06c773565fb7fcc79b14249eaef931e0fa79d0f7631f5ad1bec50a7f6af"
     },
     {
       "path": "src/changes/derived.ts",
@@ -110,15 +102,15 @@
     },
     {
       "path": "src/changes/restore.ts",
-      "sha256": "6ccbe21c649e6e71f32a2d75b8df581d1bd011009b1d203a1e214d0195d272b6"
+      "sha256": "f2f3f749888b62b44a0667a7141b72786d488622740882841a6f5f08be8e3a9a"
     },
     {
       "path": "src/changes/service.ts",
-      "sha256": "c6cab7009ee7ccd49442b57aed253b495266d8ca43ae6aaf834c1413ac01a215"
+      "sha256": "0384e84ab0fcaef38f67bd2167c498e1188fc639ef23f94aeed45e3895c606a5"
     },
     {
       "path": "src/changes/state.ts",
-      "sha256": "3f190a0dde69ec33d96d1dc796836ce13094ea1afa574855e818aefd17c1b7b3"
+      "sha256": "889ace35fb6ca0ddb11960c43e24b64bfb96697165b8d9ea5006aae99b0ec18a"
     },
     {
       "path": "src/changes/types.ts",
@@ -138,7 +130,7 @@
     },
     {
       "path": "src/components/decorators.ts",
-      "sha256": "abf31eeb3fad5251c87ef7e9888d1016c61037e3ad97faf8e35c9814b0c72717"
+      "sha256": "5a94b137073c4f41b7bdea53871b9b8270aa731bfe49963b3209717b35673937"
     },
     {
       "path": "src/components/metadata.ts",
@@ -612,6 +604,10 @@
       "path": "src/services/catalog.ts",
       "sha256": "bd11868233bb9604062311cff9bfbacf2cf93e054dd979b5c0853e3b439ad7b2"
     },
+    {
+      "path": "src/services/claims.ts",
+      "sha256": "b8db85df1c0f0806d30b6caccf20f1a94d14c2975a01b11e2ef5fa411080c817"
+    },
     {
       "path": "src/services/context.ts",
       "sha256": "3d86040e3a601321d4811b17f1063a0e181e3d6362918a6d0bf298da19c0f72f"
@@ -638,7 +634,7 @@
     },
     {
       "path": "src/services/registry.ts",
-      "sha256": "7f3aa78852eb8b9d9affadff346ee15d99f5d158891fb68561f6f3da23c4cda9"
+      "sha256": "a6ad5e6fcc646b10349c29ed0163863b958892e2a008c033eec18fd658a53f1a"
     },
     {
       "path": "src/services/scheduler.ts",
@@ -742,7 +738,7 @@
     },
     {
       "path": "../../bun.lock",
-      "sha256": "d33d090542d5ea14545f4da707e6077c1552d615bb49151fe20dd0d355000a54"
+      "sha256": "b3789d00332812b09c75e008611f9bd5c7721c296c8a883a3c7a71cde94d3193"
     }
   ],
   "svgjs": "3.2.8",
@@ -9722,8 +9718,8 @@
   },
   "size": {
     "fixture": "fixtures/size.ts",
-    "rawBytes": 68399,
-    "gzipBytes": 20540,
+    "rawBytes": 68463,
+    "gzipBytes": 20572,
     "budgetBytes": 20992,
     "included": [
       "src/changes/mutation.ts",
@@ -9762,6 +9758,7 @@
       "src/core/native-validation.ts",
       "src/services/element-key.ts",
       "src/services/initialization.ts",
+      "src/services/claims.ts",
       "src/services/registry.ts",
       "src/services/scheduler.ts",
       "src/changes/service.ts",
@@ -9775,7 +9772,7 @@
   },
   "performance": {
     "fixture": "scripts/benchmark.mjs",
-    "date": "2026-11-07T18:31:19.500Z",
+    "date": "2026-11-09T00:19:06.376Z",
     "browser": "Chromium 156.0.8078.4",
     "node": "v24.21.0",
     "os": "win32 10.0.26200",
@@ -9784,30 +9781,27 @@
     "count": 1000,
     "warmup": 20,
     "iterations": 100,
-    "medianMs": 0.6999999284744263,
-    "p95Ms": 1.3000000715255737,
+    "medianMs": 0.5,
+    "p95Ms": 0.7999999523162842,
     "targetMedianMs": 16,
     "includes": "logical mutations and synchronous DOM commit; excludes paint",
     "timings": [
-      0.40000009536743164, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5,
-      0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5999999046325684, 0.5999999046325684,
+      0.3999999761581421, 0.3999999761581421, 0.3999999761581421, 0.3999999761581421,
+      0.40000009536743164, 0.40000009536743164, 0.40000009536743164, 0.40000009536743164, 0.5, 0.5,
+      0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5,
+      0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5,
+      0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5999999046325684, 0.5999999046325684, 0.5999999046325684,
       0.5999999046325684, 0.5999999046325684, 0.5999999046325684, 0.5999999046325684,
-      0.5999999046325684, 0.6000000238418579, 0.6000000238418579, 0.6000000238418579,
+      0.5999999046325684, 0.5999999046325684, 0.6000000238418579, 0.6000000238418579,
+      0.6000000238418579, 0.6000000238418579, 0.6000000238418579, 0.6000000238418579,
+      0.6000000238418579, 0.6000000238418579, 0.6000000238418579, 0.6000000238418579,
       0.6000000238418579, 0.6000000238418579, 0.6000000238418579, 0.6000000238418579,
       0.6000000238418579, 0.6000000238418579, 0.6000000238418579, 0.6000000238418579,
-      0.6000000238418579, 0.6000000238418579, 0.6000000238418579, 0.6999999284744263,
-      0.6999999284744263, 0.6999999284744263, 0.6999999284744263, 0.6999999284744263,
-      0.6999999284744263, 0.6999999284744263, 0.6999999284744263, 0.7000000476837158,
+      0.6000000238418579, 0.6000000238418579, 0.6999999284744263, 0.6999999284744263,
       0.7000000476837158, 0.7000000476837158, 0.7000000476837158, 0.7000000476837158,
       0.7000000476837158, 0.7000000476837158, 0.7000000476837158, 0.7000000476837158,
-      0.7000000476837158, 0.7000000476837158, 0.7000000476837158, 0.7999999523162842,
-      0.8000000715255737, 0.8000000715255737, 0.8000000715255737, 0.8999999761581421,
-      0.8999999761581421, 0.8999999761581421, 0.8999999761581421, 0.9000000953674316, 1, 1, 1, 1,
-      1.100000023841858, 1.100000023841858, 1.100000023841858, 1.100000023841858, 1.100000023841858,
-      1.1999999284744263, 1.1999999284744263, 1.1999999284744263, 1.1999999284744263,
-      1.1999999284744263, 1.2000000476837158, 1.2000000476837158, 1.2000000476837158,
-      1.2000000476837158, 1.2999999523162842, 1.2999999523162842, 1.2999999523162842,
-      1.3000000715255737, 1.3000000715255737, 1.399999976158142, 1.5, 1.5, 1.600000023841858
+      0.7000000476837158, 0.7999999523162842, 0.7999999523162842, 0.7999999523162842,
+      0.8000000715255737, 0.8999999761581421, 1.2999999523162842
     ]
   }
 }

package/src/changes/restore.ts

@@ -68,8 +68,8 @@ function applyStateChange(
       },
     };
   }
-  if (change.domain === 'bounds') return { ...snapshot, contributesToBounds: value as boolean };
-  return { ...snapshot, [change.domain]: value };
+  const field = change.domain === 'bounds' ? 'contributesToBounds' : change.domain;
+  return { ...snapshot, [field]: value };
 }
 
 /** Validates the whole patch before writing; rolls back logical state on failure. */
@@ -186,18 +186,37 @@ function validateGraph(
 ): void {
   const context = owner.context;
   const removed = new Set([...states].filter(([, state]) => !state).map(([target]) => target.node));
+  let ids: Map<unknown, AnyNode | null> | undefined;
+  const siblingCounts = new Map<NodeHandle, number>();
+  for (const state of states.values()) {
+    const parent = state?.placement.parent;
+    if (!parent) continue;
+    let count = siblingCounts.get(parent);
+    if (count === undefined) {
+      count = 0;
+      if (!parent.node.isDestroyed && 'children' in parent.node)
+        for (const node of (parent.node as ParentNode).children)
+          if (!states.has(context.changes.handle(node))) count++;
+    }
+    siblingCounts.set(parent, count + 1);
+  }
   for (const [target, state] of states) {
     if (!state) continue;
     if (context.registry.registered(state.constructor) !== state.constructor)
       throw new ChangeConflictError(`Constructor is not registered: ${state.constructor.tag}`);
     const id = state.properties.id?.value;
-    if (
-      id !== undefined &&
-      context.registry.nodes.some(
-        (node) => node !== target.node && !removed.has(node) && node.getAttributeValue('id') === id,
-      )
-    )
-      throw new ChangeConflictError(`SVG ID is already in use: ${id}`);
+    if (id !== undefined) {
+      if (!ids) {
+        ids = new Map();
+        for (const node of context.registry.nodes) {
+          const value = node.getAttributeValue('id');
+          if (value !== undefined && !removed.has(node))
+            ids.set(value, ids.has(value) ? null : node);
+        }
+      }
+      if (ids.has(id) && ids.get(id) !== target.node)
+        throw new ChangeConflictError(`SVG ID is already in use: ${id}`);
+    }
     if (!target.node.isDestroyed) {
       for (const [attribute, property] of Object.entries(state.properties))
         target.node.validateAttribute(attribute, property.value);
@@ -221,22 +240,10 @@ function validateGraph(
           throw new ChangeConflictError('The reference value and its planned target ID disagree');
       }
     if (state.placement.parent) {
-      const parent = state.placement.parent;
-      const existing =
-        !parent.node.isDestroyed && 'children' in parent.node
-          ? (parent.node as ParentNode).children.map((node) => context.changes.handle(node))
-          : [];
-      const children = new Set(
-        existing.filter(
-          (child) => !states.has(child) || states.get(child)?.placement.parent === parent,
-        ),
-      );
-      for (const [child, planned] of states)
-        if (planned?.placement.parent === parent) children.add(child);
       if (
         !Number.isInteger(state.placement.index) ||
         state.placement.index < 0 ||
-        state.placement.index >= children.size
+        state.placement.index >= siblingCounts.get(state.placement.parent)!
       )
         throw new ChangeConflictError('The history sibling position is no longer available');
     }
@@ -342,23 +349,35 @@ function applyStates(
         domains.get(target)!.has('existence')),
   );
   for (const [target] of placements) if (target.node.parent) target.node.remove();
-  const pending = [...placements];
-  while (pending.length) {
-    const ready = pending.filter(
-      ([, state]) =>
-        !state!.placement.parent || !pending.some(([target]) => target === state!.placement.parent),
+  const positions = new Map(placements.map(([target], index) => [target, index]));
+  const dependants = new Map<NodeHandle, typeof placements>();
+  let ready: typeof placements = [];
+  for (const entry of placements) {
+    const parent = entry[1]!.placement.parent;
+    if (!parent || !positions.has(parent)) ready.push(entry);
+    else {
+      let children = dependants.get(parent);
+      if (!children) dependants.set(parent, (children = []));
+      children.push(entry);
+    }
+  }
+  // Preflight has already rejected parent cycles.
+  while (ready.length) {
+    ready.sort(
+      (a, b) =>
+        a[1]!.placement.index - b[1]!.placement.index ||
+        positions.get(a[0])! - positions.get(b[0])!,
     );
-    if (!ready.length) throw new ChangeConflictError('Cyclic placements');
-    ready.sort((a, b) => a[1]!.placement.index - b[1]!.placement.index);
-    for (const entry of ready) {
-      const [target, state] = entry;
+    const next: typeof placements = [];
+    for (const [target, state] of ready) {
       const parent = state!.placement.parent?.node as ParentNode | undefined;
       if (parent) {
         parent[validateChild](target.node);
         parent.add(target.node, Math.min(state!.placement.index, parent.children.length));
       }
-      pending.splice(pending.indexOf(entry), 1);
+      for (const child of dependants.get(target) ?? []) next.push(child);
     }
+    ready = next;
   }
   // Parent order is authoritative across compound edits and separate edit callbacks.
   for (const [target, state] of states)

package/src/changes/service.ts

@@ -405,8 +405,7 @@ export class ChangeService {
     this.delivering = true;
     const failures: unknown[] = [];
     try {
-      while (this.queue.length) {
-        const next = this.queue.shift()!;
+      for (const next of this.queue) {
         for (const listener of [...this.listeners]) {
           if (!this.listeners.has(listener)) continue;
           try {
@@ -417,6 +416,7 @@ export class ChangeService {
         }
       }
     } finally {
+      this.queue.length = 0;
       this.delivering = false;
     }
     if (failures.length === 1 && failures[0] instanceof ChangeConflictError) throw failures[0];

package/src/changes/state.ts

@@ -93,25 +93,27 @@ export function diffState(
     if (!sameState(previous, value))
       changes.push({ target, domain: 'property', attribute, before: previous, after: value });
   }
-  if (transform && before.transform && after.transform)
-    changes.push({ target, domain: 'transform', before: before.transform, after: after.transform });
-  if (!sameState(before.content, after.content) && before.content && after.content)
-    changes.push({ target, domain: 'content', before: before.content, after: after.content });
-  if (!sameState(before.presentation, after.presentation))
-    changes.push({
-      target,
-      domain: 'presentation',
-      before: before.presentation,
-      after: after.presentation,
-    });
-  if (!sameState(before.custom, after.custom))
-    changes.push({ target, domain: 'custom', before: before.custom, after: after.custom });
-  if (!sameState(before.native, after.native) && before.native && after.native)
-    changes.push({ target, domain: 'native', before: before.native, after: after.native });
-  if (!sameState(before.placement, after.placement))
-    changes.push({ target, domain: 'placement', before: before.placement, after: after.placement });
-  if (!sameState(before.children, after.children) && before.children && after.children)
-    changes.push({ target, domain: 'children', before: before.children, after: after.children });
+  for (const domain of [
+    'transform',
+    'content',
+    'presentation',
+    'custom',
+    'native',
+    'placement',
+    'children',
+  ] as const) {
+    const previous = before[domain],
+      value = after[domain];
+    if (
+      domain !== 'presentation' &&
+      domain !== 'custom' &&
+      domain !== 'placement' &&
+      (!previous || !value)
+    )
+      continue;
+    if (domain === 'transform' ? transform : !sameState(previous, value))
+      changes.push({ target, domain, before: previous, after: value } as ModelChange);
+  }
   if (before.contributesToBounds !== after.contributesToBounds)
     changes.push({
       target,
@@ -138,7 +140,7 @@ export function combineChanges(changes: readonly ModelChange[]): readonly ModelC
   for (const [target, records] of lifecycle) {
     const first = records.findIndex((change) => change.domain === 'existence');
     if (first < 0) {
-      normalized.push(...records);
+      for (const record of records) normalized.push(record);
       continue;
     }
     let last = records.length - 1;
@@ -160,14 +162,22 @@ export function combineChanges(changes: readonly ModelChange[]): readonly ModelC
   }
   const orders = new Map<
     NodeHandle,
-    { before: readonly NodeHandle[]; after: readonly NodeHandle[] }
+    { before: ReadonlyMap<NodeHandle, number>; after: ReadonlyMap<NodeHandle, number> }
   >();
+  const indices = (children: readonly NodeHandle[]) => {
+    const positions = new Map<NodeHandle, number>();
+    // Reverse traversal retains indexOf's first match even for repeated handles.
+    for (let index = children.length - 1; index >= 0; index--)
+      positions.set(children[index], index);
+    return positions;
+  };
   for (const change of merged.values()) {
-    if (change.domain === 'children') orders.set(change.target, change);
+    if (change.domain === 'children')
+      orders.set(change.target, { before: indices(change.before), after: indices(change.after) });
     if (change.domain === 'existence' && (change.before?.children || change.after?.children))
       orders.set(change.target, {
-        before: change.before?.children ?? [],
-        after: change.after?.children ?? [],
+        before: indices(change.before?.children ?? []),
+        after: indices(change.after?.children ?? []),
       });
   }
   const placement = (
@@ -176,7 +186,7 @@ export function combineChanges(changes: readonly ModelChange[]): readonly ModelC
     edge: 'before' | 'after',
   ) => {
     const siblings = value.parent ? orders.get(value.parent)?.[edge] : undefined;
-    return siblings ? { ...value, index: siblings.indexOf(target) } : value;
+    return siblings ? { ...value, index: siblings.get(target) ?? -1 } : value;
   };
   return Object.freeze(
     [...merged.values()]
@@ -234,9 +244,8 @@ function patchSnapshot(
     if (transform.transform !== null) properties.transform = { value: transform.transform };
     return immutable({ ...snapshot, properties, transform });
   }
-  if (change.domain === 'bounds')
-    return immutable({ ...snapshot, contributesToBounds: change[edge] });
-  return immutable({ ...snapshot, [change.domain]: change[edge] });
+  const field = change.domain === 'bounds' ? 'contributesToBounds' : change.domain;
+  return immutable({ ...snapshot, [field]: change[edge] });
 }
 
 export const stateAdapter = Object.freeze({ capture: captureState, diff: diffState, immutable });

package/src/changes.ts

@@ -1,5 +1,11 @@
 import type { AnyNode } from './core/types.js';
-import type { ChangeEvent, ChangeGroup, ChangeMetadata, ModelChange } from './changes/types.js';
+import type {
+  ChangeEvent,
+  ChangeGroup,
+  ChangeMetadata,
+  ModelChange,
+  NodeHandle,
+} from './changes/types.js';
 import { ChangeConflictError, ChangeObserverError } from './changes/types.js';
 import { combineChanges, stateAdapter } from './changes/state.js';
 import { restoreChanges } from './changes/restore.js';
@@ -64,14 +70,25 @@ export function beginChangeGroup(drawing: AnyNode, metadata: ChangeMetadata = {}
   drawing.assertLive();
   const owner = drawing.context.root!;
   let id: number | undefined;
-  let changes: readonly ModelChange[] = [];
+  let changes: ModelChange[] = [];
+  const targets = new Set<NodeHandle>();
   let invalidated = false;
   // Subscribe before groupstart so edits made by start observers are captured too.
   const unsubscribe = observeChanges(drawing, (event) => {
     if (event.type === 'dispose') invalidated = true;
     if (id === undefined && event.type === 'groupstart') id = event.group;
-    if (event.type === 'change' && event.group === id && !event.temporary)
-      changes = combineChanges([...changes, ...event.changes]);
+    if (event.type !== 'change') return;
+    if (event.group === id && !event.temporary) {
+      for (const change of event.changes) {
+        changes.push(change);
+        targets.add(change.target);
+      }
+    } else if (event.changes.some((change) => targets.has(change.target))) {
+      // A net-zero field must release its old baseline before an outside edit.
+      changes = [...combineChanges(changes)];
+      targets.clear();
+      for (const change of changes) targets.add(change.target);
+    }
   });
   let group: ReturnType<typeof drawing.context.changes.group>;
   try {
@@ -91,6 +108,7 @@ export function beginChangeGroup(drawing: AnyNode, metadata: ChangeMetadata = {}
   const finish = (cancelled: boolean, restored = false) => {
     active = false;
     changes = [];
+    targets.clear();
     unsubscribe();
     group.end(cancelled, restored);
   };
@@ -117,7 +135,8 @@ export function beginChangeGroup(drawing: AnyNode, metadata: ChangeMetadata = {}
       const failures: unknown[] = [];
       try {
         try {
-          if (changes.length) restoreChanges(owner, changes, 'undo');
+          const combined = combineChanges(changes);
+          if (combined.length) restoreChanges(owner, combined, 'undo');
         } catch (error) {
           if (error instanceof ChangeObserverError) failures.push(error);
           else throw error;

package/src/components/decorators.ts

@@ -8,6 +8,7 @@ import {
 import { defineComponent } from './metadata.js';
 import { initializeElement } from '../services/initialization.js';
 import { destroySubtrees } from '../core/destruction.js';
+import { claims, claimedSince } from '../services/claims.js';
 import { withInternalStructure } from '../mixins/parent-internals.js';
 import type { ComponentClass, ComponentOptions, PropOptions } from './types.js';
 
@@ -21,13 +22,14 @@ export function component(options: ComponentOptions) {
     const Base = target as ComponentClass;
     const Decorated = class extends Base {
       constructor(...args: ConstructorParameters<ComponentClass>) {
+        // A marker, not a copy of every node: construction runs once per component.
         const context = args[0],
-          before = new Set(context.registry.nodes);
+          mark = claims;
         try {
           super(...args);
           if (new.target === Decorated && !this.adopting) this[initializeElement]();
         } catch (error) {
-          const created = context.registry.nodes.filter((node) => !before.has(node));
+          const created = claimedSince(context.registry.nodes, mark);
           if (created.length) {
             try {
               withInternalStructure(() => created[0][destroySubtrees](created));

package/src/services/claims.ts

@@ -0,0 +1,14 @@
+import type { AnyNode } from '../core/types.js';
+
+/** Internal claim order. A node keeps the number from its first claim, even if reclaimed. */
+const claimOrder = new WeakMap<AnyNode, number>();
+/** Claims so far: a constant-time marker for `claimedSince`, instead of copying every node. */
+export let claims = 0;
+
+export function recordClaim(node: AnyNode): void {
+  if (!claimOrder.has(node)) claimOrder.set(node, ++claims);
+}
+
+/** Registered nodes first claimed after `mark`, in `nodes` order (pass `registry.nodes`). */
+export const claimedSince = (nodes: readonly AnyNode[], mark: number): AnyNode[] =>
+  nodes.filter((node) => claimOrder.get(node)! > mark);

package/src/services/registry.ts

@@ -9,6 +9,7 @@ import { elementKey } from './element-key.js';
 import { initializeNode, withInitialization } from './initialization.js';
 import type { DrawingContext } from './context.js';
 import type { ElementClass } from './types.js';
+import { recordClaim } from './claims.js';
 
 export class Registry {
   private static readonly identity = new WeakMap<SVGElement, AnyNode>();
@@ -83,6 +84,7 @@ export class Registry {
     if (!this.context.dom.owns(node.el)) throw new Error('Element belongs to another document');
     Registry.identity.set(node.el, node);
     this.wrappers.set(node.el, node);
+    recordClaim(node);
   }
 
   forget(node: AnyNode): void {