@pascal-app/nodes 1.0.7 → 1.1.0

package/dist/cupola/definition.edit.js

@@ -0,0 +1,103 @@
+import { buildCupolaFloorplan } from './floorplan.js';
+import { cupolaPaint } from './paint.js';
+import { cupolaParametrics } from './parametrics.js';
+const SIDE_HANDLE_OFFSET = 0.3;
+const HEIGHT_HANDLE_OFFSET = 0.25;
+// Snug to the cupola corner so the rotate icon stays close to the item.
+const ROTATE_CORNER_OFFSET = 0.12;
+const MIN_DIM = 0.3;
+const MIN_HEIGHT = 0.4;
+function getBodyMidY(n) {
+    return Math.max(0.001, n.height) / 2;
+}
+// Width / depth grow symmetrically from the centre (cupolas are placed by
+// their centre on the ridge), so a single centred chevron per axis.
+function cupolaWidthHandle() {
+    return {
+        kind: 'linear-resize',
+        axis: 'x',
+        anchor: 'center',
+        min: MIN_DIM,
+        currentValue: (n) => n.width,
+        apply: (_n, newValue) => ({ width: Math.max(MIN_DIM, newValue) }),
+        placement: {
+            position: (n) => [n.width / 2 + SIDE_HANDLE_OFFSET, getBodyMidY(n), 0],
+        },
+    };
+}
+function cupolaDepthHandle() {
+    return {
+        kind: 'linear-resize',
+        axis: 'z',
+        anchor: 'center',
+        min: MIN_DIM,
+        currentValue: (n) => n.depth,
+        apply: (_n, newValue) => ({ depth: Math.max(MIN_DIM, newValue) }),
+        placement: {
+            position: (n) => [0, getBodyMidY(n), n.depth / 2 + SIDE_HANDLE_OFFSET],
+        },
+    };
+}
+function cupolaHeightHandle() {
+    return {
+        kind: 'linear-resize',
+        axis: 'y',
+        anchor: 'min',
+        min: MIN_HEIGHT,
+        currentValue: (n) => n.height,
+        apply: (_n, newValue) => ({ height: Math.max(MIN_HEIGHT, newValue) }),
+        placement: {
+            position: (n) => [0, Math.max(n.height, MIN_HEIGHT) + HEIGHT_HANDLE_OFFSET, 0],
+        },
+    };
+}
+function cupolaRotateHandle() {
+    return {
+        kind: 'arc-resize',
+        axis: 'angular',
+        shape: 'rotate',
+        apply: (initial, delta) => ({ rotation: (initial.rotation ?? 0) - delta }),
+        placement: {
+            position: (n) => [
+                n.width / 2 + ROTATE_CORNER_OFFSET,
+                getBodyMidY(n),
+                n.depth / 2 + ROTATE_CORNER_OFFSET,
+            ],
+            rotationY: () => -Math.PI / 4,
+        },
+        // Guide ring centred on the cupola, sized to pass through the corner
+        // icon so the icon rides the ring — matches solar-panel / skylight.
+        decoration: {
+            kind: 'ring',
+            radius: (n) => Math.hypot(n.width / 2 + ROTATE_CORNER_OFFSET, n.depth / 2 + ROTATE_CORNER_OFFSET),
+            y: (n) => getBodyMidY(n),
+        },
+    };
+}
+// `portal: 'grandparent'` on every handle — see box-vent's note. The cupola
+// rides the roof→segment→node frame chain, so the handle rig must too, or
+// the handles (and rotate arc) render offset from the cupola.
+const cupolaHandles = [
+    cupolaWidthHandle(),
+    cupolaDepthHandle(),
+    cupolaHeightHandle(),
+    cupolaRotateHandle(),
+].map((h) => ({ ...h, portal: 'grandparent' }));
+export const cupolaEditContribution = {
+    snapProfile: 'item',
+    capabilities: {
+        paint: cupolaPaint,
+    },
+    parametrics: cupolaParametrics,
+    handles: cupolaHandles,
+    floorplan: buildCupolaFloorplan,
+    preview: () => import('./preview.js'),
+    tool: () => import('./tool.js'),
+    affordanceTools: {
+        move: () => import('./move-tool.js'),
+    },
+    toolHints: [
+        { key: 'Left click', label: 'Place cupola on roof' },
+        { key: 'Esc', label: 'Cancel' },
+    ],
+};

package/dist/cupola/definition.js

@@ -1,148 +1,4 @@
-import { CUPOLA_LOUVERS_DEFAULT, CupolaNode as CupolaNodeSchema, cupolaSlots, } from '@pascal-app/core';
-import { buildCupolaFloorplan } from './floorplan.js';
-import { cupolaPaint } from './paint.js';
-import { cupolaParametrics } from './parametrics.js';
-import { CupolaNode } from './schema.js';
-const SIDE_HANDLE_OFFSET = 0.3;
-const HEIGHT_HANDLE_OFFSET = 0.25;
-// Snug to the cupola corner so the rotate icon stays close to the item.
-const ROTATE_CORNER_OFFSET = 0.12;
-const MIN_DIM = 0.3;
-const MIN_HEIGHT = 0.4;
-function getBodyMidY(n) {
-    return Math.max(0.001, n.height) / 2;
-}
-// Width / depth grow symmetrically from the centre (cupolas are placed by
-// their centre on the ridge), so a single centred chevron per axis.
-function cupolaWidthHandle() {
-    return {
-        kind: 'linear-resize',
-        axis: 'x',
-        anchor: 'center',
-        min: MIN_DIM,
-        currentValue: (n) => n.width,
-        apply: (_n, newValue) => ({ width: Math.max(MIN_DIM, newValue) }),
-        placement: {
-            position: (n) => [n.width / 2 + SIDE_HANDLE_OFFSET, getBodyMidY(n), 0],
-        },
-    };
-}
-function cupolaDepthHandle() {
-    return {
-        kind: 'linear-resize',
-        axis: 'z',
-        anchor: 'center',
-        min: MIN_DIM,
-        currentValue: (n) => n.depth,
-        apply: (_n, newValue) => ({ depth: Math.max(MIN_DIM, newValue) }),
-        placement: {
-            position: (n) => [0, getBodyMidY(n), n.depth / 2 + SIDE_HANDLE_OFFSET],
-        },
-    };
-}
-function cupolaHeightHandle() {
-    return {
-        kind: 'linear-resize',
-        axis: 'y',
-        anchor: 'min',
-        min: MIN_HEIGHT,
-        currentValue: (n) => n.height,
-        apply: (_n, newValue) => ({ height: Math.max(MIN_HEIGHT, newValue) }),
-        placement: {
-            position: (n) => [0, Math.max(n.height, MIN_HEIGHT) + HEIGHT_HANDLE_OFFSET, 0],
-        },
-    };
-}
-function cupolaRotateHandle() {
-    return {
-        kind: 'arc-resize',
-        axis: 'angular',
-        shape: 'rotate',
-        apply: (initial, delta) => ({ rotation: (initial.rotation ?? 0) - delta }),
-        placement: {
-            position: (n) => [
-                n.width / 2 + ROTATE_CORNER_OFFSET,
-                getBodyMidY(n),
-                n.depth / 2 + ROTATE_CORNER_OFFSET,
-            ],
-            rotationY: () => -Math.PI / 4,
-        },
-        // Guide ring centred on the cupola, sized to pass through the corner
-        // icon so the icon rides the ring — matches solar-panel / skylight.
-        decoration: {
-            kind: 'ring',
-            radius: (n) => Math.hypot(n.width / 2 + ROTATE_CORNER_OFFSET, n.depth / 2 + ROTATE_CORNER_OFFSET),
-            y: (n) => getBodyMidY(n),
-        },
-    };
-}
-// `portal: 'grandparent'` on every handle — see box-vent's note. The cupola
-// rides the roof→segment→node frame chain, so the handle rig must too, or
-// the handles (and rotate arc) render offset from the cupola.
-const cupolaHandles = [
-    cupolaWidthHandle(),
-    cupolaDepthHandle(),
-    cupolaHeightHandle(),
-    cupolaRotateHandle(),
-].map((h) => ({ ...h, portal: 'grandparent' }));
-/**
- * Cupola — a louvered roof lantern. Parented to a `roof-segment`; position
- * is segment-local; rotation rotates it around the segment's vertical axis
- * after the slope tilt is applied. Same composition as the box vent (custom
- * renderer, pure geometry builder, no system) — see box-vent's definition
- * for the rationale on why roof accessories need a custom renderer.
- */
-export const cupolaDefinition = {
-    kind: 'cupola',
-    schemaVersion: 4,
-    schema: CupolaNode,
-    category: 'structure',
-    surfaceRole: 'roof',
-    defaults: () => {
-        const stub = CupolaNodeSchema.parse({ id: 'cupola_default', type: 'cupola' });
-        const { id: _id, type: _type, ...rest } = stub;
-        return {
-            ...rest,
-            slots: { ...(rest.slots ?? {}), louvers: CUPOLA_LOUVERS_DEFAULT },
-        };
-    },
-    capabilities: {
-        exterior: true,
-        slots: cupolaSlots,
-        selectable: { hitVolume: 'bbox' },
-        duplicable: true,
-        deletable: true,
-        paint: cupolaPaint,
-        // Mounts on a roof segment via `roofSegmentId`. Sits ON TOP of the
-        // slope — no `buildCut`, just the dirty cascade so the parent roof's
-        // merged shell rebuilds when the cupola moves / resizes.
-        roofAccessory: {},
-    },
-    parametrics: cupolaParametrics,
-    handles: cupolaHandles,
-    floorplan: buildCupolaFloorplan,
-    rendersChildren: false,
-    renderer: {
-        kind: 'parametric',
-        module: () => import('./renderer.js'),
-    },
-    preview: () => import('./preview.js'),
-    tool: () => import('./tool.js'),
-    affordanceTools: {
-        move: () => import('./move-tool.js'),
-    },
-    toolHints: [
-        { key: 'Left click', label: 'Place cupola on roof' },
-        { key: 'Esc', label: 'Cancel' },
-    ],
-    presentation: {
-        label: 'Cupola',
-        description: 'Louvered roof lantern with a dome or pyramid cap and optional finial.',
-        icon: { kind: 'url', src: '/icons/cupola.webp' },
-        paletteSection: 'structure',
-        paletteOrder: 122,
-    },
-    mcp: {
-        description: 'A louvered cupola (roof lantern) on a roof segment. Roof style: dome / pyramid, optional finial. Parametric width/depth/height.',
-    },
-};
+import { composeNodeDefinition } from '../definition-contributions.js';
+import { cupolaEditContribution } from './definition.edit.js';
+import { cupolaRenderDefinition } from './definition.render.js';
+export const cupolaDefinition = composeNodeDefinition(cupolaRenderDefinition, cupolaEditContribution);

package/dist/cupola/definition.render.d.ts

@@ -0,0 +1,6 @@
+import type { NodeRenderDefinition } from '../definition-contributions.js';
+import { CupolaNode } from './schema.js';
+export declare const cupolaRenderDefinition: NodeRenderDefinition<typeof CupolaNode> & {
+    kind: 'cupola';
+};
+//# sourceMappingURL=definition.render.d.ts.map

package/dist/cupola/definition.render.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"definition.render.d.ts","sourceRoot":"","sources":["../../src/cupola/definition.render.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAA;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAErC,eAAO,MAAM,sBAAsB,EAAE,oBAAoB,CAAC,OAAO,UAAU,CAAC,GAAG;IAAE,IAAI,EAAE,QAAQ,CAAA;CA0C5F,CAAA"}

package/dist/cupola/definition.render.js

@@ -0,0 +1,43 @@
+import { CUPOLA_LOUVERS_DEFAULT, CupolaNode as CupolaNodeSchema, cupolaSlots, } from '@pascal-app/core';
+import { CupolaNode } from './schema.js';
+export const cupolaRenderDefinition = {
+    kind: 'cupola',
+    schemaVersion: 4,
+    schema: CupolaNode,
+    category: 'structure',
+    surfaceRole: 'roof',
+    defaults: () => {
+        const stub = CupolaNodeSchema.parse({ id: 'cupola_default', type: 'cupola' });
+        const { id: _id, type: _type, ...rest } = stub;
+        return {
+            ...rest,
+            slots: { ...(rest.slots ?? {}), louvers: CUPOLA_LOUVERS_DEFAULT },
+        };
+    },
+    capabilities: {
+        exterior: true,
+        slots: cupolaSlots,
+        selectable: { hitVolume: 'bbox' },
+        duplicable: true,
+        deletable: true,
+        // Mounts on a roof segment via `roofSegmentId`. Sits ON TOP of the
+        // slope — no `buildCut`, just the dirty cascade so the parent roof's
+        // merged shell rebuilds when the cupola moves / resizes.
+        roofAccessory: {},
+    },
+    rendersChildren: false,
+    renderer: {
+        kind: 'parametric',
+        module: () => import('./renderer.js'),
+    },
+    presentation: {
+        label: 'Cupola',
+        description: 'Louvered roof lantern with a dome or pyramid cap and optional finial.',
+        icon: { kind: 'url', src: '/icons/cupola.webp' },
+        paletteSection: 'structure',
+        paletteOrder: 122,
+    },
+    mcp: {
+        description: 'A louvered cupola (roof lantern) on a roof segment. Roof style: dome / pyramid, optional finial. Parametric width/depth/height.',
+    },
+};

package/dist/cupola/move-tool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"move-tool.d.ts","sourceRoot":"","sources":["../../src/cupola/move-tool.tsx"],"names":[],"mappings":"AAEA,OAAO,EAEL,KAAK,UAAU,EAOhB,MAAM,kBAAkB,CAAA;AAuBzB;;;;;;GAMG;AACH,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,EAAE,IAAI,EAAE,EAAE;IAAE,IAAI,EAAE,UAAU,CAAA;CAAE,sCAwNpE"}
+{"version":3,"file":"move-tool.d.ts","sourceRoot":"","sources":["../../src/cupola/move-tool.tsx"],"names":[],"mappings":"AAEA,OAAO,EAEL,KAAK,UAAU,EAOhB,MAAM,kBAAkB,CAAA;AA0BzB;;;;;;GAMG;AACH,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,EAAE,IAAI,EAAE,EAAE;IAAE,IAAI,EAAE,UAAU,CAAA;CAAE,sCAyNpE"}

package/dist/cupola/move-tool.js

@@ -1,7 +1,7 @@
 'use client';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { emitter, sceneRegistry, useScene, } from '@pascal-app/core';
-import { consumePlacementDragRelease, markToolCancelConsumed, triggerSFX, useEditor, } from '@pascal-app/editor';
+import { consumePlacementDragRelease, isGridSnapActive, isMagneticSnapActive, markToolCancelConsumed, stripPlacementMetadataFlags, triggerSFX, useEditor, } from '@pascal-app/editor';
 import { useCallback, useEffect, useState } from 'react';
 import * as THREE from 'three';
 import { createRelativeRoofDrag, roofSegmentLocalToBuildingLocal, snapRelativeRoofDragTarget, } from '../shared/relative-roof-drag.js';
@@ -54,9 +54,9 @@ export default function MoveCupolaTool({ node }) {
             if (!rawTarget)
                 return null;
             return snapRoofSurfaceNodeTarget({
-                target: snapRelativeRoofDragTarget(rawTarget, event.nativeEvent?.shiftKey === true),
+                target: snapRelativeRoofDragTarget(rawTarget, event.nativeEvent?.altKey === true),
                 node,
-                bypass: event.nativeEvent?.shiftKey === true,
+                bypass: !isMagneticSnapActive() || event.nativeEvent?.altKey === true,
             });
         };
         const updatePreview = (event) => {
@@ -68,7 +68,8 @@ export default function MoveCupolaTool({ node }) {
             lastTarget = target;
             const sx = Math.round(target.localX * 20) / 20;
             const sz = Math.round(target.localZ * 20) / 20;
-            if (event.nativeEvent?.shiftKey !== true &&
+            if (isGridSnapActive() &&
+                event.nativeEvent?.altKey !== true &&
                 (!lastSnap || lastSnap[0] !== sx || lastSnap[1] !== sz)) {
                 triggerSFX('sfx:grid-snap');
                 lastSnap = [sx, sz];
@@ -121,7 +122,7 @@ export default function MoveCupolaTool({ node }) {
                 position: [target.localX, target.localY, target.localZ],
                 rotation: original.rotation,
                 visible: true,
-                metadata: {},
+                metadata: stripPlacementMetadataFlags(original.metadata),
             });
             useScene.temporal.getState().pause();
             st.dirtyNodes.add(targetSegmentId);

package/dist/definition-contributions.d.ts

@@ -0,0 +1,14 @@
+import type { AnyNodeDefinition, NodeDefinition } from '@pascal-app/core';
+type NodeSchema = AnyNodeDefinition['schema'];
+type EditField = 'extensions' | 'facingIndicator' | 'drafting' | 'connectedMove' | 'parametrics' | 'placementNotice' | 'quickActions' | 'quickActionNodeScope' | 'tool' | 'affordanceTools' | 'affordances' | 'toolHints' | 'affordanceHints' | 'toolOptions' | 'snapProfile' | 'snapDraftDirectional' | 'preview' | 'keyboardActions' | 'handles' | 'computeFloorplanLevelData' | 'floorplan' | 'floorplanDependencies' | 'floorplanScope' | 'floorplanDependsOnSiblings' | 'floorplanAffectedIds' | 'floorplanSiblingOverrides' | 'floorplanAffordances' | 'floorplanMoveTarget';
+type Capabilities<S extends NodeSchema> = NonNullable<NodeDefinition<S>['capabilities']>;
+export type NodeRenderDefinition<S extends NodeSchema> = Omit<NodeDefinition<S>, EditField | 'capabilities'> & {
+    capabilities: Omit<Capabilities<S>, 'paint'>;
+};
+export type NodeEditContribution<S extends NodeSchema> = Partial<Pick<NodeDefinition<S>, EditField | 'renderer'>> & {
+    capabilities?: Pick<Capabilities<S>, 'paint' | 'ceilingCut'>;
+};
+/** Top-level replacement; capabilities merge once. Arrays and functions are replaced. */
+export declare function composeNodeDefinition<S extends NodeSchema>(render: NodeRenderDefinition<S>, edit: NodeEditContribution<S>): NodeDefinition<S>;
+export {};
+//# sourceMappingURL=definition-contributions.d.ts.map

package/dist/definition-contributions.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"definition-contributions.d.ts","sourceRoot":"","sources":["../src/definition-contributions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAEzE,KAAK,UAAU,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAA;AAE7C,KAAK,SAAS,GACV,YAAY,GACZ,iBAAiB,GACjB,UAAU,GACV,eAAe,GACf,aAAa,GACb,iBAAiB,GACjB,cAAc,GACd,sBAAsB,GACtB,MAAM,GACN,iBAAiB,GACjB,aAAa,GACb,WAAW,GACX,iBAAiB,GACjB,aAAa,GACb,aAAa,GACb,sBAAsB,GACtB,SAAS,GACT,iBAAiB,GACjB,SAAS,GACT,2BAA2B,GAC3B,WAAW,GACX,uBAAuB,GACvB,gBAAgB,GAChB,4BAA4B,GAC5B,sBAAsB,GACtB,2BAA2B,GAC3B,sBAAsB,GACtB,qBAAqB,CAAA;AAEzB,KAAK,YAAY,CAAC,CAAC,SAAS,UAAU,IAAI,WAAW,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAA;AAExF,MAAM,MAAM,oBAAoB,CAAC,CAAC,SAAS,UAAU,IAAI,IAAI,CAC3D,cAAc,CAAC,CAAC,CAAC,EACjB,SAAS,GAAG,cAAc,CAC3B,GAAG;IAAE,YAAY,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAA;CAAE,CAAA;AAGpD,MAAM,MAAM,oBAAoB,CAAC,CAAC,SAAS,UAAU,IAAI,OAAO,CAC9D,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,SAAS,GAAG,UAAU,CAAC,CAChD,GAAG;IAAE,YAAY,CAAC,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,OAAO,GAAG,YAAY,CAAC,CAAA;CAAE,CAAA;AAEpE,yFAAyF;AACzF,wBAAgB,qBAAqB,CAAC,CAAC,SAAS,UAAU,EACxD,MAAM,EAAE,oBAAoB,CAAC,CAAC,CAAC,EAC/B,IAAI,EAAE,oBAAoB,CAAC,CAAC,CAAC,GAC5B,cAAc,CAAC,CAAC,CAAC,CAMnB"}

package/dist/definition-contributions.js

@@ -0,0 +1,8 @@
+/** Top-level replacement; capabilities merge once. Arrays and functions are replaced. */
+export function composeNodeDefinition(render, edit) {
+    return {
+        ...render,
+        ...edit,
+        capabilities: { ...render.capabilities, ...edit.capabilities },
+    };
+}