@weasel-js/diagram-formats 1.15.1 → 1.15.2

package/dist/index.js

@@ -1,5 +1,7 @@
 import { placedPagesOf, scenePoseAdapter, pageHolding, layoutPages, PAGES_DOC_KEY, pagesOf, nextPageId, addPage, documentOf, isAnnotationLayer, boundsOfPath, layoutTextPose, warmRender, renderSceneToPixels, planPixelRender, viewToMat3, createRasterSession, composeWorldPose, derivedDepOf, IDENTITY_POSE_COMPOSITION, pageName, derivedPartsOf, INHERIT, resolvePartPaint, createScene, mat3, effectivePose } from '@weasel-js/core';
 import { DIAGRAM_TYPES, FLOWCHART_NOTATION, sequenceLayout, diagramThemeFrom, dataEdgeStyle, dataRegionStyle, dataNodeStyle, DIAGRAM_THEME_KEY, diagramLabelOf, endLabelIdOf, sequenceRootOf, offPageSplits, diagramNotationOf, documentBoundsOf, DIAGRAM_TYPE_DOC_KEY, diagramTypeDocValue, themeDocValue, diagramTypeOfNotation, diagramShape, markShape, diagramScene, sequencePartOf, diagramEdgeOf, diagramContainerOf, NODE_STROKE_WIDTH, poolAxisOf, titleIdOf, sequenceSpecs, diagramThemeOf, layoutOwnsRoute, EDGE_STROKE_WIDTH, LAYOUTS, edgeIdOf, themeFont, layoutOwnsPort, DEFAULT_PORTS, LANE_STROKE_WIDTH } from '@weasel-js/diagram';
+import { tryNormalizeHex, parseColor, normalizeHex, rgbaToHex } from '@weasel-js/paint';
+import { deepEqual } from '@weasel-js/registry';
 import { svgNodesFromKit, svgLeafFromKit, warmSvg, serializeSvg, escapeAttr, svgPaintFromKit, svgStrokeFromKit } from '@weasel-js/svg';
 import { replayGitGraph, parseGanttEnd, parseGanttStart, formatGanttEnd, formatGanttStart, plotRootOf, plotSpecs } from '@weasel-js/plot';
 import { writePdf, registryFontSource } from '@weasel-js/pdf';
@@ -137,7 +139,6 @@ var Warnings = class {
     return [...this.seen].map((m) => this.listed.has(m) ? `${m}: ${[...this.listed.get(m)].join(", ")}.` : m);
   }
 };
-var hex2 = (n) => Math.round(Math.max(0, Math.min(1, n)) * 255).toString(16).padStart(2, "0");
 var NAMED = { amp: "&", lt: "<", gt: ">", quot: '"', apos: "'", nbsp: "\xA0" };
 function decodeEntities(text3, hash = false) {
   const re = hash ? /[&#](#x[\da-f]+|#\d+|x[\da-f]+(?=;)|\d+|[a-z]+);/gi : /&(#x[\da-f]+|#\d+|[a-z]+);/gi;
@@ -456,8 +457,6 @@ function parseDot(text3) {
     return { kind: "edge", ends, attrs: attrList2(), line };
   }
 }
-
-// src/dot/values.ts
 function labelLines(label, self, graph) {
   if (label.html) return markupLines(label.value).filter((l, i, all) => l !== "" || i > 0 && i < all.length - 1);
   const lines = [""];
@@ -485,7 +484,7 @@ function hsvHex(h, s, v) {
     const k = (n + h * 6) % 6;
     return v - v * s * Math.max(0, Math.min(k, 4 - k, 1));
   };
-  return `#${hex2(f(5))}${hex2(f(3))}${hex2(f(1))}`;
+  return rgbaToHex([f(5), f(3), f(1)]);
 }
 function dotColor(value) {
   const first = value.split(":")[0].split(";")[0].trim();
@@ -907,17 +906,20 @@ function graphOut(doc, opts, format, holdsPools = false) {
   return { page, theme, ...tree, byId, edges: [...page.data.edges], warnings };
 }
 function hexColor(css) {
-  const short = /^#([\da-f])([\da-f])([\da-f])([\da-f])?$/i.exec(css);
-  if (short !== null) return `#${short.slice(1).filter(Boolean).map((d) => d + d).join("")}`;
-  const rgb = /^rgba?\(\s*([\d.]+)[\s,]+([\d.]+)[\s,]+([\d.]+)(?:\s*[,/]\s*([\d.]+)(%?))?\s*\)$/i.exec(css);
-  if (rgb === null) return css;
-  const alpha = rgb[4] === void 0 ? "" : hex2(Number(rgb[4]) / (rgb[5] === "%" ? 100 : 1));
-  return `#${hex2(Number(rgb[1]) / 255)}${hex2(Number(rgb[2]) / 255)}${hex2(Number(rgb[3]) / 255)}${alpha}`;
+  if (css.startsWith("#")) return tryNormalizeHex(css) ?? css;
+  if (!/^rgba?\(/i.test(css)) return css;
+  let rgba;
+  try {
+    rgba = parseColor(css);
+  } catch {
+    return css;
+  }
+  return normalizeHex(rgbaToHex(rgba), /\/|(?:,[^,]*){3}/.test(css) ? "rgba" : "rgb");
 }
 function changed(style, base) {
   const out = {};
   for (const key of Object.keys(style)) {
-    if (JSON.stringify(style[key]) !== JSON.stringify(base[key])) out[key] = style[key];
+    if (!deepEqual(style[key], base[key], { undefinedAsAbsent: true })) out[key] = style[key];
   }
   return out;
 }
@@ -6748,7 +6750,7 @@ var ROUTERS = ["straight", "bezier", "orthogonal", "avoid"];
 var dataOf = (node) => node?.data ?? {};
 var traitOf = (node) => dataOf(node).diagram ?? null;
 var colorOf2 = (paint) => typeof paint?.paint?.color === "string" ? paint.paint.color : void 0;
-var same = (a, b) => JSON.stringify(a) === JSON.stringify(b);
+var same = (a, b) => deepEqual(a, b, { undefinedAsAbsent: true });
 var moved2 = (p, by) => ({ x: p.x - by.x, y: p.y - by.y });
 function kindOf2(node) {
   if (sequenceRootOf(node) !== null) return "sequence";