@knowvah/dot-engine 1.2.1 → 1.2.2

package/dist/layout/dot/edge-route-helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"edge-route-helpers.d.ts","sourceRoot":"","sources":["../../../src/layout/dot/edge-route-helpers.ts"],"names":[],"mappings":"AAEA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,KAAK,EAAE,IAAI,IAAI,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAE7D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAOjE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAEpD,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAEzF;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,CAAC,EAAE,KAAK,GAAG,MAAM,CAE/C;AAyBD,4DAA4D;AAC5D,wBAAgB,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,KAAK,GAAG,OAAO,CAepD;AAMD;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAAC,CAAC,EAAE,SAAS,GAAG,MAAM,CAEvD;AAED,qEAAqE;AACrE,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,SAAS,GAAG,MAAM,CAGrD;AAOD,wDAAwD;AACxD,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,KAAK,GAAG,MAAM,CAM5E;AAED,8DAA8D;AAC9D,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAEnD;AAED,0FAA0F;AAC1F,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,KAAK,GAAG,IAAI,CAYzF;AAaD,8EAA8E;AAC9E,wBAAgB,WAAW,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,GAAG,KAAK,EAAE,CAM3D;AAED,gFAAgF;AAChF,wBAAgB,0BAA0B,CACxC,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,YAAY,GAAG,SAAS,EAClC,QAAQ,SAAM,EACd,IAAI,CAAC,EAAE,SAAS,GACf,gBAAgB,CAIlB"}
+{"version":3,"file":"edge-route-helpers.d.ts","sourceRoot":"","sources":["../../../src/layout/dot/edge-route-helpers.ts"],"names":[],"mappings":"AAEA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,KAAK,EAAE,IAAI,IAAI,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAI7D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAOjE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAEpD,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAEzF;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,CAAC,EAAE,KAAK,GAAG,MAAM,CAE/C;AAyBD,4DAA4D;AAC5D,wBAAgB,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,KAAK,GAAG,OAAO,CAgCpD;AAMD;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAAC,CAAC,EAAE,SAAS,GAAG,MAAM,CAEvD;AAED,qEAAqE;AACrE,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,SAAS,GAAG,MAAM,CAGrD;AAOD,wDAAwD;AACxD,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,KAAK,GAAG,MAAM,CAM5E;AAED,8DAA8D;AAC9D,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAEnD;AAED,0FAA0F;AAC1F,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,KAAK,GAAG,IAAI,CAYzF;AAaD,8EAA8E;AAC9E,wBAAgB,WAAW,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,GAAG,KAAK,EAAE,CAM3D;AAED,gFAAgF;AAChF,wBAAgB,0BAA0B,CACxC,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,YAAY,GAAG,SAAS,EAClC,QAAQ,SAAM,EACd,IAAI,CAAC,EAAE,SAAS,GACf,gBAAgB,CAIlB"}

package/dist/render.js

@@ -10025,11 +10025,22 @@ function generalPolyVertices(poly, w, h) {
   const sy = ymax !== 0 ? h / (2 * ymax) : 1;
   return verts.map((v) => ({ x: v.x * sx, y: v.y * sy }));
 }
-function ellipseRings(w, h, peripheries) {
+function ellipseRings(w, h, peripheries, base) {
+  if (base === void 0) {
+    const out2 = [];
+    for (let j = 0; j < peripheries; j++) {
+      const inset = (peripheries - 1 - j) * GAP;
+      out2.push(...ellipseVertices(w - 2 * inset, h - 2 * inset));
+    }
+    return out2;
+  }
   const out = [];
+  let px = base.w / 2;
+  let py = base.h / 2;
   for (let j = 0; j < peripheries; j++) {
-    const inset = (peripheries - 1 - j) * GAP;
-    out.push(...ellipseVertices(w - 2 * inset, h - 2 * inset));
+    out.push({ x: -px, y: -py }, { x: px, y: py });
+    px += GAP;
+    py += GAP;
   }
   return out;
 }
@@ -10093,10 +10104,16 @@ function starRings(box, peripheries) {
 }
 function computeVertices(poly, w, h, base) {
   const sides = poly.sides;
+  if (poly.option.fixedshape && base !== void 0) {
+    w = base.w;
+    h = base.h;
+  }
   if (poly.option.shape === CYLINDER) return cylinderVertices(w, h);
   const peripheries = Math.max(poly.peripheries, 1);
   if (poly.option.shape === STAR) return starRings({ w, h, base }, peripheries);
-  if (sides <= 2) return ellipseRings(w, h, peripheries);
+  if (sides <= 2) {
+    return ellipseRings(w, h, peripheries, poly.option.fixedshape ? base : void 0);
+  }
   if (sides === 4 && Math.abs(poly.orientation % 90) < 0.5 && poly.distortion === 0 && poly.skew === 0) {
     return boxRings(w, h, peripheries, poly.orientation, base);
   }
@@ -10418,7 +10435,8 @@ function assembleResult(p, dimen, grown, fixedshape) {
       outlineW: Math.max(dimen.x, grown.outline.x),
       outlineH: Math.max(dimen.y, grown.outline.y),
       baseW: grown.base.x,
-      baseH: grown.base.y
+      baseH: grown.base.y,
+      fixedshape
     };
   }
   return {
@@ -10426,7 +10444,8 @@ function assembleResult(p, dimen, grown, fixedshape) {
     outlineW: grown.outline.x,
     outlineH: grown.outline.y,
     baseW: grown.base.x,
-    baseH: grown.base.y
+    baseH: grown.base.y,
+    fixedshape
   };
 }
 
@@ -14397,21 +14416,28 @@ function fixedShapeSize(poly) {
   }
   return { w: 2 * xmax, h: 2 * ymax };
 }
-function insideDims(n, poly, xsize, ysize) {
-  if (poly.option.fixedshape) {
-    const { w: w2, h: h2 } = fixedShapeSize(poly);
-    return { w: w2, h: h2, ow: w2, oh: h2 };
-  }
+function insideDims(n, xsize, ysize) {
   const w = 72 * (n.info.width || xsize / 72);
   const h = 72 * (n.info.height || ysize / 72);
   return { w, h, ow: 72 * n.info.outline_width || w, oh: 72 * n.info.outline_height || h };
 }
 function insideScale(n, poly) {
   const flip = n.root.info.flip === true;
+  if (poly.option.fixedshape) {
+    const { w: w2, h: h2 } = fixedShapeSize(poly);
+    const xsize2 = flip ? h2 : w2;
+    const ysize2 = flip ? w2 : h2;
+    return {
+      scalex: xsize2 !== 0 ? w2 / xsize2 : w2,
+      scaley: ysize2 !== 0 ? h2 / ysize2 : h2,
+      boxURx: w2 / 2,
+      boxURy: h2 / 2
+    };
+  }
   const lwrw = n.info.lw + n.info.rw;
   const xsize = flip ? n.info.ht : lwrw;
   const ysize = flip ? lwrw : n.info.ht;
-  const { w, h, ow, oh } = insideDims(n, poly, xsize, ysize);
+  const { w, h, ow, oh } = insideDims(n, xsize, ysize);
   return {
     scalex: xsize !== 0 ? w / xsize : w,
     scaley: ysize !== 0 ? h / ysize : h,
@@ -17168,7 +17194,9 @@ function pointSizeResult(sz0, peripheries, penwidth) {
     outlineW: szOutline,
     outlineH: szOutline,
     baseW: sz0,
-    baseH: sz0
+    baseH: sz0,
+    fixedshape: false
+    // C point_init never sets option.fixedshape
   };
 }
 function initPointSize(n, g, shape) {
@@ -17203,14 +17231,17 @@ function initNodeFromLabel(n, g, measurer) {
   label.space = sz.space;
   label.valign = sz.valign.charCodeAt(0);
   storeNodeSize(n, sz, flip);
-  assignShapeInfo(n, effectivePolygon(poly, params));
+  assignShapeInfo(n, effectivePolygon(poly, params, sz.fixedshape));
   return true;
 }
-function effectivePolygon(poly, p) {
+function effectivePolygon(poly, p, fixedshape) {
   let sides = p.sides;
   if (sides <= 2 && (p.distortion !== 0 || p.skew !== 0)) sides = 120;
   return {
     ...poly,
+    // C: poly->option.fixedshape = true inside the fixedsize="shape" branch;
+    // poly-inside and computeVertices key the shape-box/width split on it.
+    option: { ...poly.option, fixedshape },
     regular: p.regular,
     peripheries: p.peripheries,
     sides,
@@ -25327,6 +25358,21 @@ function nodeBoxOf(n, g) {
     const rb = recordClipBox(n);
     if (rb) return { center: n.info.coord, ...rb, isEllipse: false, penwidth };
   }
+  const si = n.info.shape_info;
+  if (si?.option?.fixedshape === true && si.vertices) {
+    const ext = fixedShapeSize(si);
+    const flip = g.root.info.flip === true;
+    const w = flip ? ext.h : ext.w;
+    const h = flip ? ext.w : ext.h;
+    return {
+      center: n.info.coord,
+      lw: w / 2,
+      rw: w / 2,
+      ht: h,
+      isEllipse: ELLIPSE_SHAPES.has(shapeName),
+      penwidth: 0
+    };
+  }
   return {
     center: n.info.coord,
     lw: n.info.lw > 0 ? n.info.lw : 27,