@poe-platform/safe-bash 0.1.817 → 0.1.818

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

@@ -420,7 +420,7 @@ function* parsePdftocairoArgsSteps(argv, hasStdin) {
 }
 
 // packages/safe-bash-command-pdftoppm/src/retained-cairo-pdf.ts
-import { createRetainedPageCopy, PdfFileSource as PdfFileSource2, PdfRetainedDocument as PdfRetainedDocument2, PdfStagingStorage as PdfStagingStorage2, PdfError as PdfError2 } from "../pdf-ast/index.js";
+import { encodePostscriptPageChunks, createRetainedPageCopy, PdfFileSource as PdfFileSource2, PdfRetainedDocument as PdfRetainedDocument2, PdfStagingStorage as PdfStagingStorage2, PdfError as PdfError2 } from "../pdf-ast/index.js";
 import { readBytes as readBytes2, writeBytes as writeBytes2 } from "../safe-bash-contracts/io.js";
 import { resolvePath as resolvePath2 } from "../safe-bash-contracts/path.js";
 import { yieldTurn as yieldTurn2 } from "../safe-bash-contracts/yield.js";
@@ -433,6 +433,7 @@ import {
   PdfRetainedDocument,
   PdfStagedOutputs,
   PdfStagingStorage,
+  renderRetainedPageToSvg,
   renderRetainedPagePixels,
   getDisplayListCropBox,
   encodeRetainedPng,
@@ -527,6 +528,19 @@ async function executeRetainedRaster(context, plan, stdout, signal, maximum, pub
             if (plan.scaleToX < 0) dpiX = dpiY;
           }
         }
+        if (plan.format === "svg") {
+          yield { name: name2(number), chunks: renderRetainedPageToSvg(page, storage, {
+            dpiX,
+            dpiY,
+            useCropBox: plan.useCropBox,
+            hideAnnotations: plan.hideAnnotations,
+            transparent: plan.transparent,
+            signal,
+            ...plan.hasCrop ? { cropRect: { x: plan.cropX, y: plan.cropY, width: plan.cropW, height: plan.cropH } } : {}
+          }) };
+          if (plan.singleFile) break;
+          continue;
+        }
         const imageStorage = new PagedStorage({ fs: context.fs, cwd: directory, env: {}, signal }, 4);
         let pageFailed = false;
         let pixelIterator;
@@ -662,7 +676,7 @@ async function publish(context, path, chunks, signal) {
 }
 
 // packages/safe-bash-command-pdftoppm/src/retained-cairo-pdf.ts
-async function executeRetainedCairoPdf(context, plan, stdout, signal, maximum) {
+async function executeRetainedCairoDocument(context, plan, stdout, signal, maximum) {
   const directory = resolvePath2(context.cwd, context.env.TMPDIR || "/tmp"), storage = new PdfStagingStorage2({ fs: context.fs, directory }), encoder = new TextEncoder();
   async function diagnostic(message, exitCode) {
     if (!plan.quiet) await writeBytes2(context.stderr, encoder.encode(message), signal);
@@ -720,13 +734,60 @@ async function executeRetainedCairoPdf(context, plan, stdout, signal, maximum) {
         yield { document: retained, indices: [page - 1] };
       }
     }
-    const paper = !plan.origPageSizes && plan.paperW > 0 && plan.paperH > 0;
-    copy = await createRetainedPageCopy(selections(), storage, { signal, metadata: await document.info(), ...paper || plan.hasCrop ? { pageBoxes: ({ width, height }) => {
-      const box = [0, 0, paper ? plan.paperW : plan.cropW > 0 ? plan.cropW : Math.max(1, width - plan.cropX), paper ? plan.paperH : plan.cropH > 0 ? plan.cropH : Math.max(1, height - plan.cropY)];
-      return { mediaBox: box, cropBox: box };
-    } } : {} });
-    result = await PdfFileSource2.fromStream(storage.fs, directory, copy.chunks(), { signal });
-    const stem = plan.inputPath.toLowerCase().endsWith(".pdf") ? plan.inputPath.slice(0, -4) : plan.inputPath, raw = plan.positionals[1] ?? (plan.inputPath === "-" ? "-" : `${stem}.pdf`), output = raw === "-" || raw.toLowerCase().endsWith(".pdf") ? raw : `${raw}.pdf`;
+    if (plan.format === "pdf") {
+      const paper = !plan.origPageSizes && plan.paperW > 0 && plan.paperH > 0;
+      copy = await createRetainedPageCopy(selections(), storage, { signal, metadata: await document.info(), ...paper || plan.hasCrop ? { pageBoxes: ({ width, height }) => {
+        const box = [0, 0, paper ? plan.paperW : plan.cropW > 0 ? plan.cropW : Math.max(1, width - plan.cropX), paper ? plan.paperH : plan.cropH > 0 ? plan.cropH : Math.max(1, height - plan.cropY)];
+        return { mediaBox: box, cropBox: box };
+      } } : {} });
+      result = await PdfFileSource2.fromStream(storage.fs, directory, copy.chunks(), { signal });
+    } else {
+      const selected = (page) => page >= plan.firstPage && page <= last && !(plan.oddOnly && page % 2 === 0 || plan.evenOnly && page % 2 === 1);
+      let selectedCount = 0, firstIndex = 0;
+      for (let page = plan.firstPage; page <= last; page++) {
+        if (selected(page)) {
+          if (!selectedCount) firstIndex = page - 1;
+          selectedCount++;
+        }
+      }
+      let box;
+      for await (const page of retained.pages()) {
+        if (page.index === firstIndex) {
+          box = (await page.attributes()).mediaBox;
+          break;
+        }
+      }
+      if (!box) throw new PdfError2("E_CAPABILITY", `Page index out of bounds: ${firstIndex}`);
+      const width = plan.hasCrop && plan.cropW > 0 ? plan.cropW : Math.round(Math.abs(box[2] - box[0])), height = plan.hasCrop && plan.cropH > 0 ? plan.cropH : Math.round(Math.abs(box[3] - box[1]));
+      async function* postscript() {
+        yield encoder.encode(`${plan.format === "eps" ? "%!PS-Adobe-3.0 EPSF-3.0" : "%!PS-Adobe-3.0"}
+%%Creator: @poe-code/pdf-ast (pdftocairo 24.08.0)
+%%BoundingBox: 0 0 ${width} ${height}
+%%Pages: ${selectedCount}
+%%EndComments
+`);
+        let ordinal = 0;
+        for await (const page of retained.pages()) {
+          await yieldTurn2(signal);
+          if (!selected(page.index + 1)) continue;
+          const index = await page.indexText(storage, { mode: "layout", signal });
+          let pageFailed = false;
+          try {
+            yield* encodePostscriptPageChunks(index, ++ordinal, { signal });
+          } catch (error) {
+            pageFailed = true;
+            throw error;
+          } finally {
+            await index.close().catch((error) => {
+              if (!pageFailed) throw error;
+            });
+          }
+        }
+        yield encoder.encode("%%Trailer\n%%EOF\n");
+      }
+      result = await PdfFileSource2.fromStream(storage.fs, directory, postscript(), { signal });
+    }
+    const stem = plan.inputPath.toLowerCase().endsWith(".pdf") ? plan.inputPath.slice(0, -4) : plan.inputPath, raw = plan.positionals[1] ?? (plan.inputPath === "-" ? "-" : `${stem}.${plan.format}`), output = raw === "-" || raw.toLowerCase().endsWith(`.${plan.format}`) ? raw : `${raw}.${plan.format}`;
     if (output === "-") {
       for await (const bytes of result.stream(0, result.size, signal)) await writeBytes2(stdout, bytes, signal);
     } else try {
@@ -1043,7 +1104,7 @@ function createPdftoppmCommand(options = {}) {
     description: "Render PDF pages to PNG, PPM, PGM, PBM, or SVG via @poe-code/pdf-ast",
     async execute(context) {
       const parsed = await drainSteps(parsePdftoppmArgsSteps(getCommandArguments(context).args, true), context.signal);
-      if ("inputPath" in parsed && parsed.format !== "svg") {
+      if ("inputPath" in parsed) {
         const invocation = createOutputOperation(context, { write: async () => {
         } });
         try {
@@ -1057,24 +1118,6 @@ function createPdftoppmCommand(options = {}) {
   });
 }
 var pdftoppmCommand = createPdftoppmCommand();
-function extractPdftocairoPositionals(argv) {
-  const pos = [];
-  for (let i = 0; i < argv.length; i++) {
-    const arg = argv[i];
-    if (arg === "--") {
-      pos.push(...argv.slice(i + 1));
-      break;
-    }
-    if (CAIRO_VALUE_FLAGS.has(arg)) {
-      i++;
-      continue;
-    }
-    if (!arg.startsWith("-") || arg === "-") {
-      pos.push(arg);
-    }
-  }
-  return pos;
-}
 function* runPdftocairoCliSteps(argv, files, options = {}) {
   const parsed = yield* parsePdftocairoArgsSteps(argv, files.has("-"));
   if (!("inputPath" in parsed)) return parsed;
@@ -1238,19 +1281,33 @@ function createPdftocairoCommand(options = {}) {
     description: "Render PDF pages to PNG, JPEG, TIFF, PDF, PS, EPS, or SVG via @poe-code/pdf-ast",
     async execute(context) {
       const parsed = await drainSteps(parsePdftocairoArgsSteps(getCommandArguments(context).args, true), context.signal);
-      if ("inputPath" in parsed && parsed.format === "pdf") {
+      if (!("inputPath" in parsed)) {
+        const invocation = createOutputOperation(context, { write: async () => {
+        } });
+        try {
+          if (parsed.stderr) await writeBytes3(context.stderr, new TextEncoder().encode(parsed.stderr), invocation.signal);
+          if (parsed.stdout) await writeBytes3(invocation.child(context.stdout).output, new TextEncoder().encode(parsed.stdout), invocation.signal);
+          return { exitCode: parsed.exitCode };
+        } finally {
+          await invocation.close();
+        }
+      }
+      if (parsed.format === "pdf" || parsed.format === "ps" || parsed.format === "eps") {
         const invocation = createOutputOperation(context, { write: async () => {
         } });
         try {
-          return await executeRetainedCairoPdf(context, parsed, invocation.child(context.stdout).output, invocation.signal, maxInputBytes);
+          return await executeRetainedCairoDocument(context, parsed, invocation.child(context.stdout).output, invocation.signal, maxInputBytes);
         } finally {
           await invocation.close();
         }
       }
-      if ("inputPath" in parsed && (parsed.format === "png" || parsed.format === "jpg" || parsed.format === "tif")) {
+      {
         const stem = parsed.inputPath.toLowerCase().endsWith(".pdf") ? parsed.inputPath.slice(0, -4) : parsed.inputPath;
         const positionals = parsed.positionals.length === 1 && parsed.inputPath !== "-" ? [parsed.inputPath, stem] : parsed.positionals;
-        let plan = await drainSteps(parsePdftoppmArgsSteps([...parsed.forwardedArgs, "--", ...positionals], true), context.signal);
+        const rawSvgOut = parsed.positionals[1] ?? (parsed.inputPath === "-" ? "-" : `${stem}.svg`);
+        const svgRoot = rawSvgOut.toLowerCase().endsWith(".svg") ? rawSvgOut.slice(0, -4) : rawSvgOut;
+        const argumentsForRaster = parsed.format === "svg" ? ["-svg", "-singlefile", ...parsed.forwardedArgs, "--", parsed.inputPath, svgRoot] : [...parsed.forwardedArgs, "--", ...positionals];
+        let plan = await drainSteps(parsePdftoppmArgsSteps(argumentsForRaster, true), context.signal);
         const invocation = createOutputOperation(context, { write: async () => {
         } });
         try {
@@ -1275,98 +1332,6 @@ function createPdftocairoCommand(options = {}) {
           await invocation.close();
         }
       }
-      return new InputByteBudget(maxInputBytes).run(context, async (context2) => {
-        let cooperativeWork = 63;
-        const invocation = createOutputOperation(context2, { write: async () => {
-        } });
-        try {
-          const carrier = getCommandArguments(context2);
-          const argv = [...carrier.args];
-          const vfsFiles = /* @__PURE__ */ new Map();
-          let accountedBytes = 0;
-          const chargeBytes = (delta) => {
-            if (delta > 0) {
-              accountedBytes += delta;
-              context2.inputBudget?.check(accountedBytes);
-            }
-          };
-          let informational = false;
-          for (let i = 0; i < argv.length; i++) {
-            const arg = argv[i];
-            if (arg === "--") break;
-            if (CAIRO_VALUE_FLAGS.has(arg)) {
-              i++;
-              continue;
-            }
-            if (["-h", "-help", "--help", "-?", "-v", "--version"].includes(arg)) {
-              informational = true;
-              break;
-            }
-          }
-          const positionals = informational ? [] : extractPdftocairoPositionals(argv);
-          if (!informational && (positionals.length === 0 || positionals[0] === "-")) {
-            const chunks = [];
-            let total = 0;
-            for await (const chunk of readBytes3(context2.stdin, invocation.signal)) {
-              if (++cooperativeWork % 64 === 0) await yieldTurn3(context2.signal);
-              chunks.push(chunk);
-              total += chunk.byteLength;
-              chargeBytes(chunk.byteLength);
-            }
-            if (total > 0) {
-              const buf = new Uint8Array(total);
-              let off = 0;
-              for (const c of chunks) {
-                if (++cooperativeWork % 64 === 0) await yieldTurn3(context2.signal);
-                buf.set(c, off);
-                off += c.byteLength;
-              }
-              vfsFiles.set("-", buf);
-            }
-          }
-          for (const token of positionals.slice(0, 1)) {
-            if (++cooperativeWork % 64 === 0) await yieldTurn3(context2.signal);
-            if (token === "-") continue;
-            try {
-              const bytes = await context2.fs.readFile(resolvePath3(context2.cwd, token), { signal: invocation.signal });
-              chargeBytes(bytes.byteLength);
-              vfsFiles.set(token, bytes);
-            } catch {
-            }
-          }
-          context2.inputBudget?.check(0);
-          const existingSnap = new Map(vfsFiles);
-          const res = await runPdftocairoCli(argv, vfsFiles, { signal: invocation.signal });
-          if (res.stderr) {
-            await writeBytes3(context2.stderr, new TextEncoder().encode(res.stderr), invocation.signal);
-          }
-          if (res.stdoutBytes) {
-            const stdout = invocation.child(context2.stdout);
-            await writeBytes3(stdout.output, res.stdoutBytes, invocation.signal);
-          } else if (res.stdout) {
-            const stdout = invocation.child(context2.stdout);
-            await writeBytes3(stdout.output, new TextEncoder().encode(res.stdout), invocation.signal);
-          }
-          for (const [key, val] of vfsFiles.entries()) {
-            if (++cooperativeWork % 64 === 0) await yieldTurn3(context2.signal);
-            if (key !== "-" && existingSnap.get(key) !== val) {
-              const abs = resolvePath3(context2.cwd, key);
-              try {
-                await writeFileOutput2(context2, val, (data) => context2.fs.writeFile(abs, data, { signal: invocation.signal }));
-              } catch (error) {
-                invocation.signal.throwIfAborted();
-                if (!(error instanceof Error) || !("code" in error)) throw error;
-                await writeBytes3(context2.stderr, new TextEncoder().encode(`Error opening output file ${key}
-`), invocation.signal);
-                return { exitCode: 2 };
-              }
-            }
-          }
-          return { exitCode: res.exitCode };
-        } finally {
-          await invocation.close();
-        }
-      });
     }
   });
 }

package/dist/safe-bash-command-pdftotext/index.d.ts

@@ -30,7 +30,7 @@ export declare function runPdftohtmlCliSync(argv: readonly string[], files: Map<
     stdout: string;
     stderr: string;
 };
-export declare function pdftohtml(context: CommandContext): Promise<{
+export declare function pdftohtml(context: CommandContext, maxInputBytes?: number): Promise<{
     exitCode: number;
 }>;
 export declare function createPdftohtmlCommand(options?: PdftotextCommandOptions): CommandDefinition;