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

package/dist/measurement/renderer.js

@@ -197,9 +197,9 @@ function buildRenderData(measurement) {
         markerPoints,
     };
 }
-function formatMeasurement(measurement, unit) {
+function formatMeasurement(measurement, unit, metricNotation) {
     if (measurement.kind === 'distance') {
-        return formatLinearMeasurement(measurementDistance(...measurement.points), unit);
+        return formatLinearMeasurement(measurementDistance(...measurement.points), unit, metricNotation);
     }
     if (measurement.kind === 'angle') {
         return formatAngleRadians(measurementAngle(...measurement.points));
@@ -208,7 +208,7 @@ function formatMeasurement(measurement, unit) {
         return `A ${formatAreaLabel(measurementArea(measurement.base), unit)}`;
     }
     if (measurement.kind === 'perimeter') {
-        return `P ${formatLinearMeasurement(measurementPerimeter(measurement.base), unit)}`;
+        return `P ${formatLinearMeasurement(measurementPerimeter(measurement.base), unit, metricNotation)}`;
     }
     return `V ${formatVolumeLabel(measurementPrismVolume(measurement.base, measurement.extrusion), unit)}`;
 }
@@ -229,6 +229,7 @@ export const MeasurementRenderer = ({ node }) => {
     const handlers = useNodeEvents(node, 'measurement');
     const showMeasurements = useViewer((state) => state.showMeasurements);
     const unit = useViewer((state) => state.unit);
+    const metricNotation = useViewer((state) => state.metricNotation);
     const active = useViewer((state) => state.hoveredId === node.id || state.selection.selectedIds.some((id) => id === node.id));
     const ownOverride = useLiveNodeOverrides((state) => state.overrides.get(node.id));
     const effectiveNode = useMemo(() => (ownOverride ? { ...node, ...ownOverride } : node), [node, ownOverride]);
@@ -244,9 +245,9 @@ export const MeasurementRenderer = ({ node }) => {
     });
     const data = buildRenderData(resolved.payload);
     const label = useMemo(() => {
-        const value = formatMeasurement(resolved.payload, unit);
+        const value = formatMeasurement(resolved.payload, unit, metricNotation);
         return resolved.dangling.length > 0 ? `Unlinked · ${value}` : value;
-    }, [resolved, unit]);
+    }, [metricNotation, resolved, unit]);
     const color = measurementPresentationColor(resolved.dangling.length > 0, active);
     const lineMaterial = useMemo(() => new LineBasicNodeMaterial({
         color,

package/dist/measurement/surface-query.js

@@ -1,5 +1,5 @@
 import { measurementDistance, measurementFeatureLength, sceneRegistry, useScene, } from '@pascal-app/core';
-import { SCENE_LAYER, ZONE_LAYER } from '@pascal-app/viewer';
+import { setSurfaceRaycastLayers, ZONE_LAYER } from '@pascal-app/viewer';
 import { Matrix3, Matrix4, Quaternion, Raycaster, Vector2, Vector3, } from 'three';
 import { matchMeasurementFeatureForNode } from './resolve';
 const AXIS_SNAP_DISTANCE_PX = 16;
@@ -405,7 +405,7 @@ function collectMeasurementAxisSurfaceIntersections(context, levelObject, anchor
     const origin = levelObject.localToWorld(new Vector3(...anchor));
     const levelRotation = levelObject.getWorldQuaternion(new Quaternion());
     const inverseLevelRotation = levelRotation.clone().invert();
-    raycaster.layers.set(SCENE_LAYER);
+    setSurfaceRaycastLayers(raycaster.layers);
     raycaster.near = 0;
     raycaster.far = maxDistance;
     const intersections = [];
@@ -452,9 +452,9 @@ export function createMeasurementSurfaceQuerySession(scene, options = {}) {
     const verificationRaycaster = new Raycaster();
     const axisRaycaster = new Raycaster();
     const pointer = new Vector2();
-    pointerRaycaster.layers.set(SCENE_LAYER);
-    verificationRaycaster.layers.set(SCENE_LAYER);
-    axisRaycaster.layers.set(SCENE_LAYER);
+    setSurfaceRaycastLayers(pointerRaycaster.layers);
+    setSurfaceRaycastLayers(verificationRaycaster.layers);
+    setSurfaceRaycastLayers(axisRaycaster.layers);
     if (options.includeZoneLayer)
         pointerRaycaster.layers.enable(ZONE_LAYER);
     let context = null;

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

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

package/dist/measurement/tool.js

@@ -2,7 +2,7 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { collectAlignmentAnchors, emitter, measurementAngle, measurementArea, measurementCentroid, measurementDistance, measurementFeatureLength, measurementPerimeter, measurementPrismVolume, sceneRegistry, useScene, } from '@pascal-app/core';
 import { buildMeasurementAngleArcPoints, commitMeasurementDraft, EDITOR_LAYER, finishMeasurementDraft, formatAngleRadians, formatAreaLabel, formatLinearMeasurement, formatVolumeLabel, getLinearUnitLabel, handleMeasurementDraftEscape, isAlignmentGuideActive, isGridSnapActive, linearUnitToMeters, MEASUREMENT_ACTIVE_COLOR, markToolCancelConsumed, measurementPolygonLabelAnchor, measurementPolygonMidpoints, metersToLinearUnit, useEditor, useInteractionScope, useMeasurementDraft, } from '@pascal-app/editor';
-import { SCENE_LAYER, useViewer } from '@pascal-app/viewer';
+import { setSurfaceRaycastLayers, useViewer } from '@pascal-app/viewer';
 import { Html } from '@react-three/drei';
 import { useFrame, useThree } from '@react-three/fiber';
 import { useEffect, useMemo, useRef, useState } from 'react';
@@ -247,7 +247,7 @@ export function collectMeasurementAxisSurfaceIntersections(scene, levelObject, a
     const origin = levelObject.localToWorld(new Vector3(...anchor));
     const levelRotation = levelObject.getWorldQuaternion(new Quaternion());
     const raycaster = new Raycaster();
-    raycaster.layers.set(SCENE_LAYER);
+    setSurfaceRaycastLayers(raycaster.layers);
     raycaster.near = 0;
     raycaster.far = maxDistance;
     const intersections = [];
@@ -766,6 +766,7 @@ const MeasurementDraftPreview = ({ buildingId, levelId, surfaceQuery }) => {
     const extrusionHeight = useMeasurementDraft((state) => state.extrusionHeight);
     const error = useMeasurementDraft((state) => state.error);
     const unit = useViewer((state) => state.unit);
+    const metricNotation = useViewer((state) => state.metricNotation);
     const axisIntersectionCache = useRef(null);
     const draftPointMaterial = useMemo(() => new MeshBasicNodeMaterial({
         color: DRAFT_COLOR,
@@ -897,7 +898,7 @@ const MeasurementDraftPreview = ({ buildingId, levelId, surfaceQuery }) => {
             const end = livePoints[livePoints.length - 1];
             label = {
                 position: localToPreviewFrame(levelObject, buildingObject, midpoint(start, end)),
-                text: formatLinearMeasurement(measurementDistance(start, end), unit),
+                text: formatLinearMeasurement(measurementDistance(start, end), unit, metricNotation),
             };
         }
         else if (kind === 'angle' && livePoints.length >= 3) {
@@ -915,7 +916,7 @@ const MeasurementDraftPreview = ({ buildingId, levelId, surfaceQuery }) => {
                     position: localToPreviewFrame(levelObject, buildingObject, center),
                     text: kind === 'area'
                         ? `A ${formatAreaLabel(measurementArea(livePoints), unit)}`
-                        : `P ${formatLinearMeasurement(measurementPerimeter(livePoints), unit)}`,
+                        : `P ${formatLinearMeasurement(measurementPerimeter(livePoints), unit, metricNotation)}`,
                 };
             }
         }
@@ -971,6 +972,7 @@ const MeasurementDraftPreview = ({ buildingId, levelId, surfaceQuery }) => {
         hoverOwner,
         kind,
         levelId,
+        metricNotation,
         points,
         stage,
         surfaceQuery,
@@ -1005,7 +1007,7 @@ export const MeasurementTool = () => {
     const cancelVertexGesture = useRef(() => { });
     const surfaceQuery = useMemo(() => createMeasurementSurfaceQuerySession(scene), [scene]);
     useEffect(() => {
-        raycaster.current.layers.set(SCENE_LAYER);
+        setSurfaceRaycastLayers(raycaster.current.layers);
     }, []);
     useEffect(() => () => surfaceQuery.dispose(), [surfaceQuery]);
     useEffect(() => {

package/dist/pipe-fitting/definition.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"definition.d.ts","sourceRoot":"","sources":["../../src/pipe-fitting/definition.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAOtD,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAE1C;;;;;GAKG;AACH,eAAO,MAAM,qBAAqB,EAAE,cAAc,CAAC,OAAO,eAAe,CA4FxE,CAAA"}
+{"version":3,"file":"definition.d.ts","sourceRoot":"","sources":["../../src/pipe-fitting/definition.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAStD,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAE1C;;;;;GAKG;AACH,eAAO,MAAM,qBAAqB,EAAE,cAAc,CAAC,OAAO,eAAe,CAwGxE,CAAA"}

package/dist/pipe-fitting/definition.js

@@ -1,5 +1,7 @@
 import { useScene } from '@pascal-app/core';
 import { getRotationAxis, rotateEulerWorld } from '../shared/fitting-rotation';
+import { pipeFittingToolOptions } from '../shared/fitting-tool-options';
+import { pipeFittingQuickActions } from '../shared/mep-fitting-actions';
 import { buildPipeFittingFloorplan } from './floorplan';
 import { buildPipeFittingGeometry } from './geometry';
 import { pipeFittingParametrics } from './parametrics';
@@ -13,7 +15,7 @@ import { PipeFittingNode } from './schema';
  */
 export const pipeFittingDefinition = {
     kind: 'pipe-fitting',
-    schemaVersion: 1,
+    schemaVersion: 2,
     schema: PipeFittingNode,
     category: 'utility',
     distributionRole: 'fitting',
@@ -25,6 +27,7 @@ export const pipeFittingDefinition = {
         metadata: {},
         position: [0, 0, 0],
         rotation: [0, 0, 0],
+        cleanoutStyle: 'end',
         fittingType: 'elbow',
         angle: 90,
         diameter: 2,
@@ -40,9 +43,19 @@ export const pipeFittingDefinition = {
     },
     parametrics: pipeFittingParametrics,
     geometry: buildPipeFittingGeometry,
-    geometryKey: (n) => JSON.stringify([n.fittingType, n.angle, n.diameter, n.diameter2, n.pipeMaterial, n.system]),
+    geometryKey: (n) => JSON.stringify([
+        n.fittingType,
+        n.cleanoutStyle,
+        n.angle,
+        n.diameter,
+        n.diameter2,
+        n.pipeMaterial,
+        n.system,
+    ]),
     ports: getPipeFittingPorts,
     floorplan: buildPipeFittingFloorplan,
+    quickActions: pipeFittingQuickActions,
+    quickActionNodeScope: 'level',
     // R/T rotate a selected fitting ±45° around the shared active axis —
     // same scheme as duct fittings (the default editor rotate only knows
     // Y; DWV stacks need X/Z). Alt-cycling lives in `./selection.tsx`.
@@ -68,6 +81,7 @@ export const pipeFittingDefinition = {
         selection: () => import('./selection'),
         move: () => import('./move-tool'),
     },
+    toolOptions: pipeFittingToolOptions,
     tool: () => import('./tool'),
     toolHints: [
         { key: 'Click', label: 'Place fitting' },

package/dist/pipe-fitting/floorplan.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"floorplan.d.ts","sourceRoot":"","sources":["../../src/pipe-fitting/floorplan.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAG1E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAK/C;;;;;GAKG;AACH,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,eAAe,EACrB,GAAG,EAAE,eAAe,GACnB,iBAAiB,GAAG,IAAI,CAwC1B"}
+{"version":3,"file":"floorplan.d.ts","sourceRoot":"","sources":["../../src/pipe-fitting/floorplan.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAK1E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAK/C;;;;;GAKG;AACH,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,eAAe,EACrB,GAAG,EAAE,eAAe,GACnB,iBAAiB,GAAG,IAAI,CA0C1B"}

package/dist/pipe-fitting/floorplan.js

@@ -1,4 +1,6 @@
 import { INCHES_TO_METERS } from '../duct-segment/geometry';
+import { accessoryFloorplan } from '../shared/accessory-floorplan';
+import { buildPipeFittingGeometry } from './geometry';
 import { getPipeFittingPorts } from './ports';
 const WASTE_COLOR = '#57534e';
 const VENT_COLOR = '#78716c';
@@ -9,6 +11,8 @@ const VENT_COLOR = '#78716c';
  * hub, which is how they should read from above.
  */
 export function buildPipeFittingFloorplan(node, ctx) {
+    if (['end-cap', 'cleanout', 'reducer', 'coupling'].includes(node.fittingType))
+        return accessoryFloorplan(buildPipeFittingGeometry(node), node, ctx);
     const [cx, , cz] = node.position;
     const view = ctx.viewState;
     const palette = view?.palette;

package/dist/pipe-fitting/geometry.d.ts

@@ -1,11 +1,9 @@
 import { Group } from 'three';
 import type { PipeFittingNode } from './schema';
 /**
- * Pure geometry builder for a DWV fitting, in the node's LOCAL frame.
- * One cylinder stub per port from the junction outward, an oversized
- * hub sphere at the junction, and a smaller hub at each collar opening
- * (solvent-weld couplings). Wyes read correctly because their branch
- * stub leaves at 45° — the port layout does the work.
+ * Pure local-frame DWV fitting geometry. Ports remain the network contract;
+ * the model grows inward from each collar so replacing the old primitives does
+ * not move any connected pipe endpoint.
  */
 export declare function buildPipeFittingGeometry(node: PipeFittingNode): Group;
 //# sourceMappingURL=geometry.d.ts.map

package/dist/pipe-fitting/geometry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"geometry.d.ts","sourceRoot":"","sources":["../../src/pipe-fitting/geometry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAiC,MAAM,OAAO,CAAA;AAI5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAI/C;;;;;;GAMG;AACH,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,eAAe,GAAG,KAAK,CA0BrE"}
+{"version":3,"file":"geometry.d.ts","sourceRoot":"","sources":["../../src/pipe-fitting/geometry.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,EASN,MAAM,OAAO,CAAA;AAKd,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAwN/C;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,eAAe,GAAG,KAAK,CAoFrE"}

package/dist/pipe-fitting/geometry.js

@@ -1,31 +1,164 @@
-import { Group, Mesh, SphereGeometry, Vector3 } from 'three';
-import { buildSection, INCHES_TO_METERS } from '../duct-segment/geometry';
+import { CubicBezierCurve3, CylinderGeometry, Group, LineCurve3, Mesh, Quaternion, RingGeometry, SphereGeometry, TubeGeometry, Vector3, } from 'three';
+import { INCHES_TO_METERS } from '../duct-segment/geometry';
 import { createPipeMaterial } from '../pipe-segment/geometry';
+import { addPlug, addProfile } from '../shared/accessory-geometry';
 import { localPipeFittingPorts } from './ports';
-const RADIAL_SEGMENTS = 20;
+const RADIAL_SEGMENTS = 28;
+const SWEEP_SEGMENTS = 32;
+const Y_AXIS = new Vector3(0, 1, 0);
+const Z_AXIS = new Vector3(0, 0, 1);
+function pipeRadius(diameterInches) {
+    return (diameterInches * INCHES_TO_METERS) / 2;
+}
+function addSocket(group, port, material, pipeMaterial) {
+    const radius = pipeRadius(port.diameter);
+    const bodyRadius = radius * 1.08;
+    const socketRadius = radius * (pipeMaterial === 'cast-iron' ? 1.18 : 1.3);
+    const portLength = port.position.length();
+    const socketDepth = Math.min(portLength * 0.42, Math.max(0.022, radius * 1.05));
+    const shoulderDepth = Math.min(portLength * 0.16, Math.max(0.006, radius * 0.32));
+    const direction = port.direction.clone().normalize();
+    const axisRotation = new Quaternion().setFromUnitVectors(Y_AXIS, direction);
+    const socket = new Mesh(new CylinderGeometry(socketRadius, socketRadius, socketDepth, RADIAL_SEGMENTS, 1, true), material);
+    socket.name = `pipe-fitting-socket-${port.id}`;
+    socket.position.copy(port.position).addScaledVector(direction, -socketDepth / 2);
+    socket.quaternion.copy(axisRotation);
+    group.add(socket);
+    const shoulder = new Mesh(new CylinderGeometry(socketRadius, bodyRadius, shoulderDepth, RADIAL_SEGMENTS, 1, true), material);
+    shoulder.name = `pipe-fitting-shoulder-${port.id}`;
+    shoulder.position
+        .copy(port.position)
+        .addScaledVector(direction, -(socketDepth + shoulderDepth / 2));
+    shoulder.quaternion.copy(axisRotation);
+    group.add(shoulder);
+    const rim = new Mesh(new RingGeometry(radius * 0.82, socketRadius, RADIAL_SEGMENTS), material);
+    rim.name = `pipe-fitting-rim-${port.id}`;
+    rim.position.copy(port.position).addScaledVector(direction, 0.0005);
+    rim.quaternion.setFromUnitVectors(Z_AXIS, direction);
+    group.add(rim);
+    if (pipeMaterial === 'cast-iron') {
+        for (const offset of [0.22, 0.72]) {
+            const band = new Mesh(new CylinderGeometry(socketRadius * 1.035, socketRadius * 1.035, 0.006, RADIAL_SEGMENTS), material);
+            band.name = `pipe-fitting-band-${port.id}-${offset}`;
+            band.position.copy(port.position).addScaledVector(direction, -socketDepth * offset);
+            band.quaternion.copy(axisRotation);
+            group.add(band);
+        }
+    }
+    else {
+        const stopRing = new Mesh(new CylinderGeometry(socketRadius * 1.035, socketRadius * 1.035, 0.006, RADIAL_SEGMENTS), material);
+        stopRing.name = `pipe-fitting-stop-${port.id}`;
+        stopRing.position.copy(port.position).addScaledVector(direction, -socketDepth * 0.88);
+        stopRing.quaternion.copy(axisRotation);
+        group.add(stopRing);
+    }
+    return {
+        bodyPoint: port.position.clone().addScaledVector(direction, -(socketDepth + shoulderDepth)),
+        bodyRadius,
+    };
+}
+function addStraight(group, start, end, radius, material, name) {
+    if (start.distanceToSquared(end) < 1e-8)
+        return;
+    const body = new Mesh(new TubeGeometry(new LineCurve3(start, end), 1, radius, RADIAL_SEGMENTS, false), material);
+    body.name = name;
+    group.add(body);
+}
+function addSweep(group, start, startTangent, end, endTangent, radius, material, name) {
+    const distance = start.distanceTo(end);
+    if (distance < 1e-5)
+        return;
+    const handle = Math.max(distance * 0.48, radius * 1.6);
+    const curve = new CubicBezierCurve3(start, start.clone().addScaledVector(startTangent.clone().normalize(), handle), end.clone().addScaledVector(endTangent.clone().normalize(), -handle), end);
+    const body = new Mesh(new TubeGeometry(curve, SWEEP_SEGMENTS, radius, RADIAL_SEGMENTS, false), material);
+    body.name = name;
+    group.add(body);
+}
+function addJunctionBlend(group, position, radius, material, name) {
+    const blend = new Mesh(new SphereGeometry(radius * 1.03, RADIAL_SEGMENTS, 18), material);
+    blend.name = name;
+    blend.position.copy(position);
+    group.add(blend);
+}
+function buildElbow(group, ports, sockets, material) {
+    const inlet = ports.find((port) => port.id === 'inlet');
+    const outlet = ports.find((port) => port.id === 'outlet');
+    if (!(inlet && outlet))
+        return;
+    const inletSocket = sockets.get(inlet.id);
+    const outletSocket = sockets.get(outlet.id);
+    if (!(inletSocket && outletSocket))
+        return;
+    addSweep(group, inletSocket.bodyPoint, inlet.direction.clone().negate(), outletSocket.bodyPoint, outlet.direction, inletSocket.bodyRadius, material, 'pipe-fitting-elbow-sweep');
+}
+function buildBranchFitting(group, node, ports, sockets, material) {
+    const inlet = ports.find((port) => port.id === 'inlet');
+    const outlet = ports.find((port) => port.id === 'outlet');
+    const inletSocket = inlet ? sockets.get(inlet.id) : null;
+    const outletSocket = outlet ? sockets.get(outlet.id) : null;
+    if (!(inlet && outlet && inletSocket && outletSocket))
+        return;
+    addStraight(group, inletSocket.bodyPoint, outletSocket.bodyPoint, inletSocket.bodyRadius, material, `pipe-fitting-${node.fittingType}-run`);
+    const runSpan = inletSocket.bodyPoint.distanceTo(outletSocket.bodyPoint);
+    const merge = new Vector3(runSpan * 0.1, 0, 0);
+    for (const branchId of node.fittingType === 'cross' ? ['branch', 'branch2'] : ['branch']) {
+        const branch = ports.find((port) => port.id === branchId);
+        const branchSocket = branch ? sockets.get(branch.id) : null;
+        if (!(branch && branchSocket))
+            continue;
+        addSweep(group, branchSocket.bodyPoint, branch.direction.clone().negate(), merge, new Vector3(1, 0, 0), branchSocket.bodyRadius, material, `pipe-fitting-${node.fittingType}-${branchId}-sweep`);
+    }
+    addJunctionBlend(group, merge, Math.max(inletSocket.bodyRadius, pipeRadius(node.diameter2) * 1.08), material, `pipe-fitting-${node.fittingType}-blend`);
+}
 /**
- * Pure geometry builder for a DWV fitting, in the node's LOCAL frame.
- * One cylinder stub per port from the junction outward, an oversized
- * hub sphere at the junction, and a smaller hub at each collar opening
- * (solvent-weld couplings). Wyes read correctly because their branch
- * stub leaves at 45° — the port layout does the work.
+ * Pure local-frame DWV fitting geometry. Ports remain the network contract;
+ * the model grows inward from each collar so replacing the old primitives does
+ * not move any connected pipe endpoint.
  */
 export function buildPipeFittingGeometry(node) {
     const group = new Group();
     const material = createPipeMaterial(node);
-    const radiusRun = (node.diameter * INCHES_TO_METERS) / 2;
-    for (const port of localPipeFittingPorts(node)) {
-        const radius = (port.diameter * INCHES_TO_METERS) / 2;
-        const stub = buildSection(new Vector3(0, 0, 0), port.position, radius, material, `pipe-fitting-stub-${port.id}`);
-        if (stub)
-            group.add(stub);
-        const hub = new Mesh(new SphereGeometry(radius * 1.18, RADIAL_SEGMENTS, 12), material);
-        hub.name = `pipe-fitting-hub-${port.id}`;
-        hub.position.copy(port.position);
-        group.add(hub);
+    const ports = localPipeFittingPorts(node);
+    const sockets = new Map();
+    for (const port of ports) {
+        sockets.set(port.id, addSocket(group, port, material, node.pipeMaterial));
+    }
+    if (node.fittingType === 'end-cap' ||
+        node.fittingType === 'cleanout' ||
+        node.fittingType === 'coupling' ||
+        node.fittingType === 'reducer') {
+        const inlet = sockets.get('inlet');
+        const outlet = sockets.get('outlet');
+        const radius = inlet.bodyRadius;
+        if (node.fittingType === 'reducer' && outlet) {
+            const taper = new Mesh(new CylinderGeometry(outlet.bodyRadius, radius, outlet.bodyPoint.x - inlet.bodyPoint.x, RADIAL_SEGMENTS, 1, true), material);
+            taper.name = 'pipe-reducer-taper';
+            taper.quaternion.setFromUnitVectors(Y_AXIS, new Vector3(1, 0, 0));
+            taper.position.x = (outlet.bodyPoint.x + inlet.bodyPoint.x) / 2;
+            group.add(taper);
+        }
+        else {
+            const end = outlet?.bodyPoint.x ?? 0.025;
+            addProfile(group, 'pipe-accessory-body', 'round', radius * 2, radius * 2, inlet.bodyPoint.x, end, material, radius * 0.16);
+            if (node.fittingType === 'end-cap')
+                addProfile(group, 'pipe-end-cap-closure', 'round', radius * 2, radius * 2, end - 0.004, end, material);
+            if (node.fittingType === 'cleanout') {
+                if (outlet) {
+                    const service = new Group();
+                    service.name = 'cleanout-service-branch';
+                    addProfile(service, 'cleanout-neck', 'round', radius * 2, radius * 2, 0, radius * 2, material, radius * 0.16);
+                    addPlug(service, radius, radius * 2, material);
+                    service.rotation.z = Math.PI / 2;
+                    group.add(service);
+                }
+                else
+                    addPlug(group, radius, end, material);
+            }
+        }
     }
-    const junction = new Mesh(new SphereGeometry(radiusRun * 1.18, RADIAL_SEGMENTS, 12), material);
-    junction.name = 'pipe-fitting-junction';
-    group.add(junction);
+    else if (node.fittingType === 'elbow')
+        buildElbow(group, ports, sockets, material);
+    else
+        buildBranchFitting(group, node, ports, sockets, material);
     return group;
 }

package/dist/pipe-fitting/inline-insertion.d.ts

@@ -0,0 +1,13 @@
+import { PipeFittingNode, PipeSegmentNode } from '@pascal-app/core';
+import type { RunBodyHit } from '../shared/ports';
+export type PipeInlineInsertionPlan = {
+    fitting: PipeFittingNode;
+    runUpdate: {
+        id: PipeSegmentNode['id'];
+        data: Partial<PipeSegmentNode>;
+    };
+    runTail: PipeSegmentNode;
+};
+export declare function isInlinePipeFitting(node: PipeFittingNode): boolean;
+export declare function planPipeInlineInsertion(run: PipeSegmentNode, hit: RunBodyHit, template: PipeFittingNode): PipeInlineInsertionPlan | null;
+//# sourceMappingURL=inline-insertion.d.ts.map

package/dist/pipe-fitting/inline-insertion.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"inline-insertion.d.ts","sourceRoot":"","sources":["../../src/pipe-fitting/inline-insertion.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAEnE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAOjD,MAAM,MAAM,uBAAuB,GAAG;IACpC,OAAO,EAAE,eAAe,CAAA;IACxB,SAAS,EAAE;QAAE,EAAE,EAAE,eAAe,CAAC,IAAI,CAAC,CAAC;QAAC,IAAI,EAAE,OAAO,CAAC,eAAe,CAAC,CAAA;KAAE,CAAA;IACxE,OAAO,EAAE,eAAe,CAAA;CACzB,CAAA;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAMlE;AAmCD,wBAAgB,uBAAuB,CACrC,GAAG,EAAE,eAAe,EACpB,GAAG,EAAE,UAAU,EACf,QAAQ,EAAE,eAAe,GACxB,uBAAuB,GAAG,IAAI,CAqEhC"}

package/dist/pipe-fitting/inline-insertion.js

@@ -0,0 +1,96 @@
+import { PipeFittingNode, PipeSegmentNode } from '@pascal-app/core';
+import { Euler, Quaternion, Vector3 } from 'three';
+import { pipeFittingLegLength } from './ports';
+const MIN_PIPE_STUB_M = 0.05;
+export function isInlinePipeFitting(node) {
+    return (node.fittingType === 'coupling' ||
+        node.fittingType === 'reducer' ||
+        (node.fittingType === 'cleanout' && node.cleanoutStyle === 'inline'));
+}
+function splitWallAttachment(run, hit) {
+    const attachment = run.wallAttachment;
+    if (!attachment)
+        return {};
+    let distanceBefore = 0;
+    let totalDistance = 0;
+    for (let index = 0; index < run.path.length - 1; index++) {
+        const length = new Vector3(...run.path[index + 1]).distanceTo(new Vector3(...run.path[index]));
+        if (index < hit.segmentIndex)
+            distanceBefore += length;
+        totalDistance += length;
+    }
+    if (totalDistance < 1e-8)
+        return {};
+    const segmentStart = new Vector3(...run.path[hit.segmentIndex]);
+    const hitDistance = segmentStart.distanceTo(new Vector3(...hit.point));
+    const ratio = Math.min(1, Math.max(0, (distanceBefore + hitDistance) / totalDistance));
+    const splitUV = [
+        attachment.startUV[0] + (attachment.endUV[0] - attachment.startUV[0]) * ratio,
+        attachment.startUV[1] + (attachment.endUV[1] - attachment.startUV[1]) * ratio,
+    ];
+    return {
+        head: { ...attachment, endUV: splitUV },
+        tail: { ...attachment, startUV: splitUV },
+    };
+}
+export function planPipeInlineInsertion(run, hit, template) {
+    if (!isInlinePipeFitting(template))
+        return null;
+    const a = run.path[hit.segmentIndex];
+    const b = run.path[hit.segmentIndex + 1];
+    if (!a || !b)
+        return null;
+    const axis = new Vector3(...b).sub(new Vector3(...a));
+    if (axis.lengthSq() < 1e-10)
+        return null;
+    axis.normalize();
+    const fitting = PipeFittingNode.parse({
+        ...template,
+        diameter: run.diameter,
+        pipeMaterial: run.pipeMaterial,
+        system: run.system,
+        position: hit.point,
+        rotation: (() => {
+            const euler = new Euler().setFromQuaternion(new Quaternion().setFromUnitVectors(new Vector3(1, 0, 0), axis));
+            return [euler.x, euler.y, euler.z];
+        })(),
+    });
+    const legLength = pipeFittingLegLength(fitting.fittingType === 'reducer'
+        ? Math.max(fitting.diameter, fitting.diameter2)
+        : fitting.diameter);
+    const center = new Vector3(...hit.point);
+    if (center.distanceTo(new Vector3(...a)) < legLength + MIN_PIPE_STUB_M ||
+        center.distanceTo(new Vector3(...b)) < legLength + MIN_PIPE_STUB_M) {
+        return null;
+    }
+    const inlet = center.clone().addScaledVector(axis, -legLength);
+    const outlet = center.clone().addScaledVector(axis, legLength);
+    const upstreamPath = [
+        ...run.path.slice(0, hit.segmentIndex + 1).map((point) => [...point]),
+        inlet.toArray(),
+    ];
+    const tailPath = [
+        outlet.toArray(),
+        ...run.path.slice(hit.segmentIndex + 1).map((point) => [...point]),
+    ];
+    const wallAttachment = splitWallAttachment(run, hit);
+    const tailDiameter = fitting.fittingType === 'reducer' ? fitting.diameter2 : run.diameter;
+    const runTail = PipeSegmentNode.parse({
+        ...run,
+        id: undefined,
+        path: tailPath,
+        diameter: tailDiameter,
+        ...(wallAttachment.tail ? { wallAttachment: wallAttachment.tail } : {}),
+    });
+    return {
+        fitting,
+        runUpdate: {
+            id: run.id,
+            data: {
+                path: upstreamPath,
+                ...(wallAttachment.head ? { wallAttachment: wallAttachment.head } : {}),
+            },
+        },
+        runTail,
+    };
+}

package/dist/pipe-fitting/parametrics.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parametrics.d.ts","sourceRoot":"","sources":["../../src/pipe-fitting/parametrics.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAsB,oBAAoB,EAAmB,MAAM,kBAAkB,CAAA;AAEjG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAkC/C,eAAO,MAAM,sBAAsB,EAAE,oBAAoB,CAAC,eAAe,CA0ExE,CAAA"}
+{"version":3,"file":"parametrics.d.ts","sourceRoot":"","sources":["../../src/pipe-fitting/parametrics.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAsB,oBAAoB,EAAmB,MAAM,kBAAkB,CAAA;AAEjG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAkC/C,eAAO,MAAM,sBAAsB,EAAE,oBAAoB,CAAC,eAAe,CAwFxE,CAAA"}

package/dist/pipe-fitting/parametrics.js

@@ -58,8 +58,22 @@ export const pipeFittingParametrics = {
                 {
                     key: 'fittingType',
                     kind: 'enum',
-                    options: ['elbow', 'wye', 'sanitary-tee', 'cross'],
-                    display: 'segmented',
+                    options: [
+                        'elbow',
+                        'wye',
+                        'sanitary-tee',
+                        'cross',
+                        'end-cap',
+                        'cleanout',
+                        'reducer',
+                        'coupling',
+                    ],
+                },
+                {
+                    key: 'cleanoutStyle',
+                    kind: 'enum',
+                    options: ['end', 'inline'],
+                    visibleIf: (n) => n.fittingType === 'cleanout',
                 },
                 {
                     key: 'angle',
@@ -89,7 +103,7 @@ export const pipeFittingParametrics = {
                     min: 1.25,
                     max: 6,
                     step: 0.25,
-                    visibleIf: (n) => n.fittingType !== 'elbow',
+                    visibleIf: (n) => ['wye', 'sanitary-tee', 'cross', 'reducer'].includes(n.fittingType),
                 },
                 { key: 'pipeMaterial', kind: 'enum', options: ['pvc', 'abs', 'cast-iron'] },
             ],

package/dist/pipe-fitting/ports.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ports.d.ts","sourceRoot":"","sources":["../../src/pipe-fitting/ports.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAChD,OAAO,EAAS,OAAO,EAAE,MAAM,OAAO,CAAA;AAEtC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAE/C;sDACsD;AACtD,wBAAgB,oBAAoB,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM,CAGnE;AAED,gDAAgD;AAChD,eAAO,MAAM,cAAc,QAAc,CAAA;AAEzC,KAAK,SAAS,GAAG;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,OAAO,CAAC;IAAC,SAAS,EAAE,OAAO,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAA;AAExF;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,eAAe,GAAG,SAAS,EAAE,CA4DxE;AAED,oEAAoE;AACpE,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,eAAe,GAAG,QAAQ,EAAE,CAcrE"}
+{"version":3,"file":"ports.d.ts","sourceRoot":"","sources":["../../src/pipe-fitting/ports.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAChD,OAAO,EAAS,OAAO,EAAE,MAAM,OAAO,CAAA;AAEtC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAE/C;sDACsD;AACtD,wBAAgB,oBAAoB,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM,CAGnE;AAED,gDAAgD;AAChD,eAAO,MAAM,cAAc,QAAc,CAAA;AAEzC,KAAK,SAAS,GAAG;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,OAAO,CAAC;IAAC,SAAS,EAAE,OAAO,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAA;AAExF;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,eAAe,GAAG,SAAS,EAAE,CAqExE;AAED,oEAAoE;AACpE,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,eAAe,GAAG,QAAQ,EAAE,CAcrE"}

package/dist/pipe-fitting/ports.js

@@ -16,13 +16,16 @@ export const WYE_BRANCH_RAD = Math.PI / 4;
  * run along X, two opposed branches on ±Z.
  */
 export function localPipeFittingPorts(node) {
-    const run = pipeFittingLegLength(node.diameter);
+    const run = pipeFittingLegLength(node.fittingType === 'reducer' ? Math.max(node.diameter, node.diameter2) : node.diameter);
     const inlet = {
         id: 'inlet',
         position: new Vector3(-run, 0, 0),
         direction: new Vector3(-1, 0, 0),
         diameter: node.diameter,
     };
+    if (node.fittingType === 'end-cap' ||
+        (node.fittingType === 'cleanout' && node.cleanoutStyle === 'end'))
+        return [inlet];
     if (node.fittingType === 'elbow') {
         const theta = (node.angle * Math.PI) / 180;
         const outDir = new Vector3(Math.cos(theta), 0, Math.sin(theta));
@@ -42,6 +45,10 @@ export function localPipeFittingPorts(node) {
         direction: new Vector3(1, 0, 0),
         diameter: node.diameter,
     };
+    if (node.fittingType === 'reducer')
+        return [inlet, { ...outlet, diameter: node.diameter2 }];
+    if (node.fittingType === 'coupling' || node.fittingType === 'cleanout')
+        return [inlet, outlet];
     const branchLeg = pipeFittingLegLength(node.diameter2);
     if (node.fittingType === 'cross') {
         return [