@poe-platform/safe-bash 0.1.764 → 0.1.766

package/dist/image-ast/index.browser.js

@@ -43703,11 +43703,10 @@ function evaluateContentStreamToDisplayList(params) {
     } else if (operator === "d") {
       const arrNode = ops[0]?.kind === "array" ? ops[0] : void 0;
       if (arrNode) {
-        const ctmScale = Math.max(1e-6, Math.hypot(st.ctm[0], st.ctm[1]));
-        const nums = arrNode.items.map((it) => it.kind === "number" ? it.value * ctmScale : 0).filter((v) => v >= 0);
+        const nums = arrNode.items.map((it) => it.kind === "number" ? it.value : 0).filter((v) => v >= 0);
         const sum = nums.reduce((a, b) => a + b, 0);
         st.dashArray = sum > 0 ? nums : void 0;
-        st.dashPhase = num(1, 0) * ctmScale;
+        st.dashPhase = num(1, 0);
       } else {
         st.dashArray = void 0;
         st.dashPhase = void 0;
@@ -43839,10 +43838,11 @@ function evaluateContentStreamToDisplayList(params) {
           const patArr = params.cosDoc.resolveArray(dArr.items[0]);
           const phaseNode = params.cosDoc.resolve(dArr.items[1]);
           if (patArr) {
-            st.dashArray = patArr.items.map((it) => {
+            const dashArray = patArr.items.map((it) => {
               const r = params.cosDoc.resolve(it);
               return r?.kind === "number" ? r.value : 0;
-            }).filter((n) => n > 0);
+            }).filter((n) => n >= 0);
+            st.dashArray = dashArray.some((value) => value > 0) ? dashArray : void 0;
             st.dashPhase = phaseNode?.kind === "number" ? phaseNode.value : 0;
           }
         }
@@ -44243,15 +44243,14 @@ function evaluateContentStreamToDisplayList(params) {
             break;
           }
           const fillRule = node.paint.includes("*") ? "evenodd" : "nonzero";
-          const ctmScale = Math.max(1e-6, Math.hypot(st.ctm[0], st.ctm[1]));
-          const scaledStrokeWidth = st.strokeWidth === 0 ? 0 : st.strokeWidth * ctmScale;
           emit({ kind: "path", value: {
             segments: transformedSegments,
             fillColor: isFill && !evaluatedFillPattern ? st.fillColor : void 0,
             fillAlpha: isFill && !evaluatedFillPattern ? st.fillAlpha : void 0,
             strokeColor: isStroke ? st.strokeColor : void 0,
             strokeAlpha: isStroke ? st.strokeAlpha : void 0,
-            strokeWidth: scaledStrokeWidth,
+            strokeWidth: st.strokeWidth,
+            ...isStroke ? { strokeMatrix: [...st.ctm] } : {},
             ...st.lineCap !== 0 ? { lineCap: st.lineCap } : {},
             ...st.lineJoin !== 0 ? { lineJoin: st.lineJoin } : {},
             ...st.miterLimit !== 10 ? { miterLimit: st.miterLimit } : {},
@@ -44439,14 +44438,14 @@ function evaluateContentStreamToDisplayList(params) {
                   if (st.textRenderMode >= 4 && st.textRenderMode <= 7) pendingTextClip.push(...transformedGlyphSegs);
                   const isFillGlyph = st.textRenderMode === 0 || st.textRenderMode === 2 || st.textRenderMode === 4 || st.textRenderMode === 6;
                   const isStrokeGlyph = st.textRenderMode === 1 || st.textRenderMode === 2 || st.textRenderMode === 5 || st.textRenderMode === 6;
-                  const ctmScale = Math.max(1e-6, Math.hypot(st.ctm[0], st.ctm[1]));
                   const paint = {
                     segments: transformedGlyphSegs,
                     fillColor: isFillGlyph ? st.fillColor : void 0,
                     fillAlpha: isFillGlyph ? st.fillAlpha : void 0,
                     strokeColor: isStrokeGlyph ? st.strokeColor : void 0,
                     strokeAlpha: isStrokeGlyph ? st.strokeAlpha : void 0,
-                    strokeWidth: isStrokeGlyph ? st.strokeWidth * ctmScale : 0,
+                    strokeWidth: isStrokeGlyph ? st.strokeWidth : 0,
+                    ...isStrokeGlyph ? { strokeMatrix: [...st.ctm] } : {},
                     fillRule: "nonzero",
                     ...st.blendMode && st.blendMode !== "Normal" ? { blendMode: st.blendMode } : {},
                     ...st.clipRect ? { clipRect: [...st.clipRect] } : {}
@@ -46847,7 +46846,7 @@ function dashSubpath(path, pattern, phase) {
     while (remaining <= 0) {
       if (++steps > MAX_STROKE_VERTICES) throw new PdfError("E_LIMIT", "Stroke dash expansion exceeds the vertex limit");
       if (index % 2 === 0) {
-        if (pattern[index] === 0) result.push({ points: [point, point], closed: false });
+        if (pattern[index] === 0) result.push({ points: [point, point], closed: false, zeroLengthDash: true });
         flush();
       }
       index = (index + 1) % pattern.length;
@@ -46862,7 +46861,7 @@ function dashSubpath(path, pattern, phase) {
       throw new PdfError("E_LIMIT", "Stroke dash expansion exceeds the vertex limit");
     }
     let distance = 0;
-    while (distance < length) {
+    while (length - distance > 8 * Number.EPSILON * Math.max(1, length)) {
       const point = [start[0] + dx * distance / length, start[1] + dy * distance / length];
       advance(point);
       const step = Math.min(remaining, length - distance);
@@ -46977,7 +46976,15 @@ function strokeOutlines(paths, width, cap, join, miterLimit, dashArray = [], das
       let closed = subpath.closed;
       if (closed && points.length > 1 && Math.hypot(points[0][0] - points[points.length - 1][0], points[0][1] - points[points.length - 1][1]) <= 1e-14) points.pop();
       if (points.length < 3) closed = false;
-      if (points.length === 1 && subpath.points.length > 1 && cap === 1) {
+      if (points.length === 1 && cap === 2 && subpath.zeroLengthDash) {
+        contour = [];
+        const [x, y] = points[0];
+        add(x - half, y - half);
+        add(x + half, y - half);
+        add(x + half, y + half);
+        add(x - half, y + half);
+        contours.push(contour);
+      } else if (points.length === 1 && subpath.points.length > 1 && cap === 1) {
         contour = [];
         const [x, y] = points[0];
         addCap([x, y], [x + 1, y]);
@@ -47696,11 +47703,10 @@ function blendPixel(rgba, width, height, px, py, color, alpha, blendMode, clipMa
   rgba[idx + 2] = Math.round((effB * a + cbB * dstA * (1 - a)) / outA * 255);
   rgba[idx + 3] = Math.round(outA * 255);
 }
-function segmentsToScreenPaths(segments, pageHeight, scale) {
+function segmentsToScreenPaths(segments, pageHeight, scale, toScreen = (x, y) => [x * scale, (pageHeight - y) * scale]) {
   const paths = [];
   let points = [];
   let current = [0, 0];
-  const toScreen = (x, y) => [x * scale, (pageHeight - y) * scale];
   for (const segment of segments) {
     if (segment.kind === "move") {
       if (points.length) paths.push({ points, closed: false });
@@ -47739,6 +47745,63 @@ function segmentsToScreenPaths(segments, pageHeight, scale) {
   if (points.length) paths.push({ points, closed: false });
   return paths;
 }
+function inverseStrokeMatrix(matrix) {
+  const [a, b, c, d, e, f] = matrix;
+  const det = a * d - b * c;
+  if (!Number.isFinite(det) || det === 0) return void 0;
+  return [d / det, -b / det, -c / det, a / det, (c * f - d * e) / det, (b * e - a * f) / det];
+}
+function prepareStroke(path, scale) {
+  const matrix = path.strokeMatrix ? [...path.strokeMatrix] : [1, 0, 0, 1, 0, 0];
+  const [a, b, c, d] = matrix;
+  const area = Math.abs(a * d - b * c) * scale * scale;
+  if (!(area > 0) || !Number.isFinite(area)) return void 0;
+  const normX = Math.hypot(a, b) * scale, normY = Math.hypot(c, d) * scale;
+  let width = path.strokeWidth || 1;
+  const scaleX = path.strokeWidth === 0 ? normY / area : Math.max(1, normY / (width * area));
+  const scaleY = path.strokeWidth === 0 ? normX / area : Math.max(1, normX / (width * area));
+  let dashArray = path.dashArray, dashPhase = path.dashPhase ?? 0;
+  if (scaleX === scaleY) {
+    width *= scaleX;
+  } else {
+    matrix[0] *= scaleX;
+    matrix[1] *= scaleX;
+    matrix[2] *= scaleY;
+    matrix[3] *= scaleY;
+    if (dashArray?.length) {
+      const dashScale = Math.max(scaleX, scaleY);
+      dashArray = dashArray.map((value) => value / dashScale);
+      dashPhase /= dashScale;
+    }
+  }
+  return { matrix, width, dashArray, dashPhase };
+}
+function strokeContours(path, pageHeight, scale) {
+  const stroke = prepareStroke(path, scale);
+  if (!stroke) return [];
+  const inverse = inverseStrokeMatrix(stroke.matrix);
+  if (!inverse) return [];
+  const [a, b, c, d, e, f] = stroke.matrix;
+  const strokeScale = scale * Math.hypot(a, b, c, d);
+  const project = (x, y) => [
+    (inverse[0] * x + inverse[2] * y + inverse[4]) * strokeScale,
+    (inverse[1] * x + inverse[3] * y + inverse[5]) * strokeScale
+  ];
+  const toScreen = ([x, y]) => [
+    (a * x / strokeScale + c * y / strokeScale + e) * scale,
+    (pageHeight - b * x / strokeScale - d * y / strokeScale - f) * scale
+  ];
+  const contours = strokeOutlines(
+    segmentsToScreenPaths(path.segments, pageHeight, scale, project),
+    stroke.width * strokeScale,
+    path.lineCap ?? 0,
+    path.lineJoin ?? 0,
+    path.miterLimit ?? 10,
+    stroke.dashArray?.map((value) => Math.max(0, value * strokeScale)),
+    stroke.dashPhase * strokeScale
+  );
+  return contours.map((points) => points.map(toScreen));
+}
 function pathsToEdges(paths, closeSubpaths = false) {
   const edges = [];
   for (const { points, closed } of paths) {
@@ -47988,19 +48051,9 @@ function renderDisplayListToBitmap(displayList, options = {}) {
         fillEdgesScanline4x4(rgba, width, height, edges, path.fillColor, path.fillAlpha ?? 1, path.fillRule ?? "nonzero", clipScreen, original.kind === "glyph" ? aaTxt : aaVec, path.blendMode, clipMask);
       }
       if (path.strokeColor) {
-        const rawSw = path.strokeWidth * scale;
-        const sw = Math.max(1, rawSw);
+        const rawSw = path.strokeWidth * scale * (path.strokeMatrix ? Math.hypot(path.strokeMatrix[0], path.strokeMatrix[1]) : 1);
         const strokeAlpha = options.thinLineMode === "shape" && rawSw < 1 ? (path.strokeAlpha ?? 1) * Math.max(0.25, rawSw) : path.strokeAlpha ?? 1;
-        const contours = strokeOutlines(
-          segmentsToScreenPaths(path.segments, displayList.height, scale),
-          sw,
-          path.lineCap ?? 0,
-          path.lineJoin ?? 0,
-          path.miterLimit ?? 10,
-          path.dashArray?.map((value) => Math.max(0, value * scale)),
-          (path.dashPhase ?? 0) * scale
-        );
-        const edges = pathsToEdges(contours.map((points) => ({ points, closed: true })));
+        const edges = pathsToEdges(strokeContours(path, displayList.height, scale).map((points) => ({ points, closed: true })));
         const clipScreen = path.clipRect ? [path.clipRect[0] * scale, (displayList.height - path.clipRect[3]) * scale, path.clipRect[2] * scale, (displayList.height - path.clipRect[1]) * scale] : void 0;
         fillEdgesScanline4x4(
           rgba,

package/dist/image-ast/index.js

@@ -43703,11 +43703,10 @@ function evaluateContentStreamToDisplayList(params) {
     } else if (operator === "d") {
       const arrNode = ops[0]?.kind === "array" ? ops[0] : void 0;
       if (arrNode) {
-        const ctmScale = Math.max(1e-6, Math.hypot(st.ctm[0], st.ctm[1]));
-        const nums = arrNode.items.map((it) => it.kind === "number" ? it.value * ctmScale : 0).filter((v) => v >= 0);
+        const nums = arrNode.items.map((it) => it.kind === "number" ? it.value : 0).filter((v) => v >= 0);
         const sum = nums.reduce((a, b) => a + b, 0);
         st.dashArray = sum > 0 ? nums : void 0;
-        st.dashPhase = num(1, 0) * ctmScale;
+        st.dashPhase = num(1, 0);
       } else {
         st.dashArray = void 0;
         st.dashPhase = void 0;
@@ -43839,10 +43838,11 @@ function evaluateContentStreamToDisplayList(params) {
           const patArr = params.cosDoc.resolveArray(dArr.items[0]);
           const phaseNode = params.cosDoc.resolve(dArr.items[1]);
           if (patArr) {
-            st.dashArray = patArr.items.map((it) => {
+            const dashArray = patArr.items.map((it) => {
               const r = params.cosDoc.resolve(it);
               return r?.kind === "number" ? r.value : 0;
-            }).filter((n) => n > 0);
+            }).filter((n) => n >= 0);
+            st.dashArray = dashArray.some((value) => value > 0) ? dashArray : void 0;
             st.dashPhase = phaseNode?.kind === "number" ? phaseNode.value : 0;
           }
         }
@@ -44243,15 +44243,14 @@ function evaluateContentStreamToDisplayList(params) {
             break;
           }
           const fillRule = node.paint.includes("*") ? "evenodd" : "nonzero";
-          const ctmScale = Math.max(1e-6, Math.hypot(st.ctm[0], st.ctm[1]));
-          const scaledStrokeWidth = st.strokeWidth === 0 ? 0 : st.strokeWidth * ctmScale;
           emit({ kind: "path", value: {
             segments: transformedSegments,
             fillColor: isFill && !evaluatedFillPattern ? st.fillColor : void 0,
             fillAlpha: isFill && !evaluatedFillPattern ? st.fillAlpha : void 0,
             strokeColor: isStroke ? st.strokeColor : void 0,
             strokeAlpha: isStroke ? st.strokeAlpha : void 0,
-            strokeWidth: scaledStrokeWidth,
+            strokeWidth: st.strokeWidth,
+            ...isStroke ? { strokeMatrix: [...st.ctm] } : {},
             ...st.lineCap !== 0 ? { lineCap: st.lineCap } : {},
             ...st.lineJoin !== 0 ? { lineJoin: st.lineJoin } : {},
             ...st.miterLimit !== 10 ? { miterLimit: st.miterLimit } : {},
@@ -44439,14 +44438,14 @@ function evaluateContentStreamToDisplayList(params) {
                   if (st.textRenderMode >= 4 && st.textRenderMode <= 7) pendingTextClip.push(...transformedGlyphSegs);
                   const isFillGlyph = st.textRenderMode === 0 || st.textRenderMode === 2 || st.textRenderMode === 4 || st.textRenderMode === 6;
                   const isStrokeGlyph = st.textRenderMode === 1 || st.textRenderMode === 2 || st.textRenderMode === 5 || st.textRenderMode === 6;
-                  const ctmScale = Math.max(1e-6, Math.hypot(st.ctm[0], st.ctm[1]));
                   const paint = {
                     segments: transformedGlyphSegs,
                     fillColor: isFillGlyph ? st.fillColor : void 0,
                     fillAlpha: isFillGlyph ? st.fillAlpha : void 0,
                     strokeColor: isStrokeGlyph ? st.strokeColor : void 0,
                     strokeAlpha: isStrokeGlyph ? st.strokeAlpha : void 0,
-                    strokeWidth: isStrokeGlyph ? st.strokeWidth * ctmScale : 0,
+                    strokeWidth: isStrokeGlyph ? st.strokeWidth : 0,
+                    ...isStrokeGlyph ? { strokeMatrix: [...st.ctm] } : {},
                     fillRule: "nonzero",
                     ...st.blendMode && st.blendMode !== "Normal" ? { blendMode: st.blendMode } : {},
                     ...st.clipRect ? { clipRect: [...st.clipRect] } : {}
@@ -46847,7 +46846,7 @@ function dashSubpath(path, pattern, phase) {
     while (remaining <= 0) {
       if (++steps > MAX_STROKE_VERTICES) throw new PdfError("E_LIMIT", "Stroke dash expansion exceeds the vertex limit");
       if (index % 2 === 0) {
-        if (pattern[index] === 0) result.push({ points: [point, point], closed: false });
+        if (pattern[index] === 0) result.push({ points: [point, point], closed: false, zeroLengthDash: true });
         flush();
       }
       index = (index + 1) % pattern.length;
@@ -46862,7 +46861,7 @@ function dashSubpath(path, pattern, phase) {
       throw new PdfError("E_LIMIT", "Stroke dash expansion exceeds the vertex limit");
     }
     let distance = 0;
-    while (distance < length) {
+    while (length - distance > 8 * Number.EPSILON * Math.max(1, length)) {
       const point = [start[0] + dx * distance / length, start[1] + dy * distance / length];
       advance(point);
       const step = Math.min(remaining, length - distance);
@@ -46977,7 +46976,15 @@ function strokeOutlines(paths, width, cap, join, miterLimit, dashArray = [], das
       let closed = subpath.closed;
       if (closed && points.length > 1 && Math.hypot(points[0][0] - points[points.length - 1][0], points[0][1] - points[points.length - 1][1]) <= 1e-14) points.pop();
       if (points.length < 3) closed = false;
-      if (points.length === 1 && subpath.points.length > 1 && cap === 1) {
+      if (points.length === 1 && cap === 2 && subpath.zeroLengthDash) {
+        contour = [];
+        const [x, y] = points[0];
+        add(x - half, y - half);
+        add(x + half, y - half);
+        add(x + half, y + half);
+        add(x - half, y + half);
+        contours.push(contour);
+      } else if (points.length === 1 && subpath.points.length > 1 && cap === 1) {
         contour = [];
         const [x, y] = points[0];
         addCap([x, y], [x + 1, y]);
@@ -47696,11 +47703,10 @@ function blendPixel(rgba, width, height, px, py, color, alpha, blendMode, clipMa
   rgba[idx + 2] = Math.round((effB * a + cbB * dstA * (1 - a)) / outA * 255);
   rgba[idx + 3] = Math.round(outA * 255);
 }
-function segmentsToScreenPaths(segments, pageHeight, scale) {
+function segmentsToScreenPaths(segments, pageHeight, scale, toScreen = (x, y) => [x * scale, (pageHeight - y) * scale]) {
   const paths = [];
   let points = [];
   let current = [0, 0];
-  const toScreen = (x, y) => [x * scale, (pageHeight - y) * scale];
   for (const segment of segments) {
     if (segment.kind === "move") {
       if (points.length) paths.push({ points, closed: false });
@@ -47739,6 +47745,63 @@ function segmentsToScreenPaths(segments, pageHeight, scale) {
   if (points.length) paths.push({ points, closed: false });
   return paths;
 }
+function inverseStrokeMatrix(matrix) {
+  const [a, b, c, d, e, f] = matrix;
+  const det = a * d - b * c;
+  if (!Number.isFinite(det) || det === 0) return void 0;
+  return [d / det, -b / det, -c / det, a / det, (c * f - d * e) / det, (b * e - a * f) / det];
+}
+function prepareStroke(path, scale) {
+  const matrix = path.strokeMatrix ? [...path.strokeMatrix] : [1, 0, 0, 1, 0, 0];
+  const [a, b, c, d] = matrix;
+  const area = Math.abs(a * d - b * c) * scale * scale;
+  if (!(area > 0) || !Number.isFinite(area)) return void 0;
+  const normX = Math.hypot(a, b) * scale, normY = Math.hypot(c, d) * scale;
+  let width = path.strokeWidth || 1;
+  const scaleX = path.strokeWidth === 0 ? normY / area : Math.max(1, normY / (width * area));
+  const scaleY = path.strokeWidth === 0 ? normX / area : Math.max(1, normX / (width * area));
+  let dashArray = path.dashArray, dashPhase = path.dashPhase ?? 0;
+  if (scaleX === scaleY) {
+    width *= scaleX;
+  } else {
+    matrix[0] *= scaleX;
+    matrix[1] *= scaleX;
+    matrix[2] *= scaleY;
+    matrix[3] *= scaleY;
+    if (dashArray?.length) {
+      const dashScale = Math.max(scaleX, scaleY);
+      dashArray = dashArray.map((value) => value / dashScale);
+      dashPhase /= dashScale;
+    }
+  }
+  return { matrix, width, dashArray, dashPhase };
+}
+function strokeContours(path, pageHeight, scale) {
+  const stroke = prepareStroke(path, scale);
+  if (!stroke) return [];
+  const inverse = inverseStrokeMatrix(stroke.matrix);
+  if (!inverse) return [];
+  const [a, b, c, d, e, f] = stroke.matrix;
+  const strokeScale = scale * Math.hypot(a, b, c, d);
+  const project = (x, y) => [
+    (inverse[0] * x + inverse[2] * y + inverse[4]) * strokeScale,
+    (inverse[1] * x + inverse[3] * y + inverse[5]) * strokeScale
+  ];
+  const toScreen = ([x, y]) => [
+    (a * x / strokeScale + c * y / strokeScale + e) * scale,
+    (pageHeight - b * x / strokeScale - d * y / strokeScale - f) * scale
+  ];
+  const contours = strokeOutlines(
+    segmentsToScreenPaths(path.segments, pageHeight, scale, project),
+    stroke.width * strokeScale,
+    path.lineCap ?? 0,
+    path.lineJoin ?? 0,
+    path.miterLimit ?? 10,
+    stroke.dashArray?.map((value) => Math.max(0, value * strokeScale)),
+    stroke.dashPhase * strokeScale
+  );
+  return contours.map((points) => points.map(toScreen));
+}
 function pathsToEdges(paths, closeSubpaths = false) {
   const edges = [];
   for (const { points, closed } of paths) {
@@ -47988,19 +48051,9 @@ function renderDisplayListToBitmap(displayList, options = {}) {
         fillEdgesScanline4x4(rgba, width, height, edges, path.fillColor, path.fillAlpha ?? 1, path.fillRule ?? "nonzero", clipScreen, original.kind === "glyph" ? aaTxt : aaVec, path.blendMode, clipMask);
       }
       if (path.strokeColor) {
-        const rawSw = path.strokeWidth * scale;
-        const sw = Math.max(1, rawSw);
+        const rawSw = path.strokeWidth * scale * (path.strokeMatrix ? Math.hypot(path.strokeMatrix[0], path.strokeMatrix[1]) : 1);
         const strokeAlpha = options.thinLineMode === "shape" && rawSw < 1 ? (path.strokeAlpha ?? 1) * Math.max(0.25, rawSw) : path.strokeAlpha ?? 1;
-        const contours = strokeOutlines(
-          segmentsToScreenPaths(path.segments, displayList.height, scale),
-          sw,
-          path.lineCap ?? 0,
-          path.lineJoin ?? 0,
-          path.miterLimit ?? 10,
-          path.dashArray?.map((value) => Math.max(0, value * scale)),
-          (path.dashPhase ?? 0) * scale
-        );
-        const edges = pathsToEdges(contours.map((points) => ({ points, closed: true })));
+        const edges = pathsToEdges(strokeContours(path, displayList.height, scale).map((points) => ({ points, closed: true })));
         const clipScreen = path.clipRect ? [path.clipRect[0] * scale, (displayList.height - path.clipRect[3]) * scale, path.clipRect[2] * scale, (displayList.height - path.clipRect[1]) * scale] : void 0;
         fillEdgesScanline4x4(
           rgba,

package/dist/pdf-ast/ast.d.ts

@@ -246,6 +246,8 @@ export interface PdfEvaluatedPath {
     readonly fillColor?: PdfRgbColor | undefined;
     readonly fillAlpha?: number | undefined;
     readonly strokeWidth: number;
+    /** Paint-time user-to-page transform for stroke width/dashes; segments remain in page coordinates. */
+    readonly strokeMatrix?: readonly [number, number, number, number, number, number] | undefined;
     readonly lineCap?: 0 | 1 | 2 | undefined;
     readonly lineJoin?: 0 | 1 | 2 | undefined;
     readonly miterLimit?: number | undefined;