@cardenelabs/cdl 0.78.0 → 0.79.0

package/dist/react.js

@@ -1379,72 +1379,169 @@ function collectBBoxes(lanes, nodes, edges) {
     });
   }
   for (const e of edges) {
-    const points = extractPathPoints(e.d);
-    if (points.length === 0) continue;
-    const xs = points.map((p) => p.x);
-    const ys = points.map((p) => p.y);
-    const minX = Math.min(...xs);
-    const maxX = Math.max(...xs);
-    const minY = Math.min(...ys);
-    const maxY = Math.max(...ys);
+    const box = pathBBox(e.d);
+    if (!box) continue;
     out.push({
       kind: "edge-path",
       id: e.id,
-      x: minX - 2,
-      y: minY - 2,
-      w: maxX - minX + 4,
-      h: maxY - minY + 4
+      x: box.minX - 2,
+      y: box.minY - 2,
+      w: box.maxX - box.minX + 4,
+      h: box.maxY - box.minY + 4
     });
   }
   return out;
 }
+var PATH_ARITY = {
+  M: 2,
+  L: 2,
+  H: 1,
+  V: 1,
+  C: 6,
+  S: 4,
+  Q: 4,
+  T: 2,
+  A: 7,
+  Z: 0
+};
+function isRelative(cmd) {
+  return cmd >= "a" && cmd <= "z";
+}
+function coordSlots(cmd) {
+  switch (cmd.toUpperCase()) {
+    case "M":
+    case "L":
+    case "T":
+      return [[0, 1]];
+    case "H":
+      return [[0, -1]];
+    case "V":
+      return [[-1, 0]];
+    case "Q":
+    case "S":
+      return [[0, 1], [2, 3]];
+    case "C":
+      return [[0, 1], [2, 3], [4, 5]];
+    case "A":
+      return [[5, 6]];
+    default:
+      return [];
+  }
+}
+function parsePathCommands(d) {
+  const out = [];
+  const commandRegex = /([MmLlHhVvCcSsQqTtAaZz])([^MmLlHhVvCcSsQqTtAaZz]*)/g;
+  let m;
+  while ((m = commandRegex.exec(d)) !== null) {
+    const cmd = m[1];
+    const arity = PATH_ARITY[cmd.toUpperCase()] ?? 0;
+    if (arity === 0) {
+      out.push({ cmd, args: [] });
+      continue;
+    }
+    const nums = (m[2] ?? "").trim().split(/[\s,]+/).filter(Boolean).map(parseFloat);
+    for (let i = 0; i + arity <= nums.length; i += arity) {
+      const args = nums.slice(i, i + arity);
+      if (!args.every(Number.isFinite)) break;
+      const \u7E70\u308A\u8FD4\u3057 = i > 0;
+      const c = \u7E70\u308A\u8FD4\u3057 && cmd === "M" ? "L" : \u7E70\u308A\u8FD4\u3057 && cmd === "m" ? "l" : cmd;
+      out.push({ cmd: c, args });
+    }
+  }
+  return out;
+}
 function extractPathPoints(d) {
   const out = [];
-  const tokens = d.replace(/[A-Za-z]/g, " ").trim().split(/[\s,]+/).filter(Boolean);
-  for (let i = 0; i + 1 < tokens.length; i += 2) {
-    const x = parseFloat(tokens[i]);
-    const y = parseFloat(tokens[i + 1]);
-    if (Number.isFinite(x) && Number.isFinite(y)) {
+  let cur = { x: 0, y: 0 };
+  let started = false;
+  for (const { cmd, args } of parsePathCommands(d)) {
+    const \u76F8\u5BFE = started && isRelative(cmd);
+    const \u57FA\u70B9 = cur;
+    for (const [xi, yi] of coordSlots(cmd)) {
+      const x = xi >= 0 ? \u76F8\u5BFE ? \u57FA\u70B9.x + args[xi] : args[xi] : \u57FA\u70B9.x;
+      const y = yi >= 0 ? \u76F8\u5BFE ? \u57FA\u70B9.y + args[yi] : args[yi] : \u57FA\u70B9.y;
       out.push({ x, y });
+      cur = { x, y };
     }
+    started = true;
   }
   return out;
 }
+function pathBBox(d) {
+  let minX = Infinity;
+  let minY = Infinity;
+  let maxX = -Infinity;
+  let maxY = -Infinity;
+  let \u70B9\u3042\u308A = false;
+  const \u53D6\u308B = (x, y) => {
+    minX = Math.min(minX, x);
+    minY = Math.min(minY, y);
+    maxX = Math.max(maxX, x);
+    maxY = Math.max(maxY, y);
+    \u70B9\u3042\u308A = true;
+  };
+  let cur = { x: 0, y: 0 };
+  let started = false;
+  for (const { cmd, args } of parsePathCommands(d)) {
+    const \u76F8\u5BFE = started && isRelative(cmd);
+    const \u57FA\u70B9 = cur;
+    for (const [xi, yi] of coordSlots(cmd)) {
+      const x = xi >= 0 ? \u76F8\u5BFE ? \u57FA\u70B9.x + args[xi] : args[xi] : \u57FA\u70B9.x;
+      const y = yi >= 0 ? \u76F8\u5BFE ? \u57FA\u70B9.y + args[yi] : args[yi] : \u57FA\u70B9.y;
+      \u53D6\u308B(x, y);
+      cur = { x, y };
+    }
+    if (cmd.toUpperCase() === "A") {
+      const r = Math.max(Math.abs(args[0]), Math.abs(args[1]));
+      const \u5F26 = Math.hypot(cur.x - \u57FA\u70B9.x, cur.y - \u57FA\u70B9.y);
+      const \u534A\u5F26 = Math.min(\u5F26 / 2, r);
+      const \u4F59 = Math.sqrt(Math.max(0, r * r - \u534A\u5F26 * \u534A\u5F26));
+      const \u81A8\u3089\u307F = args[3] !== 0 ? r + \u4F59 : r - \u4F59;
+      \u53D6\u308B(Math.min(\u57FA\u70B9.x, cur.x) - \u81A8\u3089\u307F, Math.min(\u57FA\u70B9.y, cur.y) - \u81A8\u3089\u307F);
+      \u53D6\u308B(Math.max(\u57FA\u70B9.x, cur.x) + \u81A8\u3089\u307F, Math.max(\u57FA\u70B9.y, cur.y) + \u81A8\u3089\u307F);
+    }
+    started = true;
+  }
+  return \u70B9\u3042\u308A ? { minX, minY, maxX, maxY } : null;
+}
 function rebuildPathD(d, map) {
-  const commandRegex = /([MLCQZmlcqz])([^MLCQZmlcqz]*)/g;
   let out = "";
   let idx = 0;
-  let m;
-  while ((m = commandRegex.exec(d)) !== null) {
-    const cmd = m[1];
-    const argsStr = (m[2] ?? "").trim();
-    if (argsStr === "" || cmd === "Z" || cmd === "z") {
+  let cur = { x: 0, y: 0 };
+  let started = false;
+  for (const { cmd, args } of parsePathCommands(d)) {
+    const slots = coordSlots(cmd);
+    if (slots.length === 0) {
       out += cmd + " ";
+      started = true;
       continue;
     }
-    const args = argsStr.split(/[\s,]+/).filter(Boolean).map(parseFloat);
-    const translated = [];
-    for (let i = 0; i + 1 < args.length; i += 2) {
-      const [nx, ny] = map(args[i], args[i + 1], idx);
-      translated.push(nx, ny);
+    const \u76F8\u5BFE = started && isRelative(cmd);
+    const \u57FA\u70B9 = cur;
+    const \u6B21\u306E\u5F15\u6570 = args.slice();
+    for (const [xi, yi] of slots) {
+      const x = xi >= 0 ? \u76F8\u5BFE ? \u57FA\u70B9.x + args[xi] : args[xi] : \u57FA\u70B9.x;
+      const y = yi >= 0 ? \u76F8\u5BFE ? \u57FA\u70B9.y + args[yi] : args[yi] : \u57FA\u70B9.y;
+      const [nx, ny] = map(x, y, idx);
+      if (!\u76F8\u5BFE) {
+        if (xi >= 0) \u6B21\u306E\u5F15\u6570[xi] = nx;
+        if (yi >= 0) \u6B21\u306E\u5F15\u6570[yi] = ny;
+      }
       idx += 1;
+      cur = { x, y };
     }
-    out += cmd + " " + translated.join(" ") + " ";
+    out += cmd + " " + \u6B21\u306E\u5F15\u6570.join(" ") + " ";
+    started = true;
   }
   return out.trim();
 }
 function cornerBoundaryIndices(d) {
-  const commandRegex = /([MLCQZmlcqz])([^MLCQZmlcqz]*)/g;
   let idx = 0;
   let firstCornerEnd = -1;
   let lastCornerStart = -1;
-  let m;
-  while ((m = commandRegex.exec(d)) !== null) {
-    const cmd = m[1];
-    const argsStr = (m[2] ?? "").trim();
-    if (argsStr === "" || cmd === "Z" || cmd === "z") continue;
-    const pairs = argsStr.split(/[\s,]+/).filter(Boolean).length >> 1;
-    if ((cmd === "Q" || cmd === "q") && pairs >= 2) {
+  for (const { cmd } of parsePathCommands(d)) {
+    const pairs = coordSlots(cmd).length;
+    if (cmd.toUpperCase() === "Q" && pairs >= 2) {
       if (firstCornerEnd < 0) firstCornerEnd = idx + 1;
       lastCornerStart = idx;
     }