@weasel-js/diagram-formats 1.11.1 → 1.13.0-rc.0

package/dist/index.d.ts

@@ -179,7 +179,7 @@ type PageExportScene = Scene<unknown, string, RectPose>;
  * that derives its path (a connector) is drawn along that path, and anything
  * else is written by `svgLeafFromKit`.
  */
-declare function pageSvgNodes(scene: PageExportScene, page: PageRect): SvgNode[];
+declare function pageSvgNodes(live: PageExportScene, page: PageRect): SvgNode[];
 
 /** Options for {@link exportPageSvg}. */
 interface ExportPageSvgOptions extends Pick<SerializeOptions, 'title' | 'onWarn' | 'pretty'> {

package/dist/index.js

@@ -1,5 +1,5 @@
 import { diagramThemeFrom, DIAGRAM_THEME_KEY, diagramLabelOf, offPageSplits, diagramScene, themeDocValue, diagramShape, markShape, documentBoundsOf, dataNodeStyle, dataEdgeStyle, diagramEdgeOf, diagramContainerOf, NODE_STROKE_WIDTH, dataRegionStyle, poolAxisOf, titleIdOf, layoutOwnsRoute, EDGE_STROKE_WIDTH, diagramThemeOf, edgeIdOf, layoutOwnsPort, DEFAULT_PORTS, LANE_STROKE_WIDTH } from '@weasel-js/diagram';
-import { placedPagesOf, layoutPages, PAGES_DOC_KEY, isAnnotationLayer, boundsOfPath, layoutTextPose, warmRender, renderSceneToPixels, planPixelRender, viewToMat3, createRasterSession, pageHolding, effectivePose, derivedDepOf, pageName, derivedPartsOf, createScene, mat3 } from '@weasel-js/core';
+import { placedPagesOf, layoutPages, PAGES_DOC_KEY, documentOf, isAnnotationLayer, boundsOfPath, layoutTextPose, warmRender, renderSceneToPixels, planPixelRender, viewToMat3, createRasterSession, pageHolding, effectivePose, derivedDepOf, pageName, derivedPartsOf, INHERIT, resolvePartPaint, createScene, mat3 } from '@weasel-js/core';
 import { svgNodesFromKit, svgLeafFromKit, warmSvg, serializeSvg, escapeAttr, svgPaintFromKit, svgStrokeFromKit } from '@weasel-js/svg';
 import { writePdf, registryFontSource } from '@weasel-js/pdf';
 
@@ -2978,15 +2978,15 @@ function diagramPainted(painters, node, pose) {
   return painter.paint(node, pose).flatMap((cmd) => commandNode(cmd, at) ?? []);
 }
 function derivedNodes(path, data) {
-  const parts = derivedPartsOf(path) ?? [{ path }];
-  return parts.flatMap((part) => svgLeafFromKit({
-    path: part.path,
-    ...part.fill !== void 0 ? { fill: part.fill } : data.fill !== void 0 ? { fill: data.fill } : {},
-    stroke: part.stroke !== void 0 ? part.stroke : data.stroke
-  }, boundsOfPath(part.path)) ?? []);
+  const parts = derivedPartsOf(path) ?? [{ path, fill: INHERIT, stroke: INHERIT }];
+  return parts.flatMap((part) => svgLeafFromKit(
+    { path: part.path, ...resolvePartPaint(part, data) },
+    boundsOfPath(part.path)
+  ) ?? []);
 }
 var one = (nodes) => nodes.length === 0 ? null : nodes.length === 1 ? nodes[0] : { kind: "group", children: nodes };
-function pageSvgNodes(scene, page) {
+function pageSvgNodes(live, page) {
+  const scene = documentOf(live);
   const painters = [diagramShape(), markShape()];
   const shown = new Set(scene.layers.filter((l) => l.visible && !isAnnotationLayer(l)).map((l) => l.id));
   const poseCache = /* @__PURE__ */ new Map();
@@ -2995,7 +2995,7 @@ function pageSvgNodes(scene, page) {
     if (p === void 0) poseCache.set(node.id, p = effectivePose(scene, node));
     return p;
   };
-  const pathOf = (node) => node.kind === "leaf" ? derivedDepOf(scene, node.id)?.path ?? null : null;
+  const pathOf = (node) => node.kind === "mark" ? derivedDepOf(scene, node.id)?.path ?? null : null;
   const tree = {
     roots: scene.layers.flatMap((l) => scene.roots.filter((id) => scene.get(id)?.layer === l.id)),
     childrenOf: (id) => scene.childrenOf(id),
@@ -3007,7 +3007,8 @@ function pageSvgNodes(scene, page) {
         data: node.data,
         pose: poseOf(pose(node)),
         ...node.hidden ? { hidden: true } : {},
-        ...node.kind === "container" && node.copiesFromPose ? { copiesFromPose: node.copiesFromPose } : {}
+        ...node.clip ? { clip: node.clip } : {},
+        ...node.copiesFromPose ? { copiesFromPose: node.copiesFromPose } : {}
       };
     }
   };
@@ -3024,11 +3025,6 @@ function pageSvgNodes(scene, page) {
       if (path) return one(derivedNodes(path, kit.data));
       const painted = diagramPainted(painters, node, pose(node));
       return painted ? one(painted) : svgLeafFromKit(kit.data, kit.pose);
-    },
-    group(id, g) {
-      const node = scene.get(id);
-      const outline = diagramPainted(painters, node, pose(node));
-      return outline ? { ...g, children: [...outline, ...g.children] } : g;
     }
   });
 }
@@ -3089,7 +3085,8 @@ function pageRasterizer(session) {
       scene: empty,
       sourceRect: { x: -toRaster[6] / sx, y: -toRaster[7] / sy, width: rect.width * scale / sx, height: rect.height * scale / sy },
       scale: { x: sx, y: sy },
-      overlay: [{ kind: "group", transform: toPixels, children: [...commands] }]
+      overlay: [{ kind: "group", transform: toPixels, children: [...commands] }],
+      screen: toPixels
     });
   };
 }