schematex 0.4.3 → 0.5.2

package/dist/{chunk-6IGSKU6D.js → chunk-UFTYX73U.js}

@@ -822,15 +822,27 @@ function isFullWidth(code) {
   if (code >= 131072 && code <= 196607) return true;
   return false;
 }
-function measureLabelWidth(label) {
+function labelLines(label) {
+  return String(label).split(/<br\s*\/?>|\n/i).map((line2) => line2.replace(/<\/?[bi]>/gi, ""));
+}
+function measureLineWidth(line2) {
   let w = 0;
-  for (const ch of label) {
+  for (const ch of line2) {
     const code = ch.codePointAt(0) ?? 0;
     if (isFullWidth(code)) w += FC_CONST.cjkCharWidth;
     else w += FC_CONST.charWidth;
   }
   return w;
 }
+function measureLabelWidth(label) {
+  const lines = labelLines(label);
+  let max = 0;
+  for (const line2 of lines) {
+    const w = measureLineWidth(line2);
+    if (w > max) max = w;
+  }
+  return max;
+}
 function greedyFAS(nodeIds, edges) {
   const outAdj = /* @__PURE__ */ new Map();
   const inAdj = /* @__PURE__ */ new Map();
@@ -1263,6 +1275,85 @@ function laneBasedXCoords(layerNodes, pathOf, nodeSpacingX, segments) {
   }
   return result;
 }
+function enforceSequentialClusterLayers(ast, layerMap, edges) {
+  const sgParent = /* @__PURE__ */ new Map();
+  for (const sg of ast.subgraphs) {
+    for (const childSg of sg.subgraphs) sgParent.set(childSg, sg.id);
+    if (!sgParent.has(sg.id)) sgParent.set(sg.id, void 0);
+  }
+  const topLevel = ast.subgraphs.filter((sg) => !sgParent.get(sg.id));
+  if (topLevel.length < 2) return;
+  const collect = (sgId) => {
+    const sg = ast.subgraphs.find((s) => s.id === sgId);
+    if (!sg) return [];
+    const ids = [...sg.children];
+    for (const childSgId of sg.subgraphs) ids.push(...collect(childSgId));
+    return ids;
+  };
+  const adjOut = /* @__PURE__ */ new Map();
+  for (const e of edges) {
+    if (!adjOut.has(e.from)) adjOut.set(e.from, []);
+    adjOut.get(e.from).push(e.to);
+  }
+  const hasForwardEdge = (srcSgId, dstSgId) => {
+    const srcIds = new Set(collect(srcSgId));
+    const dstIds = new Set(collect(dstSgId));
+    for (const id of srcIds) {
+      for (const t of adjOut.get(id) ?? []) {
+        if (dstIds.has(t)) return true;
+      }
+    }
+    return false;
+  };
+  const chains = [];
+  let cur = [];
+  for (let i = 0; i < topLevel.length; i++) {
+    const sg = topLevel[i];
+    if (i === 0 || !hasForwardEdge(topLevel[i - 1].id, sg.id)) {
+      if (cur.length > 1) chains.push(cur);
+      cur = [sg.id];
+    } else {
+      cur.push(sg.id);
+    }
+  }
+  if (cur.length > 1) chains.push(cur);
+  if (chains.length === 0) return;
+  for (const chain of chains) {
+    let prevMax = -Infinity;
+    for (const clusterId of chain) {
+      const ids = collect(clusterId);
+      if (ids.length === 0) continue;
+      let curMin = Infinity;
+      let curMax = -Infinity;
+      for (const id of ids) {
+        const l = layerMap.get(id) ?? 0;
+        if (l < curMin) curMin = l;
+        if (l > curMax) curMax = l;
+      }
+      const requiredMin = prevMax === -Infinity ? curMin : prevMax + 1;
+      if (curMin < requiredMin) {
+        const shift = requiredMin - curMin;
+        const toShift = new Set(ids);
+        const queue = [...ids];
+        while (queue.length > 0) {
+          const u = queue.shift();
+          for (const t of adjOut.get(u) ?? []) {
+            if (!toShift.has(t)) {
+              toShift.add(t);
+              queue.push(t);
+            }
+          }
+        }
+        for (const id of toShift) {
+          layerMap.set(id, (layerMap.get(id) ?? 0) + shift);
+        }
+        prevMax = curMax + shift;
+      } else {
+        prevMax = curMax;
+      }
+    }
+  }
+}
 function hasOverlappingTopLevelClusters(ast, layerMap, sgParent) {
   const topLevel = ast.subgraphs.filter((sg) => !sgParent.get(sg.id));
   if (topLevel.length < 2) return false;
@@ -1299,7 +1390,9 @@ function layoutFlowchart(ast) {
       Math.ceil(rawTextW) + FC_CONST.labelHPad * 2
     );
     let shapeW = Math.max(FC_CONST.minNodeWidth, labelW);
-    let shapeH = FC_CONST.nodeHeight;
+    const nLines = labelLines(n.label).length;
+    const multilineH = nLines > 1 ? FC_CONST.nodeHeight + (nLines - 1) * 14 : FC_CONST.nodeHeight;
+    let shapeH = multilineH;
     if (n.shape === "diamond") {
       shapeW = Math.max(shapeW, labelW * 1.4);
       shapeH = Math.max(shapeH, 52);
@@ -1356,6 +1449,7 @@ function layoutFlowchart(ast) {
     };
   });
   const layerMap = longestPathLayers(allIds, ledges);
+  enforceSequentialClusterLayers(ast, layerMap, ledges);
   let dummyCounter = 0;
   const dummies = [];
   const { updatedEdges } = insertDummies(ledges, layerMap, () => {
@@ -2143,5 +2237,5 @@ var flowchart = {
 };
 
 export { FC_CONST, flowchart, layoutFlowchart, parseFlowchart, renderFlowchart, renderFlowchartAST };
-//# sourceMappingURL=chunk-6IGSKU6D.js.map
-//# sourceMappingURL=chunk-6IGSKU6D.js.map
+//# sourceMappingURL=chunk-UFTYX73U.js.map
+//# sourceMappingURL=chunk-UFTYX73U.js.map