schematex 0.6.0 → 0.6.1

package/dist/{chunk-7AFW2J6J.js → chunk-I2GQYOZ5.js}

@@ -1,8 +1,8 @@
 import { orgchart } from './chunk-RJMCWT7Z.js';
 import { circuit } from './chunk-UWA5MWCI.js';
-import { blockdiagram } from './chunk-EPKIJEH7.js';
+import { blockdiagram } from './chunk-MFAMNFPA.js';
 import { ladder } from './chunk-TWLKXV2O.js';
-import { sld } from './chunk-LGABFD3L.js';
+import { sld } from './chunk-522WB2EH.js';
 import { entity } from './chunk-H4MT5TJP.js';
 import { fishbone } from './chunk-HAZALB7U.js';
 import { venn } from './chunk-FBS3PACU.js';
@@ -4355,7 +4355,8 @@ var GEOMETRY = {
       top: { x: 0, y: -55 },
       bottom: { x: 0, y: 55 },
       in: { x: -45, y: -10 },
-      out: { x: 0, y: 55 }
+      out: { x: 45, y: 10 },
+      right: { x: 45, y: 10 }
     }
   },
   reactor_pfr: {
@@ -5050,9 +5051,10 @@ function renderInstrument(category, letterCode, loopNumber) {
 // src/diagrams/pid/layout.ts
 var PADDING = 30;
 var TITLE_AREA = 26;
-var EQUIP_GAP_X = 70;
+var EQUIP_GAP_X = 92;
 var INST_RADIUS = 14;
-var INST_OFFSET = 38;
+var INST_OFFSET = 52;
+var PORT_CLEARANCE = 18;
 function defaultPort(direction, equip) {
   if (equip.equipType === "tank_atm" || equip.equipType === "tank_cone_roof") {
     return direction === "out" ? "bottom" : "top";
@@ -5064,8 +5066,9 @@ function defaultPort(direction, equip) {
 }
 function resolveSide(port) {
   if (port === "top" || port === "vapor_out" || port === "reflux") return "top";
-  if (port === "bottom" || port === "liquid_out" || port === "bottom_return") return "bottom";
-  if (port === "left" || port === "in" || port === "feed" || port === "tube_in" || port === "shell_in") return "left";
+  if (port === "bottom" || port === "liquid_out" || port === "bottom_return" || port === "shell_out") return "bottom";
+  if (port === "left" || port === "in" || port === "feed" || port === "tube_in") return "left";
+  if (port === "shell_in") return "top";
   return "right";
 }
 function getAnchor(layoutEq, port, fallback) {
@@ -5110,12 +5113,53 @@ function manhattanPath(fromX, fromY, fromSide, toX, toY, toSide) {
     midY: toY
   };
 }
+function sideVector(side) {
+  switch (side) {
+    case "left":
+      return { x: -1, y: 0 };
+    case "right":
+      return { x: 1, y: 0 };
+    case "top":
+      return { x: 0, y: -1 };
+    case "bottom":
+      return { x: 0, y: 1 };
+  }
+}
+function portStubPath(from, to, clearance = PORT_CLEARANCE) {
+  const fv = sideVector(from.side);
+  const tv = sideVector(to.side);
+  const fromStub = {
+    x: from.x + fv.x * clearance,
+    y: from.y + fv.y * clearance,
+    side: from.side
+  };
+  const toStub = {
+    x: to.x + tv.x * clearance,
+    y: to.y + tv.y * clearance,
+    side: to.side
+  };
+  const routed = manhattanPath(fromStub.x, fromStub.y, fromStub.side, toStub.x, toStub.y, toStub.side);
+  return {
+    d: `M ${from.x} ${from.y} L ${fromStub.x} ${fromStub.y} ${routed.d.replace(/^M\s+[-\d.]+\s+[-\d.]+\s*/, "")} L ${to.x} ${to.y}`,
+    midX: routed.midX,
+    midY: routed.midY
+  };
+}
+function lineMidpoint(ln, equipById) {
+  const fromEq = equipById.get(ln.from.id);
+  const toEq = equipById.get(ln.to.id);
+  if (!fromEq || !toEq) return void 0;
+  const from = getAnchor(fromEq, ln.from.port, "out");
+  const to = getAnchor(toEq, ln.to.port, "in");
+  const routed = portStubPath(from, to);
+  return { x: routed.midX, y: routed.midY };
+}
 function layoutPid(ast) {
   const equipment = [];
   const equipById = /* @__PURE__ */ new Map();
   const heights = ast.equipment.map((e) => GEOMETRY[e.equipType]?.height ?? 60);
   const maxH = Math.max(...heights, 0);
-  const rowY = PADDING + TITLE_AREA + maxH / 2 + 30;
+  const rowY = PADDING + TITLE_AREA + maxH / 2 + 50;
   let cursorX = PADDING + 40;
   for (const equip of ast.equipment) {
     const geo = GEOMETRY[equip.equipType] ?? { width: 60, height: 40, ports: {} };
@@ -5143,7 +5187,7 @@ function layoutPid(ast) {
   }
   const instruments = [];
   const instById = /* @__PURE__ */ new Map();
-  const crBandY = PADDING + TITLE_AREA + 40;
+  const crBandY = PADDING + TITLE_AREA + 28;
   let crSlot = 0;
   for (const inst of ast.instruments) {
     let cx = 0;
@@ -5158,12 +5202,16 @@ function layoutPid(ast) {
       cy = rowY + maxH / 2 + INST_OFFSET + INST_RADIUS;
       const tgt = inst.measures ?? inst.controls ?? "";
       const tgtEq = equipById.get(tgt);
-      cx = tgtEq ? tgtEq.cx : PADDING + 80;
+      const tgtLine = ast.lines.find((line2) => line2.id === tgt);
+      const lineMid = tgtLine ? lineMidpoint(tgtLine, equipById) : void 0;
+      cx = tgtEq ? tgtEq.cx : lineMid ? lineMid.x : PADDING + 80;
     } else {
       cy = rowY + maxH / 2 + INST_OFFSET;
       const tgt = inst.measures ?? inst.controls ?? "";
       const tgtEq = equipById.get(tgt);
-      cx = tgtEq ? tgtEq.cx : PADDING + 80;
+      const tgtLine = ast.lines.find((line2) => line2.id === tgt);
+      const lineMid = tgtLine ? lineMidpoint(tgtLine, equipById) : void 0;
+      cx = tgtEq ? tgtEq.cx : lineMid ? lineMid.x : PADDING + 80;
     }
     const lay = {
       inst,
@@ -5174,6 +5222,22 @@ function layoutPid(ast) {
     instruments.push(lay);
     instById.set(inst.tag, lay);
   }
+  const targetOf = (inst) => inst.inst.measures ?? inst.inst.controls ?? "";
+  const fieldGroups = /* @__PURE__ */ new Map();
+  for (const inst of instruments) {
+    if (inst.inst.category.startsWith("cr_")) continue;
+    const target = targetOf(inst);
+    if (!target) continue;
+    const group2 = fieldGroups.get(target) ?? [];
+    group2.push(inst);
+    fieldGroups.set(target, group2);
+  }
+  for (const group2 of fieldGroups.values()) {
+    if (group2.length < 2) continue;
+    group2.forEach((inst, idx) => {
+      inst.cx += (idx - (group2.length - 1) / 2) * (INST_RADIUS * 2 + 12);
+    });
+  }
   const sameRow = (a, b) => Math.abs(a.cy - b.cy) < INST_RADIUS && Math.abs(a.cx - b.cx) < INST_RADIUS * 2 + 8;
   const sortedByX = [...instruments].sort((a, b) => a.cx - b.cx);
   for (let i = 1; i < sortedByX.length; i++) {
@@ -5218,14 +5282,7 @@ function routeLine(ln, equipById, instById) {
   const fromAnchor = resolveAnchor(ln.from.id, ln.from.port, "out", equipById, instById);
   const toAnchor = resolveAnchor(ln.to.id, ln.to.port, "in", equipById, instById);
   if (!fromAnchor || !toAnchor) return void 0;
-  const { d, midX, midY } = manhattanPath(
-    fromAnchor.x,
-    fromAnchor.y,
-    fromAnchor.side,
-    toAnchor.x,
-    toAnchor.y,
-    toAnchor.side
-  );
+  const { d, midX, midY } = portStubPath(fromAnchor, toAnchor);
   return {
     line: ln,
     path: d,
@@ -5261,6 +5318,7 @@ var STYLE2 = `
 .lt-pid-capillary { stroke: #1d1d1d; stroke-width: 1.4; fill: none; stroke-dasharray: 1 5; stroke-linecap: round; }
 .lt-pid-software { stroke: #6a6a6a; stroke-width: 1.3; fill: none; stroke-dasharray: 2 4; }
 .lt-pid-mechanical { stroke: #1d1d1d; stroke-width: 1.4; fill: none; stroke-dasharray: 3 2 1 2; }
+.lt-pid-line-path { fill: none; }
 
 .lt-pid-pneumatic-tick { stroke: #1d1d1d; stroke-width: 1.2; }
 
@@ -5277,14 +5335,19 @@ var STYLE2 = `
 `;
 var ARROW_ID = "lt-pid-arrow";
 function lineClass(t) {
-  return `lt-pid-${t.replace("_", "-")}`;
+  switch (t) {
+    case "process_minor":
+      return "lt-pid-process-min";
+    default:
+      return `lt-pid-${t.replaceAll("_", "-")}`;
+  }
 }
 function renderLine(l) {
   const cls = lineClass(l.line.lineType);
   const parts = [
     path({
       d: l.path,
-      class: cls,
+      class: `${cls} lt-pid-line-path`,
       "data-line-id": l.line.id,
       "data-service": l.line.service ?? ""
     })
@@ -5360,6 +5423,12 @@ function renderPidAST(ast, _config) {
   return renderLayout2(layout);
 }
 function renderLayout2(layout) {
+  const processLines = layout.lines.filter(
+    (line2) => line2.line.lineType === "process" || line2.line.lineType === "process_minor"
+  );
+  const signalLines = layout.lines.filter(
+    (line2) => line2.line.lineType !== "process" && line2.line.lineType !== "process_minor"
+  );
   const equipNodes = layout.equipment.map((eq) => {
     const symbol = renderEquip(eq.equip.equipType, eq.equip.tag ?? eq.equip.id);
     return group(
@@ -5446,8 +5515,9 @@ function renderLayout2(layout) {
         el("style", {}, STYLE2)
       ]),
       titleNode,
+      group({ class: "lt-pid-lines lt-pid-process-lines" }, processLines.map(renderLine)),
       group({ class: "lt-pid-equipment" }, equipNodes),
-      group({ class: "lt-pid-lines" }, layout.lines.map(renderLine)),
+      group({ class: "lt-pid-lines lt-pid-signal-lines" }, signalLines.map(renderLine)),
       group({ class: "lt-pid-signals" }, autoSignals),
       group({ class: "lt-pid-instruments" }, instNodes)
     ]
@@ -22521,5 +22591,5 @@ function renderWithPlugin(prepared, plugin, config) {
 }
 
 export { GEOMETRY, decisiontree, drawDeviceIcon, iconSize, network, parse, parseResult, pert, petri, pid, prisma, render, renderEquip, renderPreview, renderResult, sequence, state, timeline, usecase };
-//# sourceMappingURL=chunk-7AFW2J6J.js.map
-//# sourceMappingURL=chunk-7AFW2J6J.js.map
+//# sourceMappingURL=chunk-I2GQYOZ5.js.map
+//# sourceMappingURL=chunk-I2GQYOZ5.js.map