@relu-interactives/spatial-ecs 0.2.20 → 0.2.21

package/dist/{System-BjwOBx81.d.cts → System-me3iAcMF.d.cts}

@@ -523,6 +523,10 @@ declare function remapSnapshotEntityIds(snapshot: SubtreeSnapshot, idMap: Map<nu
 };
 
 declare const PREFAB_FILE_VERSION = 1;
+/** Written for files containing NESTED instances (parse accepts either). */
+declare const PREFAB_FILE_VERSION_NESTED = 2;
+/** File version to write for a given snapshot: 2 iff it nests instances. */
+declare function prefabFileVersionFor(snapshot: SubtreeSnapshot): number;
 /**
  * Envelope of a `.prefab` asset file (and, later, `.scene` assets — same
  * shape with `type: "scene"`). `snapshot` is the same columnar world-snapshot
@@ -1114,4 +1118,4 @@ interface EcsSystem {
     dispose?(world: World): void;
 }
 
-export { TransformSyncSystem as $, type AssetInput as A, type EcsComponentFactoryKind as B, Component as C, DEFAULT_ENVIRONMENT_STATE as D, Environment as E, type EcsEntityEditorKind as F, type EntityInput as G, type FloatInput as H, InputSystem as I, type IntersectionResult as J, type KeyboardKey as K, KeyboardKeys as L, type MouseButton as M, PREFAB_FILE_VERSION as N, ObjectManagementSystem as O, ParentId as P, type PrefabAsset as Q, type RemapSnapshotOptions as R, type SpawnPrefabSource as S, TransformComponent as T, RenderSystem as U, type Vec3$1 as V, type WorldEntityView$1 as W, type SelectionListener as X, type SliderInput as Y, type TextInput as Z, type ToggleInput as _, DEFAULT_POSTPROCESSING_STATE as a, type Vec3 as a0, type Vector2Input as a1, type Vector3Input as a2, clearPrefabCache as a3, despawnPrefab as a4, loadPrefab as a5, parsePrefabAsset as a6, remapSnapshotEntityIds as a7, setPrefabAssetUrlResolver as a8, spawnPrefab as a9, type AnyComponent as aa, DEBUG_CHANGE_IGNORED_SYSTEMS as ab, type WorldHistorySnapshot as ac, cloneHistoryValue as ad, normalizeDebugValue as ae, type EnvironmentFogState as b, type EnvironmentFogType as c, type EnvironmentGradientEffect as d, type EnvironmentSkyboxState as e, type EnvironmentSkyboxType as f, type EnvironmentState as g, Postprocessing as h, type PostprocessingState as i, type TransformData as j, type EcsSystem as k, World as l, type SpawnPrefabOptions as m, type ComponentClass as n, type ParentLookup as o, type EcsEntityKind as p, type EntityId as q, type SubtreeSnapshot as r, type ExternalRefWarning as s, type CheckboxInput as t, type ColorInput as u, type ComponentFactory as v, type ComponentInput as w, type ComponentKind as x, type DropdownInput as y, type DropdownOption as z };
+export { type ToggleInput as $, type AssetInput as A, type EcsComponentFactoryKind as B, Component as C, DEFAULT_ENVIRONMENT_STATE as D, Environment as E, type EcsEntityEditorKind as F, type EntityInput as G, type FloatInput as H, InputSystem as I, type IntersectionResult as J, type KeyboardKey as K, KeyboardKeys as L, type MouseButton as M, PREFAB_FILE_VERSION as N, ObjectManagementSystem as O, ParentId as P, PREFAB_FILE_VERSION_NESTED as Q, type PrefabAsset as R, type SpawnPrefabSource as S, TransformComponent as T, type RemapSnapshotOptions as U, type Vec3$1 as V, type WorldEntityView$1 as W, RenderSystem as X, type SelectionListener as Y, type SliderInput as Z, type TextInput as _, DEFAULT_POSTPROCESSING_STATE as a, TransformSyncSystem as a0, type Vec3 as a1, type Vector2Input as a2, type Vector3Input as a3, clearPrefabCache as a4, despawnPrefab as a5, loadPrefab as a6, parsePrefabAsset as a7, prefabFileVersionFor as a8, remapSnapshotEntityIds as a9, setPrefabAssetUrlResolver as aa, spawnPrefab as ab, type AnyComponent as ac, DEBUG_CHANGE_IGNORED_SYSTEMS as ad, type WorldHistorySnapshot as ae, cloneHistoryValue as af, normalizeDebugValue as ag, type EnvironmentFogState as b, type EnvironmentFogType as c, type EnvironmentGradientEffect as d, type EnvironmentSkyboxState as e, type EnvironmentSkyboxType as f, type EnvironmentState as g, Postprocessing as h, type PostprocessingState as i, type TransformData as j, type EcsSystem as k, World as l, type SpawnPrefabOptions as m, type ComponentClass as n, type ParentLookup as o, type EcsEntityKind as p, type SubtreeSnapshot as q, type EntityId as r, type ExternalRefWarning as s, type CheckboxInput as t, type ColorInput as u, type ComponentFactory as v, type ComponentInput as w, type ComponentKind as x, type DropdownInput as y, type DropdownOption as z };

package/dist/{System-BjwOBx81.d.ts → System-me3iAcMF.d.ts}

@@ -523,6 +523,10 @@ declare function remapSnapshotEntityIds(snapshot: SubtreeSnapshot, idMap: Map<nu
 };
 
 declare const PREFAB_FILE_VERSION = 1;
+/** Written for files containing NESTED instances (parse accepts either). */
+declare const PREFAB_FILE_VERSION_NESTED = 2;
+/** File version to write for a given snapshot: 2 iff it nests instances. */
+declare function prefabFileVersionFor(snapshot: SubtreeSnapshot): number;
 /**
  * Envelope of a `.prefab` asset file (and, later, `.scene` assets — same
  * shape with `type: "scene"`). `snapshot` is the same columnar world-snapshot
@@ -1114,4 +1118,4 @@ interface EcsSystem {
     dispose?(world: World): void;
 }
 
-export { TransformSyncSystem as $, type AssetInput as A, type EcsComponentFactoryKind as B, Component as C, DEFAULT_ENVIRONMENT_STATE as D, Environment as E, type EcsEntityEditorKind as F, type EntityInput as G, type FloatInput as H, InputSystem as I, type IntersectionResult as J, type KeyboardKey as K, KeyboardKeys as L, type MouseButton as M, PREFAB_FILE_VERSION as N, ObjectManagementSystem as O, ParentId as P, type PrefabAsset as Q, type RemapSnapshotOptions as R, type SpawnPrefabSource as S, TransformComponent as T, RenderSystem as U, type Vec3$1 as V, type WorldEntityView$1 as W, type SelectionListener as X, type SliderInput as Y, type TextInput as Z, type ToggleInput as _, DEFAULT_POSTPROCESSING_STATE as a, type Vec3 as a0, type Vector2Input as a1, type Vector3Input as a2, clearPrefabCache as a3, despawnPrefab as a4, loadPrefab as a5, parsePrefabAsset as a6, remapSnapshotEntityIds as a7, setPrefabAssetUrlResolver as a8, spawnPrefab as a9, type AnyComponent as aa, DEBUG_CHANGE_IGNORED_SYSTEMS as ab, type WorldHistorySnapshot as ac, cloneHistoryValue as ad, normalizeDebugValue as ae, type EnvironmentFogState as b, type EnvironmentFogType as c, type EnvironmentGradientEffect as d, type EnvironmentSkyboxState as e, type EnvironmentSkyboxType as f, type EnvironmentState as g, Postprocessing as h, type PostprocessingState as i, type TransformData as j, type EcsSystem as k, World as l, type SpawnPrefabOptions as m, type ComponentClass as n, type ParentLookup as o, type EcsEntityKind as p, type EntityId as q, type SubtreeSnapshot as r, type ExternalRefWarning as s, type CheckboxInput as t, type ColorInput as u, type ComponentFactory as v, type ComponentInput as w, type ComponentKind as x, type DropdownInput as y, type DropdownOption as z };
+export { type ToggleInput as $, type AssetInput as A, type EcsComponentFactoryKind as B, Component as C, DEFAULT_ENVIRONMENT_STATE as D, Environment as E, type EcsEntityEditorKind as F, type EntityInput as G, type FloatInput as H, InputSystem as I, type IntersectionResult as J, type KeyboardKey as K, KeyboardKeys as L, type MouseButton as M, PREFAB_FILE_VERSION as N, ObjectManagementSystem as O, ParentId as P, PREFAB_FILE_VERSION_NESTED as Q, type PrefabAsset as R, type SpawnPrefabSource as S, TransformComponent as T, type RemapSnapshotOptions as U, type Vec3$1 as V, type WorldEntityView$1 as W, RenderSystem as X, type SelectionListener as Y, type SliderInput as Z, type TextInput as _, DEFAULT_POSTPROCESSING_STATE as a, TransformSyncSystem as a0, type Vec3 as a1, type Vector2Input as a2, type Vector3Input as a3, clearPrefabCache as a4, despawnPrefab as a5, loadPrefab as a6, parsePrefabAsset as a7, prefabFileVersionFor as a8, remapSnapshotEntityIds as a9, setPrefabAssetUrlResolver as aa, spawnPrefab as ab, type AnyComponent as ac, DEBUG_CHANGE_IGNORED_SYSTEMS as ad, type WorldHistorySnapshot as ae, cloneHistoryValue as af, normalizeDebugValue as ag, type EnvironmentFogState as b, type EnvironmentFogType as c, type EnvironmentGradientEffect as d, type EnvironmentSkyboxState as e, type EnvironmentSkyboxType as f, type EnvironmentState as g, Postprocessing as h, type PostprocessingState as i, type TransformData as j, type EcsSystem as k, World as l, type SpawnPrefabOptions as m, type ComponentClass as n, type ParentLookup as o, type EcsEntityKind as p, type SubtreeSnapshot as q, type EntityId as r, type ExternalRefWarning as s, type CheckboxInput as t, type ColorInput as u, type ComponentFactory as v, type ComponentInput as w, type ComponentKind as x, type DropdownInput as y, type DropdownOption as z };

package/dist/{Video-B9z5AtIf.d.ts → Video-DHnxjGhW.d.ts}

@@ -1,5 +1,5 @@
 import * as THREE from 'three';
-import { C as Component, p as EcsEntityKind, F as EcsEntityEditorKind, q as EntityId } from './System-BjwOBx81.js';
+import { C as Component, p as EcsEntityKind, F as EcsEntityEditorKind, r as EntityId } from './System-me3iAcMF.js';
 import * as RAPIER from '@dimforge/rapier3d-compat';
 
 interface StateMachine {

package/dist/{Video-B8yVI1tF.d.cts → Video-U9hAnf9y.d.cts}

@@ -1,5 +1,5 @@
 import * as THREE from 'three';
-import { C as Component, p as EcsEntityKind, F as EcsEntityEditorKind, q as EntityId } from './System-BjwOBx81.cjs';
+import { C as Component, p as EcsEntityKind, F as EcsEntityEditorKind, r as EntityId } from './System-me3iAcMF.cjs';
 import * as RAPIER from '@dimforge/rapier3d-compat';
 
 interface StateMachine {

package/dist/{chunk-67MFQDHX.js → chunk-5U3YS4JD.js}

@@ -1,5 +1,5 @@
-import { resolveDracoDecoderPath, applyTransform } from './chunk-DY4ETMP2.js';
-import { AnimationComponent, ModelComponent, CameraComponent, Object3DRef, Environment, Postprocessing, TransformComponent, PhysicsComponent, LightComponent, MaterialComponent, DEFAULT_MESH_GEOMETRY_PARAMETERS, MeshGeometryComponent, InstancedMeshComponent, ParentId, ScriptComponent, InstanceSlotComponent, Name, ImageComponent, SpriteComponent, VideoComponent, AudioComponent, ImageTarget, Selectable, PrefabNode, PrefabInstance } from './chunk-Z6OMYEXU.js';
+import { resolveDracoDecoderPath, applyTransform } from './chunk-AXRCGF63.js';
+import { AnimationComponent, ModelComponent, CameraComponent, Object3DRef, Environment, Postprocessing, TransformComponent, PhysicsComponent, LightComponent, MaterialComponent, DEFAULT_MESH_GEOMETRY_PARAMETERS, MeshGeometryComponent, InstancedMeshComponent, ParentId, ScriptComponent, InstanceSlotComponent, Name, ImageComponent, SpriteComponent, VideoComponent, AudioComponent, ImageTarget, Selectable, PrefabNode, PrefabInstance } from './chunk-V7BNVTJW.js';
 import { __name } from './chunk-OY7ZODZP.js';
 import * as THREE7 from 'three';
 import { DRACOLoader } from 'three/examples/jsm/loaders/DRACOLoader.js';
@@ -3410,7 +3410,13 @@ function restoreComponentState(world, objectManagementSystem, targetEntityId, so
       ) : [];
       world.addComponent(
         targetEntityId,
-        new PrefabInstance(sourcePrefabInstance.url, overrides)
+        new PrefabInstance(
+          sourcePrefabInstance.url,
+          overrides,
+          // Preserve the placement identity; the constructor generates a
+          // fresh one for legacy snapshots that predate instanceId.
+          typeof sourcePrefabInstance.instanceId === "string" && sourcePrefabInstance.instanceId.length > 0 ? sourcePrefabInstance.instanceId : void 0
+        )
       );
     }
   }
@@ -3657,6 +3663,148 @@ function hydrateWorldFromSnapshot(snapshot, world, objectManagementSystem) {
 }
 __name(hydrateWorldFromSnapshot, "hydrateWorldFromSnapshot");
 
+// core/prefab/nodeKeys.ts
+var NODE_KEY_SEPARATOR = "/";
+var ADDED_NODE_MARKER_COMPONENT = "+node";
+var asRecord2 = /* @__PURE__ */ __name((value) => value !== null && typeof value === "object" && !Array.isArray(value) ? value : null, "asRecord");
+var readBlock = /* @__PURE__ */ __name((snapshot, component) => {
+  const map = /* @__PURE__ */ new Map();
+  const block = snapshot.components.find((b) => b.component === component);
+  for (const entry of block?.entries ?? []) {
+    const record = asRecord2(entry.value);
+    if (record) {
+      map.set(entry.entityId, record);
+    }
+  }
+  return map;
+}, "readBlock");
+var fallbackInstanceId = /* @__PURE__ */ __name((entityId) => `e${entityId}`, "fallbackInstanceId");
+function buildNodeKeyMapsFromSnapshot(snapshot, options) {
+  const parentValues = readBlock(snapshot, "ParentId");
+  const nodeValues = readBlock(snapshot, "PrefabNode");
+  const instanceValues = readBlock(snapshot, "PrefabInstance");
+  const inDocument = new Set(snapshot.entities);
+  const childrenByParent = /* @__PURE__ */ new Map();
+  const rootIds = [];
+  for (const entityId of snapshot.entities) {
+    const parent = parentValues.get(entityId)?.value;
+    if (typeof parent === "number" && inDocument.has(parent)) {
+      const siblings = childrenByParent.get(parent);
+      if (siblings) siblings.push(entityId);
+      else childrenByParent.set(parent, [entityId]);
+    } else {
+      rootIds.push(entityId);
+    }
+  }
+  const scopeRoots = options?.scopeRootEntityId !== void 0 ? [options.scopeRootEntityId] : rootIds;
+  const idToKey = /* @__PURE__ */ new Map();
+  const keyToId = /* @__PURE__ */ new Map();
+  const boundaryIds = /* @__PURE__ */ new Map();
+  const scopeRootSet = new Set(scopeRoots);
+  const queue = scopeRoots.map(
+    (entityId) => ({ entityId, prefix: "" })
+  );
+  while (queue.length > 0) {
+    const { entityId, prefix } = queue.shift();
+    const instance = instanceValues.get(entityId);
+    const isBoundary = Boolean(
+      instance && typeof instance.url === "string" && !scopeRootSet.has(entityId)
+    );
+    let ownPrefix = prefix;
+    let childPrefix = prefix;
+    if (isBoundary && instance) {
+      const instanceId = typeof instance.instanceId === "string" && instance.instanceId.length > 0 ? instance.instanceId : fallbackInstanceId(entityId);
+      childPrefix = `${prefix}${instanceId}${NODE_KEY_SEPARATOR}`;
+      ownPrefix = childPrefix;
+      boundaryIds.set(entityId, {
+        url: instance.url,
+        instanceId
+      });
+    }
+    const nodeId = nodeValues.get(entityId)?.nodeId;
+    if (typeof nodeId === "string" && nodeId.length > 0) {
+      const key = `${ownPrefix}${nodeId}`;
+      idToKey.set(entityId, key);
+      keyToId.set(key, entityId);
+    }
+    for (const child of childrenByParent.get(entityId) ?? []) {
+      queue.push({ entityId: child, prefix: childPrefix });
+    }
+  }
+  const rootEntityId = scopeRoots[0];
+  const rootNodeId = rootEntityId !== void 0 ? nodeValues.get(rootEntityId)?.nodeId : void 0;
+  return {
+    idToKey,
+    keyToId,
+    rootKey: typeof rootNodeId === "string" && rootNodeId.length > 0 ? rootNodeId : null,
+    boundaryIds
+  };
+}
+__name(buildNodeKeyMapsFromSnapshot, "buildNodeKeyMapsFromSnapshot");
+function collectSnapshotSubtreeIds(snapshot, rootEntityId) {
+  const parentValues = readBlock(snapshot, "ParentId");
+  const childrenByParent = /* @__PURE__ */ new Map();
+  for (const entityId of snapshot.entities) {
+    const parent = parentValues.get(entityId)?.value;
+    if (typeof parent === "number") {
+      const siblings = childrenByParent.get(parent);
+      if (siblings) siblings.push(entityId);
+      else childrenByParent.set(parent, [entityId]);
+    }
+  }
+  const ordered = [];
+  const seen = /* @__PURE__ */ new Set();
+  const queue = [rootEntityId];
+  while (queue.length > 0) {
+    const entityId = queue.shift();
+    if (seen.has(entityId)) continue;
+    seen.add(entityId);
+    ordered.push(entityId);
+    queue.push(...childrenByParent.get(entityId) ?? []);
+  }
+  return ordered;
+}
+__name(collectSnapshotSubtreeIds, "collectSnapshotSubtreeIds");
+function findTopLevelNestedRegions(snapshot) {
+  const parentValues = readBlock(snapshot, "ParentId");
+  const instanceValues = readBlock(snapshot, "PrefabInstance");
+  const inDocument = new Set(snapshot.entities);
+  const roots = new Set(
+    snapshot.entities.filter((entityId) => {
+      const parent = parentValues.get(entityId)?.value;
+      return typeof parent !== "number" || !inDocument.has(parent);
+    })
+  );
+  const regions = [];
+  for (const [entityId, instance] of instanceValues) {
+    if (roots.has(entityId)) continue;
+    if (typeof instance.url !== "string" || instance.url.length === 0) continue;
+    let ancestor = parentValues.get(entityId)?.value;
+    let nestedDeeper = false;
+    let hops = 0;
+    while (typeof ancestor === "number" && hops < 512) {
+      if (instanceValues.has(ancestor) && !roots.has(ancestor)) {
+        nestedDeeper = true;
+        break;
+      }
+      ancestor = parentValues.get(ancestor)?.value;
+      hops += 1;
+    }
+    if (nestedDeeper) continue;
+    regions.push({
+      rootEntityId: entityId,
+      url: instance.url,
+      instanceId: typeof instance.instanceId === "string" && instance.instanceId.length > 0 ? instance.instanceId : fallbackInstanceId(entityId),
+      overrides: Array.isArray(instance.overrides) ? instance.overrides.filter(
+        (entry) => typeof entry === "string"
+      ) : []
+    });
+  }
+  regions.sort((a, b) => a.rootEntityId - b.rootEntityId);
+  return regions;
+}
+__name(findTopLevelNestedRegions, "findTopLevelNestedRegions");
+
 // core/prefab/overrides.ts
 var OVERRIDE_DIFF_EXCLUDED_COMPONENTS = /* @__PURE__ */ new Set([
   "PrefabNode",
@@ -3670,10 +3818,10 @@ var OVERRIDE_ROOT_EXCLUDED_COMPONENTS = /* @__PURE__ */ new Set([
   "Name",
   "ParentId"
 ]);
-var asRecord2 = /* @__PURE__ */ __name((value) => value !== null && typeof value === "object" && !Array.isArray(value) ? value : null, "asRecord");
+var asRecord3 = /* @__PURE__ */ __name((value) => value !== null && typeof value === "object" && !Array.isArray(value) ? value : null, "asRecord");
 var clone = /* @__PURE__ */ __name((value) => value === void 0 ? value : structuredClone(value), "clone");
 var isNodeRef = /* @__PURE__ */ __name((value) => {
-  const record = asRecord2(value);
+  const record = asRecord3(value);
   return Boolean(
     record && typeof record.$node === "string" && Object.keys(record).length === 1
   );
@@ -3685,7 +3833,7 @@ function findSnapshotRootEntityIds(snapshot) {
   );
   const parentByEntity = /* @__PURE__ */ new Map();
   for (const entry of parentBlock?.entries ?? []) {
-    parentByEntity.set(entry.entityId, asRecord2(entry.value)?.value ?? null);
+    parentByEntity.set(entry.entityId, asRecord3(entry.value)?.value ?? null);
   }
   return snapshot.entities.filter(
     (entityId) => typeof parentByEntity.get(entityId) !== "number"
@@ -3699,7 +3847,7 @@ function buildNodeMapsFromSnapshot(snapshot) {
     (block) => block.component === "PrefabNode"
   );
   for (const entry of nodeBlock?.entries ?? []) {
-    const nodeId = asRecord2(entry.value)?.nodeId;
+    const nodeId = asRecord3(entry.value)?.nodeId;
     if (typeof nodeId === "string" && nodeId.length > 0) {
       idToNode.set(entry.entityId, nodeId);
       nodeToId.set(nodeId, entry.entityId);
@@ -3731,7 +3879,7 @@ var toRefOrRaw = /* @__PURE__ */ __name((id, idToNode) => {
 }, "toRefOrRaw");
 function canonicalizeComponentValue(componentName, value, idToNode) {
   const cloned = clone(value);
-  const record = asRecord2(cloned);
+  const record = asRecord3(cloned);
   if (!record) {
     return cloned;
   }
@@ -3750,14 +3898,14 @@ function canonicalizeComponentValue(componentName, value, idToNode) {
     const entries = Array.isArray(record.entries) ? record.entries : [];
     return {
       entries: entries.map((rawEntry) => {
-        const entry = asRecord2(rawEntry);
+        const entry = asRecord3(rawEntry);
         if (!entry) {
           return rawEntry;
         }
-        const data = asRecord2(entry.data) ?? {};
+        const data = asRecord3(entry.data) ?? {};
         const canonicalData = {};
         for (const [key, fieldValue] of Object.entries(data)) {
-          const field = asRecord2(fieldValue);
+          const field = asRecord3(fieldValue);
           if (field?.type === "entity" && typeof field.value === "number") {
             canonicalData[key] = {
               ...field,
@@ -3765,7 +3913,7 @@ function canonicalizeComponentValue(componentName, value, idToNode) {
             };
             continue;
           }
-          const componentRef = asRecord2(field?.value);
+          const componentRef = asRecord3(field?.value);
           if (field?.type === "component" && componentRef && typeof componentRef.entityId === "number") {
             canonicalData[key] = {
               ...field,
@@ -3811,7 +3959,7 @@ function decanonicalizeComponentValue(value, nodeToId) {
   if (Array.isArray(value)) {
     return value.map((item) => decanonicalizeComponentValue(item, nodeToId));
   }
-  const record = asRecord2(value);
+  const record = asRecord3(value);
   if (record) {
     const result = {};
     for (const [key, item] of Object.entries(record)) {
@@ -3914,15 +4062,20 @@ function collectDiffPaths(base, current, prefix = "", out = []) {
   return out;
 }
 __name(collectDiffPaths, "collectDiffPaths");
-function computeInstanceOverrides(baseSnapshot, instanceSnapshot) {
-  const baseMaps = buildNodeMapsFromSnapshot(baseSnapshot);
-  const instanceMaps = buildNodeMapsFromSnapshot(instanceSnapshot);
+function computeInstanceOverrides(baseSnapshot, instanceSnapshot, options) {
+  const baseMaps = buildNodeKeyMapsFromSnapshot(baseSnapshot);
+  const instanceMaps = buildNodeKeyMapsFromSnapshot(instanceSnapshot);
   const baseByEntity = indexSnapshotByEntity(baseSnapshot);
   const instanceByEntity = indexSnapshotByEntity(instanceSnapshot);
   const overrides = [];
-  for (const [nodeId, instanceEntityId] of instanceMaps.nodeToId) {
-    const baseEntityId = baseMaps.nodeToId.get(nodeId);
+  for (const [nodeKey, instanceEntityId] of instanceMaps.keyToId) {
+    const baseEntityId = baseMaps.keyToId.get(nodeKey);
     if (baseEntityId === void 0) {
+      if (options?.emitAdditionMarkers) {
+        overrides.push(
+          encodeOverride(nodeKey, ADDED_NODE_MARKER_COMPONENT, "")
+        );
+      }
       continue;
     }
     const baseComponents = baseByEntity.get(baseEntityId);
@@ -3930,7 +4083,7 @@ function computeInstanceOverrides(baseSnapshot, instanceSnapshot) {
     if (!baseComponents) {
       continue;
     }
-    const isRoot = nodeId === baseMaps.rootNodeId;
+    const isRoot = nodeKey === baseMaps.rootKey;
     for (const [componentName, baseRaw] of baseComponents) {
       if (OVERRIDE_DIFF_EXCLUDED_COMPONENTS.has(componentName)) {
         continue;
@@ -3945,15 +4098,15 @@ function computeInstanceOverrides(baseSnapshot, instanceSnapshot) {
       const baseCanonical = canonicalizeComponentValue(
         componentName,
         baseRaw,
-        baseMaps.idToNode
+        baseMaps.idToKey
       );
       const instanceCanonical = canonicalizeComponentValue(
         componentName,
         instanceRaw,
-        instanceMaps.idToNode
+        instanceMaps.idToKey
       );
       for (const path of collectDiffPaths(baseCanonical, instanceCanonical)) {
-        overrides.push(encodeOverride(nodeId, componentName, path));
+        overrides.push(encodeOverride(nodeKey, componentName, path));
       }
     }
   }
@@ -3967,7 +4120,7 @@ function getAtPath(value, tokens) {
     if (Array.isArray(cursor)) {
       cursor = cursor[Number(token)];
     } else {
-      const record = asRecord2(cursor);
+      const record = asRecord3(cursor);
       if (!record) {
         return void 0;
       }
@@ -3987,7 +4140,7 @@ function setAtPath(target, tokens, value) {
     if (Array.isArray(cursor)) {
       cursor = cursor[Number(token)];
     } else {
-      const record = asRecord2(cursor);
+      const record = asRecord3(cursor);
       if (!record) {
         return;
       }
@@ -4001,7 +4154,7 @@ function setAtPath(target, tokens, value) {
   if (Array.isArray(cursor)) {
     cursor[Number(last)] = value;
   } else {
-    const record = asRecord2(cursor);
+    const record = asRecord3(cursor);
     if (record) {
       if (value === void 0) {
         delete record[last];
@@ -4033,15 +4186,20 @@ __name(mergeComponentValue, "mergeComponentValue");
 var INSTANTIATE_EXCLUDED_COMPONENTS = /* @__PURE__ */ new Set([
   "Environment",
   "Postprocessing",
-  "SelectionTransformState",
-  "PrefabInstance"
+  "SelectionTransformState"
 ]);
 function instantiateSubtree(world, objectManagementSystem, snapshot) {
+  const snapshotRootIds = new Set(findSnapshotRootEntityIds(snapshot));
   const safeSnapshot = {
     entities: snapshot.entities,
-    components: snapshot.components.filter(
-      (block) => !INSTANTIATE_EXCLUDED_COMPONENTS.has(block.component)
-    )
+    components: snapshot.components.filter((block) => !INSTANTIATE_EXCLUDED_COMPONENTS.has(block.component)).map(
+      (block) => block.component === "PrefabInstance" ? {
+        component: block.component,
+        entries: block.entries.filter(
+          (entry) => !snapshotRootIds.has(entry.entityId)
+        )
+      } : block
+    ).filter((block) => block.entries.length > 0)
   };
   const result = hydrateWorldFromSnapshotDetailed(
     safeSnapshot,
@@ -4061,6 +4219,11 @@ __name(instantiateSubtree, "instantiateSubtree");
 
 // core/prefab/types.ts
 var PREFAB_FILE_VERSION = 1;
+var PREFAB_FILE_VERSION_NESTED = 2;
+function prefabFileVersionFor(snapshot) {
+  return findTopLevelNestedRegions(snapshot).length > 0 ? PREFAB_FILE_VERSION_NESTED : PREFAB_FILE_VERSION;
+}
+__name(prefabFileVersionFor, "prefabFileVersionFor");
 var isRecord = /* @__PURE__ */ __name((value) => value !== null && typeof value === "object" && !Array.isArray(value), "isRecord");
 function parsePrefabAsset(json) {
   if (!isRecord(json)) {
@@ -5282,6 +5445,6 @@ var _VideoSystem = class _VideoSystem {
 __name(_VideoSystem, "VideoSystem");
 var VideoSystem = _VideoSystem;
 
-export { AnimationSystem, AudioSystem, Behaviour, CameraSyncSystem, EnvironmentSyncSystem, HYDRATABLE_ENTITY_KINDS, InputSystem, InstancedMeshSystem, KeyboardKeys, LightSyncSystem, MaterialSyncSystem, MeshGeometrySystem, OVERRIDE_DIFF_EXCLUDED_COMPONENTS, OVERRIDE_ROOT_EXCLUDED_COMPONENTS, ObjectVisibilitySystem, PREFAB_FILE_VERSION, PhysicsSyncSystem, PostprocessingSyncSystem, RenderSystem, ScriptBehaviourSystem, TransformSyncSystem, VideoSystem, buildComponentValueMaps, buildNodeMapsFromSnapshot, canonicalizeComponentValue, clearPrefabCache, collectDiffPaths, collectEntitySubtree, computeInstanceOverrides, decanonicalizeComponentValue, despawnPrefab, encodeOverride, findSnapshotRootEntityIds, groupOverridePaths, hydrateWorldFromSnapshot, hydrateWorldFromSnapshotDetailed, indexSnapshotByEntity, instantiateSubtree, loadPrefab, mergeComponentValue, parseOverride, parsePrefabAsset, restoreComponentState, restorePostCreateComponents, setPrefabAssetUrlResolver, spawnPrefab };
-//# sourceMappingURL=chunk-67MFQDHX.js.map
-//# sourceMappingURL=chunk-67MFQDHX.js.map
+export { ADDED_NODE_MARKER_COMPONENT, AnimationSystem, AudioSystem, Behaviour, CameraSyncSystem, EnvironmentSyncSystem, HYDRATABLE_ENTITY_KINDS, InputSystem, InstancedMeshSystem, KeyboardKeys, LightSyncSystem, MaterialSyncSystem, MeshGeometrySystem, NODE_KEY_SEPARATOR, OVERRIDE_DIFF_EXCLUDED_COMPONENTS, OVERRIDE_ROOT_EXCLUDED_COMPONENTS, ObjectVisibilitySystem, PREFAB_FILE_VERSION, PREFAB_FILE_VERSION_NESTED, PhysicsSyncSystem, PostprocessingSyncSystem, RenderSystem, ScriptBehaviourSystem, TransformSyncSystem, VideoSystem, buildComponentValueMaps, buildNodeKeyMapsFromSnapshot, buildNodeMapsFromSnapshot, canonicalizeComponentValue, clearPrefabCache, collectDiffPaths, collectEntitySubtree, collectSnapshotSubtreeIds, computeInstanceOverrides, decanonicalizeComponentValue, despawnPrefab, encodeOverride, findSnapshotRootEntityIds, findTopLevelNestedRegions, groupOverridePaths, hydrateWorldFromSnapshot, hydrateWorldFromSnapshotDetailed, indexSnapshotByEntity, instantiateSubtree, loadPrefab, mergeComponentValue, parseOverride, parsePrefabAsset, prefabFileVersionFor, restoreComponentState, restorePostCreateComponents, setPrefabAssetUrlResolver, spawnPrefab };
+//# sourceMappingURL=chunk-5U3YS4JD.js.map
+//# sourceMappingURL=chunk-5U3YS4JD.js.map