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

package/dist/cabinet/stack-transitions.js

@@ -1,8 +1,9 @@
+import { CABINET_METRIC_DEFAULTS } from '@pascal-app/core';
 import { resolveCabinetType } from './run-ops';
-import { COOKTOP_STANDARD_WIDTH, cooktopCabinetStack, DISHWASHER_STANDARD_HEIGHT, DISHWASHER_STANDARD_WIDTH, FRIDGE_COLUMN_WIDTH, FRIDGE_WIDE_WIDTH, fridgeCabinetStack, hoodCompartmentHeight, isCooktopCompartmentType, isFridgeCompartmentType, isHoodCompartmentType, MICROWAVE_STANDARD_WIDTH, PULL_OUT_PANTRY_STANDARD_WIDTH, replaceCabinetCompartmentStack, SINK_STANDARD_WIDTH, sinkCabinetStack, stackForCabinet, TALL_CABINET_CARCASS_HEIGHT, } from './stack';
+import { COOKTOP_STANDARD_WIDTH, cooktopCabinetStack, DISHWASHER_STANDARD_WIDTH, FRIDGE_COLUMN_HEIGHT, FRIDGE_COLUMN_WIDTH, FRIDGE_WIDE_WIDTH, fridgeCabinetStack, hoodCompartmentHeight, isCooktopCompartmentType, isFridgeCompartmentType, isHoodCompartmentType, MICROWAVE_STANDARD_WIDTH, OVEN_STANDARD_WIDTH, PULL_OUT_PANTRY_STANDARD_WIDTH, replaceCabinetCompartmentStack, SINK_STANDARD_WIDTH, sinkCabinetStack, stackForCabinet, TALL_CABINET_CARCASS_HEIGHT, } from './stack';
 const BASE_MODULE_WIDTH = 0.5;
-const BASE_CARCASS_HEIGHT = 0.72;
-const WALL_CARCASS_HEIGHT = 0.72;
+const BASE_CARCASS_HEIGHT = CABINET_METRIC_DEFAULTS.carcassHeight;
+const WALL_CARCASS_HEIGHT = CABINET_METRIC_DEFAULTS.carcassHeight;
 const TALL_CARCASS_HEIGHT = TALL_CABINET_CARCASS_HEIGHT;
 export function resolveCompartmentTransition({ node, parentRun, index, next, }) {
     const stack = stackForCabinet(node);
@@ -15,7 +16,11 @@ export function resolveCompartmentTransition({ node, parentRun, index, next, })
     const enteringPullOutPantry = next.type === 'pull-out-pantry';
     const leavingHood = current ? isHoodCompartmentType(current.type) : false;
     const enteringHood = isHoodCompartmentType(next.type);
-    const enteringSingleDishwasher = next.type === 'dishwasher' && stack.length === 1;
+    const leavingFixedModuleForStandardStorage = (leavingFridge || leavingPullOutPantry || leavingHood) &&
+        (next.type === 'shelf' || next.type === 'drawer' || next.type === 'door');
+    const enteringDishwasher = next.type === 'dishwasher';
+    const dishwasherHeight = parentRun?.carcassHeight ?? BASE_CARCASS_HEIGHT;
+    const replacement = enteringDishwasher ? { ...next, height: dishwasherHeight } : next;
     const hoodModulePatch = enteringHood
         ? {
             carcassHeight: Math.max(0.4, hoodCompartmentHeight(next.type)),
@@ -35,9 +40,9 @@ export function resolveCompartmentTransition({ node, parentRun, index, next, })
                 : next.type === 'fridge-double'
                     ? FRIDGE_WIDE_WIDTH
                     : FRIDGE_COLUMN_WIDTH,
-            depth: parentRun?.depth ?? 0.5,
-            carcassHeight: TALL_CARCASS_HEIGHT,
-            plinthHeight: 0.1,
+            depth: parentRun?.depth ?? CABINET_METRIC_DEFAULTS.depth,
+            carcassHeight: enteringFridge ? FRIDGE_COLUMN_HEIGHT : TALL_CARCASS_HEIGHT,
+            plinthHeight: CABINET_METRIC_DEFAULTS.plinthHeight,
             toeKickDepth: 0.075,
             countertopThickness: 0,
             countertopOverhang: parentRun?.countertopOverhang ?? 0.02,
@@ -55,9 +60,9 @@ export function resolveCompartmentTransition({ node, parentRun, index, next, })
                     : enteringCooktop
                         ? COOKTOP_STANDARD_WIDTH
                         : BASE_MODULE_WIDTH,
-            depth: parentRun?.depth ?? 0.5,
+            depth: parentRun?.depth ?? CABINET_METRIC_DEFAULTS.depth,
             carcassHeight: parentRun?.carcassHeight ?? BASE_CARCASS_HEIGHT,
-            plinthHeight: parentRun?.plinthHeight ?? 0.1,
+            plinthHeight: parentRun?.plinthHeight ?? CABINET_METRIC_DEFAULTS.plinthHeight,
             toeKickDepth: parentRun?.toeKickDepth ?? 0.075,
             countertopThickness: 0,
             countertopOverhang: parentRun?.countertopOverhang ?? 0.02,
@@ -65,13 +70,13 @@ export function resolveCompartmentTransition({ node, parentRun, index, next, })
             withCountertop: false,
         }
         : {};
-    const dishwasherModulePatch = enteringSingleDishwasher
+    const dishwasherModulePatch = enteringDishwasher
         ? {
             cabinetType: 'base',
             width: DISHWASHER_STANDARD_WIDTH,
-            depth: parentRun?.depth ?? 0.5,
-            carcassHeight: DISHWASHER_STANDARD_HEIGHT,
-            plinthHeight: parentRun?.plinthHeight ?? 0.1,
+            depth: parentRun?.depth ?? CABINET_METRIC_DEFAULTS.depth,
+            carcassHeight: dishwasherHeight,
+            plinthHeight: parentRun?.plinthHeight ?? CABINET_METRIC_DEFAULTS.plinthHeight,
             toeKickDepth: parentRun?.toeKickDepth ?? 0.075,
             countertopThickness: 0,
             countertopOverhang: parentRun?.countertopOverhang ?? 0.02,
@@ -82,22 +87,28 @@ export function resolveCompartmentTransition({ node, parentRun, index, next, })
     return {
         stack: enteringFridge
             ? fridgeCabinetStack(next.type)
-            : enteringCooktop && stack.length === 1
-                ? cooktopCabinetStack(next.type)
-                : enteringSink && stack.length === 1
-                    ? sinkCabinetStack()
-                    : enteringPullOutPantry
-                        ? [{ ...next, height: TALL_CARCASS_HEIGHT }]
-                        : enteringHood
-                            ? [next]
-                            : replaceCabinetCompartmentStack(node, index, next, node.type === 'cabinet-module' && resolveCabinetType(node, parentRun) === 'base'
-                                ? 'drawer'
-                                : 'door'),
+            : enteringDishwasher
+                ? [replacement]
+                : enteringCooktop && stack.length === 1
+                    ? cooktopCabinetStack(next.type)
+                    : enteringSink && stack.length === 1
+                        ? sinkCabinetStack()
+                        : enteringPullOutPantry
+                            ? [{ ...next, height: TALL_CARCASS_HEIGHT }]
+                            : leavingFixedModuleForStandardStorage
+                                ? [next]
+                                : enteringHood
+                                    ? [next]
+                                    : replaceCabinetCompartmentStack(node, index, replacement, node.type === 'cabinet-module' &&
+                                        resolveCabinetType(node, parentRun) === 'base'
+                                        ? 'drawer'
+                                        : 'door'),
         modulePatch: {
             ...tallApplianceModulePatch,
             ...standardModulePatch,
             ...dishwasherModulePatch,
             ...hoodModulePatch,
+            ...(next.type === 'oven' ? { width: OVEN_STANDARD_WIDTH } : {}),
             ...(next.type === 'microwave' ? { width: MICROWAVE_STANDARD_WIDTH } : {}),
             ...(next.type === 'dishwasher' ? { width: DISHWASHER_STANDARD_WIDTH } : {}),
             ...(enteringCooktop ? { width: COOKTOP_STANDARD_WIDTH } : {}),

package/dist/cabinet/stack.d.ts

@@ -1,4 +1,4 @@
-import type { CabinetModuleNode, CabinetNode } from '@pascal-app/core';
+import { type CabinetModuleNode, type CabinetNode } from '@pascal-app/core';
 type CabinetStackOwner = CabinetNode | CabinetModuleNode;
 export declare const CABINET_COMPARTMENT_TYPES: readonly ["shelf", "drawer", "door", "oven", "microwave", "dishwasher", "sink", "cooktop-gas", "cooktop-induction", "pull-out-pantry", "fridge-single", "fridge-double", "fridge-top-freezer", "fridge-bottom-freezer", "hood-pyramid", "hood-curved-glass"];
 export type CabinetCompartmentType = (typeof CABINET_COMPARTMENT_TYPES)[number];
@@ -14,6 +14,7 @@ export type PullOutPantryRackStyle = (typeof PULL_OUT_PANTRY_RACK_STYLES)[number
 export declare const CABINET_DOOR_TYPES: readonly ["single-left", "single-right", "double", "glass"];
 export type CabinetDoorType = (typeof CABINET_DOOR_TYPES)[number];
 export type CabinetCompartment = NonNullable<CabinetStackOwner['stack']>[number];
+export declare const OVEN_STANDARD_WIDTH = 0.6;
 export declare const OVEN_DEFAULT_HEIGHT = 0.595;
 export declare const MICROWAVE_STANDARD_WIDTH = 0.61;
 export declare const MICROWAVE_STANDARD_HEIGHT = 0.39;
@@ -88,6 +89,173 @@ export declare function compartmentCooktopShowGrate(compartment: CabinetCompartm
 export declare function compartmentSinkLayout(compartment: CabinetCompartment): SinkLayout;
 export declare function compartmentDoorType(compartment: CabinetCompartment, width: number): CabinetDoorType;
 export declare function minCabinetCarcassHeightForStack(node: Pick<CabinetStackOwner, 'stack' | 'width'>, minHeight?: number): number;
+export declare function clampCabinetCarcassHeightForStack(node: Pick<CabinetStackOwner, 'stack' | 'width'>, carcassHeight: number, 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;
+} | {
+    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;
+})[]): number;
+export declare function removeCabinetCompartmentStack(node: Pick<CabinetStackOwner, 'carcassHeight' | 'stack' | 'width'>, index: number): {
+    stack: CabinetCompartment[];
+    carcassHeight?: number;
+};
 export declare function replaceCabinetCompartmentStack(node: Pick<CabinetStackOwner, 'carcassHeight' | 'stack' | 'width'>, index: number, next: CabinetCompartment, fillerType?: Extract<CabinetCompartmentType, 'drawer' | 'door' | 'shelf'>, minHeight?: number): CabinetCompartment[];
 export declare function normalizeCabinetStack(node: Pick<CabinetStackOwner, 'carcassHeight' | 'stack' | 'width'>): Array<{
     compartment: CabinetCompartment;

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

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

package/dist/cabinet/stack.js

@@ -1,3 +1,4 @@
+import { CABINET_METRIC_DEFAULTS } from '@pascal-app/core';
 export const CABINET_COMPARTMENT_TYPES = [
     'shelf',
     'drawer',
@@ -30,6 +31,7 @@ export const CABINET_DOOR_TYPES = ['single-left', 'single-right', 'double', 'gla
 let compartmentIdCounter = 0;
 const DEFAULT_SHELF_COUNT = 2;
 const DEFAULT_MIN_COMPARTMENT_HEIGHT = 0.1;
+export const OVEN_STANDARD_WIDTH = 0.6;
 export const OVEN_DEFAULT_HEIGHT = 0.595;
 export const MICROWAVE_STANDARD_WIDTH = 0.61;
 export const MICROWAVE_STANDARD_HEIGHT = 0.39;
@@ -141,7 +143,7 @@ export function newCabinetCompartment(type) {
     return build();
 }
 export function fridgeCabinetStack(type) {
-    return [newCabinetCompartment(type), { ...newCabinetCompartment('drawer'), drawerCount: 1 }];
+    return [newCabinetCompartment(type)];
 }
 export function cooktopCabinetStack(type) {
     return [{ ...newCabinetCompartment('drawer'), drawerCount: 2 }, newCabinetCompartment(type)];
@@ -289,13 +291,50 @@ function lockedApplianceHeight(compartment) {
 }
 export function minCabinetCarcassHeightForStack(node, minHeight = DEFAULT_MIN_COMPARTMENT_HEIGHT) {
     const stack = stackForCabinet(node);
-    return stack.reduce((sum, compartment) => sum + (lockedApplianceHeight(compartment) ?? minHeight), 0);
+    return stack.reduce((sum, compartment) => sum + (explicitCompartmentHeight(compartment) ?? minHeight), 0);
+}
+export function clampCabinetCarcassHeightForStack(node, carcassHeight, stack = stackForCabinet(node)) {
+    return Math.max(carcassHeight, minCabinetCarcassHeightForStack({ ...node, stack }));
+}
+export function removeCabinetCompartmentStack(node, index) {
+    const stack = stackForCabinet(node);
+    if (index < 0 || index >= stack.length || stack.length <= 1)
+        return { stack };
+    const next = stack.filter((_, compartmentIndex) => compartmentIndex !== index);
+    const soleCompartment = next[0];
+    if (next.length === 1 && soleCompartment?.type === 'dishwasher') {
+        const applianceHeight = explicitCompartmentHeight(soleCompartment) ?? 0;
+        const carcassHeight = Math.max(applianceHeight, Math.min(node.carcassHeight, CABINET_METRIC_DEFAULTS.carcassHeight));
+        return {
+            stack: [{ ...soleCompartment, height: carcassHeight }],
+            carcassHeight,
+        };
+    }
+    if (index !== stack.length - 1)
+        return { stack: next };
+    const hasFlexibleCompartment = next.some((compartment) => explicitCompartmentHeight(compartment) == null);
+    if (hasFlexibleCompartment)
+        return { stack: next };
+    const occupiedHeight = next.reduce((sum, compartment) => sum + (explicitCompartmentHeight(compartment) ?? 0), 0);
+    return {
+        stack: next,
+        carcassHeight: Math.max(0.4, occupiedHeight),
+    };
 }
 export function replaceCabinetCompartmentStack(node, index, next, fillerType = 'drawer', minHeight = DEFAULT_MIN_COMPARTMENT_HEIGHT) {
     const stack = stackForCabinet(node);
     if (index < 0 || index >= stack.length)
         return stack;
-    const replaced = stack.map((compartment, compartmentIndex) => compartmentIndex === index ? next : compartment);
+    const current = stack[index];
+    const replacement = current &&
+        typeof current.height === 'number' &&
+        current.height > 0 &&
+        explicitCompartmentHeight(next) == null
+        ? { ...next, height: current.height }
+        : next;
+    const replaced = stack.map((compartment, compartmentIndex) => compartmentIndex === index ? replacement : compartment);
+    if (isFridgeCompartmentType(next.type))
+        return [replacement];
     if (lockedApplianceHeight(next) == null)
         return replaced;
     if (isHoodCompartmentType(next.type))
@@ -304,16 +343,25 @@ export function replaceCabinetCompartmentStack(node, index, next, fillerType = '
         return replaced;
     if (next.type === 'pull-out-pantry')
         return replaced;
-    const hasFlexibleSibling = replaced.some((compartment, compartmentIndex) => compartmentIndex !== index && lockedApplianceHeight(compartment) == null);
+    const hasFlexibleSibling = replaced.some((compartment, compartmentIndex) => compartmentIndex !== index && explicitCompartmentHeight(compartment) == null);
     if (hasFlexibleSibling)
         return replaced;
+    const configurableStorageSibling = replaced
+        .map((compartment, compartmentIndex) => ({ compartment, compartmentIndex }))
+        .filter(({ compartment, compartmentIndex }) => compartmentIndex !== index && lockedApplianceHeight(compartment) == null)
+        .sort((a, b) => Math.abs(a.compartmentIndex - index) - Math.abs(b.compartmentIndex - index))[0];
+    if (configurableStorageSibling) {
+        return replaced.map((compartment, compartmentIndex) => {
+            if (compartmentIndex !== configurableStorageSibling.compartmentIndex)
+                return compartment;
+            const { height: _height, ...flexibleCompartment } = compartment;
+            return flexibleCompartment;
+        });
+    }
     const lockedHeight = replaced.reduce((sum, compartment) => sum + (lockedApplianceHeight(compartment) ?? 0), 0);
     if (node.carcassHeight - lockedHeight < minHeight)
         return replaced;
     const filler = newCabinetCompartment(fillerType);
-    if (isFridgeCompartmentType(next.type)) {
-        return [...replaced.slice(0, index + 1), filler, ...replaced.slice(index + 1)];
-    }
     return [...replaced.slice(0, index), filler, ...replaced.slice(index)];
 }
 export function normalizeCabinetStack(node) {
@@ -338,17 +386,8 @@ export function resizeCabinetCompartmentStack(node, index, targetHeight, minHeig
     const stack = stackForCabinet(node);
     if (stack.length === 0 || index < 0 || index >= stack.length)
         return stack;
-    if (stack.length === 1) {
-        const compartment = stack[0];
-        return [
-            {
-                ...compartment,
-                height: lockedApplianceHeight(compartment) != null
-                    ? Math.max(minHeight, Math.min(targetHeight, node.carcassHeight))
-                    : node.carcassHeight,
-            },
-        ];
-    }
+    if (stack.length === 1)
+        return stack;
     const normalized = normalizeCabinetStack({ ...node, stack });
     const otherRows = normalized.filter((row) => row.index !== index);
     const lockedOtherRows = otherRows.filter((row) => lockedApplianceHeight(row.compartment) != null);

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

@@ -1 +1 @@
-{"version":3,"file":"tool.d.ts","sourceRoot":"","sources":["../../src/cabinet/tool.tsx"],"names":[],"mappings":"AA+PA,QAAA,MAAM,WAAW,0CA49BhB,CAAA;AAED,eAAe,WAAW,CAAA"}
+{"version":3,"file":"tool.d.ts","sourceRoot":"","sources":["../../src/cabinet/tool.tsx"],"names":[],"mappings":"AAoZA,QAAA,MAAM,WAAW,0CAy/ChB,CAAA;AAED,eAAe,WAAW,CAAA"}