@poe-platform/safe-bash 0.1.837 → 0.1.839

package/dist/safe-bash-command-imagemagick/index.js

@@ -875,9 +875,10 @@ function* warpPixelSteps(source, plan, background) {
 }
 
 // packages/safe-bash-command-imagemagick/src/morphology-kernel.ts
-function* morphologyPixelSteps(image, rx, ry, mode) {
+function* morphologyPixelSteps(image, rows, mode) {
   const { width, height } = image, histogram = new Float64Array(4 * 256);
-  const rank = Math.floor((rx * 2 + 1) * (ry * 2 + 1) / 2);
+  const ry = Math.floor(rows.length / 2);
+  const rank = Math.floor(rows.reduce((total, radius) => total + radius * 2 + 1, 0) / 2);
   let work = 0;
   for (let y = 0; y < height; y++) {
     yield;
@@ -887,14 +888,18 @@ function* morphologyPixelSteps(image, rx, ry, mode) {
       for (let local = 0; local < count; local++) {
         const x = left + local;
         for (let phase = 0; phase < (x === 0 ? 1 : 2); phase++) {
-          const first = x === 0 ? -rx : phase === 0 ? x - rx - 1 : x + rx;
-          const last = x === 0 ? rx : first, delta = x === 0 || phase === 1 ? 1 : -1;
-          for (let dy = -ry; dy <= ry; dy++) for (let column = first; column <= last; column++) {
-            if (++work % 4096 === 0) yield;
-            const sx = Math.max(0, Math.min(width - 1, column)), sy = Math.max(0, Math.min(height - 1, y + dy));
-            const bytes = yield { kind: "read", position: (sy * width + sx) * 4, length: 4 };
-            if (!bytes || bytes.length !== 4) throw new Error("Truncated morphology pixels");
-            for (let c = 0; c < 4; c++) histogram[c * 256 + bytes[c]] += delta;
+          const delta = x === 0 || phase === 1 ? 1 : -1;
+          for (let dy = -ry; dy <= ry; dy++) {
+            const rx = rows[dy + ry];
+            const first = x === 0 ? -rx : phase === 0 ? x - rx - 1 : x + rx;
+            const last = x === 0 ? rx : first;
+            for (let column = first; column <= last; column++) {
+              if (++work % 4096 === 0) yield;
+              const sx = Math.max(0, Math.min(width - 1, column)), sy = Math.max(0, Math.min(height - 1, y + dy));
+              const bytes = yield { kind: "read", position: (sy * width + sx) * 4, length: 4 };
+              if (!bytes || bytes.length !== 4) throw new Error("Truncated morphology pixels");
+              for (let c = 0; c < 4; c++) histogram[c * 256 + bytes[c]] += delta;
+            }
           }
         }
         for (let c = 0; c < 4; c++) {
@@ -2001,6 +2006,10 @@ function magickMorphologyPlan(methodRaw, kernelSpec) {
     rx = Math.max(1, Math.round(Number(sizePart)));
     ry = rx;
   }
+  const disk = (colonIdx < 0 ? kernelSpec : kernelSpec.slice(0, colonIdx)).toLowerCase() === "disk";
+  const radius = Number(sizePart) || 4.5;
+  if (disk) ry = Math.max(0, Math.floor(radius));
+  const rows = Array.from({ length: ry * 2 + 1 }, (_, row) => disk ? Math.floor(Math.sqrt(radius * radius - (row - ry) ** 2)) : rx);
   const filter = (source, mode) => ({ source, mode });
   const diff = (a, b) => ({ mode: "diff", a, b });
   let steps;
@@ -2037,7 +2046,7 @@ function magickMorphologyPlan(methodRaw, kernelSpec) {
     default:
       steps = [filter(0, "max")];
   }
-  return { rx, ry, steps };
+  return { rows, steps };
 }
 function* subtractMagickPixelSteps(a, b) {
   const result = new Uint8Array(a.length);
@@ -2055,7 +2064,7 @@ function* applyMagickMorphology4ChSteps(img, methodRaw, kernelSpec, signal) {
       images.push({ ...a, data: yield* subtractMagickPixelSteps(a.data, b.data) });
     } else {
       const source = images[step.source];
-      images.push(yield* applyMagickRasterSteps(source, morphologyPixelSteps(source, plan.rx, plan.ry, step.mode), signal));
+      images.push(yield* applyMagickRasterSteps(source, morphologyPixelSteps(source, plan.rows, step.mode), signal));
     }
   }
   return images.at(-1);
@@ -6227,7 +6236,7 @@ async function morphStoredMagickImage(image, backend, plan, signal) {
       images.push({ ...image, position });
     } else {
       const source = images[step.source];
-      images.push(await transformStoredMagickRaster(source, backend, morphologyPixelSteps(source, plan.rx, plan.ry, step.mode), signal));
+      images.push(await transformStoredMagickRaster(source, backend, morphologyPixelSteps(source, plan.rows, step.mode), signal));
     }
   }
   return images.at(-1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@poe-platform/safe-bash",
-  "version": "0.1.837",
+  "version": "0.1.839",
   "description": "Extensible virtual shell with pluggable filesystems and streaming commands",
   "type": "module",
   "license": "MIT",
@@ -1415,7 +1415,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@poe-platform/safe-fs": "0.1.837",
+    "@poe-platform/safe-fs": "0.1.839",
     "pdf-lib": "1.17.1",
     "@types/node": "^25.2.2",
     "@formatjs/intl-numberformat": "9.4.0",