@poe-platform/safe-bash 0.1.843 → 0.1.844

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

@@ -1,8 +1,8 @@
 import {
   createFfprobeCommand
-} from "../safe-bash/command-chunks/chunk-MJB4WWYP.js";
+} from "../safe-bash/command-chunks/chunk-3SWIXYXT.js";
 import "../safe-bash/command-chunks/chunk-MGBHGZEX.js";
-import "../safe-bash/command-chunks/chunk-SBBMNLD6.js";
+import "../safe-bash/command-chunks/chunk-LORSYIAF.js";
 import "../safe-bash/command-chunks/chunk-65DS4IOB.js";
 
 // packages/safe-bash-command-ffprobe/src/index.ts

package/dist/safe-bash-command-ffprobe/media.js

@@ -11,9 +11,9 @@ import {
   loadManifestResources,
   resolvePath,
   rethrowRuntimeError
-} from "../safe-bash/command-chunks/chunk-MJB4WWYP.js";
+} from "../safe-bash/command-chunks/chunk-3SWIXYXT.js";
 import "../safe-bash/command-chunks/chunk-MGBHGZEX.js";
-import "../safe-bash/command-chunks/chunk-SBBMNLD6.js";
+import "../safe-bash/command-chunks/chunk-LORSYIAF.js";
 import "../safe-bash/command-chunks/chunk-65DS4IOB.js";
 export {
   createFfprobeCommand,

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

@@ -1273,10 +1273,10 @@ function* combinePixelSteps(size, lengths) {
         for (let offset = 3; offset < length; offset += 4) data[offset] = 255;
         continue;
       }
-      const count = Math.max(0, Math.min(length, lengths[image] - position));
+      const count = Math.max(0, Math.min(length, (lengths[image] ?? 0) - position));
       if (!count) continue;
       const source = yield { kind: "read", image, position, length: count };
-      for (let offset = 0; offset < count; offset += 4) data[offset + image] = source[offset];
+      for (let offset = 0; offset < count; offset += 4) data[offset + image] = Math.round(0.212656 * source[offset] + 0.715158 * source[offset + 1] + 0.072186 * source[offset + 2]);
     }
     yield { kind: "write", position, data };
   }
@@ -4840,8 +4840,8 @@ function* applyMagickSpliceSteps(img, geomStr, bg, gravity = "northwest", signal
 function* applyMagickChopSteps(img, geomStr, gravity = "northwest", signal) {
   let cooperativeWork = 0;
   const g = parseMagickGeometry(geomStr);
-  const cw = Math.max(0, Math.round(g.width ?? 0));
-  const ch = Math.max(0, Math.round(g.height ?? 0));
+  const cw = Math.max(0, Math.round((g.width ?? 0) * (g.isPercent ? img.width / 100 : 1)));
+  const ch = Math.max(0, Math.round((g.height ?? 0) * (g.isPercent ? img.height / 100 : 1)));
   const { x: x0, y: y0 } = gravityAdjustBox(img.width, img.height, cw, ch, g.x, g.y, gravity);
   if (x0 + cw < 0 || y0 + ch < 0 || x0 > img.width || y0 > img.height) {
     return img;
@@ -4879,6 +4879,7 @@ function* applyMagickChopSteps(img, geomStr, gravity = "northwest", signal) {
 }
 function parseMagickRollGeometry(raw) {
   const geometry = parseMagickGeometry(raw);
+  if (geometry.isPercent) return { ...geometry, x: 0, y: 0 };
   if (geometry.hasOffset && geometry.width !== void 0 && !raw.toLowerCase().includes("x")) {
     throw new Error(`invalid argument for option '-roll': ${raw}`);
   }
@@ -7797,32 +7798,37 @@ function runIdentifyCliSync(argv, files, stdinBytes, signal) {
   }
   return next.value;
 }
-function* parseMagickIndexSpec(spec, length) {
+function parseMagickIndices(spec, ranges = true) {
+  if (!spec.trim() || spec.trimStart().startsWith(",")) throw new Error(`invalid argument ${spec}`);
+  return spec.split(",").filter((part) => part.trim()).map((part) => {
+    const value = part.trim();
+    const separator = ranges ? value.indexOf("-", 1) : -1;
+    const values = separator > 0 ? [value.slice(0, separator), value.slice(separator + 1)] : [value];
+    return values.map((value2) => {
+      const digits = value2.startsWith("-") ? value2.slice(1) : value2;
+      if (!digits.length || !Array.from(digits).every((c) => c >= "0" && c <= "9") || !Number.isSafeInteger(Number(value2))) {
+        throw new Error(`invalid argument ${spec}`);
+      }
+      return Number(value2);
+    });
+  });
+}
+function* parseMagickIndexSpec(spec, length, operation) {
+  const parts = parseMagickIndices(spec);
   if (length <= 0) return;
   const resolve = (n) => n < 0 ? Math.max(0, length + n) : Math.min(Math.max(0, n), length - 1);
-  for (const part of spec.split(",")) {
-    const trimmed = part.trim();
-    if (!trimmed) continue;
-    const separator = trimmed.indexOf("-", 1);
-    const integer = (value) => {
-      const digits = value.startsWith("-") ? value.slice(1) : value;
-      return digits.length > 0 && Array.from(digits).every((c) => c >= "0" && c <= "9");
-    };
-    const rangeMatch = separator > 0 && integer(trimmed.slice(0, separator)) && integer(trimmed.slice(separator + 1)) ? [trimmed, trimmed.slice(0, separator), trimmed.slice(separator + 1)] : void 0;
-    if (rangeMatch) {
-      const s = resolve(parseInt(rangeMatch[1], 10));
-      const e = resolve(parseInt(rangeMatch[2], 10));
-      if (s <= e) {
-        for (let k = s; k <= e; k++) yield k;
-      } else {
-        for (let k = s; k >= e; k--) yield k;
+  for (const [num, end] of parts) {
+    if (end !== void 0) {
+      const s = resolve(num), e = resolve(end), step = s <= e ? 1 : -1;
+      if (operation === "delete" && s > e) continue;
+      for (let k = s; ; k += step) {
+        yield k;
+        if (k === e) break;
       }
     } else {
-      const num = parseInt(trimmed, 10);
-      if (!Number.isNaN(num)) {
-        const idx = num < 0 ? length + num : num;
-        if (idx >= 0 && idx < length) yield idx;
-      }
+      const idx = num < 0 ? length + num : num;
+      if (idx >= 0 && idx < length) yield idx;
+      else if (operation === "clone") throw new Error(`invalid image index ${num}`);
     }
   }
 }
@@ -8619,7 +8625,7 @@ function applyMagickReadSetting(tokens, state, start) {
   } else return void 0;
   return i;
 }
-function* evaluatePipelineTokensSteps(tokens, files, state, parentStack = [], stdinBytes, signal, analysis = { text: "", warnings: "" }) {
+function* evaluatePipelineTokensSteps(tokens, files, state, parentStack, stdinBytes, signal, analysis = { text: "", warnings: "" }) {
   let cooperativeWork = 63;
   let stack = [];
   let operandsOnly = false;
@@ -9077,14 +9083,11 @@ function* evaluatePipelineTokensSteps(tokens, files, state, parentStack = [], st
       }
       stack = nextStack;
     } else if (t === "-combine") {
-      if (stack.length >= 3) {
+      if (stack.length > 0) {
         const rIm = stack[0];
-        const gIm = stack[1] ?? rIm;
-        const bIm = stack[2] ?? rIm;
-        const aIm = stack[3];
-        const sources = [rIm, gIm, bIm, ...aIm ? [aIm] : []];
+        const sources = stack.slice(0, 4);
         const result = yield* applyMagickRasterSteps(rIm, combinePixelSteps(rIm.width * rIm.height * 4, sources.map((image) => image.data.length)), signal, rIm, sources);
-        stack = [{ ...result, space: "srgb", channels: 4, hasAlpha: Boolean(aIm) }];
+        stack = [{ ...result, space: "srgb", channels: 4, hasAlpha: sources.length === 4 }];
       }
     } else if (t === "-draw") {
       const drawSpec = tokens[++i] ?? "";
@@ -9115,9 +9118,10 @@ function* evaluatePipelineTokensSteps(tokens, files, state, parentStack = [], st
         return yield* applyMagickRasterSteps(im, annotatePixelSteps(im, offset, text, state), signal);
       });
     } else if (t === "+clone" || t === "-clone") {
-      const sourcePool = stack.length > 0 ? stack : parentStack;
+      const sourcePool = parentStack ?? stack;
+      if (sourcePool.length === 0) throw new Error(`UnableToCloneImage ${t}`);
       const spec = t === "+clone" ? "-1" : tokens[++i] ?? "-1";
-      for (const idx of parseMagickIndexSpec(spec, sourcePool.length)) {
+      for (const idx of parseMagickIndexSpec(spec, sourcePool.length, "clone")) {
         if (++cooperativeWork % 65536 === 0)
           yield;
         const chosen = sourcePool[idx];
@@ -9125,27 +9129,23 @@ function* evaluatePipelineTokensSteps(tokens, files, state, parentStack = [], st
           stack.push({ ...chosen, data: new Uint8Array(chosen.data) });
       }
     } else if (t === "-duplicate" || t === "+duplicate") {
+      if (stack.length === 0) throw new Error(`no images found for operation ${t}`);
       let count = 1;
       let idxSpec = "-1";
       if (t === "-duplicate") {
-        const nextTok = tokens[i + 1];
-        if (nextTok && /^\d+/.test(nextTok)) {
-          i++;
-          const commaIdx = nextTok.indexOf(",");
-          if (commaIdx >= 0) {
-            count = Math.max(0, parseInt(nextTok.slice(0, commaIdx), 10));
-            idxSpec = nextTok.slice(commaIdx + 1) || "-1";
-          } else {
-            count = Math.max(0, parseInt(nextTok, 10));
-          }
-        }
-      }
-      const sourcePool = stack.length > 0 ? stack : parentStack;
+        const value = tokens[++i] ?? "", comma = value.indexOf(",");
+        const countSpec = comma < 0 ? value : value.slice(0, comma);
+        count = parseInt(countSpec, 10);
+        if (!Number.isSafeInteger(count) || count < 0) throw new Error(`invalid argument ${value}`);
+        idxSpec = comma < 0 ? "-1" : value.slice(comma + 1) || "-1";
+        parseMagickIndices(idxSpec);
+      }
+      const sourcePool = stack;
       const sourceLength = sourcePool.length;
       for (let k = 0; k < count; k++) {
         if (++cooperativeWork % 65536 === 0)
           yield;
-        for (const idx of parseMagickIndexSpec(idxSpec, sourceLength)) {
+        for (const idx of parseMagickIndexSpec(idxSpec, sourceLength, "clone")) {
           if (++cooperativeWork % 65536 === 0)
             yield;
           const chosen = sourcePool[idx];
@@ -9155,30 +9155,30 @@ function* evaluatePipelineTokensSteps(tokens, files, state, parentStack = [], st
       }
     } else if (t === "+insert" || t === "-insert") {
       const rawIdx = t === "+insert" ? 0 : Number(tokens[++i] ?? 0);
+      const target = rawIdx < 0 ? stack.length - 1 + rawIdx : rawIdx;
+      if (!Number.isInteger(target) || target < 0 || target >= stack.length || rawIdx < 0 && target === 0) throw new Error(`invalid image index ${t}`);
       if (stack.length > 1) {
         const last = stack.pop();
-        const target = rawIdx < 0 ? Math.max(0, stack.length + 1 + rawIdx) : Math.min(stack.length, Math.max(0, rawIdx));
         stack.splice(target, 0, last);
       }
     } else if (t === "+swap" || t === "-swap") {
       let i1 = stack.length - 2;
       let i2 = stack.length - 1;
       if (t === "-swap") {
-        const [s1, s2] = (tokens[++i] ?? "-2,-1").split(",").map((n) => Number(n));
+        const [s1, s2] = parseMagickIndices(tokens[++i] ?? "-2,-1", false).flat();
         i1 = (s1 ?? -2) < 0 ? stack.length + (s1 ?? -2) : s1 ?? 0;
         i2 = (s2 ?? -1) < 0 ? stack.length + (s2 ?? -1) : s2 ?? 0;
       }
-      if (stack[i1] && stack[i2]) {
-        const tmp = stack[i1];
-        stack[i1] = stack[i2];
-        stack[i2] = tmp;
-      }
+      if (i1 === i2 || !stack[i1] || !stack[i2]) throw new Error(`invalid image index ${t}`);
+      const tmp = stack[i1];
+      stack[i1] = stack[i2];
+      stack[i2] = tmp;
     } else if (t === "+delete" || t === "-delete") {
       if (t === "+delete") {
         const popped = stack.pop();
         if (popped) detachRgbaBuffer(popped.data);
       } else {
-        const toDelete = new Set(parseMagickIndexSpec(tokens[++i] ?? "-1", stack.length));
+        const toDelete = new Set(parseMagickIndexSpec(tokens[++i] ?? "-1", stack.length, "delete"));
         stack = stack.filter((im, idx) => {
           if (toDelete.has(idx)) {
             detachRgbaBuffer(im.data);
@@ -9335,7 +9335,7 @@ function* runConvertCliResultSteps(argv, files, stdinBytes, signal, analysis = {
   const pipelineTokens = argv.slice(0, -1);
   const state = createDefaultState();
   try {
-    const stack = yield* evaluatePipelineTokensSteps(pipelineTokens, files, state, [], stdinBytes, signal, analysis);
+    const stack = yield* evaluatePipelineTokensSteps(pipelineTokens, files, state, void 0, stdinBytes, signal, analysis);
     if (stack.length === 0) {
       return {
         exitCode: 1,
@@ -9535,7 +9535,8 @@ async function transformStoredMagickCoordinates(image, backend, token, geometry,
     xs = [{ source: 0, target: 0, length: x }, { source: x, target: x + sw, length: w - x }];
     ys = [{ source: 0, target: 0, length: y }, { source: y, target: y + sh, length: h - y }];
   } else {
-    const cw = Math.max(0, Math.round(g.width ?? 0)), ch = Math.max(0, Math.round(g.height ?? 0));
+    const cw = Math.max(0, Math.round((g.width ?? 0) * (g.isPercent ? w / 100 : 1)));
+    const ch = Math.max(0, Math.round((g.height ?? 0) * (g.isPercent ? h / 100 : 1)));
     const { x, y } = gravityAdjustBox(w, h, cw, ch, g.x, g.y, state.gravity);
     if (x + cw < 0 || y + ch < 0 || x > w || y > h) return image;
     const x0 = Math.max(0, Math.min(w, x)), x1 = Math.max(x0, Math.min(w, x + cw));
@@ -9686,34 +9687,42 @@ async function tryConvertFilesResult(argv, input, stdinBytes, signal, analysis)
       if (!operandsOnly && ["+clone", "-clone", "+duplicate", "-duplicate", "+delete", "-delete", "+swap", "-swap", "-reverse", "+insert", "-insert"].includes(token)) {
         let spec = "-1", count = 1;
         if (["-clone", "-delete", "-swap", "-insert"].includes(token)) spec = tokens[++i] ?? (token === "-swap" ? "-2,-1" : token === "-insert" ? "0" : "-1");
-        if (token === "-duplicate" && tokens[i + 1]?.[0] && tokens[i + 1][0] >= "0" && tokens[i + 1][0] <= "9") {
-          const value = tokens[++i], comma = value.indexOf(",");
-          count = Math.max(0, parseInt(value, 10));
+        if (token === "-duplicate") {
+          const value = tokens[++i] ?? "", comma = value.indexOf(",");
+          count = parseInt(value, 10);
+          if (!Number.isSafeInteger(count) || count < 0) throw new Error(`invalid argument ${value}`);
           spec = comma < 0 ? "-1" : value.slice(comma + 1) || "-1";
+          parseMagickIndices(spec);
         }
         stackStep(async (stack, _backend, parents) => {
+          if (token.endsWith("duplicate") && stack.length === 0) throw new Error(`no images found for operation ${token}`);
           if (token.endsWith("clone") || token.endsWith("duplicate")) {
-            const source = stack.length ? stack : parents.at(-1) ?? stack, length = source.length;
-            for (let repeat = 0; repeat < count; repeat++) for (const index of parseMagickIndexSpec(spec, length)) {
+            const source = token.endsWith("clone") ? parents.at(-1) ?? stack : stack;
+            const length = source.length;
+            if (token.endsWith("clone") && length === 0) throw new Error(`UnableToCloneImage ${token}`);
+            for (let repeat = 0; repeat < count; repeat++) for (const index of parseMagickIndexSpec(spec, length, "clone")) {
               await yieldTurn11(signal);
               await stack.push(await source.get(index));
             }
-          } else if (token.endsWith("delete")) await stack.remove(parseMagickIndexSpec(spec, stack.length));
+          } else if (token.endsWith("delete")) await stack.remove(parseMagickIndexSpec(spec, stack.length, "delete"));
           else if (token === "-reverse") {
             for (let n = 0; n < Math.floor(stack.length / 2); n++) {
               await yieldTurn11(signal);
               await stack.swap(n, stack.length - 1 - n);
             }
           } else if (token.endsWith("insert")) {
-            const raw = token === "+insert" ? 0 : Number(spec), target = raw < 0 ? Math.max(0, stack.length + raw) : Math.min(stack.length - 1, Math.max(0, raw));
+            const raw = token === "+insert" ? 0 : Number(spec), target = raw < 0 ? stack.length - 1 + raw : raw;
+            if (!Number.isInteger(target) || target < 0 || target >= stack.length || raw < 0 && target === 0) throw new Error(`invalid image index ${token}`);
             for (let n = stack.length - 1; n > target; n--) {
               await yieldTurn11(signal);
               await stack.swap(n, n - 1);
             }
           } else {
-            const values = (token === "+swap" ? "-2,-1" : spec).split(",").map(Number);
+            const values = parseMagickIndices(token === "+swap" ? "-2,-1" : spec, false).flat();
             const a = values[0] ?? -2, b = values[1] ?? -1;
-            await stack.swap(a < 0 ? stack.length + a : a, b < 0 ? stack.length + b : b);
+            const i1 = a < 0 ? stack.length + a : a, i2 = b < 0 ? stack.length + b : b;
+            if (i1 === i2 || i1 < 0 || i2 < 0 || i1 >= stack.length || i2 >= stack.length) throw new Error(`invalid image index ${token}`);
+            await stack.swap(i1, i2);
           }
           return stack;
         });
@@ -9743,7 +9752,7 @@ async function tryConvertFilesResult(argv, input, stdinBytes, signal, analysis)
             }
             return result;
           } else if (token === "-combine") {
-            if (stack.length < 3) return stack;
+            if (stack.length === 0) return stack;
             const sources = [];
             for (let index = 0; index < Math.min(4, stack.length); index++) sources.push(await stack.get(index));
             const base = sources[0], result = await transformStoredMagickRaster(base, backend, combinePixelSteps(base.width * base.height * 4, sources.map((image) => image.width * image.height * 4)), signal, base, sources);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@poe-platform/safe-bash",
-  "version": "0.1.843",
+  "version": "0.1.844",
   "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.843",
+    "@poe-platform/safe-fs": "0.1.844",
     "pdf-lib": "1.17.1",
     "@types/node": "^25.2.2",
     "@formatjs/intl-numberformat": "9.4.0",