@pascal-app/nodes 1.0.0 → 1.0.3

package/dist/cabinet/appliance-layout.js

@@ -0,0 +1,52 @@
+export const BASIN_WALL = 0.012;
+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 },
+    ];
+}
+export function sinkOpening(bowl) {
+    return { ...bowl, width: bowl.width - BASIN_WALL, depth: bowl.depth - BASIN_WALL };
+}
+export function cooktopFootprint(node) {
+    return {
+        width: Math.max(0.32, Math.min(node.width - 0.01, 0.76)),
+        depth: Math.max(0.28, Math.min(node.depth - 0.04, 0.53)),
+    };
+}
+export const FAUCET_BASE_RADIUS = 0.032;
+export function sinkFaucetFootprint(bowls) {
+    const minX = Math.min(...bowls.map((bowl) => bowl.centerX - bowl.width / 2));
+    const maxX = Math.max(...bowls.map((bowl) => bowl.centerX + bowl.width / 2));
+    return {
+        x: (minX + maxX) / 2,
+        z: -bowls[0].depth / 2 - FAUCET_SETBACK,
+        radius: FAUCET_BASE_RADIUS,
+    };
+}

package/dist/cabinet/countertop-layout.d.ts

@@ -0,0 +1,173 @@
+import type { CabinetNode, GeometryContext } from '@pascal-app/core';
+import { type SinkBowlSpec } from './appliance-layout';
+export type CabinetSlab = {
+    size: [number, number, number];
+    position: [number, number, number];
+};
+export type RunSinkCut = {
+    bowls: SinkBowlSpec[];
+    x: number;
+    z: number;
+};
+export declare function getCabinetCountertopLayout(node: CabinetNode, ctx?: GeometryContext): {
+    span: import("./run-layout").RunSpan;
+    modules: {
+        object: "node";
+        parentId: string | null;
+        visible: boolean;
+        metadata: Record<string, unknown>;
+        position: [number, number, number];
+        rotation: number;
+        width: number;
+        depth: number;
+        carcassHeight: number;
+        operationState: number;
+        plinthHeight: number;
+        toeKickDepth: number;
+        boardThickness: number;
+        countertopThickness: number;
+        countertopOverhang: number;
+        countertopBackOverhang: number;
+        withFinishedBack: boolean;
+        frontThickness: number;
+        frontGap: number;
+        frontStyle: "slab" | "shaker" | "raised-arch";
+        panelReady: boolean;
+        handleStyle: "none" | "bar" | "cutout" | "hole" | "knob";
+        handlePosition: "center" | "top" | "auto";
+        frontOverlay: "full" | "inset";
+        withBottomPanel: boolean;
+        showPlinth: boolean;
+        withCountertop: boolean;
+        id: `cabinet-module_${string}`;
+        type: "cabinet-module";
+        children: string[];
+        cabinetType: "base" | "tall";
+        moduleKind: "standard" | "corner-filler";
+        topFinish: "trim" | "none" | "top-cabinet";
+        topFinishHeight: number;
+        topFinishDepth: number;
+        name?: string | undefined;
+        camera?: {
+            position: [number, number, number];
+            target: [number, number, number];
+            mode: "perspective" | "orthographic";
+            fov?: number | undefined;
+            zoom?: number | undefined;
+        } | undefined;
+        supportSlabId?: string | undefined;
+        material?: {
+            id?: string | undefined;
+            preset?: "custom" | "white" | "brick" | "concrete" | "wood" | "glass" | "metal" | "plaster" | "tile" | "marble" | undefined;
+            properties?: {
+                color: string;
+                roughness: number;
+                metalness: number;
+                opacity: number;
+                transparent: boolean;
+                side: "front" | "back" | "double";
+            } | undefined;
+            texture?: {
+                url: string;
+                repeat?: [number, number] | undefined;
+                scale?: number | undefined;
+            } | undefined;
+        } | undefined;
+        materialPreset?: string | undefined;
+        slots?: Record<string, string> | undefined;
+        stack?: ({
+            type: "shelf";
+            id: string;
+            shelfCount?: number | undefined;
+            height?: number | undefined;
+        } | {
+            type: "drawer";
+            id: string;
+            drawerCount?: number | undefined;
+            height?: number | undefined;
+        } | {
+            type: "door";
+            id: string;
+            doorType?: "glass" | "double" | "single-left" | "single-right" | undefined;
+            shelfCount?: number | undefined;
+            height?: number | undefined;
+        } | {
+            type: "sink";
+            id: string;
+            sinkLayout?: "single" | "double" | "double-offset" | undefined;
+            height?: number | undefined;
+        } | {
+            type: "oven";
+            id: string;
+            height?: number | undefined;
+        } | {
+            type: "microwave";
+            id: string;
+            height?: number | undefined;
+        } | {
+            type: "dishwasher";
+            id: string;
+            height?: number | undefined;
+        } | {
+            type: "cooktop-gas";
+            id: string;
+            cooktopLayout?: "gas-2burner" | "gas-4burner" | "gas-5burner-wok" | "gas-6burner" | undefined;
+            cooktopBurnersOn?: boolean | undefined;
+            cooktopActiveBurners?: number[] | undefined;
+            cooktopKnobProgress?: number[] | undefined;
+            cooktopShowGrate?: boolean | undefined;
+            height?: number | undefined;
+        } | {
+            type: "cooktop-induction";
+            id: string;
+            cooktopLayout?: "induction-2zone" | "induction-4zone" | undefined;
+            cooktopBurnersOn?: boolean | undefined;
+            cooktopActiveBurners?: number[] | undefined;
+            cooktopKnobProgress?: number[] | undefined;
+            cooktopShowGrate?: boolean | undefined;
+            height?: number | undefined;
+        } | {
+            type: "pull-out-pantry";
+            id: string;
+            shelfCount?: number | undefined;
+            pantryRackStyle?: "glass" | "wire" | "tray" | undefined;
+            height?: number | undefined;
+        } | {
+            type: "fridge-single";
+            id: string;
+            height?: number | undefined;
+        } | {
+            type: "fridge-double";
+            id: string;
+            height?: number | undefined;
+        } | {
+            type: "fridge-top-freezer";
+            id: string;
+            height?: number | undefined;
+        } | {
+            type: "fridge-bottom-freezer";
+            id: string;
+            height?: number | undefined;
+        } | {
+            type: "hood-pyramid";
+            id: string;
+            height?: number | undefined;
+        } | {
+            type: "hood-curved-glass";
+            id: string;
+            height?: number | undefined;
+        })[] | undefined;
+        openSide?: "left" | "right" | undefined;
+        cornerShelf?: boolean | undefined;
+    }[];
+    ends: import("./run-layout").RunSpanEnds;
+    backOverhang: number;
+    countertop: CabinetSlab | null;
+    bar: {
+        slab: CabinetSlab;
+        support: CabinetSlab;
+        edge: NonNullable<CabinetNode["barLedge"]>["edge"];
+    } | null;
+    sinkCuts: RunSinkCut[];
+}[];
+//# sourceMappingURL=countertop-layout.d.ts.map

package/dist/cabinet/countertop-layout.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"countertop-layout.d.ts","sourceRoot":"","sources":["../../src/cabinet/countertop-layout.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAqB,WAAW,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AACvF,OAAO,EAAE,KAAK,YAAY,EAAa,MAAM,oBAAoB,CAAA;AAIjE,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAA;IAC9B,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAA;CACnC,CAAA;AAED,MAAM,MAAM,UAAU,GAAG;IAAE,KAAK,EAAE,YAAY,EAAE,CAAC;IAAC,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAAA;AAExE,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,CAAC,EAAE,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;cA8BvE,WAAW;iBACR,WAAW;cACd,WAAW,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC;;;IA4DvD"}

package/dist/cabinet/countertop-layout.js

@@ -0,0 +1,80 @@
+import { sinkBowls } from './appliance-layout';
+import { getRunSpanEnds, getRunSpanGroups } from './run-layout';
+import { compartmentSinkLayout } from './stack';
+export function getCabinetCountertopLayout(node, ctx) {
+    const modules = (ctx?.children ?? []).filter((child) => child.type === 'cabinet-module');
+    const groups = getRunSpanGroups(modules, { runTier: node.runTier });
+    const ends = getRunSpanEnds(node, ctx, groups.map(({ span }) => span));
+    // A back bar replaces the seating overhang; side bars leave it alone.
+    const backOverhang = node.withCountertop && node.barLedge?.edge !== 'back' ? node.countertopBackOverhang : 0;
+    return groups.map(({ span, modules: spanModules }, index) => {
+        const spanEnds = ends[index];
+        const { leftOverhang, rightOverhang } = spanEnds;
+        const width = span.width + leftOverhang + rightOverhang;
+        const centerX = span.centerX + (rightOverhang - leftOverhang) / 2;
+        const depth = span.depth + node.countertopOverhang + backOverhang;
+        const centerZ = span.centerZ + (node.countertopOverhang - backOverhang) / 2;
+        const countertop = node.withCountertop && span.hasCountertop && node.countertopThickness > 0
+            ? {
+                size: [width, node.countertopThickness, depth],
+                position: [centerX, span.topY + node.countertopThickness / 2, centerZ],
+            }
+            : null;
+        const ledge = node.barLedge;
+        let bar = null;
+        if (ledge &&
+            span.hasCountertop &&
+            (ledge.edge === 'back' ||
+                (ledge.edge === 'left' && index === 0) ||
+                (ledge.edge === 'right' && index === groups.length - 1))) {
+            const thickness = Math.max(node.countertopThickness, 0.02);
+            const height = Math.max(0.1, ledge.height - thickness);
+            if (ledge.edge === 'back') {
+                const backZ = span.minZ - (node.withFinishedBack ? node.boardThickness : 0);
+                bar = {
+                    edge: ledge.edge,
+                    support: {
+                        size: [width, height, node.boardThickness],
+                        position: [centerX, height / 2, backZ - node.boardThickness / 2],
+                    },
+                    slab: {
+                        size: [width, thickness, ledge.depth],
+                        position: [centerX, height + thickness / 2, backZ - ledge.depth / 2],
+                    },
+                };
+            }
+            else {
+                const sign = ledge.edge === 'left' ? -1 : 1;
+                const edgeX = ledge.edge === 'left' ? span.minX : span.maxX;
+                bar = {
+                    edge: ledge.edge,
+                    support: {
+                        size: [node.boardThickness, height, depth],
+                        position: [edgeX + (sign * node.boardThickness) / 2, height / 2, centerZ],
+                    },
+                    slab: {
+                        size: [ledge.depth, thickness, depth],
+                        position: [edgeX + (sign * ledge.depth) / 2, height + thickness / 2, centerZ],
+                    },
+                };
+            }
+        }
+        const sinkCuts = [];
+        if (countertop) {
+            for (const module of modules) {
+                if (module.position[0] < span.minX - 1e-4 || module.position[0] > span.maxX + 1e-4)
+                    continue;
+                // The default stack contains only storage; avoid generating compartment IDs in a query.
+                const sink = module.stack?.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],
+                });
+            }
+        }
+        return { span, modules: spanModules, ends: spanEnds, backOverhang, countertop, bar, sinkCuts };
+    });
+}

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

@@ -1 +1 @@
-{"version":3,"file":"definition.d.ts","sourceRoot":"","sources":["../../src/cabinet/definition.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACP,SAAS,EAET,WAAW,IAAI,eAAe,EAG9B,oBAAoB,EAMpB,cAAc,EACd,QAAQ,EACT,MAAM,kBAAkB,CAAA;AAwDzB,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AAuKzD,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,eAAe,EACrB,KAAK,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,GAC3C,oBAAoB,EAAE,CAcxB;AAiKD,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,EAAE,SAAS,GAAG,IAAI,CAAA;IAC1B,CAAC,EAAE,MAAM,CAAA;IACT,CAAC,EAAE,MAAM,CAAA;IACT,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAED,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,eAAe,EACpB,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,GAC1C,mBAAmB,CAWrB;AAED;;;;;;;;;GASG;AACH,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,QAAQ,EAClB,UAAU,EAAE,SAAS,mBAAmB,EAAE,EAC1C,QAAQ,EAAE,WAAW,CAAC,MAAM,CAAC,QAgD9B;AAED,oEAAoE;AACpE,wBAAgB,2BAA2B,CAAC,GAAG,EAAE,eAAe,GAAG,MAAM,CAaxE;AA6uDD,eAAO,MAAM,iBAAiB,EAAE,cAAc,CAAC,OAAO,WAAW,CAwMhE,CAAA;AAED,eAAO,MAAM,uBAAuB,EAAE,cAAc,CAAC,OAAO,iBAAiB,CAmK5E,CAAA"}
+{"version":3,"file":"definition.d.ts","sourceRoot":"","sources":["../../src/cabinet/definition.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACP,SAAS,EAET,WAAW,IAAI,eAAe,EAG9B,oBAAoB,EAMpB,cAAc,EACd,QAAQ,EACT,MAAM,kBAAkB,CAAA;AAyDzB,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AAwKzD,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,eAAe,EACrB,KAAK,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,GAC3C,oBAAoB,EAAE,CAcxB;AAiKD,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,EAAE,SAAS,GAAG,IAAI,CAAA;IAC1B,CAAC,EAAE,MAAM,CAAA;IACT,CAAC,EAAE,MAAM,CAAA;IACT,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAED,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,eAAe,EACpB,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,GAC1C,mBAAmB,CAWrB;AAED;;;;;;;;;GASG;AACH,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,QAAQ,EAClB,UAAU,EAAE,SAAS,mBAAmB,EAAE,EAC1C,QAAQ,EAAE,WAAW,CAAC,MAAM,CAAC,QAgD9B;AAED,oEAAoE;AACpE,wBAAgB,2BAA2B,CAAC,GAAG,EAAE,eAAe,GAAG,MAAM,CAexE;AAgvDD,eAAO,MAAM,iBAAiB,EAAE,cAAc,CAAC,OAAO,WAAW,CA+MhE,CAAA;AAED,eAAO,MAAM,uBAAuB,EAAE,cAAc,CAAC,OAAO,iBAAiB,CA0K5E,CAAA"}

package/dist/cabinet/definition.js

@@ -5,6 +5,7 @@ import { buildCabinetFloorplan, buildCabinetModuleFloorplan } from './floorplan'
 import { cabinetModuleFloorplanMoveTarget } from './floorplan-move';
 import { cabinetFloorplanSiblingOverrides } from './floorplan-overrides';
 import { buildCabinetGeometry } from './geometry';
+import { withCabinetHostedChildren } from './hosted-resize';
 import { toggleCabinetOperationState } from './interaction';
 import { cabinetModuleParentFrame } from './move-frame';
 import { cabinetPaint } from './paint';
@@ -21,6 +22,7 @@ import { cabinetSceneAction } from './scene-action';
 import { CabinetModuleNode, CabinetNode } from './schema';
 import { cabinetSlots } from './slots';
 import { backAnchoredModuleZ, isHoodCompartmentType, minCabinetCarcassHeightForStack, stackForCabinet, } from './stack';
+import { cabinetModuleSurfaceProvider, cabinetSurfaceProvider } from './surfaces';
 import { cabinetFloorplanAffectedIds, cabinetTreeChildIds, cabinetTreeHidden, cabinetTreeLabel, } from './tree-structure';
 import { findClosestCabinetWallInPlan, resolveCabinetModuleWallSnapLocal, resolveCabinetRunWallSnap, resolveCabinetWallFaceOffset, } from './wall-snap';
 function isCabinetDuplicableNode(node) {
@@ -334,7 +336,7 @@ export function cabinetRunNeighborSignature(run) {
         run.carcassHeight,
         run.runTier,
         run.countertopOverhang,
-        run.children ?? [],
+        (run.children ?? []).filter((id) => id.startsWith('cabinet_') || id.startsWith('cabinet-module_')),
         cabinetLayoutRevision(run.metadata),
     ]);
 }
@@ -1698,7 +1700,8 @@ function cabinetRotateHandle() {
     };
 }
 function cabinetHandles(node, sceneApi) {
-    if ((node.children ?? []).length > 0) {
+    const structuralChildren = (node.children ?? []).filter((id) => id.startsWith('cabinet_') || id.startsWith('cabinet-module_'));
+    if (structuralChildren.length > 0) {
         const connectedRuns = sceneApi && node.runTier === 'base' ? connectedBaseRuns(node, sceneApi) : [];
         const depthHandles = sceneApi
             ? connectedRuns.map((run) => cabinetConnectedRunDepthHandle(node, run, sceneApi))
@@ -1715,7 +1718,7 @@ function cabinetHandles(node, sceneApi) {
         cabinetHeightHandle(),
         cabinetRotateHandle(),
     ];
-    if ((node.children ?? []).length === 0) {
+    if (structuralChildren.length === 0) {
         handles.unshift(cabinetWidthHandle('left'), cabinetWidthHandle('right'));
     }
     return handles;
@@ -1798,6 +1801,7 @@ export const cabinetDefinition = {
         // material / materialPreset left undefined — paint mode writes slot refs.
     }),
     capabilities: {
+        surfacePlacement: 'floor-only',
         selectable: { hitVolume: 'bbox' },
         movable: {
             axes: ['x', 'z'],
@@ -1821,6 +1825,7 @@ export const cabinetDefinition = {
         duplicable: { subtree: true, prepareSubtreeClone: prepareCabinetSubtreeClone },
         deletable: true,
         surfaces: {
+            hosting: cabinetSurfaceProvider,
             top: {
                 height: (node, context) => cabinetLocalBounds(node, context.nodes).maxY,
             },
@@ -1845,10 +1850,10 @@ export const cabinetDefinition = {
     // Dirty-cascade: a dirtied run re-marks its hosted modules so their
     // composite geometry re-flows with the run (see `cascadeDirty`).
     relations: {
-        hosts: ['cabinet', 'cabinet-module'],
+        hosts: ['cabinet', 'cabinet-module', 'item', 'procedural-item'],
     },
     parametrics: cabinetParametrics,
-    handles: cabinetHandles,
+    handles: (node, sceneApi) => cabinetHandles(node, sceneApi).map(withCabinetHostedChildren),
     geometry: buildCabinetGeometry,
     exportAnimation: ({ node, object }) => bakeCabinetAnimationClip(node, object),
     system: {
@@ -1857,6 +1862,7 @@ export const cabinetDefinition = {
     },
     // `operationState` is deliberately absent — door/drawer poses are applied
     // per-frame by the cabinet animation system, not by geometry rebuilds.
+    geometryChildTypes: ['cabinet', 'cabinet-module'],
     geometryKey: (n) => JSON.stringify([
         n.width,
         n.depth,
@@ -1890,7 +1896,7 @@ export const cabinetDefinition = {
         // overhang re-trims against the neighbor's new spans (the neighbor's
         // own fields never appear in this key).
         JSON.stringify(cabinetAdjacencyRevision(n.metadata)),
-        JSON.stringify(n.children ?? []),
+        JSON.stringify((n.children ?? []).filter((id) => id.startsWith('cabinet_') || id.startsWith('cabinet-module_'))),
         JSON.stringify(n.stack ?? null),
     ]),
     floorplan: buildCabinetFloorplan,
@@ -1990,6 +1996,7 @@ export const cabinetModuleDefinition = {
     }),
     capabilities: {
         selectable: { hitVolume: 'bbox' },
+        surfaces: { hosting: cabinetModuleSurfaceProvider },
         movable: {
             axes: ['x', 'z'],
             directDrag: true,
@@ -2022,11 +2029,13 @@ export const cabinetModuleDefinition = {
         sceneAction: cabinetSceneAction,
         slots: () => cabinetSlots(),
     },
+    relations: { hosts: ['cabinet', 'cabinet-module', 'item', 'procedural-item'] },
     parametrics: cabinetModuleParametrics,
-    handles: cabinetModuleHandles,
+    handles: () => cabinetModuleHandles().map(withCabinetHostedChildren),
     geometry: buildCabinetGeometry,
     exportAnimation: ({ node, object }) => bakeCabinetAnimationClip(node, object),
     // `operationState` is deliberately absent — see cabinetDefinition.geometryKey.
+    geometryChildTypes: ['cabinet', 'cabinet-module'],
     geometryKey: (n) => JSON.stringify([
         n.cabinetType,
         n.moduleKind,
@@ -2056,7 +2065,7 @@ export const cabinetModuleDefinition = {
         JSON.stringify(n.material ?? null),
         JSON.stringify(n.materialPreset ?? null),
         JSON.stringify(n.slots ?? null),
-        JSON.stringify(n.children ?? []),
+        JSON.stringify((n.children ?? []).filter((id) => id.startsWith('cabinet_') || id.startsWith('cabinet-module_'))),
         JSON.stringify(n.stack ?? null),
     ]),
     floorplan: buildCabinetModuleFloorplan,

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/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,EAAQ,MAAM,OAAO,CAAA;AAOnC,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,CAmNd"}
+{"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,9 +1,8 @@
 import { Group, Mesh } from 'three';
-import { getRunSpanEnds, getRunSpans } from '../run-layout';
-import { compartmentSinkLayout, stackForCabinet } from '../stack';
+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');
 }
@@ -14,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;
@@ -52,39 +45,9 @@ export function buildCabinetRunGeometry(node, ctx, shading, textures, colorPrese
                 group.add(endPanel);
             }
         }
-        // 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 (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).
@@ -100,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"}