@pascal-app/core 1.0.6 → 1.0.7

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

@@ -43,7 +43,9 @@
  * `exterior` nor `sheathing`, whose interior finish is then applied to BOTH
  * faces and no cladding or sheathing is drawn (see `resolveWallAssembly`).
  */
+import { getLibraryMaterialIdFromRef, getMaterialsForCategory, } from '../../material-library.js';
 import { WallAssembly } from '../../schema/nodes/wall.js';
+import { WallTypeDefinition } from '../../schema/wall-type.js';
 import { DEFAULT_WALL_THICKNESS } from './wall-footprint.js';
 import { pointToKey } from './wall-mitering.js';
 // ============================================================================
@@ -67,6 +69,19 @@ export const GYPSUM_SHEATHING = inches(0.5);
 export const STUD_2X4 = inches(3.5);
 /** 2x6 stud, actual 5-1/2 in. Same source as STUD_2X4. */
 export const STUD_2X6 = inches(5.5);
+/** 2x8 stud, actual 7-1/4 in: the PS 20 dressed size the IRC lumber tables assume. */
+export const STUD_2X8 = inches(7.25);
+/**
+ * Steel stud webs, 3-1/2, 5-1/2 and 8 in: members 350S162, 550S162 and 800S162, whose designation
+ * leads with the web depth in hundredths of an inch (AISI S201, the designations 2021 IRC R603
+ * uses).
+ */
+export const LGS_STUD_350 = inches(3.5);
+export const LGS_STUD_550 = inches(5.5);
+export const LGS_STUD_800 = inches(8);
+/** Stud spacings the 2021 IRC stud tables are written for, 16 and 24 in on centre (Table R602.3(5)). */
+export const STUD_SPACING_16 = inches(16);
+export const STUD_SPACING_24 = inches(24);
 /** Vinyl / wood lap siding bounding depth, 3/4 in. 2021 IRC R703.11 / R703.5 + Table R703.3(1). */
 export const SIDING_LAP = inches(0.75);
 /** Fiber cement lap board, 5/16 in board. 2021 IRC R703.10.2 + Table R703.3(1). */
@@ -182,6 +197,7 @@ export function wallAssemblyFromLegacy(legacy) {
         core: true,
         material: legacy.framing.kind,
         thickness: legacy.framing.depth,
+        ...(legacy.framing.spacing !== undefined ? { spacing: legacy.framing.spacing } : {}),
     });
     if (interior)
         layers.push({ id: 'interior', ...interior });
@@ -242,6 +258,7 @@ export function wallAssemblyToLegacy(assembly) {
     legacy.framing = {
         kind: framing.material,
         depth: framing.thickness,
+        ...(framing.spacing !== undefined ? { spacing: framing.spacing } : {}),
     };
     const lining = take('lining');
     if (layers.length > 0)
@@ -270,6 +287,7 @@ export function wallAssemblyToLegacy(assembly) {
             restored.role === layer.role &&
             restored.core === layer.core &&
             restored.material === layer.material &&
+            restored.spacing === layer.spacing &&
             Math.abs(restored.thickness - layer.thickness) < 1e-12);
     });
     if (!sameLayers)
@@ -305,6 +323,10 @@ const INTERIOR_FINISH_LABEL = {
     plaster: 'plaster',
     none: 'none',
 };
+const INSULATION_LABEL = {
+    'rigid-foam': 'rigid foam insulation',
+    'mineral-wool': 'mineral wool board',
+};
 /** An F2 layer as the WS5 drawing role and its inspector / poché label. */
 function drawnLayer(layer) {
     const material = layer.material;
@@ -325,9 +347,13 @@ function drawnLayer(layer) {
         case 'substrate':
         case 'membrane':
         case 'underlay':
+        // Continuous insulation is a board on the face of the frame, drawn as one.
+        case 'insulation':
             return {
                 role: 'sheathing',
-                material: (material && SHEATHING_LABEL[material]) ?? material ?? layer.role,
+                material: (material && (SHEATHING_LABEL[material] ?? INSULATION_LABEL[material])) ??
+                    material ??
+                    layer.role,
             };
         default:
             return {
@@ -542,20 +568,193 @@ export function wallAssemblyFraming(wall) {
         return undefined;
     return { depth: core.thickness, ...(core.material ? { kind: core.material } : {}) };
 }
-/** `library:` ref for the wall's assembly cladding, or null when it has none. */
+/**
+ * `library:` ref for the wall's assembly cladding, or null when it has none: the product picked
+ * for its cladding layer while drafting (`wallAssemblyFinishSlots`), else the kind's own
+ * (`WALL_FINISH_LIBRARY_REF`). A picked product that no longer dresses the cladding (the layer
+ * changed from siding to stucco since) gives way to the kind's own.
+ */
 export function wallAssemblyFinishRef(wall) {
-    const finish = wallAssemblyExteriorFinish(wall);
-    if (!finish)
+    const layer = layersOutsideIn(wall).layers.find((layer) => layer.role === 'finish');
+    const finish = layer?.material;
+    if (!(layer && finish))
         return null;
+    const picked = wall.slots?.[assemblyLayerSlotKey(layer)];
+    if (isWallCladdingProduct(finish, picked))
+        return picked;
     return WALL_FINISH_LIBRARY_REF[finish] ?? null;
 }
+/**
+ * The finish the wall's assembly gives one geometric face (`a` is the +normal face) where the
+ * face has no paint of its own: on the exterior face its cladding (`wallAssemblyFinishRef`), on a
+ * lined face the paint picked for that lining while drafting. Null where the assembly says
+ * nothing, and the face shows the wall's slot default.
+ */
+export function wallAssemblyFaceFinish(wall, face) {
+    const { layers, exteriorSideResolved } = layersOutsideIn(wall);
+    const exterior = face === (exteriorSideResolved === 1 ? 'a' : 'b');
+    if (exterior) {
+        const cladding = wallAssemblyFinishRef(wall);
+        if (cladding)
+            return cladding;
+    }
+    const drawn = layers.filter((layer) => layer.thickness > 0);
+    const outer = exterior ? drawn[0] : drawn[drawn.length - 1];
+    if (outer?.role !== 'lining')
+        return null;
+    return wall.slots?.[assemblyLayerSlotKey(outer)] ?? null;
+}
+// ============================================================================
+// FINISHES PICKED WHILE DRAFTING
+// ============================================================================
+/** The `slots` key a layer's look is kept under: its own `slot`, else `layer:<id>` (`AssemblyLayer.slot`). */
+export function assemblyLayerSlotKey(layer) {
+    return layer.slot ?? `layer:${layer.id}`;
+}
+/** An outdoor wall finish: a brick or stone made for a wall outside, not a floor tile. */
+const outdoorWall = (item) => !!item.surfaces?.includes('wall') && item.surfaces.includes('outdoor');
+/** Which catalog finishes dress each cladding kind. */
+const CLADDING_PRODUCTS = {
+    siding: () => getMaterialsForCategory('siding'),
+    'fiber-cement': () => getMaterialsForCategory('siding'),
+    // The textured coat, then the flat colours of an integrally coloured or painted finish coat.
+    stucco: () => [
+        ...getMaterialsForCategory('concrete').filter((item) => item.id.includes('stucco')),
+        ...getMaterialsForCategory('colors'),
+    ],
+    brick: () => getMaterialsForCategory('brick').filter(outdoorWall),
+    stone: () => getMaterialsForCategory('stone').filter(outdoorWall),
+};
+/**
+ * The catalog products a cladding kind (`siding`, `stucco`, `brick`, …) can be finished with,
+ * the kind's own (`WALL_FINISH_LIBRARY_REF`) among them: what the drafting finish picker offers
+ * for a wall type with that cladding. Empty for a kind with none (`none`, an unknown kind).
+ */
+export function wallCladdingProducts(kind) {
+    return (kind && CLADDING_PRODUCTS[kind]?.()) || [];
+}
+/** Whether `ref` is a `library:` product `wallCladdingProducts(kind)` lists. */
+export function isWallCladdingProduct(kind, ref) {
+    const id = getLibraryMaterialIdFromRef(ref);
+    return !!id && wallCladdingProducts(kind).some((item) => item.id === id);
+}
+/**
+ * Whether a stack builds an exterior wall, read from its own layers: it has a cladding side — a
+ * finish or sheathing layer, or a lining on one face only (block or framing left bare outside).
+ * A stack lined on both faces, or bare on both, is a partition.
+ */
+export function isExteriorWallAssembly(assembly) {
+    const layers = [...assembly.layers, ...(assembly.backing ?? [])].filter((layer) => layer.thickness > 0);
+    if (layers.some((layer) => layer.role === 'finish' || layer.role === 'sheathing'))
+        return true;
+    return (layers[0]?.role === 'lining') !== (layers[layers.length - 1]?.role === 'lining');
+}
+/**
+ * The framing cores a project wall type is built around: wood studs (2x4, 2x6, 2x8) and steel
+ * studs (the 3-1/2, 5-1/2 and 8 in webs the framers size steel walls by) at 16 or 24 in on
+ * centre, or an 8 in block. The core's depth and spacing are what a framer studs the wall at.
+ */
+export const WALL_TYPE_CORES = [
+    ...[
+        ['2x4', STUD_2X4],
+        ['2x6', STUD_2X6],
+        ['2x8', STUD_2X8],
+    ].flatMap(([size, thickness]) => [16, 24].map((oc) => ({
+        id: `wood-${size}-${oc}`,
+        label: `${size} wood studs @ ${oc}" o.c.`,
+        material: 'wood',
+        thickness,
+        spacing: oc === 16 ? STUD_SPACING_16 : STUD_SPACING_24,
+    }))),
+    ...[
+        ['3-1/2"', '350', LGS_STUD_350],
+        ['5-1/2"', '550', LGS_STUD_550],
+        ['8"', '800', LGS_STUD_800],
+    ].flatMap(([depth, web, thickness]) => [16, 24].map((oc) => ({
+        id: `lgs-${web}-${oc}`,
+        label: `${depth} steel studs @ ${oc}" o.c.`,
+        material: 'lgs',
+        thickness,
+        spacing: oc === 16 ? STUD_SPACING_16 : STUD_SPACING_24,
+    }))),
+    { id: 'cmu-8', label: 'CMU 8" block', material: 'cmu', thickness: CMU_8_ACTUAL },
+];
+const near = (a, b) => Math.abs(a - b) < 1e-6;
+/**
+ * The listed core a stack is built around, or undefined for one off the list. A core with no
+ * spacing of its own (every preset's: the framer's default) reads as the 16 in one.
+ */
+export function wallTypeCoreOf(assembly) {
+    const core = assembly.layers.find((layer) => layer.core);
+    if (!core)
+        return undefined;
+    const spacing = core.spacing ?? STUD_SPACING_16;
+    return WALL_TYPE_CORES.find((option) => option.material === core.material &&
+        near(option.thickness, core.thickness) &&
+        (option.spacing === undefined || near(option.spacing, spacing)));
+}
+/** The id each layer role takes in a project wall type, as the presets name them. */
+const WALL_TYPE_LAYER_ID = {
+    finish: 'exterior',
+    air: 'air-space',
+    sheathing: 'sheathing',
+    structure: 'framing',
+};
+/**
+ * A project wall type's stack from its layers listed outside-in, with ids as the presets give
+ * them (`exterior`, `sheathing`, `framing`, `interior`, a lining outside the core
+ * `interior-back`, a repeat numbered `-2`, `-3`…), so a stack the inspector's cladding /
+ * sheathing / framing / interior rows can express stays editable there.
+ */
+export function wallTypeAssembly(id, layers) {
+    const coreIndex = layers.findIndex((layer) => layer.core);
+    const used = new Set();
+    return {
+        layers: layers.map((layer, index) => {
+            const base = layer.role === 'lining'
+                ? index < coreIndex
+                    ? 'interior-back'
+                    : 'interior'
+                : (WALL_TYPE_LAYER_ID[layer.role] ?? layer.role);
+            let layerId = base;
+            for (let n = 2; used.has(layerId); n += 1)
+                layerId = `${base}-${n}`;
+            used.add(layerId);
+            return { id: layerId, ...layer };
+        }),
+        face: 'exterior',
+        presetId: id,
+    };
+}
+/**
+ * The project's own wall types: those saved on its site (`SiteNode.wallTypes`), in their saved
+ * order. A scene is loaded without parsing, so an entry that does not parse, or repeats an id, is
+ * skipped rather than trusted.
+ */
+export function projectWallTypes(nodes, rootNodeIds) {
+    const site = rootNodeIds.map((id) => nodes[id]).find((node) => node?.type === 'site');
+    return parseWallTypes(site?.type === 'site' ? site.wallTypes : undefined);
+}
+/** A saved `SiteNode.wallTypes` list as `projectWallTypes` reads it: parsed, first id wins. */
+export function parseWallTypes(saved) {
+    const seen = new Set();
+    const types = [];
+    for (const entry of Array.isArray(saved) ? saved : []) {
+        const parsed = WallTypeDefinition.safeParse(entry);
+        if (!parsed.success || seen.has(parsed.data.id))
+            continue;
+        seen.add(parsed.data.id);
+        types.push(parsed.data);
+    }
+    return types;
+}
 /**
  * What the wall's exterior face shows when its assembly declares no cladding and no lining over
  * the core and the core is masonry or concrete: the structure itself, exposed. A foundation wall's
  * block or cast concrete above grade, and from under the ground, is what it is. `null` for a wall
  * with a cladding (`wallAssemblyFinishRef` speaks for it), a lining outside the core (a
  * partition), a framed or foam core (`wood`, `lgs`, `icf`), and a wall whose exterior side is not
- * yet resolved. The viewer draws it as the generic foundation draws the same structure.
+ * yet resolved.
  */
 export function wallAssemblyExposedStructure(wall) {
     if (resolveWallExteriorSide(wall) === null)

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

@@ -66,7 +66,8 @@ export declare function wallFinishMaterialIndex(layout: WallFinishLayout, face:
 /**
  * The wall's own chain for one face, in the order the renderer walks it:
  * `slots[face]` ref → legacy inline finish (per-face, then wall-wide) → the
- * declared default. A dangling ref renders the declared default.
+ * face's default (`getWallFaceDefault`: the interior paint, or raw drywall on
+ * the exterior side). A dangling ref renders the face's default.
  */
 export type WallFaceChainFinish = {
     kind: 'ref';
@@ -78,7 +79,42 @@ export type WallFaceChainFinish = {
     kind: 'default';
     ref: string;
 };
-export declare function resolveWallFaceChain(wall: Pick<WallNode, 'slots' | 'legacyFaceMaterials' | 'material' | 'materialPreset'>, face: WallFace): WallFaceChainFinish;
+export declare function resolveWallFaceChain(wall: Pick<WallNode, 'slots' | 'legacyFaceMaterials' | 'material' | 'materialPreset'> & Partial<Pick<WallNode, 'frontSide' | 'backSide'>>, face: WallFace): WallFaceChainFinish;
+export type WallFaceStretchSource = 'room_face_override' | 'room_wall_material' | 'wall_face';
+/** A stretch of one wall face that shows one finish. */
+export type WallFaceStretch = {
+    /** Metres from the wall's start, along its reference line. */
+    u0: number;
+    u1: number;
+    source: WallFaceStretchSource;
+    /** The finish ref that shows; null when the wall's own finish is an inline spec naming no preset. */
+    ref: string | null;
+    /** The room that gives the finish (a room source only). */
+    roomId?: string;
+    roomName?: string;
+    /** How the wall's own face reached `ref` (a `wall_face` source only): chosen, legacy or default. */
+    chain?: WallFaceChainFinish['kind'];
+};
+/** A paint region on a face: it shows over the stretches it covers (`v` is metres above the face's base). */
+export type WallFacePaintRegion = {
+    id: string;
+    ref: string;
+    u0?: number;
+    u1?: number;
+    v0?: number;
+    v1?: number;
+};
+export type WallFaceFinishes = Record<WallFace, {
+    stretches: WallFaceStretch[];
+    paintRegions: WallFacePaintRegion[];
+}>;
+/**
+ * What each face of a wall shows, for a reader that cannot render it: the resolution order above run
+ * along the face, with the room that gives each stretch. The renderer and the paint tool resolve a
+ * face through the same layout, so this agrees with both. Paint regions sit over the stretches and
+ * are listed apart; what is not modelled here: exterior assembly cladding, a ref that does not resolve.
+ */
+export declare function describeWallFaceFinishes(wall: WallNode, nodes: Readonly<Record<string, AnyNode | undefined>>): WallFaceFinishes;
 export type WallPaintRole = {
     kind: 'slot';
     slotId: string;

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

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

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

@@ -1,6 +1,6 @@
 import { containsPoint } from '../../lib/polygon-boolean.js';
 import { sampleWallPointsForRoomDetection, WALL_JUNCTION_TOLERANCE } from '../../lib/room-graph.js';
-import { getEffectiveWallFaceMaterial, WALL_FACE_REGION_LIMIT, WALL_SLOT_DEFAULT, } from '../../schema/nodes/wall.js';
+import { getEffectiveWallFaceMaterial, getWallFaceDefault, WALL_FACE_REGION_LIMIT, } from '../../schema/nodes/wall.js';
 import { isCurvedWall } from './wall-curve.js';
 const FACE_PROBE = 0.01;
 const SPLIT_EPSILON = 1e-6;
@@ -232,7 +232,75 @@ export function resolveWallFaceChain(wall, face) {
     const spec = getEffectiveWallFaceMaterial(wall, face);
     if (spec.materialPreset || spec.material)
         return { kind: 'legacy', spec };
-    return { kind: 'default', ref: WALL_SLOT_DEFAULT[face] };
+    return { kind: 'default', ref: getWallFaceDefault(wall, face) };
+}
+const toMillimetre = (value) => Math.round(value * 1000) / 1000;
+/**
+ * What each face of a wall shows, for a reader that cannot render it: the resolution order above run
+ * along the face, with the room that gives each stretch. The renderer and the paint tool resolve a
+ * face through the same layout, so this agrees with both. Paint regions sit over the stretches and
+ * are listed apart; what is not modelled here: exterior assembly cladding, a ref that does not resolve.
+ */
+export function describeWallFaceFinishes(wall, nodes) {
+    const layout = buildWallFinishLayout(wall, getWallLevelZones(wall, nodes));
+    const underRegions = { ...layout, regions: { a: [], b: [] } };
+    const read = (face) => {
+        const cuts = new Set([0, layout.length]);
+        for (const span of layout.spans[face])
+            for (const u of [span.u0, span.u1])
+                if (u > SPLIT_EPSILON && u < layout.length - SPLIT_EPSILON)
+                    cuts.add(u);
+        const stations = [...cuts].sort((x, y) => x - y);
+        const own = resolveWallFaceChain(wall, face);
+        const ownRef = own.kind === 'legacy' ? (own.spec.materialPreset ?? null) : own.ref;
+        const stretches = [];
+        const push = (stretch) => {
+            const last = stretches.at(-1);
+            if (last &&
+                last.source === stretch.source &&
+                last.ref === stretch.ref &&
+                last.roomId === stretch.roomId &&
+                last.chain === stretch.chain &&
+                stretch.u0 - last.u1 < SPLIT_EPSILON)
+                last.u1 = stretch.u1;
+            else
+                stretches.push(stretch);
+        };
+        for (let index = 0; index + 1 < stations.length; index += 1) {
+            const u0 = toMillimetre(stations[index]);
+            const u1 = toMillimetre(stations[index + 1]);
+            if (u1 - u0 < SPLIT_EPSILON)
+                continue;
+            const hit = resolveWallFinish(underRegions, face, (u0 + u1) / 2, 0);
+            if (hit.source === 'override' || hit.source === 'zone') {
+                const zone = nodes[hit.zoneId];
+                const roomName = zone?.type === 'zone' ? zone.name : undefined;
+                push({
+                    u0,
+                    u1,
+                    source: hit.source === 'override' ? 'room_face_override' : 'room_wall_material',
+                    ref: hit.ref,
+                    roomId: hit.zoneId,
+                    ...(roomName ? { roomName } : {}),
+                });
+            }
+            else
+                push({ u0, u1, source: 'wall_face', ref: ownRef, chain: own.kind });
+        }
+        // A wall with no length has no stretch to read; its own face is what it would show.
+        if (stretches.length === 0)
+            stretches.push({ u0: 0, u1: 0, source: 'wall_face', ref: ownRef, chain: own.kind });
+        const paintRegions = layout.regions[face].map((region) => ({
+            id: region.id,
+            ref: region.finish,
+            ...(region.u0 !== undefined ? { u0: toMillimetre(region.u0) } : {}),
+            ...(region.u1 !== undefined ? { u1: toMillimetre(region.u1) } : {}),
+            ...(region.v0 !== undefined ? { v0: toMillimetre(region.v0) } : {}),
+            ...(region.v1 !== undefined ? { v1: toMillimetre(region.v1) } : {}),
+        }));
+        return { stretches, paintRegions };
+    };
+    return { a: read('a'), b: read('b') };
 }
 export function wallRegionRole(regionId) {
     return `region:${regionId}`;

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

@@ -56,11 +56,11 @@ export function getWallPlanFootprint(wallNode, miterData) {
     };
     const polygon = [pStartRight, pEndRight];
     if (endJunction) {
-        polygon.push(endJunction.closing ?? wallEnd);
+        polygon.push(...(endJunction.closingPath ?? [endJunction.closing ?? wallEnd]));
     }
     polygon.push(pEndLeft, pStartLeft);
     if (startJunction) {
-        polygon.push(startJunction.closing ?? wallStart);
+        polygon.push(...(startJunction.closingPath ?? [startJunction.closing ?? wallStart]));
     }
     return polygon;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"wall-merge.d.ts","sourceRoot":"","sources":["../../../src/systems/wall/wall-merge.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,OAAO,EACZ,KAAK,SAAS,EAMd,KAAK,cAAc,EACnB,KAAK,QAAQ,EACb,KAAK,QAAQ,EACd,MAAM,cAAc,CAAA;AAGrB,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAA;AAK1D,MAAM,MAAM,oBAAoB,GAAG;IAAE,EAAE,EAAE,SAAS,CAAC;IAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAA;CAAE,CAAA;AAY5E,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,OAAO,GAAG,KAAK,CAAC,EACrC,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,GACtB,OAAO,GAAG,KAAK,GAAG,IAAI,CAIxB;AAMD;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAC/B,CAAC,EAAE,QAAQ,EACX,CAAC,EAAE,QAAQ,EACX,OAAO,EAAE;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,MAAM,CAAA;CAAE,GACjE,MAAM,GAAG,IAAI,CA+Bf;AA4CD;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,SAAS,QAAQ,EAAE,EAC1B,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAC7B,SAAS,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,GAC1B,cAAc,EAAE,GAAG,IAAI,CAqEzB;AAED;;;;;;GAMG;AACH,wBAAgB,wBAAwB,CACtC,KAAK,EAAE,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,EACjC,OAAO,EAAE,QAAQ,EACjB,SAAS,EAAE,QAAQ,EACnB,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAC7B,SAAS,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,GAC1B,KAAK,CAAC;IAAE,EAAE,EAAE,SAAS,CAAC;IAAC,IAAI,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAA;CAAE,CAAC,GAAG,IAAI,CA+C1D;AAED,wBAAgB,uBAAuB,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,WAE/D;AAED,wBAAgB,4BAA4B,CAC1C,CAAC,EAAE,QAAQ,EACX,CAAC,EAAE,QAAQ,EACX,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,WAgB9B;AAED,wBAAgB,0BAA0B,CACxC,OAAO,EAAE,QAAQ,EACjB,SAAS,EAAE,QAAQ,EACnB,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,GAC5B;IAAE,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAAC,GAAG,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,CAkBpD;AAyBD,wBAAgB,gCAAgC,CAC9C,OAAO,EAAE,QAAQ,EACjB,SAAS,EAAE,QAAQ,EACnB,YAAY,EAAE,SAAS,EACvB,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAC7B,SAAS,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAC3B,KAAK,EAAE,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,GAChC,oBAAoB,EAAE,CAyDxB;AAED;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAC3B,KAAK,EAAE,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,EACjC,OAAO,EAAE,SAAS,SAAS,EAAE,GAC5B;IAAE,OAAO,EAAE,mBAAmB,CAAC;IAAC,MAAM,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAA;CAAE,CA8F1D"}
+{"version":3,"file":"wall-merge.d.ts","sourceRoot":"","sources":["../../../src/systems/wall/wall-merge.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,OAAO,EACZ,KAAK,SAAS,EAMd,KAAK,cAAc,EACnB,KAAK,QAAQ,EACb,KAAK,QAAQ,EACd,MAAM,cAAc,CAAA;AAGrB,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAA;AAK1D,MAAM,MAAM,oBAAoB,GAAG;IAAE,EAAE,EAAE,SAAS,CAAC;IAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAA;CAAE,CAAA;AAY5E,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,OAAO,GAAG,KAAK,CAAC,EACrC,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,GACtB,OAAO,GAAG,KAAK,GAAG,IAAI,CAIxB;AAMD;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAC/B,CAAC,EAAE,QAAQ,EACX,CAAC,EAAE,QAAQ,EACX,OAAO,EAAE;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,MAAM,CAAA;CAAE,GACjE,MAAM,GAAG,IAAI,CAiCf;AA4CD;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,SAAS,QAAQ,EAAE,EAC1B,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAC7B,SAAS,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,GAC1B,cAAc,EAAE,GAAG,IAAI,CAqEzB;AAED;;;;;;GAMG;AACH,wBAAgB,wBAAwB,CACtC,KAAK,EAAE,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,EACjC,OAAO,EAAE,QAAQ,EACjB,SAAS,EAAE,QAAQ,EACnB,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAC7B,SAAS,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,GAC1B,KAAK,CAAC;IAAE,EAAE,EAAE,SAAS,CAAC;IAAC,IAAI,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAA;CAAE,CAAC,GAAG,IAAI,CA+C1D;AAED,wBAAgB,uBAAuB,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,WAE/D;AAED,wBAAgB,4BAA4B,CAC1C,CAAC,EAAE,QAAQ,EACX,CAAC,EAAE,QAAQ,EACX,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,WAgB9B;AAED,wBAAgB,0BAA0B,CACxC,OAAO,EAAE,QAAQ,EACjB,SAAS,EAAE,QAAQ,EACnB,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,GAC5B;IAAE,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAAC,GAAG,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,CAkBpD;AA8BD,wBAAgB,gCAAgC,CAC9C,OAAO,EAAE,QAAQ,EACjB,SAAS,EAAE,QAAQ,EACnB,YAAY,EAAE,SAAS,EACvB,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAC7B,SAAS,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAC3B,KAAK,EAAE,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,GAChC,oBAAoB,EAAE,CAyDxB;AAED;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAC3B,KAAK,EAAE,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,EACjC,OAAO,EAAE,SAAS,SAAS,EAAE,GAC5B;IAAE,OAAO,EAAE,mBAAmB,CAAC;IAAC,MAAM,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAA;CAAE,CA2G1D"}

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

@@ -46,10 +46,12 @@ export function wallStyleMismatch(a, b, options) {
         : (a.height == null) !== (b.height == null) ||
             Math.abs((a.height ?? 0) - (b.height ?? 0)) > 1e-6)
         return 'height';
-    // Faces are compared as the merged wall will carry them: b read in a's direction.
+    // Faces are compared as the merged wall will carry them: b read in a's direction. An unpainted
+    // face's default follows its room side, which room detection reclassifies, so it is set aside.
+    const painted = (wall) => ({ ...wall, frontSide: undefined, backSide: undefined });
     for (const face of ['a', 'b']) {
-        if (JSON.stringify(resolveWallFaceChain(a, face)) !==
-            JSON.stringify(resolveWallFaceChain(alignedB, face)))
+        if (JSON.stringify(resolveWallFaceChain(painted(a), face)) !==
+            JSON.stringify(resolveWallFaceChain(painted(alignedB), face)))
             return `side ${face.toUpperCase()} finish`;
     }
     if (wallTrimSignature(a) !== wallTrimSignature(alignedB))
@@ -260,13 +262,19 @@ export function resolveMergedWallEndpoints(primary, secondary, sharedPoint) {
  * 0 front / π back). A wall read backwards turns that frame by 180° about Y,
  * so the face and the yaw swap and the caller mirrors depth. Hinges, handles
  * and swing hang off the node's own yaw (the plan symbol flips them from it),
- * so they stay as stored.
+ * so they stay as stored. Door and window casing is kept per wall face, so it
+ * swaps faces too and stays on the same side of the wall.
  */
 function reversedWallChildPatch(child) {
     const patch = {};
     if ('side' in child && (child.side === 'front' || child.side === 'back')) {
         patch.side = child.side === 'front' ? 'back' : 'front';
     }
+    if (child.type === 'door' || child.type === 'window') {
+        const [faceA, faceB] = [child.casingFaceA === true, child.casingFaceB === true];
+        if (faceA !== faceB)
+            Object.assign(patch, { casingFaceA: faceB, casingFaceB: faceA });
+    }
     if ('rotation' in child && Array.isArray(child.rotation)) {
         const yaw = child.rotation[1] + Math.PI;
         patch.rotation = [
@@ -355,13 +363,26 @@ export function planWallMerge(nodes, wallIds) {
         }
         if (!(next && joint))
             throw Error('Merge walls that touch end to end.');
+        if (!areWallsCollinearAcrossPoint(merged, next, joint))
+            throw Error('Merge walls that continue in a straight line.');
+        // A wall meeting the joint from the side stays T'd into the merged wall's
+        // body there; one running along the line would be buried in it.
+        const runX = merged.end[0] - merged.start[0];
+        const runZ = merged.end[1] - merged.start[1];
+        const alongRun = (wall) => {
+            const free = getWallFreeEndpoint(wall, joint);
+            const x = free[0] - joint[0];
+            const z = free[1] - joint[1];
+            const length = Math.hypot(x, z) * Math.hypot(runX, runZ);
+            return length < 1e-12 || Math.abs(x * runZ - z * runX) / length < 1e-4;
+        };
         const atJoint = Object.values(virtual).filter((node) => node?.type === 'wall' &&
+            node.id !== merged.id &&
+            node.id !== next.id &&
             (node.parentId ?? null) === levelId &&
             getWallEndpointAtPoint(node, joint) !== null);
-        if (atJoint.length !== 2)
+        if (atJoint.some(alongRun))
             throw Error('Another wall meets this joint, so merging would disconnect it.');
-        if (!areWallsCollinearAcrossPoint(merged, next, joint))
-            throw Error('Merge walls that continue in a straight line.');
         const mismatch = wallStyleMismatch(merged, next, {
             sides: false,
             heightOf: (wall) => getWallEffectiveHeightForNodes(wall, virtual),

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

@@ -13,6 +13,7 @@ type WallIntersections = Map<string, {
     left?: Point2D;
     right?: Point2D;
     closing?: Point2D;
+    closingPath?: Point2D[];
 }>;
 type JunctionData = Map<string, WallIntersections>;
 declare function pointToKey(p: Point2D, tolerance?: number): string;

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

@@ -1 +1 @@
-{"version":3,"file":"wall-mitering.d.ts","sourceRoot":"","sources":["../../../src/systems/wall/wall-mitering.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AAQ5C,MAAM,WAAW,OAAO;IACtB,CAAC,EAAE,MAAM,CAAA;IACT,CAAC,EAAE,MAAM,CAAA;CACV;AAED,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,OAAO,CAAA;IAChB,QAAQ,EAAE,OAAO,CAAA;IACjB,SAAS,EAAE,OAAO,CAAA;IAClB,UAAU,EAAE,OAAO,CAAA;CACpB;AASD,KAAK,iBAAiB,GAAG,GAAG,CAAC,MAAM,EAAE;IAAE,IAAI,CAAC,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,OAAO,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC,CAAA;AAG5F,KAAK,YAAY,GAAG,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAA;AAmBlD,iBAAS,UAAU,CAAC,CAAC,EAAE,OAAO,EAAE,SAAS,SAAY,GAAG,MAAM,CAG7D;AA8CD,UAAU,QAAQ;IAChB,cAAc,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,QAAQ,CAAC;QAAC,OAAO,EAAE,OAAO,GAAG,KAAK,GAAG,aAAa,CAAA;KAAE,CAAC,CAAA;IACnF,YAAY,EAAE,OAAO,CAAA;CACtB;AA2XD,MAAM,WAAW,aAAa;IAE5B,YAAY,EAAE,YAAY,CAAA;IAE1B,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;CACjC;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,WAAW,SAAI,GAAG,aAAa,CAUtF;AAED,wBAAgB,0BAA0B,CACxC,IAAI,EAAE,QAAQ,EACd,SAAS,EAAE,aAAa,EACxB,WAAW,SAAI,GACd,uBAAuB,GAAG,IAAI,CA2BhC;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,QAAQ,EAAE,EAAE,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,CA8C/F;AAGD,OAAO,EAAE,UAAU,EAAE,CAAA"}
+{"version":3,"file":"wall-mitering.d.ts","sourceRoot":"","sources":["../../../src/systems/wall/wall-mitering.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AAQ5C,MAAM,WAAW,OAAO;IACtB,CAAC,EAAE,MAAM,CAAA;IACT,CAAC,EAAE,MAAM,CAAA;CACV;AAED,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,OAAO,CAAA;IAChB,QAAQ,EAAE,OAAO,CAAA;IACjB,SAAS,EAAE,OAAO,CAAA;IAClB,UAAU,EAAE,OAAO,CAAA;CACpB;AAWD,KAAK,iBAAiB,GAAG,GAAG,CAC1B,MAAM,EACN;IAAE,IAAI,CAAC,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,OAAO,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,WAAW,CAAC,EAAE,OAAO,EAAE,CAAA;CAAE,CAChF,CAAA;AAGD,KAAK,YAAY,GAAG,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAA;AAmBlD,iBAAS,UAAU,CAAC,CAAC,EAAE,OAAO,EAAE,SAAS,SAAY,GAAG,MAAM,CAG7D;AA8CD,UAAU,QAAQ;IAChB,cAAc,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,QAAQ,CAAC;QAAC,OAAO,EAAE,OAAO,GAAG,KAAK,GAAG,aAAa,CAAA;KAAE,CAAC,CAAA;IACnF,YAAY,EAAE,OAAO,CAAA;CACtB;AA4fD,MAAM,WAAW,aAAa;IAE5B,YAAY,EAAE,YAAY,CAAA;IAE1B,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;CACjC;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,WAAW,SAAI,GAAG,aAAa,CAUtF;AAED,wBAAgB,0BAA0B,CACxC,IAAI,EAAE,QAAQ,EACd,SAAS,EAAE,aAAa,EACxB,WAAW,SAAI,GACd,uBAAuB,GAAG,IAAI,CA2BhC;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,QAAQ,EAAE,EAAE,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,CA8C/F;AAGD,OAAO,EAAE,UAAU,EAAE,CAAA"}