schematex 0.6.8 → 0.6.10

package/dist/{chunk-J2TT7PGI.js → chunk-6AWASOFO.js}

@@ -5169,6 +5169,22 @@ function layoutPid(ast) {
     equipById.set(equip.id, layoutEq);
     cursorX += geo.width + EQUIP_GAP_X;
   }
+  const lineMidById = /* @__PURE__ */ new Map();
+  for (const ln of ast.lines) {
+    const from = equipById.get(ln.from.id);
+    const to = equipById.get(ln.to.id);
+    if (!from || !to) continue;
+    const fa = getAnchor(from, ln.from.port, "out");
+    const ta = getAnchor(to, ln.to.port, "in");
+    lineMidById.set(ln.id, { x: (fa.x + ta.x) / 2, y: (fa.y + ta.y) / 2 });
+  }
+  const targetX = (tgt, fallback) => {
+    const eq = equipById.get(tgt);
+    if (eq) return eq.cx;
+    const lm = lineMidById.get(tgt);
+    if (lm) return lm.x;
+    return fallback;
+  };
   const instruments = [];
   const instById = /* @__PURE__ */ new Map();
   const crBandY = PADDING + TITLE_AREA + 40;
@@ -5178,20 +5194,17 @@ function layoutPid(ast) {
     let cy = 0;
     if (inst.category.startsWith("cr_")) {
       const tgt = inst.controls ?? inst.measures ?? "";
-      const tgtEq = equipById.get(tgt);
-      cx = tgtEq ? tgtEq.cx : PADDING + 80 + crSlot * (INST_RADIUS * 2 + 28);
+      cx = targetX(tgt, PADDING + 80 + crSlot * (INST_RADIUS * 2 + 28));
       cy = crBandY;
       crSlot += 1;
     } else if (inst.category.startsWith("local_")) {
       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;
+      cx = targetX(tgt, 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;
+      cx = targetX(tgt, PADDING + 80);
     }
     const lay = {
       inst,
@@ -5202,13 +5215,14 @@ function layoutPid(ast) {
     instruments.push(lay);
     instById.set(inst.tag, lay);
   }
-  const sameRow = (a, b) => Math.abs(a.cy - b.cy) < INST_RADIUS && Math.abs(a.cx - b.cx) < INST_RADIUS * 2 + 8;
+  const INST_FANOUT = INST_RADIUS * 2 + 12;
+  const sameYRow = (a, b) => Math.abs(a.cy - b.cy) < INST_RADIUS;
   const sortedByX = [...instruments].sort((a, b) => a.cx - b.cx);
   for (let i = 1; i < sortedByX.length; i++) {
     const prev = sortedByX[i - 1];
     const cur = sortedByX[i];
-    if (sameRow(prev, cur)) {
-      cur.cx = prev.cx + INST_RADIUS * 2 + 14;
+    if (sameYRow(prev, cur) && cur.cx < prev.cx + INST_FANOUT) {
+      cur.cx = prev.cx + INST_FANOUT;
     }
   }
   const lines = [];
@@ -5298,6 +5312,7 @@ var STYLE2 = `
 .lt-inst-local-line { stroke: #1d1d1d; stroke-width: 1; stroke-dasharray: 2 2; }
 .lt-pid-valve-body { fill: #ffffff; stroke: #1d1d1d; stroke-width: 1.4; }
 
+.lt-pid-line-path { fill: none; }
 .lt-pid-line-tag-bg { fill: #ffffff; stroke: #1d1d1d; stroke-width: 0.6; }
 .lt-pid-line-tag-text { font: 9px ui-monospace, monospace; fill: #1d1d1d; }
 
@@ -5308,15 +5323,37 @@ var STYLE2 = `
 .lt-pid-unknown-type { font: 9px ui-monospace, monospace; fill: #6a6a6a; }
 `;
 var ARROW_ID = "lt-pid-arrow";
+var LINE_CLASS = {
+  process: "lt-pid-process",
+  process_minor: "lt-pid-process-min",
+  pneumatic: "lt-pid-pneumatic",
+  electric: "lt-pid-electric",
+  hydraulic: "lt-pid-hydraulic",
+  capillary: "lt-pid-capillary",
+  software: "lt-pid-software",
+  mechanical: "lt-pid-mechanical"
+};
+var SIGNAL_LINE_TYPES = /* @__PURE__ */ new Set([
+  "pneumatic",
+  "electric",
+  "hydraulic",
+  "capillary",
+  "software",
+  "mechanical"
+]);
 function lineClass(t) {
-  return `lt-pid-${t.replace("_", "-")}`;
+  return LINE_CLASS[t] ?? `lt-pid-${String(t).replace(/_/g, "-")}`;
+}
+function isSignalLine(l) {
+  return SIGNAL_LINE_TYPES.has(l.line.lineType);
 }
 function renderLine(l) {
   const cls = lineClass(l.line.lineType);
   const parts = [
     path({
       d: l.path,
-      class: cls,
+      // Type class + a shared no-fill guard class on every line path.
+      class: `${cls} lt-pid-line-path`,
       "data-line-id": l.line.id,
       "data-service": l.line.service ?? ""
     })
@@ -5483,9 +5520,16 @@ function renderLayout2(layout) {
         el("style", {}, STYLE2)
       ]),
       titleNode,
+      // Z-order: process pipes behind equipment; signal lines + instruments above.
+      group(
+        { class: "lt-pid-lines lt-pid-process-lines" },
+        layout.lines.filter((l) => !isSignalLine(l)).map(renderLine)
+      ),
       group({ class: "lt-pid-equipment" }, equipNodes),
-      group({ class: "lt-pid-lines" }, layout.lines.map(renderLine)),
-      group({ class: "lt-pid-signals" }, autoSignals),
+      group(
+        { class: "lt-pid-lines lt-pid-signal-lines" },
+        [...layout.lines.filter(isSignalLine).map(renderLine), ...autoSignals]
+      ),
       group({ class: "lt-pid-instruments" }, instNodes)
     ]
   );
@@ -14905,7 +14949,6 @@ function layoutUmlClass(ast) {
       n.box.layer = n.rank;
     }
   }
-  applyDirectionTransform(direction, nodes, boxes);
   normaliseCoords(nodes, boxes);
   const packages = layoutPackages(ast, boxByID);
   shiftForPackages(nodes, boxes, packages);
@@ -14913,29 +14956,6 @@ function layoutUmlClass(ast) {
   const { edges, trees } = routeEdges(chains, nodes, boxByID, vertical);
   return { ast, boxes, packages, edges, trees, width, height };
 }
-function applyDirectionTransform(direction, nodes, boxes) {
-  if (direction === "tb") return;
-  const transform = (p) => {
-    switch (direction) {
-      case "bt":
-        return { x: p.x, y: -p.y };
-      case "lr":
-        return { x: p.y, y: p.x };
-      case "rl":
-        return { x: -p.y, y: p.x };
-    }
-  };
-  for (const n of nodes) {
-    const p = transform({ x: n.cx, y: n.cy });
-    n.cx = p.x;
-    n.cy = p.y;
-  }
-  for (const b of boxes) {
-    const c = transform({ x: b.x + b.width / 2, y: b.y + b.height / 2 });
-    b.x = c.x - b.width / 2;
-    b.y = c.y - b.height / 2;
-  }
-}
 function topLevelPackageMap(ast) {
   const parentOf = /* @__PURE__ */ new Map();
   for (const p of ast.packages) parentOf.set(p.id, p.parentId);
@@ -16211,14 +16231,12 @@ function parseFaultTree(text2) {
     }
     if (/^layout\s*:/i.test(t)) {
       const v = afterColon2(t).toLowerCase();
-      if (v === "tb") ast.direction = v;
-      else if (v === "bt") ast.warnings.push(`Line ${lineNo}: layout: bt is reserved but not implemented yet; using layout: tb.`);
+      if (v === "tb" || v === "bt") ast.direction = v;
       continue;
     }
     if (/^style\s*:/i.test(t)) {
       const v = afterColon2(t).toLowerCase();
-      if (v === "ansi") ast.gateStyle = v;
-      else if (v === "iec") ast.warnings.push(`Line ${lineNo}: style: iec is reserved but not implemented yet; using style: ansi.`);
+      if (v === "ansi" || v === "iec") ast.gateStyle = v;
       continue;
     }
     if (/^transfer\b/i.test(t)) {
@@ -17252,7 +17270,6 @@ function summarise(layout) {
     if (analysis.topProb !== void 0) parts.push(`P(top) = ${fmtProb(analysis.topProb)} (${analysis.method}).`);
     else if (analysis.missingProb.length > 0) parts.push(`P(top) = n/a \u2014 missing p on ${analysis.missingProb.join(", ")}.`);
   }
-  for (const w of ast.warnings) parts.push(w);
   for (const n of analysis.notes) parts.push(n);
   for (const w of analysis.warnings) parts.push(w);
   return parts.join(" ");
@@ -17349,8 +17366,7 @@ function parseBowtie(text2) {
     const lineNo = i + 1;
     if (/^layout\s*:/i.test(t)) {
       const v = afterColon3(t).toLowerCase();
-      if (v === "symmetric") ast.layout = v;
-      else if (v === "compact") ast.warnings.push(`Line ${lineNo}: layout: compact is reserved but not implemented yet; using layout: symmetric.`);
+      if (v === "symmetric" || v === "compact") ast.layout = v;
       continue;
     }
     if (/^legend\s*:/i.test(t)) {
@@ -26740,5 +26756,5 @@ function renderWithPlugin(prepared, plugin, config) {
 }
 
 export { GEOMETRY, bowtie2 as bowtie, decisiontree, drawDeviceIcon, faulttree, iconSize, network, parse, parseResult, pert, petri, pid, prisma, render, renderEquip, renderPreview, renderResult, sequence, state, timeline, umlclass, usecase };
-//# sourceMappingURL=chunk-J2TT7PGI.js.map
-//# sourceMappingURL=chunk-J2TT7PGI.js.map
+//# sourceMappingURL=chunk-6AWASOFO.js.map
+//# sourceMappingURL=chunk-6AWASOFO.js.map