@pascal-app/core 1.0.5 → 1.0.7

package/dist/systems/wall/wall-mitering.js

@@ -208,6 +208,125 @@ function getWallBoundaryFrame(wall, endType) {
         normal: { x: -direction.y / length, y: direction.x / length },
     };
 }
+function isOutsideWall(wall) {
+    return wall.frontSide === 'exterior' || wall.backSide === 'exterior';
+}
+/** Each wall's joint with its neighbours round the junction (sorted by angle). */
+function miterAdjacentWalls(processedWalls, meetingPoint) {
+    const wallIntersections = new Map();
+    const n = processedWalls.length;
+    // Calculate intersections between adjacent walls (exactly like demo)
+    for (let i = 0; i < n; i++) {
+        const wall1 = processedWalls[i];
+        const wall2 = processedWalls[(i + 1) % n];
+        // Intersect left edge of wall1 with right edge of wall2
+        const det = wall1.edgeA.a * wall2.edgeB.b - wall2.edgeB.a * wall1.edgeA.b;
+        // If lines are parallel (det ≈ 0), skip this intersection - walls will use defaults
+        if (Math.abs(det) < 1e-9) {
+            continue;
+        }
+        const p = {
+            x: (wall1.edgeA.b * wall2.edgeB.c - wall2.edgeB.b * wall1.edgeA.c) / det,
+            y: (wall2.edgeB.a * wall1.edgeA.c - wall1.edgeA.a * wall2.edgeB.c) / det,
+        };
+        // Miter limit: `det` only catches walls that are *exactly* parallel. Two
+        // walls meeting at a shallow angle have a small-but-nonzero `det`, so `p`
+        // lands far from the junction (∝ 1/sin θ) and the wall renders as an
+        // infinite spike. Reject any joint farther than MITER_LIMIT half-thicknesses
+        // from the meeting point — those walls fall back to a square joint.
+        const maxMiter = MITER_LIMIT * Math.max(wall1.halfThickness, wall2.halfThickness);
+        const dx = p.x - meetingPoint.x;
+        const dy = p.y - meetingPoint.y;
+        if (!(Number.isFinite(p.x) && Number.isFinite(p.y)) ||
+            dx * dx + dy * dy > maxMiter * maxMiter) {
+            continue;
+        }
+        // Only assign intersection to non-passthrough walls
+        // Passthrough walls don't receive junction data (their geometry doesn't change)
+        if (!wall1.isPassthrough) {
+            if (!wallIntersections.has(wall1.wallId)) {
+                wallIntersections.set(wall1.wallId, {});
+            }
+            wallIntersections.get(wall1.wallId).left = p;
+        }
+        if (!wall2.isPassthrough) {
+            if (!wallIntersections.has(wall2.wallId)) {
+                wallIntersections.set(wall2.wallId, {});
+            }
+            wallIntersections.get(wall2.wallId).right = p;
+        }
+    }
+    return wallIntersections;
+}
+// Walls within about 15° of each other don't make an outside corner.
+const CORNER_MIN_SINE = Math.sin(Math.PI / 12);
+// Walls within about 1° of each other run in line.
+const IN_LINE_SINE = Math.sin(Math.PI / 180);
+const dot2 = (a, b) => a.x * b.x + a.y * b.y;
+const cross2 = (a, b) => a.x * b.y - a.y * b.x;
+/**
+ * An outside corner keeps its own miter when a partition carries one of its
+ * walls on past the corner (two outside walls at an angle, one inside wall in
+ * line with one of them): the outside faces miter to the corner, the partition
+ * stops square at the other outside wall's inside face, and the in-line outside
+ * wall fills the corner on the partition's room side. So each room's own walls
+ * cover its side of the corner, and its floor and ceiling stop at them, where a
+ * three-way miter would notch the corner. Null for any other junction.
+ */
+function outsideCornerIntersections(processedWalls, meetingPoint) {
+    if (processedWalls.length !== 3 || processedWalls.some((wall) => wall.isPassthrough))
+        return null;
+    const outside = processedWalls.filter((wall) => wall.outside);
+    const inside = processedWalls.find((wall) => !wall.outside);
+    if (outside.length !== 2 || !inside)
+        return null;
+    const inLine = outside.find((wall) => Math.abs(cross2(wall.dir, inside.dir)) < IN_LINE_SINE && dot2(wall.dir, inside.dir) < 0);
+    const across = outside.find((wall) => wall !== inLine);
+    if (!(inLine && across) || Math.abs(cross2(inLine.dir, across.dir)) < CORNER_MIN_SINE) {
+        return null;
+    }
+    const corner = miterAdjacentWalls(outside, meetingPoint);
+    const inLineEnds = corner.get(inLine.wallId);
+    const acrossEnds = corner.get(across.wallId);
+    if (!(inLineEnds?.left && inLineEnds.right && acrossEnds?.left && acrossEnds.right))
+        return null;
+    // Of the L's two joints, the one toward the partition is its inside corner.
+    const toward = (point) => dot2({ x: point.x - meetingPoint.x, y: point.y - meetingPoint.y }, inside.dir);
+    // Where a line parallel to the partition, `offset` across it, meets the
+    // across wall's face toward the partition.
+    const face = dot2(inside.dir, across.normal) > 0 ? across.hi : across.lo;
+    const rate = dot2(inside.dir, across.normal);
+    const onFace = (offset) => {
+        const origin = {
+            x: meetingPoint.x + inside.normal.x * offset,
+            y: meetingPoint.y + inside.normal.y * offset,
+        };
+        const along = (face - offset * dot2(inside.normal, across.normal)) / rate;
+        return { x: origin.x + inside.dir.x * along, y: origin.y + inside.dir.y * along };
+    };
+    // The shared line's point on that face: the in-line wall fills the corner up to it.
+    const heel = onFace(0);
+    corner.set(inLine.wallId, {
+        left: inLineEnds.left,
+        right: inLineEnds.right,
+        closingPath: toward(inLineEnds.left) > toward(inLineEnds.right)
+            ? [heel, meetingPoint]
+            : [meetingPoint, heel],
+    });
+    corner.set(across.wallId, toward(acrossEnds.left) > toward(acrossEnds.right)
+        ? { left: heel, right: acrossEnds.right }
+        : { left: acrossEnds.left, right: heel });
+    const left = onFace(inside.hi);
+    const right = onFace(inside.lo);
+    corner.set(inside.wallId, {
+        left,
+        right,
+        // Square across the partition: closing through the junction would reach
+        // back into the corner.
+        closing: { x: (left.x + right.x) / 2, y: (left.y + right.y) / 2 },
+    });
+    return corner;
+}
 function calculateJunctionIntersections(junction, facePadding) {
     const { meetingPoint, connectedWalls } = junction;
     const processedWalls = [];
@@ -239,6 +358,11 @@ function calculateJunctionIntersections(junction, facePadding) {
                     edgeB,
                     isPassthrough: true,
                     halfThickness: halfT,
+                    outside: isOutsideWall(wall),
+                    dir: { x: v.x / L, y: v.y / L },
+                    normal: nUnit,
+                    lo: b,
+                    hi: a,
                 });
             }
         }
@@ -263,6 +387,11 @@ function calculateJunctionIntersections(junction, facePadding) {
                 edgeB,
                 isPassthrough: false,
                 halfThickness: halfT,
+                outside: isOutsideWall(wall),
+                dir: { x: v.x / L, y: v.y / L },
+                normal: nUnit,
+                lo: b,
+                hi: a,
             });
         }
     }
@@ -274,68 +403,39 @@ function calculateJunctionIntersections(junction, facePadding) {
             return angleOrder;
         return a.wallId < b.wallId ? -1 : a.wallId > b.wallId ? 1 : 0;
     });
-    const wallIntersections = new Map();
-    const n = processedWalls.length;
-    if (n < 2)
-        return wallIntersections;
-    // Calculate intersections between adjacent walls (exactly like demo)
-    for (let i = 0; i < n; i++) {
-        const wall1 = processedWalls[i];
-        const wall2 = processedWalls[(i + 1) % n];
-        // Intersect left edge of wall1 with right edge of wall2
-        const det = wall1.edgeA.a * wall2.edgeB.b - wall2.edgeB.a * wall1.edgeA.b;
-        // If lines are parallel (det ≈ 0), skip this intersection - walls will use defaults
-        if (Math.abs(det) < 1e-9) {
-            continue;
-        }
-        const p = {
-            x: (wall1.edgeA.b * wall2.edgeB.c - wall2.edgeB.b * wall1.edgeA.c) / det,
-            y: (wall2.edgeB.a * wall1.edgeA.c - wall1.edgeA.a * wall2.edgeB.c) / det,
-        };
-        // Miter limit: `det` only catches walls that are *exactly* parallel. Two
-        // walls meeting at a shallow angle have a small-but-nonzero `det`, so `p`
-        // lands far from the junction (∝ 1/sin θ) and the wall renders as an
-        // infinite spike. Reject any joint farther than MITER_LIMIT half-thicknesses
-        // from the meeting point — those walls fall back to a square joint.
-        const maxMiter = MITER_LIMIT * Math.max(wall1.halfThickness, wall2.halfThickness);
-        const dx = p.x - meetingPoint.x;
-        const dy = p.y - meetingPoint.y;
-        if (!(Number.isFinite(p.x) && Number.isFinite(p.y)) ||
-            dx * dx + dy * dy > maxMiter * maxMiter) {
-            continue;
-        }
-        // Only assign intersection to non-passthrough walls
-        // Passthrough walls don't receive junction data (their geometry doesn't change)
-        if (!wall1.isPassthrough) {
-            if (!wallIntersections.has(wall1.wallId)) {
-                wallIntersections.set(wall1.wallId, {});
-            }
-            wallIntersections.get(wall1.wallId).left = p;
-        }
-        if (!wall2.isPassthrough) {
-            if (!wallIntersections.has(wall2.wallId)) {
-                wallIntersections.set(wall2.wallId, {});
-            }
-            wallIntersections.get(wall2.wallId).right = p;
-        }
+    if (processedWalls.length < 2)
+        return new Map();
+    if (!connectedWalls.some(({ wall }) => wall.justification !== undefined)) {
+        const corner = outsideCornerIntersections(processedWalls, meetingPoint);
+        if (corner)
+            return corner;
     }
-    if (connectedWalls.some(({ wall }) => wall.justification !== undefined)) {
-        const host = connectedWalls.find(({ endType }) => endType === 'passthrough');
+    const wallIntersections = miterAdjacentWalls(processedWalls, meetingPoint);
+    const host = connectedWalls.find(({ endType }) => endType === 'passthrough');
+    if (host) {
+        // A wall T'd into another's body ends square on its face: both edges
+        // already meet the host's near face, and closing through the reference
+        // vertex would add a triangular sliver inside the host.
         for (const entry of connectedWalls) {
             if (entry.endType === 'passthrough')
                 continue;
             const edges = wallIntersections.get(entry.wall.id);
-            if (!edges)
-                continue;
-            if (host && edges.left && edges.right) {
-                // Both edges already meet the host's near face. Closing through the
-                // reference vertex would add a triangular sliver inside the host.
+            if (edges?.left && edges.right) {
                 edges.closing = {
                     x: (edges.left.x + edges.right.x) / 2,
                     y: (edges.left.y + edges.right.y) / 2,
                 };
             }
-            else if (connectedWalls.length === 2) {
+        }
+    }
+    if (connectedWalls.some(({ wall }) => wall.justification !== undefined)) {
+        for (const entry of connectedWalls) {
+            if (entry.endType === 'passthrough')
+                continue;
+            const edges = wallIntersections.get(entry.wall.id);
+            if (!edges || (host && edges.left && edges.right))
+                continue;
+            if (connectedWalls.length === 2) {
                 const other = connectedWalls.find((candidate) => candidate !== entry);
                 if (other.endType === 'passthrough')
                     continue;

package/dist/systems/wall/wall-move.d.ts

@@ -2,17 +2,21 @@ import type { WallNode } from '../../schema/index.js';
 export type WallPlanPoint = [number, number];
 export type WallMoveAxis = [number, number];
 export type WallMoveEndpoint = 'start' | 'end';
-export type WallMoveBridgePlan<TWall extends Pick<WallNode, 'id' | 'start' | 'end'>> = {
+/** A wall's line as the move planners read it: invisible walls move by the same rules. */
+export type WallMoveLine = Pick<WallNode, 'start' | 'end'> & {
+    id: string;
+};
+export type WallMoveBridgePlan<TWall extends WallMoveLine> = {
     wall: TWall;
     originalPoint: WallPlanPoint;
     movedEndpoint: WallMoveEndpoint;
 };
-export type WallMoveLinkedWallTargetPlan<TWall extends Pick<WallNode, 'id' | 'start' | 'end'>> = {
+export type WallMoveLinkedWallTargetPlan<TWall extends WallMoveLine> = {
     wall: TWall;
     originalPoint: WallPlanPoint;
     targetPoint: WallPlanPoint;
 };
-export type WallMoveJunctionPlan<TWall extends Pick<WallNode, 'id' | 'start' | 'end'>> = {
+export type WallMoveJunctionPlan<TWall extends WallMoveLine> = {
     linkedWallsToMove: TWall[];
     linkedWallTargetPlans: Array<WallMoveLinkedWallTargetPlan<TWall>>;
     bridgePlans: Array<WallMoveBridgePlan<TWall>>;
@@ -30,7 +34,7 @@ export declare function constrainWallMoveDeltaToAxis(deltaX: number, deltaZ: num
  * matchPoint/targetPoint pair encodes the pivot, not the original ↔ next
  * endpoint mapping.
  */
-export declare function getLinkedWallUpdates<TWall extends Pick<WallNode, 'id' | 'start' | 'end'>>(linkedWalls: Array<{
+export declare function getLinkedWallUpdates<TWall extends WallMoveLine>(linkedWalls: Array<{
     wall: TWall;
     matchPoint?: WallPlanPoint;
     targetPoint?: WallPlanPoint;
@@ -39,10 +43,23 @@ export declare function getLinkedWallUpdates<TWall extends Pick<WallNode, 'id' |
     start: WallPlanPoint;
     end: WallPlanPoint;
 }>;
-export declare function getPlannedLinkedWallUpdates<TWall extends Pick<WallNode, 'id' | 'start' | 'end'>>(plan: WallMoveJunctionPlan<TWall>, originalStart: WallPlanPoint, originalEnd: WallPlanPoint, nextStart: WallPlanPoint, nextEnd: WallPlanPoint): Array<{
+export declare function getPlannedLinkedWallUpdates<TWall extends WallMoveLine>(plan: WallMoveJunctionPlan<TWall>, originalStart: WallPlanPoint, originalEnd: WallPlanPoint, nextStart: WallPlanPoint, nextEnd: WallPlanPoint): Array<{
+    id: TWall['id'];
+    start: WallPlanPoint;
+    end: WallPlanPoint;
+}>;
+export declare function planWallMoveJunctions<TWall extends WallMoveLine>(linkedWalls: TWall[], originalStart: WallPlanPoint, originalEnd: WallPlanPoint, nextStart: WallPlanPoint, nextEnd: WallPlanPoint): WallMoveJunctionPlan<TWall>;
+/**
+ * Walls T'd into a moving wall (an end on its reference line, between its
+ * ends) stay on it: each such end slides along its own wall onto the moved
+ * line, so a partition stretches or shortens with the wall it meets, as a
+ * framed partition stays nailed to it. An end the move would carry past the
+ * moved wall's ends lets go and stays where it was; walls joined at the moving
+ * wall's ends are the junction planner's (`planWallMoveJunctions`).
+ */
+export declare function planAttachedWallUpdates<TWall extends WallMoveLine & Pick<WallNode, 'curveOffset'>>(walls: readonly TWall[], originalStart: WallPlanPoint, originalEnd: WallPlanPoint, nextStart: WallPlanPoint, nextEnd: WallPlanPoint): Array<{
     id: TWall['id'];
     start: WallPlanPoint;
     end: WallPlanPoint;
 }>;
-export declare function planWallMoveJunctions<TWall extends Pick<WallNode, 'id' | 'start' | 'end'>>(linkedWalls: TWall[], originalStart: WallPlanPoint, originalEnd: WallPlanPoint, nextStart: WallPlanPoint, nextEnd: WallPlanPoint): WallMoveJunctionPlan<TWall>;
 //# sourceMappingURL=wall-move.d.ts.map

package/dist/systems/wall/wall-move.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wall-move.d.ts","sourceRoot":"","sources":["../../../src/systems/wall/wall-move.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"wall-move.d.ts","sourceRoot":"","sources":["../../../src/systems/wall/wall-move.ts"],"names":[],"mappings":"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"}

package/dist/systems/wall/wall-move.js

@@ -191,3 +191,68 @@ export function planWallMoveJunctions(linkedWalls, originalStart, originalEnd, n
         wallsToDelete: Array.from(wallsToDelete.values()),
     };
 }
+// An end within this of a wall's reference line is T'd into it.
+const ATTACH_TOLERANCE = 1e-3;
+// Walls within about 1° of each other run alongside, never T'd.
+const ATTACH_MIN_SINE = Math.sin(Math.PI / 180);
+const ATTACHED_MIN_LENGTH = 0.01;
+/**
+ * Walls T'd into a moving wall (an end on its reference line, between its
+ * ends) stay on it: each such end slides along its own wall onto the moved
+ * line, so a partition stretches or shortens with the wall it meets, as a
+ * framed partition stays nailed to it. An end the move would carry past the
+ * moved wall's ends lets go and stays where it was; walls joined at the moving
+ * wall's ends are the junction planner's (`planWallMoveJunctions`).
+ */
+export function planAttachedWallUpdates(walls, originalStart, originalEnd, nextStart, nextEnd) {
+    const dx = originalEnd[0] - originalStart[0];
+    const dz = originalEnd[1] - originalStart[1];
+    const length = Math.hypot(dx, dz);
+    const mx = nextEnd[0] - nextStart[0];
+    const mz = nextEnd[1] - nextStart[1];
+    const movedLength = Math.hypot(mx, mz);
+    if (length < AXIS_EPSILON || movedLength < AXIS_EPSILON)
+        return [];
+    const ux = dx / length;
+    const uz = dz / length;
+    const updates = [];
+    for (const wall of walls) {
+        if ((wall.curveOffset ?? 0) !== 0)
+            continue;
+        if (wallTouchesPoint(wall, originalStart) || wallTouchesPoint(wall, originalEnd))
+            continue;
+        const next = { start: wall.start, end: wall.end };
+        let moved = false;
+        for (const end of ['start', 'end']) {
+            const point = wall[end];
+            const along = (point[0] - originalStart[0]) * ux + (point[1] - originalStart[1]) * uz;
+            const across = (point[1] - originalStart[1]) * ux - (point[0] - originalStart[0]) * uz;
+            if (Math.abs(across) > ATTACH_TOLERANCE ||
+                along <= ATTACH_TOLERANCE ||
+                along >= length - ATTACH_TOLERANCE) {
+                continue;
+            }
+            const other = end === 'start' ? wall.end : wall.start;
+            const wx = point[0] - other[0];
+            const wz = point[1] - other[1];
+            const denominator = wx * mz - wz * mx;
+            if (Math.abs(denominator) <= ATTACH_MIN_SINE * Math.hypot(wx, wz) * movedLength)
+                continue;
+            // other + w·s meets nextStart + m·t.
+            const ox = nextStart[0] - other[0];
+            const oz = nextStart[1] - other[1];
+            const s = (ox * mz - oz * mx) / denominator;
+            const t = (ox * wz - oz * wx) / denominator;
+            if (t < -AXIS_EPSILON || t > 1 + AXIS_EPSILON)
+                continue;
+            const target = [other[0] + wx * s, other[1] + wz * s];
+            if (Math.hypot(target[0] - other[0], target[1] - other[1]) < ATTACHED_MIN_LENGTH)
+                continue;
+            next[end] = target;
+            moved = true;
+        }
+        if (moved)
+            updates.push({ id: wall.id, start: next.start, end: next.end });
+    }
+    return updates;
+}

package/dist/systems/wall/wall-top.d.ts

@@ -7,7 +7,7 @@ import type { WallNode } from '../../schema/nodes/wall.js';
  * would collapse below this minimum.
  */
 export declare const MIN_WALL_HEIGHT = 0.5;
-export declare function wallFollowsStorey(wall: Pick<WallNode, 'height' | 'supportSlabId'>, authoredStoreyHeight: number | null): boolean;
+export declare function wallFollowsStorey(wall: Pick<WallNode, 'height' | 'supportSlabId' | 'wallType'>, authoredStoreyHeight: number | null): boolean;
 /**
  * Wall-top inversion (vertical building model): a wall with no stored
  * `height` is plane-bound — its top sits at the storey plane (level-local
@@ -20,7 +20,7 @@ export declare function wallFollowsStorey(wall: Pick<WallNode, 'height' | 'suppo
  *
  * Returns the top in level-local Y (same frame as `electedBase`).
  */
-export declare function resolveWallTop(wall: Pick<WallNode, 'height' | 'supportSlabId'>, storeyHeight: number, electedBase: number, authoredStoreyHeight?: number | null): number;
+export declare function resolveWallTop(wall: Pick<WallNode, 'height' | 'supportSlabId' | 'wallType'>, storeyHeight: number, electedBase: number, authoredStoreyHeight?: number | null): number;
 /**
  * Extruded height of the wall body: {@link resolveWallTop} minus the
  * elected base. Base convention: the elected slab-support elevation itself

package/dist/systems/wall/wall-top.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wall-top.d.ts","sourceRoot":"","sources":["../../../src/systems/wall/wall-top.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAEvD;;;;;;GAMG;AACH,eAAO,MAAM,eAAe,MAAM,CAAA;AAElC,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,QAAQ,GAAG,eAAe,CAAC,EAChD,oBAAoB,EAAE,MAAM,GAAG,IAAI,GAClC,OAAO,CAOT;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,cAAc,CAC5B,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,QAAQ,GAAG,eAAe,CAAC,EAChD,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,MAAM,EACnB,oBAAoB,GAAE,MAAM,GAAG,IAAmB,GACjD,MAAM,CAGR;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,0BAA0B,CACxC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,QAAQ,GAAG,eAAe,CAAC,EAChD,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,MAAM,EACnB,oBAAoB,GAAE,MAAM,GAAG,IAAmB,GACjD,MAAM,CAER"}
+{"version":3,"file":"wall-top.d.ts","sourceRoot":"","sources":["../../../src/systems/wall/wall-top.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAEvD;;;;;;GAMG;AACH,eAAO,MAAM,eAAe,MAAM,CAAA;AAElC,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,QAAQ,GAAG,eAAe,GAAG,UAAU,CAAC,EAC7D,oBAAoB,EAAE,MAAM,GAAG,IAAI,GAClC,OAAO,CAST;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,cAAc,CAC5B,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,QAAQ,GAAG,eAAe,GAAG,UAAU,CAAC,EAC7D,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,MAAM,EACnB,oBAAoB,GAAE,MAAM,GAAG,IAAmB,GACjD,MAAM,CAIR;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,0BAA0B,CACxC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,QAAQ,GAAG,eAAe,CAAC,EAChD,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,MAAM,EACnB,oBAAoB,GAAE,MAAM,GAAG,IAAmB,GACjD,MAAM,CAER"}

package/dist/systems/wall/wall-top.js

@@ -1,3 +1,4 @@
+import { RAILING_GUARD_HEIGHT } from '../../schema/nodes/railing-wall.js';
 /**
  * Minimum wall body height in meters. Governs both the wall height
  * arrow's lower drag bound and the slab-elevation clamp: a slab may not
@@ -7,6 +8,9 @@
  */
 export const MIN_WALL_HEIGHT = 0.5;
 export function wallFollowsStorey(wall, authoredStoreyHeight) {
+    // A railing is a guard as tall as itself, never the storey (36 in when it says nothing).
+    if (wall.wallType === 'railing')
+        return false;
     return (wall.height == null ||
         (authoredStoreyHeight !== null &&
             wall.supportSlabId !== 'ground' &&
@@ -27,7 +31,8 @@ export function wallFollowsStorey(wall, authoredStoreyHeight) {
 export function resolveWallTop(wall, storeyHeight, electedBase, authoredStoreyHeight = storeyHeight) {
     if (wallFollowsStorey(wall, authoredStoreyHeight))
         return storeyHeight;
-    return electedBase + wall.height;
+    // Only a railing reaches here with no height of its own.
+    return electedBase + (wall.height ?? RAILING_GUARD_HEIGHT);
 }
 /**
  * Extruded height of the wall body: {@link resolveWallTop} minus the

package/dist/systems/wall/wall-topology.d.ts

@@ -1,5 +1,5 @@
 import { type OpenWallEnd } from '../../lib/room-graph.js';
-import { type AnyNode, type AnyNodeId, type WallNode } from '../../schema/index.js';
+import { type AnyNode, type AnyNodeId, SeparatorNode, type WallNode } from '../../schema/index.js';
 import type { WallPlanPoint } from './wall-move.js';
 export declare const WALL_MIN_LENGTH = 0.01;
 export type WallTopologyChanges = {
@@ -60,6 +60,12 @@ export declare function planWallSplitAtPoint(nodes: Record<AnyNodeId, AnyNode>,
     ignoreWallIds?: readonly string[];
     mintId?: () => string;
 }): WallPointSplitResult;
+/** Where a door, window or wall item sits along its wall: metres from the wall start. */
+export declare function wallAttachmentSpan(node: AnyNode): {
+    min: number;
+    max: number;
+    center: number;
+} | null;
 export declare function splitWall(wall: WallNode, splitParameters: number[], nodes: Record<AnyNodeId, AnyNode>, mintId?: () => string): {
     create: WallNode[];
     update: WallTopologyChanges['update'];
@@ -71,7 +77,32 @@ export declare function planWallInsertion(nodes: Record<AnyNodeId, AnyNode>, arg
     joinRadius: number;
     wallDefaults?: Partial<WallNode>;
     mintId?: () => string;
+    /**
+     * Draw along walls that already cover the span instead of refusing: the
+     * caller has the new wall take that stretch over (`finishWallEdit`).
+     */
+    replaceCovered?: boolean;
 }): WallInsertionResult;
+/**
+ * An invisible wall drawn `start` → `end` (a room divider): a room separator, so
+ * rooms close on it as on a wall, but it is no wall and cuts none. An end landing on a wall joins
+ * it on its reference line, where the room graph meets it (a join inside a corner block takes the
+ * corner), and the line breaks either side of a wall it crosses so each piece tees into it. A
+ * stretch drawn over an invisible wall or along a wall's reference line adds nothing. Null when
+ * nothing is left to add, or it would be too short.
+ */
+export declare function planSeparatorInsertion(nodes: Record<AnyNodeId, AnyNode>, args: {
+    levelId: AnyNodeId;
+    start: WallPlanPoint;
+    end: WallPlanPoint;
+    joinRadius: number;
+    mintId?: () => string;
+}): {
+    changes: WallTopologyChanges;
+    separators: SeparatorNode[];
+    resolvedStart: WallPlanPoint;
+    resolvedEnd: WallPlanPoint;
+} | null;
 /** Repair one reference endpoint, including host splits and opening rehosting, in one scene batch. */
 export declare function planJoinOpenWallEnd(nodes: Readonly<Record<string, AnyNode>>, openEnd: OpenWallEnd): WallJoinResult;
 /**

package/dist/systems/wall/wall-topology.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wall-topology.d.ts","sourceRoot":"","sources":["../../../src/systems/wall/wall-topology.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"wall-topology.d.ts","sourceRoot":"","sources":["../../../src/systems/wall/wall-topology.ts"],"names":[],"mappings":"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"}