@pascal-app/nodes 1.0.7 → 1.1.1

package/dist/cabinet/floorplan.js

@@ -1,4 +1,4 @@
-import { floorplanGeometryMetadata, readFloorplanContext } from '@pascal-app/editor';
+import { floorplanGeometryMetadata, readFloorplanContext } from '@pascal-app/core';
 import { GAS_HOB_BURNER_RADIUS, gasHobBurners, inductionZones } from './geometry/cooktop.js';
 import { FAUCET_SETBACK, sinkBowls } from './geometry/sink.js';
 import { getRunSpanEnds, getRunSpans } from './run-layout.js';

package/dist/cabinet/kitchen-module-actions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"kitchen-module-actions.d.ts","sourceRoot":"","sources":["../../src/cabinet/kitchen-module-actions.tsx"],"names":[],"mappings":"AAEA,OAAO,EACL,iBAAiB,EACjB,KAAK,WAAW,EAKjB,MAAM,kBAAkB,CAAA;AAOzB,OAAO,EAAE,KAAK,eAAe,EAAqB,MAAM,WAAW,CAAA;AAYnE,wBAAgB,oBAAoB,CAAC,EACnC,IAAI,EACJ,GAAG,EACH,SAAS,GACV,EAAE;IACD,IAAI,EAAE,iBAAiB,CAAA;IACvB,GAAG,EAAE,WAAW,CAAA;IAChB,SAAS,EAAE,CAAC,EAAE,EAAE,eAAe,KAAK,IAAI,CAAA;CACzC,+BAyTA"}
+{"version":3,"file":"kitchen-module-actions.d.ts","sourceRoot":"","sources":["../../src/cabinet/kitchen-module-actions.tsx"],"names":[],"mappings":"AAEA,OAAO,EACL,iBAAiB,EACjB,KAAK,WAAW,EAMjB,MAAM,kBAAkB,CAAA;AAOzB,OAAO,EAAE,KAAK,eAAe,EAAqB,MAAM,WAAW,CAAA;AAYnE,wBAAgB,oBAAoB,CAAC,EACnC,IAAI,EACJ,GAAG,EACH,SAAS,GACV,EAAE;IACD,IAAI,EAAE,iBAAiB,CAAA;IACvB,GAAG,EAAE,WAAW,CAAA;IAChB,SAAS,EAAE,CAAC,EAAE,EAAE,eAAe,KAAK,IAAI,CAAA;CACzC,+BAyTA"}

package/dist/cabinet/kitchen-module-actions.js

@@ -1,7 +1,7 @@
 'use client';
 import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { CabinetModuleNode, createSceneApi, runAsSingleSceneHistoryStep, usePascalI18n, useScene, } from '@pascal-app/core';
-import { ActionButton, formatLinearMeasurement } from '@pascal-app/editor';
+import { CabinetModuleNode, createSceneApi, formatLinearMeasurement, runAsSingleSceneHistoryStep, usePascalI18n, useScene, } from '@pascal-app/core';
+import { ActionButton } from '@pascal-app/editor';
 import { useViewer } from '@pascal-app/viewer';
 import { useState } from 'react';
 import { applyCabinetModuleInsertion, cabinetModuleForRunInsertion } from './insertion.js';

package/dist/cabinet/placement-dimensions.d.ts

@@ -1,4 +1,5 @@
-import type { AnyNode, AnyNodeId } from '@pascal-app/core';
+import { type AnyNode, type AnyNodeId } from '@pascal-app/core';
+import { findClosestCabinetWallInPlan } from './wall-snap.js';
 export type CabinetPlacementDimension = {
     id: string;
     start: [number, number, number];
@@ -9,6 +10,37 @@ export type CabinetPlacementDimension = {
     renderIn3d?: boolean;
     renderInFloorplan?: boolean;
 };
+type CabinetPlacementWallHit = NonNullable<ReturnType<typeof findClosestCabinetWallInPlan>>;
+export type CabinetPlacementCoordinates = {
+    distance: number;
+    offset: number;
+};
+/**
+ * Cabinet distance is measured from the wall start to the cabinet's near edge;
+ * offset is signed away from the selected wall face.
+ */
+export declare function getCabinetPlacementCoordinates({ depth, hit, levelId, nodes, position, width, }: {
+    depth: number;
+    hit: CabinetPlacementWallHit;
+    levelId: AnyNodeId;
+    nodes: Readonly<Record<AnyNodeId, AnyNode>>;
+    position: readonly [number, number, number];
+    width: number;
+}): CabinetPlacementCoordinates;
+export declare function resolveCabinetTypedPlacementPosition({ depth, distance, hit, levelId, nodes, offset, position, width, }: {
+    depth: number;
+    distance: number;
+    hit: CabinetPlacementWallHit;
+    levelId: AnyNodeId;
+    nodes: Readonly<Record<AnyNodeId, AnyNode>>;
+    offset: number;
+    position: readonly [number, number, number];
+    width: number;
+}): {
+    position: [number, number, number];
+    wallLocalX: number;
+    yaw: number;
+} | null;
 export declare function buildCabinetPlacementSizeDimensions({ depth, height, position, rotation, width, }: {
     depth: number;
     height: number;
@@ -16,11 +48,12 @@ export declare function buildCabinetPlacementSizeDimensions({ depth, height, pos
     rotation: number;
     width: number;
 }): CabinetPlacementDimension[];
-export declare function resolveCabinetPlacementDimensions({ depth, levelId, nodes, position, rotation, wallId, width, }: {
+export declare function resolveCabinetPlacementDimensions({ depth, levelId, nodes, position, providedWallHit, rotation, wallId, width, }: {
     depth: number;
     levelId: AnyNodeId;
     nodes: Readonly<Record<AnyNodeId, AnyNode>>;
     position: readonly [number, number, number];
+    providedWallHit?: CabinetPlacementWallHit;
     rotation: number;
     wallId?: AnyNodeId;
     width: number;
@@ -39,4 +72,5 @@ export declare function resolveCabinetPlacementDimensionPosition({ depth, dimens
     position: [number, number, number];
     wallLocalX: number;
 } | null;
+export {};
 //# sourceMappingURL=placement-dimensions.d.ts.map

package/dist/cabinet/placement-dimensions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"placement-dimensions.d.ts","sourceRoot":"","sources":["../../src/cabinet/placement-dimensions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAY1D,MAAM,MAAM,yBAAyB,GAAG;IACtC,EAAE,EAAE,MAAM,CAAA;IACV,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAA;IAC/B,GAAG,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAA;IAC7B,YAAY,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC9B,cAAc,EAAE,MAAM,CAAA;IACtB,KAAK,EAAE,MAAM,CAAA;IACb,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,iBAAiB,CAAC,EAAE,OAAO,CAAA;CAC5B,CAAA;AAED,wBAAgB,mCAAmC,CAAC,EAClD,KAAK,EACL,MAAM,EACN,QAAQ,EACR,QAAQ,EACR,KAAK,GACN,EAAE;IACD,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAA;IAC3C,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,EAAE,MAAM,CAAA;CACd,GAAG,yBAAyB,EAAE,CAmC9B;AAmED,wBAAgB,iCAAiC,CAAC,EAChD,KAAK,EACL,OAAO,EACP,KAAK,EACL,QAAQ,EACR,QAAQ,EACR,MAAM,EACN,KAAK,GACN,EAAE;IACD,KAAK,EAAE,MAAM,CAAA;IACb,OAAO,EAAE,SAAS,CAAA;IAClB,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAA;IAC3C,QAAQ,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAA;IAC3C,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,CAAC,EAAE,SAAS,CAAA;IAClB,KAAK,EAAE,MAAM,CAAA;CACd,GAAG,yBAAyB,EAAE,CAkF9B;AAED,wBAAgB,wCAAwC,CAAC,EACvD,KAAK,EACL,WAAW,EACX,OAAO,EACP,KAAK,EACL,QAAQ,EACR,QAAQ,EACR,MAAM,EACN,KAAK,EACL,KAAK,GACN,EAAE;IACD,KAAK,EAAE,MAAM,CAAA;IACb,WAAW,EAAE,MAAM,CAAA;IACnB,OAAO,EAAE,SAAS,CAAA;IAClB,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAA;IAC3C,QAAQ,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAA;IAC3C,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,CAAC,EAAE,SAAS,CAAA;IAClB,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,MAAM,CAAA;CACd,GAAG;IAAE,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAyEpE"}
+{"version":3,"file":"placement-dimensions.d.ts","sourceRoot":"","sources":["../../src/cabinet/placement-dimensions.ts"],"names":[],"mappings":"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"}

package/dist/cabinet/placement-dimensions.js

@@ -1,8 +1,74 @@
+import { getWallCurveFrameAt, isCurvedWall } from '@pascal-app/core';
 import { runLocalToPlan } from './run-layout.js';
 import { collectCabinetWallSnapNeighbors, findClosestCabinetWallInPlan, resolveCabinetWallFaceOffset, } from './wall-snap.js';
 const DIMENSION_Y = 0.035;
 const DIMENSION_OFFSET = 0.22;
 const DIMENSION_EPSILON = 1e-4;
+function cabinetWallFrameAtLocalX(hit, localX) {
+    if (isCurvedWall(hit.wall)) {
+        return getWallCurveFrameAt(hit.wall, localX / hit.wallLength);
+    }
+    return {
+        point: {
+            x: hit.wall.start[0] + hit.dirX * localX,
+            y: hit.wall.start[1] + hit.dirY * localX,
+        },
+        tangent: { x: hit.dirX, y: hit.dirY },
+        normal: { x: -hit.dirY, y: hit.dirX },
+    };
+}
+/**
+ * Cabinet distance is measured from the wall start to the cabinet's near edge;
+ * offset is signed away from the selected wall face.
+ */
+export function getCabinetPlacementCoordinates({ depth, hit, levelId, nodes, position, width, }) {
+    const frame = cabinetWallFrameAtLocalX(hit, hit.localX);
+    const faceOffset = resolveCabinetWallFaceOffset({
+        hit,
+        nodes: nodes,
+        parentLevelId: levelId,
+    });
+    const normalScale = hit.side === 'front' ? 1 : -1;
+    const wallToPosition = [position[0] - frame.point.x, position[2] - frame.point.y];
+    const actualOffset = (wallToPosition[0] * frame.normal.x + wallToPosition[1] * frame.normal.y) * normalScale;
+    const flushOffset = faceOffset * normalScale + depth / 2;
+    return {
+        distance: Math.max(0, Math.min(hit.wallLength - width, hit.localX - width / 2)),
+        offset: actualOffset - flushOffset,
+    };
+}
+export function resolveCabinetTypedPlacementPosition({ depth, distance, hit, levelId, nodes, offset, position, width, }) {
+    if (!Number.isFinite(distance) || !Number.isFinite(offset))
+        return null;
+    // A cabinet wider than the wall still places (wall snap allows the pose),
+    // and wall snap centers it on the wall (empty span → midpoint). Typed
+    // distance collapses to that centered pose instead of mapping 0 to
+    // width / 2, which would slide the cabinet off the wall center.
+    const maxDistance = Math.max(0, hit.wallLength - width);
+    if (distance < -DIMENSION_EPSILON || distance > maxDistance + DIMENSION_EPSILON)
+        return null;
+    const clampedDistance = Math.min(Math.max(distance, 0), maxDistance);
+    const localX = hit.wallLength <= width ? hit.wallLength / 2 : clampedDistance + width / 2;
+    const frame = cabinetWallFrameAtLocalX(hit, localX);
+    // Sample the miter at the destination station — the frozen hit's localX is
+    // the pre-typing snap, so its face offset is wrong on mitered corners.
+    const faceOffset = resolveCabinetWallFaceOffset({
+        hit: { ...hit, localX },
+        nodes: nodes,
+        parentLevelId: levelId,
+    });
+    const normalScale = hit.side === 'front' ? 1 : -1;
+    const centerOffset = faceOffset + normalScale * (depth / 2 + offset);
+    return {
+        position: [
+            frame.point.x + frame.normal.x * centerOffset,
+            position[1],
+            frame.point.y + frame.normal.y * centerOffset,
+        ],
+        wallLocalX: localX,
+        yaw: Math.atan2(frame.normal.x * normalScale, frame.normal.y * normalScale),
+    };
+}
 export function buildCabinetPlacementSizeDimensions({ depth, height, position, rotation, width, }) {
     const run = {
         position: [position[0], position[1], position[2]],
@@ -70,8 +136,8 @@ function findPlacementWallHit({ levelId, nodes, position, rotation, wallId, }) {
     });
     return selectedWall?.type === 'wall' && hit?.wall.id !== selectedWall.id ? null : hit;
 }
-export function resolveCabinetPlacementDimensions({ depth, levelId, nodes, position, rotation, wallId, width, }) {
-    const wallHit = findPlacementWallHit({ levelId, nodes, position, rotation, wallId });
+export function resolveCabinetPlacementDimensions({ depth, levelId, nodes, position, providedWallHit, rotation, wallId, width, }) {
+    const wallHit = providedWallHit ?? findPlacementWallHit({ levelId, nodes, position, rotation, wallId });
     if (!wallHit)
         return [];
     const minLocalX = wallHit.localX - width / 2;

package/dist/cabinet/system.js

@@ -4,7 +4,7 @@ import { useFrame } from '@react-three/fiber';
 import { useRef } from 'react';
 import { poseCabinetMovingParts } from './animation.js';
 import { updateCooktopFlameTube } from './cooktop-flame.js';
-import { bumpCabinetRunsNear, cabinetRunFootprint, cabinetRunNeighborSignature, } from './definition.js';
+import { bumpCabinetRunsNear, cabinetRunFootprint, cabinetRunNeighborSignature, } from './definition.render.js';
 import { collectCabinetFlameObjects } from './flame-index.js';
 function materialWithOpacity(material) {
     if (!material)

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

@@ -1 +1 @@
-{"version":3,"file":"tool.d.ts","sourceRoot":"","sources":["../../src/cabinet/tool.tsx"],"names":[],"mappings":"AAkiEA,MAAM,CAAC,OAAO,UAAU,WAAW,gCAGlC"}
+{"version":3,"file":"tool.d.ts","sourceRoot":"","sources":["../../src/cabinet/tool.tsx"],"names":[],"mappings":"AAi1EA,MAAM,CAAC,OAAO,UAAU,WAAW,gCAGlC"}