@pascal-app/nodes 1.0.0-beta.5 → 1.0.1

package/dist/cabinet/floorplan-move.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"floorplan-move.d.ts","sourceRoot":"","sources":["../../src/cabinet/floorplan-move.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,iBAAiB,IAAI,qBAAqB,EAG/C,KAAK,mBAAmB,EAMzB,MAAM,kBAAkB,CAAA;AA8GzB;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,gCAAgC,EAAE,mBAAmB,CAAC,qBAAqB,CAiHvF,CAAA"}
+{"version":3,"file":"floorplan-move.d.ts","sourceRoot":"","sources":["../../src/cabinet/floorplan-move.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,iBAAiB,IAAI,qBAAqB,EAG/C,KAAK,mBAAmB,EAMzB,MAAM,kBAAkB,CAAA;AAqHzB;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,gCAAgC,EAAE,mBAAmB,CAAC,qBAAqB,CA6LvF,CAAA"}

package/dist/cabinet/floorplan-move.js

@@ -1,7 +1,7 @@
 import { createSceneApi, useLiveNodeOverrides, useScene, } from '@pascal-app/core';
 import { isAlignmentGuideActive, isGridSnapActive, isMagneticSnapActive, useAlignmentGuides, useEditor, } from '@pascal-app/editor';
 import { cabinetModuleParentFrame } from './move-frame';
-import { bumpCabinetRunLayoutRevision, syncCornerRunsFromSourceModule } from './run-ops';
+import { bumpCabinetRunLayoutRevision, previewCornerRunsFromRunSources, syncCornerRunsFromSourceModule, } from './run-ops';
 import { resolveCabinetModuleWallSnapLocal } from './wall-snap';
 function alignmentGuideFromParentFrameMatch(match) {
     return {
@@ -22,7 +22,7 @@ function mergeSceneUpdate(updates, id, patch) {
         ...patch,
     });
 }
-function collectCabinetModuleMoveCommitUpdates({ lastLocal, moduleId, runId, }) {
+function collectCabinetModuleMoveCommitUpdates({ lastLocal, moduleId, previousModule, runId, }) {
     const baseNodes = useScene.getState().nodes;
     const nodes = { ...baseNodes };
     const updates = new Map();
@@ -75,6 +75,7 @@ function collectCabinetModuleMoveCommitUpdates({ lastLocal, moduleId, runId, })
     if (liveModule?.type === 'cabinet-module') {
         syncCornerRunsFromSourceModule({
             module: liveModule,
+            previousModule,
             run: sceneApi.get(runId) ?? liveRun,
             sceneApi,
         });
@@ -100,9 +101,75 @@ export const cabinetModuleFloorplanMoveTarget = ({ node, nodes, }) => {
     const run = cabinetModuleParentFrame.resolveParent(node, nodes);
     const originalLocal = [...node.position];
     let lastLocal = originalLocal;
+    let lastPositionValid = true;
+    let forcePlace = false;
+    const initialPreviewSceneApi = createSceneApi(useScene);
+    const initialCornerPreview = run
+        ? previewCornerRunsFromRunSources({
+            initialOverrides: [[moduleId, { position: originalLocal }]],
+            previousModules: [node],
+            run,
+            sceneApi: initialPreviewSceneApi,
+        })
+        : [];
+    const affectedIds = new Set([moduleId, ...(run ? [run.id] : [])]);
+    for (const [id] of initialCornerPreview)
+        affectedIds.add(id);
+    let activePreviewIds = new Set();
+    const publishPreview = (position) => {
+        if (!run) {
+            useLiveNodeOverrides.getState().set(moduleId, { position });
+            return;
+        }
+        const entries = previewCornerRunsFromRunSources({
+            initialOverrides: [[moduleId, { position }]],
+            previousModules: [node],
+            run,
+            sceneApi: createSceneApi(useScene),
+        });
+        const nextIds = new Set(entries.map(([id]) => id));
+        for (const id of activePreviewIds) {
+            if (!nextIds.has(id))
+                useLiveNodeOverrides.getState().clear(id);
+        }
+        useLiveNodeOverrides.getState().setMany(entries);
+        activePreviewIds = nextIds;
+        const scene = useScene.getState();
+        scene.markDirty(run.id);
+        for (const [id] of entries) {
+            if (scene.nodes[id])
+                scene.markDirty(id);
+        }
+    };
     const session = {
-        affectedIds: run ? [moduleId, run.id] : [moduleId],
-        apply({ planPoint }) {
+        affectedIds: [...affectedIds],
+        apply({ planPoint, modifiers }) {
+            forcePlace = modifiers.altKey;
+            if ((isGridSnapActive() || isMagneticSnapActive()) && run?.parentId) {
+                const rawLocal = cabinetModuleParentFrame.planToLocal(run, planPoint[0], originalLocal[1], planPoint[1], useScene.getState().nodes);
+                const wallLocal = resolveCabinetModuleWallSnapLocal({
+                    candidateLocal: rawLocal,
+                    gridStep: isGridSnapActive() ? useEditor.getState().gridSnapStep : 0,
+                    module: node,
+                    nodes: useScene.getState().nodes,
+                    parentLevelId: run.parentId,
+                    run,
+                });
+                if (wallLocal) {
+                    lastLocal = wallLocal;
+                    lastPositionValid = cabinetModuleParentFrame.isValidPosition
+                        ? cabinetModuleParentFrame.isValidPosition({
+                            node: { ...node, position: wallLocal },
+                            parent: run,
+                            position: wallLocal,
+                            nodes: useScene.getState().nodes,
+                        })
+                        : true;
+                    useAlignmentGuides.getState().clear();
+                    publishPreview(wallLocal);
+                    return;
+                }
+            }
             const snap = (value) => isGridSnapActive()
                 ? Math.round(value / useEditor.getState().gridSnapStep) *
                     useEditor.getState().gridSnapStep
@@ -113,7 +180,8 @@ export const cabinetModuleFloorplanMoveTarget = ({ node, nodes, }) => {
             // same as the generic overlay would have done.
             if (!run) {
                 lastLocal = [planX, originalLocal[1], planZ];
-                useLiveNodeOverrides.getState().set(moduleId, { position: lastLocal });
+                lastPositionValid = true;
+                publishPreview(lastLocal);
                 return;
             }
             let local = cabinetModuleParentFrame.planToLocal(run, planX, originalLocal[1], planZ, useScene.getState().nodes);
@@ -133,28 +201,23 @@ export const cabinetModuleFloorplanMoveTarget = ({ node, nodes, }) => {
                     }
                 }
             }
-            // Wall attachment snap — 2D parity with the 3D move tool's
-            // `groupMoveSnap` pass: active in every snapping mode except Off.
-            if ((isGridSnapActive() || isMagneticSnapActive()) && run.parentId) {
-                const snapped = resolveCabinetModuleWallSnapLocal({
-                    candidateLocal: local,
-                    module: node,
-                    nodes: useScene.getState().nodes,
-                    parentLevelId: run.parentId,
-                    run,
-                });
-                if (snapped)
-                    local = snapped;
-            }
             lastLocal = local;
-            useLiveNodeOverrides.getState().set(moduleId, { position: local });
-            useScene.getState().markDirty(run.id);
+            lastPositionValid = cabinetModuleParentFrame.isValidPosition
+                ? cabinetModuleParentFrame.isValidPosition({
+                    node: { ...node, position: local },
+                    parent: run,
+                    position: local,
+                    nodes: useScene.getState().nodes,
+                })
+                : true;
+            publishPreview(local);
         },
         canCommit() {
             const live = useScene.getState().nodes[moduleId];
             if (live?.type !== 'cabinet-module')
                 return false;
-            return lastLocal[0] !== originalLocal[0] || lastLocal[2] !== originalLocal[2];
+            const changed = lastLocal[0] !== originalLocal[0] || lastLocal[2] !== originalLocal[2];
+            return changed && (lastPositionValid || forcePlace);
         },
         commit() {
             const scene = useScene.getState();
@@ -165,7 +228,12 @@ export const cabinetModuleFloorplanMoveTarget = ({ node, nodes, }) => {
                 return;
             }
             const runId = run.id;
-            const updates = collectCabinetModuleMoveCommitUpdates({ lastLocal, moduleId, runId });
+            const updates = collectCabinetModuleMoveCommitUpdates({
+                lastLocal,
+                moduleId,
+                previousModule: node,
+                runId,
+            });
             if (updates) {
                 scene.updateNodes(updates);
                 return;
@@ -182,6 +250,7 @@ export const cabinetModuleFloorplanMoveTarget = ({ node, nodes, }) => {
             if (liveModule?.type === 'cabinet-module') {
                 syncCornerRunsFromSourceModule({
                     module: liveModule,
+                    previousModule: node,
                     run: sceneApi.get(runId) ?? liveRun,
                     sceneApi,
                 });

package/dist/cabinet/geometry/cooktop.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cooktop.d.ts","sourceRoot":"","sources":["../../../src/cabinet/geometry/cooktop.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,KAAK,EAMN,MAAM,OAAO,CAAA;AAOd,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,6BAA6B,EAClC,KAAK,aAAa,EAMnB,MAAM,UAAU,CAAA;AACjB,OAAO,EAGL,KAAK,mBAAmB,EAWzB,MAAM,UAAU,CAAA;AAEjB,eAAO,MAAM,qBAAqB,QAAQ,CAAA;AAC1C,MAAM,MAAM,iBAAiB,GAAG;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAA;AA+BtE,MAAM,MAAM,iBAAiB,GAAG;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,CAAC,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAAA;AAgBhG,wBAAgB,aAAa,CAAC,MAAM,EAAE,aAAa,GAAG,iBAAiB,EAAE,CASxE;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,aAAa,GAAG,iBAAiB,EAAE,CAMzE;AA+SD,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,mBAAmB,EACzB,WAAW,EAAE,kBAAkB,EAC/B,IAAI,EAAE,6BAA6B,EACnC,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,QAoJd"}
+{"version":3,"file":"cooktop.d.ts","sourceRoot":"","sources":["../../../src/cabinet/geometry/cooktop.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,KAAK,EAMN,MAAM,OAAO,CAAA;AAQd,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,6BAA6B,EAClC,KAAK,aAAa,EAMnB,MAAM,UAAU,CAAA;AACjB,OAAO,EAGL,KAAK,mBAAmB,EAWzB,MAAM,UAAU,CAAA;AAEjB,eAAO,MAAM,qBAAqB,QAAQ,CAAA;AAC1C,MAAM,MAAM,iBAAiB,GAAG;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAA;AA+BtE,MAAM,MAAM,iBAAiB,GAAG;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,CAAC,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAAA;AAgBhG,wBAAgB,aAAa,CAAC,MAAM,EAAE,aAAa,GAAG,iBAAiB,EAAE,CASxE;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,aAAa,GAAG,iBAAiB,EAAE,CAMzE;AA+SD,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,mBAAmB,EACzB,WAAW,EAAE,kBAAkB,EAC/B,IAAI,EAAE,6BAA6B,EACnC,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,QAmJd"}

package/dist/cabinet/geometry/cooktop.js

@@ -1,4 +1,5 @@
 import { AdditiveBlending, BoxGeometry, CylinderGeometry, DoubleSide, Group, Mesh, MeshBasicMaterial, RingGeometry, SphereGeometry, TorusGeometry, } from 'three';
+import { cooktopFootprint } from '../appliance-layout';
 import { COOKTOP_FLAME_COUNT, cooktopFlameSeed, createCooktopFlameGeometry, updateCooktopFlameTube, } from '../cooktop-flame';
 import { compartmentCooktopActiveBurners, compartmentCooktopBurnersOn, compartmentCooktopKnobProgress, compartmentCooktopLayout, compartmentCooktopShowGrate, } from '../stack';
 import { addBox, applianceDisplayMaterial, cooktopBurnerMaterial, cooktopGlassMaterial, cooktopGrateMaterial, cooktopInductionActiveZoneMaterial, cooktopInductionZoneMaterial, cooktopKnobHitMaterial, cooktopKnobOnMaterial, cooktopTrimMaterial, createWorldScaleBoxGeometry, stampSlot, } from './shared';
@@ -192,8 +193,7 @@ export function addCooktopCompartment(group, node, compartment, type, topY, inde
     const knobProgress = compartmentCooktopKnobProgress(compartment, type);
     const burnersOn = activeBurners.size > 0 || compartmentCooktopBurnersOn(compartment);
     const name = type === 'cooktop-gas' ? `cabinet-cooktop-gas-${index}` : `cabinet-cooktop-induction-${index}`;
-    const frameWidth = Math.max(0.32, Math.min(node.width - 0.01, 0.76));
-    const frameDepth = Math.max(0.28, Math.min(node.depth - 0.04, 0.53));
+    const { width: frameWidth, depth: frameDepth } = cooktopFootprint(node);
     const surfaceWidth = Math.max(0.28, frameWidth - 0.026);
     const surfaceDepth = Math.max(0.24, frameDepth - 0.026);
     const surfaceThickness = 0.012;

package/dist/cabinet/geometry/fridge.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fridge.d.ts","sourceRoot":"","sources":["../../../src/cabinet/geometry/fridge.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,KAAK,EAAuB,MAAM,OAAO,CAAA;AAC/D,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,UAAU,CAAA;AAC5D,OAAO,EAIL,KAAK,mBAAmB,EACxB,KAAK,oBAAoB,EAc1B,MAAM,UAAU,CAAA;AAy3BjB,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,mBAAmB,EACzB,SAAS,EAAE,oBAAoB,EAC/B,IAAI,EAAE,4BAA4B,EAClC,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,QA2Ld"}
+{"version":3,"file":"fridge.d.ts","sourceRoot":"","sources":["../../../src/cabinet/geometry/fridge.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,KAAK,EAAuB,MAAM,OAAO,CAAA;AAC/D,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,UAAU,CAAA;AAE5D,OAAO,EAIL,KAAK,mBAAmB,EACxB,KAAK,oBAAoB,EAc1B,MAAM,UAAU,CAAA;AAy3BjB,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,mBAAmB,EACzB,SAAS,EAAE,oBAAoB,EAC/B,IAAI,EAAE,4BAA4B,EAClC,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,QAqOd"}

package/dist/cabinet/geometry/fridge.js

@@ -1,4 +1,5 @@
 import { BoxGeometry, Group, Mesh } from 'three';
+import { addHandleFeature, buildFrontGeometry } from './fronts';
 import { addApplianceHandle, addBox, applianceDisplayMaterial, microwaveScreenMaterial, refrigeratorBinMaterial, refrigeratorBrassAccentMaterial, refrigeratorDarkTrimMaterial, refrigeratorDrawerMaterial, refrigeratorLightMaterial, refrigeratorLinerAccentMaterial, refrigeratorLinerMaterial, refrigeratorSealMaterial, refrigeratorSilverMaterial, refrigeratorWaterMaterial, roundedButtonGeometry, stampSlot, } from './shared';
 function addFridgeWireBasket(group, materials, x, width, depth, y, zCenter, name) {
     const bar = 0.006;
@@ -388,6 +389,29 @@ export function addFridgeCompartment(group, node, materials, kind, faceWidth, fa
         const doorHeight = Math.max(0.01, layout.height - doorGap * 2);
         const doorCenterX = shellWidth * layout.xFraction;
         const doorCenterY = shellCenterY + layout.y;
-        addFridgeLeaf(group, materials, doorWidth, doorHeight, layout.hinge, doorCenterX, doorCenterY, frontZ, `${name}-door-${layout.key}`, layout.section, node.operationState ?? 0);
+        const doorName = `${name}-door-${layout.key}`;
+        if (node.panelReady) {
+            const hingeGroup = new Group();
+            hingeGroup.name = `${doorName}-hinge`;
+            hingeGroup.position.set(layout.hinge === 'left' ? doorCenterX - doorWidth / 2 : doorCenterX + doorWidth / 2, doorCenterY, frontZ);
+            hingeGroup.rotation.y =
+                (layout.hinge === 'left' ? -1 : 1) * (Math.PI * 0.62) * (node.operationState ?? 0);
+            hingeGroup.userData.cabinetPose = {
+                type: 'rotate',
+                axis: 'y',
+                angle: (layout.hinge === 'left' ? -1 : 1) * (Math.PI * 0.62),
+            };
+            const panel = stampSlot(new Mesh(buildFrontGeometry(node, doorWidth, doorHeight, false, layout.hinge), materials.front), 'front');
+            panel.name = `${doorName}-panel`;
+            panel.position.x = layout.hinge === 'left' ? doorWidth / 2 : -doorWidth / 2;
+            panel.castShadow = true;
+            panel.receiveShadow = true;
+            addHandleFeature(panel, node, materials, doorWidth, doorHeight, layout.hinge, true, false, `${doorName}-handle`);
+            hingeGroup.add(panel);
+            group.add(hingeGroup);
+        }
+        else {
+            addFridgeLeaf(group, materials, doorWidth, doorHeight, layout.hinge, doorCenterX, doorCenterY, frontZ, doorName, layout.section, node.operationState ?? 0);
+        }
     }
 }

package/dist/cabinet/geometry/fronts.d.ts

@@ -2,6 +2,10 @@ import { type BufferGeometry, Group, type Material, type Object3D } from 'three'
 import { type CabinetGeometryNode, type CabinetSlotMaterials } from './shared';
 export declare function buildFrontGeometry(node: CabinetGeometryNode, width: number, height: number, drawer: boolean, hinge?: 'left' | 'right' | null): BufferGeometry;
 export declare function addBarHandle(group: Object3D, position: [number, number, number], length: number, vertical: boolean, name: string, material: Material): void;
+export declare function addHandleFeature(group: Object3D, node: CabinetGeometryNode, materials: CabinetSlotMaterials, width: number, height: number, hinge: 'left' | 'right' | null, vertical: boolean, drawer?: boolean, name?: string, placement?: {
+    x?: number;
+    y?: number;
+}): void;
 export declare function addDoorFronts(group: Group, node: CabinetGeometryNode, materials: CabinetSlotMaterials, openingWidth: number, openingHeight: number, centerX: number, centerY: number, frontZ: number, doorType: 'single-left' | 'single-right' | 'double' | 'glass'): void;
 export declare function addSinkFalseFront(group: Group, node: CabinetGeometryNode, materials: CabinetSlotMaterials, faceWidth: number, faceHeight: number, centerY: number, frontZ: number, index: number): void;
 export declare function addShelfBoards(group: Group, materials: CabinetSlotMaterials, openingWidth: number, openingDepth: number, board: number, y0: number, height: number, count: number, centerX?: number): void;

package/dist/cabinet/geometry/fronts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fronts.d.ts","sourceRoot":"","sources":["../../../src/cabinet/geometry/fronts.ts"],"names":[],"mappings":"AAOA,OAAO,EAEL,KAAK,cAAc,EAGnB,KAAK,EACL,KAAK,QAAQ,EAIb,KAAK,QAAQ,EAGd,MAAM,OAAO,CAAA;AACd,OAAO,EAEL,KAAK,mBAAmB,EACxB,KAAK,oBAAoB,EAG1B,MAAM,UAAU,CAAA;AAoSjB,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,mBAAmB,EACzB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,OAAO,EACf,KAAK,GAAE,MAAM,GAAG,OAAO,GAAG,IAAW,GACpC,cAAc,CAUhB;AAsBD,wBAAgB,YAAY,CAC1B,KAAK,EAAE,QAAQ,EACf,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAClC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,OAAO,EACjB,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,QAAQ,QA4BnB;AA6PD,wBAAgB,aAAa,CAC3B,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,mBAAmB,EACzB,SAAS,EAAE,oBAAoB,EAC/B,YAAY,EAAE,MAAM,EACpB,aAAa,EAAE,MAAM,EACrB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,aAAa,GAAG,cAAc,GAAG,QAAQ,GAAG,OAAO,QA8C9D;AAED,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,mBAAmB,EACzB,SAAS,EAAE,oBAAoB,EAC/B,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,QAgBd;AAED,wBAAgB,cAAc,CAC5B,KAAK,EAAE,KAAK,EACZ,SAAS,EAAE,oBAAoB,EAC/B,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,MAAM,EACpB,KAAK,EAAE,MAAM,EACb,EAAE,EAAE,MAAM,EACV,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,EACb,OAAO,SAAI,QAcZ;AAOD,wBAAgB,eAAe,CAC7B,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,mBAAmB,EACzB,SAAS,EAAE,oBAAoB,EAC/B,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,MAAM,EACf,EAAE,EAAE,MAAM,EACV,eAAe,EAAE,MAAM,EACvB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,QAiFjB"}
+{"version":3,"file":"fronts.d.ts","sourceRoot":"","sources":["../../../src/cabinet/geometry/fronts.ts"],"names":[],"mappings":"AAOA,OAAO,EAEL,KAAK,cAAc,EAGnB,KAAK,EACL,KAAK,QAAQ,EAIb,KAAK,QAAQ,EAGd,MAAM,OAAO,CAAA;AACd,OAAO,EAEL,KAAK,mBAAmB,EACxB,KAAK,oBAAoB,EAG1B,MAAM,UAAU,CAAA;AAoSjB,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,mBAAmB,EACzB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,OAAO,EACf,KAAK,GAAE,MAAM,GAAG,OAAO,GAAG,IAAW,GACpC,cAAc,CAUhB;AAsBD,wBAAgB,YAAY,CAC1B,KAAK,EAAE,QAAQ,EACf,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAClC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,OAAO,EACjB,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,QAAQ,QA4BnB;AAwED,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,QAAQ,EACf,IAAI,EAAE,mBAAmB,EACzB,SAAS,EAAE,oBAAoB,EAC/B,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,GAAG,OAAO,GAAG,IAAI,EAC9B,QAAQ,EAAE,OAAO,EACjB,MAAM,UAAQ,EACd,IAAI,SAAW,EACf,SAAS,CAAC,EAAE;IAAE,CAAC,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,CAAC,EAAE,MAAM,CAAA;CAAE,QAwBvC;AAmJD,wBAAgB,aAAa,CAC3B,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,mBAAmB,EACzB,SAAS,EAAE,oBAAoB,EAC/B,YAAY,EAAE,MAAM,EACpB,aAAa,EAAE,MAAM,EACrB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,aAAa,GAAG,cAAc,GAAG,QAAQ,GAAG,OAAO,QA8C9D;AAED,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,mBAAmB,EACzB,SAAS,EAAE,oBAAoB,EAC/B,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,QAgBd;AAED,wBAAgB,cAAc,CAC5B,KAAK,EAAE,KAAK,EACZ,SAAS,EAAE,oBAAoB,EAC/B,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,MAAM,EACpB,KAAK,EAAE,MAAM,EACb,EAAE,EAAE,MAAM,EACV,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,EACb,OAAO,SAAI,QAcZ;AAOD,wBAAgB,eAAe,CAC7B,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,mBAAmB,EACzB,SAAS,EAAE,oBAAoB,EAC/B,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,MAAM,EACf,EAAE,EAAE,MAAM,EACV,eAAe,EAAE,MAAM,EACvB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,QAiFjB"}

package/dist/cabinet/geometry/fronts.js

@@ -313,7 +313,7 @@ function resolveHandlePlacement(node, width, height, drawer, hinge) {
         y: drawer ? (position === 'center' ? 0 : frameY) : position === 'center' ? 0 : defaultY,
     };
 }
-function addHandleFeature(group, node, materials, width, height, hinge, vertical, drawer = false, name = 'handle', placement) {
+export function addHandleFeature(group, node, materials, width, height, hinge, vertical, drawer = false, name = 'handle', placement) {
     const style = node.handleStyle ?? 'bar';
     if (style === 'none')
         return;

package/dist/cabinet/geometry/run.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../../src/cabinet/geometry/run.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AACvF,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AACpE,OAAO,EAAE,KAAK,EAAa,MAAM,OAAO,CAAA;AAMxC,wBAAgB,aAAa,CAAC,GAAG,CAAC,EAAE,eAAe,GAAG,iBAAiB,EAAE,CAIxE;AAED,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,WAAW,EACjB,GAAG,EAAE,eAAe,GAAG,SAAS,EAChC,OAAO,EAAE,aAAa,EACtB,QAAQ,EAAE,OAAO,EACjB,WAAW,EAAE,WAAW,EACxB,UAAU,EAAE,MAAM,GAAG,SAAS,GAC7B,KAAK,GAAG,IAAI,CA2Ld"}
+{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../../src/cabinet/geometry/run.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AACvF,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AACpE,OAAO,EAAE,KAAK,EAAQ,MAAM,OAAO,CAAA;AAMnC,wBAAgB,aAAa,CAAC,GAAG,CAAC,EAAE,eAAe,GAAG,iBAAiB,EAAE,CAIxE;AAED,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,WAAW,EACjB,GAAG,EAAE,eAAe,GAAG,SAAS,EAChC,OAAO,EAAE,aAAa,EACtB,QAAQ,EAAE,OAAO,EACjB,WAAW,EAAE,WAAW,EACxB,UAAU,EAAE,MAAM,GAAG,SAAS,GAC7B,KAAK,GAAG,IAAI,CAoId"}

package/dist/cabinet/geometry/run.js

@@ -1,8 +1,8 @@
-import { Group } from 'three';
-import { getRunSpanEnds, getRunSpans } from '../run-layout';
-import { compartmentSinkLayout, stackForCabinet } from '../stack';
+import { Group, Mesh } from 'three';
+import { getCabinetCountertopLayout } from '../countertop-layout';
+import { buildFrontGeometry } from './fronts';
 import { addBox, getCabinetSlotMaterials } from './shared';
-import { cutSinkIntoCountertop, sinkBowls } from './sink';
+import { cutSinkIntoCountertop } from './sink';
 export function getRunModules(ctx) {
     return (ctx?.children ?? []).filter((child) => child.type === 'cabinet-module');
 }
@@ -13,15 +13,9 @@ export function buildCabinetRunGeometry(node, ctx, shading, textures, colorPrese
     const group = new Group();
     const materials = getCabinetSlotMaterials(node, ctx, shading, textures, colorPreset, sceneTheme);
     const plinth = node.showPlinth ? node.plinthHeight : 0;
-    // A back-edge bar ledge occupies the back edge, superseding the seating
-    // overhang; side-edge bars leave it alone.
-    const backOverhang = node.withCountertop && node.barLedge?.edge !== 'back' ? node.countertopBackOverhang : 0;
-    const spans = getRunSpans(modules, { runTier: node.runTier });
-    const spanEnds = getRunSpanEnds(node, ctx, spans);
-    for (const span of spans) {
-        const spanIndex = spans.indexOf(span);
-        const barEdge = node.barLedge?.edge;
-        const { leftOverhang, rightOverhang, exposedLeft, exposedRight } = spanEnds[spanIndex];
+    for (const layout of getCabinetCountertopLayout(node, ctx)) {
+        const { span, backOverhang, countertop: slab, bar, sinkCuts } = layout;
+        const { leftOverhang, rightOverhang, exposedLeft, exposedRight } = layout.ends;
         const toeKickDepth = node.showPlinth
             ? Math.min(node.toeKickDepth, span.depth - node.boardThickness * 2)
             : 0;
@@ -34,40 +28,27 @@ export function buildCabinetRunGeometry(node, ctx, shading, textures, colorPrese
         if (node.withFinishedBack) {
             addBox(group, [span.width, span.topY, node.boardThickness], [span.centerX, span.topY / 2, span.minZ - node.boardThickness / 2], materials.front, 'cabinet-run-back-panel', 'front');
         }
-        // Raised bar counter: knee wall against one run face topped by a slab at
-        // bar height, cantilevered outward as knee space for stools. Side bars
-        // apply only to the run's end span on that side.
-        const spanHasBar = node.barLedge &&
-            span.hasCountertop &&
-            (barEdge === 'back' ||
-                (barEdge === 'left' && spanIndex === 0) ||
-                (barEdge === 'right' && spanIndex === spans.length - 1));
-        if (node.barLedge && spanHasBar) {
-            const slabThickness = Math.max(node.countertopThickness, 0.02);
-            const supportHeight = Math.max(0.1, node.barLedge.height - slabThickness);
-            // Knee wall spans the slab's full footprint on the shared axis so the
-            // two faces stay flush — a carcass-sized wall reads as a seam under
-            // the wider slab.
-            if (barEdge === 'back') {
-                const backZ = span.minZ - (node.withFinishedBack ? node.boardThickness : 0);
-                const barWidth = span.width + leftOverhang + rightOverhang;
-                const barCenterX = span.centerX + (rightOverhang - leftOverhang) / 2;
-                addBox(group, [barWidth, supportHeight, node.boardThickness], [barCenterX, supportHeight / 2, backZ - node.boardThickness / 2], materials.front, 'cabinet-run-bar-support', 'front');
-                addBox(group, [barWidth, slabThickness, node.barLedge.depth], [barCenterX, supportHeight + slabThickness / 2, backZ - node.barLedge.depth / 2], materials.countertop, 'cabinet-run-bar-slab', 'countertop');
-            }
-            else {
-                const sign = barEdge === 'left' ? -1 : 1;
-                const edgeX = barEdge === 'left' ? span.minX : span.maxX;
-                const slabDepth = span.depth + node.countertopOverhang + backOverhang;
-                const slabCenterZ = span.centerZ + (node.countertopOverhang - backOverhang) / 2;
-                addBox(group, [node.boardThickness, supportHeight, slabDepth], [edgeX + sign * (node.boardThickness / 2), supportHeight / 2, slabCenterZ], materials.front, 'cabinet-run-bar-support', 'front');
-                addBox(group, [node.barLedge.depth, slabThickness, slabDepth], [
-                    edgeX + sign * (node.barLedge.depth / 2),
-                    supportHeight + slabThickness / 2,
-                    slabCenterZ,
-                ], materials.countertop, 'cabinet-run-bar-slab', 'countertop');
+        if (node.withFinishedEnds) {
+            for (const side of ['left', 'right']) {
+                const exposed = side === 'left' ? exposedLeft : exposedRight;
+                if (!exposed)
+                    continue;
+                const endPanel = new Mesh(buildFrontGeometry(node, span.depth, span.topY, false, null), materials.front);
+                endPanel.name = `cabinet-run-finished-end-${side}`;
+                endPanel.position.set(side === 'left'
+                    ? span.minX - node.frontThickness / 2
+                    : span.maxX + node.frontThickness / 2, span.topY / 2, span.centerZ);
+                endPanel.rotation.y = side === 'left' ? -Math.PI / 2 : Math.PI / 2;
+                endPanel.castShadow = true;
+                endPanel.receiveShadow = true;
+                endPanel.userData.slotId = 'front';
+                group.add(endPanel);
             }
         }
+        if (bar) {
+            addBox(group, bar.support.size, bar.support.position, materials.front, 'cabinet-run-bar-support', 'front');
+            addBox(group, bar.slab.size, bar.slab.position, materials.countertop, 'cabinet-run-bar-slab', 'countertop');
+        }
         // Waterfall ends: the slab material drops to the floor on exposed run
         // ends (skipped where a neighbor abuts or a side bar occupies the end).
         if (node.withWaterfall && span.hasCountertop && node.countertopThickness > 0) {
@@ -82,32 +63,8 @@ export function buildCabinetRunGeometry(node, ctx, shading, textures, colorPrese
                 addBox(group, [node.countertopThickness, span.topY, slabDepth], [outerX - sign * (node.countertopThickness / 2), span.topY / 2, slabCenterZ], materials.countertop, `cabinet-run-waterfall-${side}`, 'countertop');
             }
         }
-        if (node.withCountertop && span.hasCountertop && node.countertopThickness > 0) {
-            const countertop = addBox(group, [
-                span.width + leftOverhang + rightOverhang,
-                node.countertopThickness,
-                span.depth + node.countertopOverhang + backOverhang,
-            ], [
-                span.centerX + (rightOverhang - leftOverhang) / 2,
-                span.topY + node.countertopThickness / 2,
-                span.centerZ + (node.countertopOverhang - backOverhang) / 2,
-            ], materials.countertop, 'cabinet-run-countertop', 'countertop');
-            // Undermount sink modules cut their bowl openings out of the run's
-            // slab (modules inside a run never own a countertop themselves).
-            const sinkCuts = [];
-            for (const module of modules) {
-                if (module.position[0] < span.minX - 1e-4 || module.position[0] > span.maxX + 1e-4) {
-                    continue;
-                }
-                const sink = stackForCabinet(module).find((compartment) => compartment.type === 'sink');
-                if (!sink)
-                    continue;
-                sinkCuts.push({
-                    bowls: sinkBowls(compartmentSinkLayout(sink), Math.max(0.01, module.width - 2 * module.boardThickness), module.depth),
-                    x: module.position[0],
-                    z: module.position[2],
-                });
-            }
+        if (slab) {
+            const countertop = addBox(group, slab.size, slab.position, materials.countertop, 'cabinet-run-countertop', 'countertop');
             if (sinkCuts.length > 0) {
                 group.remove(countertop);
                 let cut = countertop;

package/dist/cabinet/geometry/sink.d.ts

@@ -1,16 +1,6 @@
 import { Group, type Material, Mesh } from 'three';
-import type { SinkLayout } from '../stack';
-export declare const FAUCET_SETBACK = 0.03;
-export type SinkBowlSpec = {
-    centerX: number;
-    width: number;
-    depth: number;
-};
-/**
- * Bowl rects in module-local X/Z given the usable countertop footprint.
- * Shared by the 3D cut, the run-countertop cut, and the 2D floorplan symbol.
- */
-export declare function sinkBowls(layout: SinkLayout, usableWidth: number, usableDepth: number): SinkBowlSpec[];
+import { type SinkBowlSpec } from '../appliance-layout';
+export { FAUCET_SETBACK, type SinkBowlSpec, sinkBowls } from '../appliance-layout';
 /**
  * Subtract the sink bowl openings from a countertop mesh via three-bvh-csg.
  * `cutCenterX/Z` position the sink footprint in the countertop mesh's local

package/dist/cabinet/geometry/sink.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sink.d.ts","sourceRoot":"","sources":["../../../src/cabinet/geometry/sink.ts"],"names":[],"mappings":"AAOA,OAAO,EAGL,KAAK,EACL,KAAK,QAAQ,EACb,IAAI,EAGL,MAAM,OAAO,CAAA;AACd,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAQ1C,eAAO,MAAM,cAAc,OAAO,CAAA;AAElC,MAAM,MAAM,YAAY,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAA;AAE5E;;;GAGG;AACH,wBAAgB,SAAS,CACvB,MAAM,EAAE,UAAU,EAClB,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,GAClB,YAAY,EAAE,CAuBhB;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CACnC,UAAU,EAAE,IAAI,EAChB,KAAK,EAAE,YAAY,EAAE,EACrB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,mBAAmB,EAAE,MAAM,GAC1B,IAAI,CA8BN;AAkUD;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,YAAY,EAAE,EACrB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EACZ,mBAAmB,EAAE,MAAM,EAC3B,KAAK,EAAE,MAAM,EACb,iBAAiB,EAAE,QAAQ,QAY5B"}
+{"version":3,"file":"sink.d.ts","sourceRoot":"","sources":["../../../src/cabinet/geometry/sink.ts"],"names":[],"mappings":"AAOA,OAAO,EAGL,KAAK,EACL,KAAK,QAAQ,EACb,IAAI,EAGL,MAAM,OAAO,CAAA;AACd,OAAO,EAGL,KAAK,YAAY,EAGlB,MAAM,qBAAqB,CAAA;AAE5B,OAAO,EAAE,cAAc,EAAE,KAAK,YAAY,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAMlF;;;;;GAKG;AACH,wBAAgB,qBAAqB,CACnC,UAAU,EAAE,IAAI,EAChB,KAAK,EAAE,YAAY,EAAE,EACrB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,mBAAmB,EAAE,MAAM,GAC1B,IAAI,CA6BN;AAqUD;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,YAAY,EAAE,EACrB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EACZ,mBAAmB,EAAE,MAAM,EAC3B,KAAK,EAAE,MAAM,EACb,iBAAiB,EAAE,QAAQ,QAW5B"}

package/dist/cabinet/geometry/sink.js

@@ -1,40 +1,9 @@
 import { Brush, csgEvaluator, csgGeometry, prepareBrushForCSG, SUBTRACTION, } from '@pascal-app/viewer';
 import { BoxGeometry, CylinderGeometry, Group, Mesh, SphereGeometry, TorusGeometry, } from 'three';
+import { BASIN_WALL, FAUCET_BASE_RADIUS, sinkFaucetFootprint, sinkOpening, } from '../appliance-layout';
+export { FAUCET_SETBACK, sinkBowls } from '../appliance-layout';
 import { createWorldScaleBoxGeometry, stampSlot } from './shared';
-const BASIN_WALL = 0.012;
 const BASIN_DEPTH = 0.19;
-const BASIN_CORNER_MARGIN = 0.06;
-// Centers the faucet base in the strip between the bowl's back edge and the
-// countertop's back edge (BASIN_CORNER_MARGIN wide).
-export const FAUCET_SETBACK = 0.03;
-/**
- * Bowl rects in module-local X/Z given the usable countertop footprint.
- * Shared by the 3D cut, the run-countertop cut, and the 2D floorplan symbol.
- */
-export function sinkBowls(layout, usableWidth, usableDepth) {
-    const depth = Math.max(0.1, usableDepth - BASIN_CORNER_MARGIN * 2);
-    const full = Math.max(0.15, usableWidth - BASIN_CORNER_MARGIN * 2);
-    if (layout === 'single') {
-        const width = Math.min(0.7, full);
-        return [{ centerX: 0, width, depth }];
-    }
-    const divider = 0.03;
-    if (layout === 'double') {
-        const width = Math.min(0.42, (full - divider) / 2);
-        return [
-            { centerX: -(width + divider) / 2, width, depth },
-            { centerX: (width + divider) / 2, width, depth },
-        ];
-    }
-    // double-offset: 60/40 split
-    const total = Math.min(0.86, full);
-    const main = (total - divider) * 0.6;
-    const side = (total - divider) * 0.4;
-    return [
-        { centerX: -(total / 2) + main / 2, width: main, depth },
-        { centerX: total / 2 - side / 2, width: side, depth },
-    ];
-}
 /**
  * Subtract the sink bowl openings from a countertop mesh via three-bvh-csg.
  * `cutCenterX/Z` position the sink footprint in the countertop mesh's local
@@ -49,7 +18,8 @@ export function cutSinkIntoCountertop(countertop, bowls, cutCenterX, cutCenterZ,
     for (const bowl of bowls) {
         // Rim reveal: the opening is slightly smaller than the basin shell so
         // the undermount lip tucks under the countertop.
-        const cutter = new Brush(new BoxGeometry(bowl.width - BASIN_WALL, countertopThickness * 4, bowl.depth - BASIN_WALL));
+        const opening = sinkOpening(bowl);
+        const cutter = new Brush(new BoxGeometry(opening.width, countertopThickness * 4, opening.depth));
         cutter.position.set(cutCenterX + bowl.centerX, countertop.position.y, cutCenterZ);
         prepareBrushForCSG(cutter);
         const next = csgEvaluator.evaluate(result, cutter, SUBTRACTION);
@@ -174,7 +144,7 @@ function addFaucet(group, x, z, rimY, name, applianceMaterial) {
     const riserTopY = rimY + FAUCET_RISER_TOP;
     const reach = FAUCET_ARC_RADIUS * 2;
     // Round base flare where the body meets the countertop.
-    const flare = stampSlot(new Mesh(new CylinderGeometry(FAUCET_BODY_RADIUS + 0.002, 0.032, 0.008, 28), applianceMaterial), 'appliance');
+    const flare = stampSlot(new Mesh(new CylinderGeometry(FAUCET_BODY_RADIUS + 0.002, FAUCET_BASE_RADIUS, 0.008, 28), applianceMaterial), 'appliance');
     flare.name = `${name}-faucet-escutcheon`;
     flare.position.set(x, rimY + 0.004, z);
     flare.castShadow = true;
@@ -254,9 +224,8 @@ export function addSinkCompartment(group, bowls, centerX, centerZ, rimY, counter
     for (const [bowlIndex, bowl] of bowls.entries()) {
         addBasinShell(group, bowl, centerX, centerZ, rimY, `${name}-${bowlIndex}`, applianceMaterial);
     }
-    const bowlsMinX = Math.min(...bowls.map((bowl) => bowl.centerX - bowl.width / 2));
-    const bowlsMaxX = Math.max(...bowls.map((bowl) => bowl.centerX + bowl.width / 2));
-    const faucetX = centerX + (bowlsMinX + bowlsMaxX) / 2;
-    const faucetZ = centerZ - bowls[0].depth / 2 - FAUCET_SETBACK;
+    const faucet = sinkFaucetFootprint(bowls);
+    const faucetX = centerX + faucet.x;
+    const faucetZ = centerZ + faucet.z;
     addFaucet(group, faucetX, faucetZ, rimY + countertopThickness, name, applianceMaterial);
 }

package/dist/cabinet/geometry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"geometry.d.ts","sourceRoot":"","sources":["../../src/cabinet/geometry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAe,eAAe,EAAE,MAAM,kBAAkB,CAAA;AACpE,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AACpE,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAA;AAc7B,OAAO,EAAU,KAAK,mBAAmB,EAA2B,MAAM,mBAAmB,CAAA;AAmB7F,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,mBAAmB,EACzB,GAAG,CAAC,EAAE,eAAe,EACrB,OAAO,GAAE,aAA0B,EACnC,QAAQ,UAAO,EACf,WAAW,GAAE,WAAoB,EACjC,UAAU,CAAC,EAAE,MAAM,GAClB,KAAK,CA2dP"}
+{"version":3,"file":"geometry.d.ts","sourceRoot":"","sources":["../../src/cabinet/geometry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkC,eAAe,EAAE,MAAM,kBAAkB,CAAA;AACvF,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AACpE,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAA;AAc7B,OAAO,EAEL,KAAK,mBAAmB,EAGzB,MAAM,mBAAmB,CAAA;AAuJ1B,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,mBAAmB,EACzB,GAAG,CAAC,EAAE,eAAe,EACrB,OAAO,GAAE,aAA0B,EACnC,QAAQ,UAAO,EACf,WAAW,GAAE,WAAoB,EACjC,UAAU,CAAC,EAAE,MAAM,GAClB,KAAK,CA8dP"}

package/dist/cabinet/geometry.js

@@ -7,7 +7,7 @@ import { addRangeHoodCompartment } from './geometry/hood';
 import { addApplianceCompartment } from './geometry/oven-microwave';
 import { addPullOutPantryCompartment } from './geometry/pantry';
 import { buildCabinetRunGeometry } from './geometry/run';
-import { addBox, getCabinetSlotMaterials } from './geometry/shared';
+import { addBox, getCabinetSlotMaterials, } from './geometry/shared';
 import { addSinkCompartment, cutSinkIntoCountertop, sinkBowls } from './geometry/sink';
 import { compartmentDoorType, compartmentDrawerCount, compartmentShelfCount, compartmentSinkLayout, isHoodCompartmentType, normalizeCabinetStack, stackForCabinet, } from './stack';
 const CORNER_FILLER_TOP_INSET = 0.001;
@@ -15,6 +15,66 @@ const CORNER_FILLER_SIDE_INSET = 0.001;
 const WALL_CORNER_FILLER_FRONT_HEIGHT_INSET = 0.001;
 const SINK_FALSE_FRONT_HEIGHT = 0.22;
 const MIN_RENDERABLE_BRIDGE_FILLER_WIDTH = 1e-4;
+function addTopFinishGeometry(group, node, materials, topY, isWallCornerFiller = false) {
+    if (!node.topFinish || node.topFinish === 'none')
+        return;
+    const height = Math.max(0.05, node.topFinishHeight ?? 0.33);
+    const board = node.boardThickness;
+    const depth = Math.min(node.depth, Math.max(0.15, node.topFinishDepth ?? node.depth));
+    const backInset = Math.min(0.012, depth * 0.08);
+    const backThickness = Math.min(0.006, board / 2);
+    const centerZ = (node.depth - depth) / 2;
+    const inset = node.frontOverlay === 'inset';
+    const isCornerFiller = node.moduleKind === 'corner-filler';
+    const openLeft = node.openSide === 'left';
+    const openRight = node.openSide === 'right';
+    const topFrontZ = inset
+        ? centerZ + depth / 2 - node.frontThickness / 2 - 0.0015
+        : centerZ + depth / 2 + node.frontThickness / 2 - 0.0015;
+    if (node.topFinish === 'trim') {
+        addBox(group, [node.width, height, depth], [0, topY + height / 2, centerZ], materials.carcass, 'cabinet-top-trim', 'carcass');
+        return;
+    }
+    const innerLeft = -node.width / 2 + (node.openSide === 'left' ? 0 : board);
+    const innerRight = node.width / 2 - (node.openSide === 'right' ? 0 : board);
+    const innerWidth = Math.max(0.01, innerRight - innerLeft);
+    const innerCenterX = (innerLeft + innerRight) / 2;
+    if (!openLeft) {
+        addBox(group, [board, height, depth], [-node.width / 2 + board / 2, topY + height / 2, centerZ], materials.carcass, 'cabinet-top-cabinet-side-left', 'carcass');
+    }
+    if (!openRight) {
+        addBox(group, [board, height, depth], [node.width / 2 - board / 2, topY + height / 2, centerZ], materials.carcass, 'cabinet-top-cabinet-side-right', 'carcass');
+    }
+    addBox(group, [innerWidth, board, depth], [innerCenterX, topY + board / 2, centerZ], materials.carcass, 'cabinet-top-cabinet-bottom', 'carcass');
+    addBox(group, [innerWidth, board, depth], [innerCenterX, topY + height - board / 2, centerZ], materials.carcass, 'cabinet-top-cabinet-top', 'carcass');
+    addBox(group, [innerWidth, Math.max(0.001, height - board * 2), backThickness], [innerCenterX, topY + height / 2, centerZ - depth / 2 + backInset + backThickness / 2], materials.carcass, 'cabinet-top-cabinet-back', 'carcass');
+    if (isCornerFiller) {
+        const frontExtension = board / 2 + node.frontGap;
+        const wallFrontSharedInset = isWallCornerFiller ? node.frontThickness + node.frontGap : 0;
+        const frontLeft = -node.width / 2 -
+            (openLeft ? frontExtension : 0) +
+            (isWallCornerFiller && openRight ? wallFrontSharedInset : 0);
+        const frontRight = node.width / 2 +
+            (openRight ? frontExtension : 0) -
+            (isWallCornerFiller && openLeft ? wallFrontSharedInset : 0);
+        const frontHeight = isWallCornerFiller
+            ? Math.max(0.01, height - WALL_CORNER_FILLER_FRONT_HEIGHT_INSET * 2)
+            : height;
+        addBox(group, [Math.max(0.01, frontRight - frontLeft), frontHeight, node.frontThickness], [(frontLeft + frontRight) / 2, topY + height / 2, topFrontZ], materials.front, 'cabinet-top-corner-filler-front', 'front');
+        return;
+    }
+    // Keep the upper front's reveal contract identical to the parent cabinet.
+    // Overlay fronts reserve one extra front gap at the opening edge; addDoorFronts
+    // applies the remaining leaf-to-leaf gaps. Inset fronts use the carcass opening.
+    const faceWidth = inset ? innerWidth : Math.max(0.01, node.width - node.frontGap);
+    const topDoorCompartment = stackForCabinet(node).find((compartment) => compartment.type === 'door');
+    const topDoorType = topDoorCompartment
+        ? compartmentDoorType(topDoorCompartment, node.width)
+        : node.width > 0.5
+            ? 'double'
+            : 'single-left';
+    addDoorFronts(group, node, materials, faceWidth, inset ? Math.max(0.01, height - board * 2) : height, 0, topY + height / 2, topFrontZ, topDoorType);
+}
 export function buildCabinetGeometry(node, ctx, shading = 'rendered', textures = true, colorPreset = 'clay', sceneTheme) {
     if (node.type === 'cabinet') {
         const run = buildCabinetRunGeometry(node, ctx, shading, textures, colorPreset, sceneTheme);
@@ -109,6 +169,7 @@ export function buildCabinetGeometry(node, ctx, shading = 'rendered', textures =
         if (node.cornerShelf) {
             addShelfBoards(filler, materials, innerWidth, shelfDepth, board, plinth + board, Math.max(0.01, carcassHeight - board * 2), shelfCount, innerCenterX);
         }
+        addTopFinishGeometry(filler, node, materials, topY, isWallCornerFiller);
         return filler;
     }
     const rows = normalizeCabinetStack(node);
@@ -219,5 +280,6 @@ export function buildCabinetGeometry(node, ctx, shading = 'rendered', textures =
             addRangeHoodCompartment(group, node, materials, row.compartment.type, plinth + row.y0, row.height, ctx, index);
         }
     });
+    addTopFinishGeometry(group, node, materials, topY);
     return group;
 }

package/dist/cabinet/hosted-resize.d.ts

@@ -0,0 +1,8 @@
+import { type AnyNode, type AnyNodeId, type HandleDescriptor, type SceneApi } from '@pascal-app/core';
+type Nodes = Record<AnyNodeId, AnyNode>;
+type Update = readonly [AnyNodeId, Partial<AnyNode>];
+export declare function cabinetHostedChildUpdates(before: Nodes, after: Nodes): Update[] | null;
+export declare function planCabinetHostedEdit(sceneApi: SceneApi, apply: (staged: SceneApi) => void): Update[] | null;
+export declare function withCabinetHostedChildren<N extends AnyNode>(descriptor: HandleDescriptor<N>): HandleDescriptor<N>;
+export {};
+//# sourceMappingURL=hosted-resize.d.ts.map