@poe-platform/safe-bash 0.1.758 → 0.1.760

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

@@ -2488,6 +2488,19 @@ function formatCommandOutputSync(options) {
 }
 
 // packages/safe-bash-command-gh/dist/commands/issue.js
+function extractRepoAndSelectorFromIssueArg(selector, explicitRepoFlag) {
+  if (selector?.startsWith("https://") || selector?.startsWith("http://")) {
+    const url = new URL(selector);
+    const parts = url.pathname.split("/");
+    if (parts.length === 5 && parts[1] && parts[2] && parts[3] === "issues" && parts[4] && Number.isSafeInteger(Number(parts[4])) && Number(parts[4]) > 0) {
+      return {
+        repoOverride: explicitRepoFlag ?? `${url.host}/${parts[1]}/${parts[2]}`,
+        selector: parts[4]
+      };
+    }
+  }
+  return { repoOverride: explicitRepoFlag, selector };
+}
 var ISSUE_JSON_FIELDS = [
   "assignees",
   "author",
@@ -2643,9 +2656,10 @@ async function handleIssueCommand(env, rawArgs) {
   if (subcommand === "view") {
     const schemas = [{ short: "c", long: "comments", type: "boolean" }];
     const parsed = parseCommandArgs(restArgs, schemas);
-    const coords = await resolveRepoFromContext(context, parsed.repoFlag, backend.defaultHost, backend.getActiveUser());
+    const { repoOverride, selector } = extractRepoAndSelectorFromIssueArg(parsed.positionals[0], parsed.repoFlag);
+    const coords = await resolveRepoFromContext(context, repoOverride, backend.defaultHost, backend.getActiveUser());
     const repo = backend.getOrCreateRepo(coords.owner, coords.name);
-    const issue = backend.resolveIssue(repo, parsed.positionals[0] ?? "1");
+    const issue = backend.resolveIssue(repo, selector ?? "1");
     if (getBoolFlag(parsed, "web")) {
       if (openBrowser)
         await openBrowser(issue.url);
@@ -2691,9 +2705,10 @@ ${c.body}
       { short: "r", long: "reason", type: "string" }
     ];
     const parsed = parseCommandArgs(restArgs, schemas);
-    const coords = await resolveRepoFromContext(context, parsed.repoFlag, backend.defaultHost, backend.getActiveUser());
+    const { repoOverride, selector } = extractRepoAndSelectorFromIssueArg(parsed.positionals[0], parsed.repoFlag);
+    const coords = await resolveRepoFromContext(context, repoOverride, backend.defaultHost, backend.getActiveUser());
     const repo = backend.getOrCreateRepo(coords.owner, coords.name);
-    const issue = backend.resolveIssue(repo, parsed.positionals[0] ?? "1");
+    const issue = backend.resolveIssue(repo, selector ?? "1");
     const commentText = getStringFlag(parsed, "comment");
     if (commentText) {
       const id = backend.nextId();
@@ -2726,14 +2741,54 @@ ${c.body}
   if (subcommand === "comment") {
     const schemas = [
       { short: "b", long: "body", type: "string" },
-      { short: "F", long: "body-file", type: "string" }
+      { short: "F", long: "body-file", type: "string" },
+      { long: "edit-last", type: "boolean" },
+      { long: "delete-last", type: "boolean" },
+      { long: "create-if-none", type: "boolean" }
     ];
     const parsed = parseCommandArgs(restArgs, schemas);
-    const coords = await resolveRepoFromContext(context, parsed.repoFlag, backend.defaultHost, backend.getActiveUser());
+    const { repoOverride, selector } = extractRepoAndSelectorFromIssueArg(parsed.positionals[0], parsed.repoFlag);
+    const coords = await resolveRepoFromContext(context, repoOverride, backend.defaultHost, backend.getActiveUser());
     const repo = backend.getOrCreateRepo(coords.owner, coords.name);
-    const issue = backend.resolveIssue(repo, parsed.positionals[0] ?? "1");
+    const issue = backend.resolveIssue(repo, selector ?? "1");
+    const activeUser = backend.getActiveUser();
+    let lastIndex = -1;
+    for (let index = issue.comments.length - 1; index >= 0; index--) {
+      if (issue.comments[index].author.login === activeUser) {
+        lastIndex = index;
+        break;
+      }
+    }
+    if (getBoolFlag(parsed, "delete-last")) {
+      if (lastIndex < 0) {
+        await writeErr("no comments found for current user\n");
+        return 1;
+      }
+      issue.comments.splice(lastIndex, 1);
+      issue.updatedAt = backend.isoNow();
+      await writeOut("Comment deleted\n");
+      return 0;
+    }
     const bodyFile = getStringFlag(parsed, "body-file");
     const body = bodyFile !== void 0 ? bodyFile === "-" ? stdinText : decodeUtf8(await context.fs.readFile(resolvePath2(context.cwd, bodyFile), { signal: context.signal })) : getStringFlag(parsed, "body") ?? "";
+    if (!body) {
+      await writeErr("body cannot be blank; provide -b/--body or -F/--body-file\n");
+      return 1;
+    }
+    if (getBoolFlag(parsed, "edit-last")) {
+      if (lastIndex >= 0) {
+        const previous = issue.comments[lastIndex];
+        issue.comments[lastIndex] = { ...previous, body, updatedAt: backend.isoNow() };
+        issue.updatedAt = issue.comments[lastIndex].updatedAt;
+        await writeOut(`${previous.url}
+`);
+        return 0;
+      }
+      if (!getBoolFlag(parsed, "create-if-none")) {
+        await writeErr("no comments found for current user to edit\n");
+        return 1;
+      }
+    }
     const id = backend.nextId();
     const ts = backend.isoNow();
     const c = {
@@ -2745,6 +2800,7 @@ ${c.body}
       url: `${issue.url}#issuecomment-${id}`
     };
     issue.comments.push(c);
+    issue.updatedAt = ts;
     await writeOut(`${c.url}
 `);
     return 0;
@@ -2753,19 +2809,26 @@ ${c.body}
     const schemas = [
       { short: "t", long: "title", type: "string" },
       { short: "b", long: "body", type: "string" },
+      { short: "F", long: "body-file", type: "string" },
+      { short: "m", long: "milestone", type: "string" },
+      { long: "remove-milestone", type: "boolean" },
+      { long: "add-project", type: "string[]" },
+      { long: "remove-project", type: "string[]" },
       { long: "add-label", type: "string[]" },
       { long: "remove-label", type: "string[]" },
       { long: "add-assignee", type: "string[]" },
       { long: "remove-assignee", type: "string[]" }
     ];
     const parsed = parseCommandArgs(restArgs, schemas);
-    const coords = await resolveRepoFromContext(context, parsed.repoFlag, backend.defaultHost, backend.getActiveUser());
+    const { repoOverride, selector } = extractRepoAndSelectorFromIssueArg(parsed.positionals[0], parsed.repoFlag);
+    const coords = await resolveRepoFromContext(context, repoOverride, backend.defaultHost, backend.getActiveUser());
     const repo = backend.getOrCreateRepo(coords.owner, coords.name);
-    const issue = backend.resolveIssue(repo, parsed.positionals[0] ?? "1");
+    const issue = backend.resolveIssue(repo, selector ?? "1");
     const title = getStringFlag(parsed, "title");
     if (title !== void 0)
       issue.title = title;
-    const body = getStringFlag(parsed, "body");
+    const bodyFile = getStringFlag(parsed, "body-file");
+    const body = bodyFile !== void 0 ? bodyFile === "-" ? stdinText : decodeUtf8(await context.fs.readFile(resolvePath2(context.cwd, bodyFile), { signal: context.signal })) : getStringFlag(parsed, "body");
     if (body !== void 0)
       issue.body = body;
     for (const lblName of getStringArrayFlag(parsed, "add-label")) {
@@ -2783,15 +2846,38 @@ ${c.body}
     if (rmLabels.length > 0) {
       issue.labels = issue.labels.filter((l) => !rmLabels.includes(l.name.toLowerCase()));
     }
+    for (const login of getStringArrayFlag(parsed, "add-assignee")) {
+      const resolved = login === "@me" ? backend.getActiveUser() : login;
+      if (!issue.assignees.some((a) => a.login.toLowerCase() === resolved.toLowerCase())) {
+        issue.assignees.push({ login: resolved });
+      }
+    }
+    const removeAssignees = getStringArrayFlag(parsed, "remove-assignee").map((login) => (login === "@me" ? backend.getActiveUser() : login).toLowerCase());
+    issue.assignees = issue.assignees.filter((a) => !removeAssignees.includes(a.login.toLowerCase()));
+    const milestone = getStringFlag(parsed, "milestone");
+    if (getBoolFlag(parsed, "remove-milestone")) {
+      issue.milestone = null;
+    } else if (milestone !== void 0) {
+      issue.milestone = { id: backend.nextId(), number: 1, title: milestone, description: "", state: "open" };
+    }
+    for (const title2 of getStringArrayFlag(parsed, "add-project")) {
+      if (!issue.projectItems.some((project) => project.title === title2)) {
+        issue.projectItems.push({ title: title2 });
+      }
+    }
+    const removeProjects = getStringArrayFlag(parsed, "remove-project");
+    issue.projectItems = issue.projectItems.filter((project) => !removeProjects.includes(project.title));
+    issue.updatedAt = backend.isoNow();
     await writeOut(`${issue.url}
 `);
     return 0;
   }
   if (subcommand === "delete") {
     const parsed = parseCommandArgs(restArgs, []);
-    const coords = await resolveRepoFromContext(context, parsed.repoFlag, backend.defaultHost, backend.getActiveUser());
+    const { repoOverride, selector } = extractRepoAndSelectorFromIssueArg(parsed.positionals[0], parsed.repoFlag);
+    const coords = await resolveRepoFromContext(context, repoOverride, backend.defaultHost, backend.getActiveUser());
     const repo = backend.getOrCreateRepo(coords.owner, coords.name);
-    const issue = backend.resolveIssue(repo, parsed.positionals[0] ?? "1");
+    const issue = backend.resolveIssue(repo, selector ?? "1");
     repo.issues.delete(issue.number);
     await writeOut(`\u2713 Deleted issue #${issue.number}
 `);
@@ -2799,9 +2885,10 @@ ${c.body}
   }
   if (subcommand === "pin" || subcommand === "unpin") {
     const parsed = parseCommandArgs(restArgs, []);
-    const coords = await resolveRepoFromContext(context, parsed.repoFlag, backend.defaultHost, backend.getActiveUser());
+    const { repoOverride, selector } = extractRepoAndSelectorFromIssueArg(parsed.positionals[0], parsed.repoFlag);
+    const coords = await resolveRepoFromContext(context, repoOverride, backend.defaultHost, backend.getActiveUser());
     const repo = backend.getOrCreateRepo(coords.owner, coords.name);
-    const issue = backend.resolveIssue(repo, parsed.positionals[0] ?? "1");
+    const issue = backend.resolveIssue(repo, selector ?? "1");
     issue.isPinned = subcommand === "pin";
     await writeOut(`\u2713 ${subcommand === "pin" ? "Pinned" : "Unpinned"} issue #${issue.number}
 `);
@@ -2809,9 +2896,10 @@ ${c.body}
   }
   if (subcommand === "lock" || subcommand === "unlock") {
     const parsed = parseCommandArgs(restArgs, [{ short: "r", long: "reason", type: "string" }]);
-    const coords = await resolveRepoFromContext(context, parsed.repoFlag, backend.defaultHost, backend.getActiveUser());
+    const { repoOverride, selector } = extractRepoAndSelectorFromIssueArg(parsed.positionals[0], parsed.repoFlag);
+    const coords = await resolveRepoFromContext(context, repoOverride, backend.defaultHost, backend.getActiveUser());
     const repo = backend.getOrCreateRepo(coords.owner, coords.name);
-    const issue = backend.resolveIssue(repo, parsed.positionals[0] ?? "1");
+    const issue = backend.resolveIssue(repo, selector ?? "1");
     issue.locked = subcommand === "lock";
     await writeOut(`\u2713 ${subcommand === "lock" ? "Locked" : "Unlocked"} issue #${issue.number}
 `);
@@ -2819,9 +2907,10 @@ ${c.body}
   }
   if (subcommand === "transfer") {
     const parsed = parseCommandArgs(restArgs, []);
-    const coords = await resolveRepoFromContext(context, parsed.repoFlag, backend.defaultHost, backend.getActiveUser());
+    const { repoOverride, selector } = extractRepoAndSelectorFromIssueArg(parsed.positionals[0], parsed.repoFlag);
+    const coords = await resolveRepoFromContext(context, repoOverride, backend.defaultHost, backend.getActiveUser());
     const repo = backend.getOrCreateRepo(coords.owner, coords.name);
-    const issue = backend.resolveIssue(repo, parsed.positionals[0] ?? "1");
+    const issue = backend.resolveIssue(repo, selector ?? "1");
     const destSpec = parsed.positionals[1];
     if (!destSpec) {
       await writeErr("destination repository required\n");
@@ -2848,9 +2937,10 @@ ${c.body}
       { short: "l", long: "list", type: "boolean" }
     ];
     const parsed = parseCommandArgs(restArgs, schemas);
-    const coords = await resolveRepoFromContext(context, parsed.repoFlag, backend.defaultHost, backend.getActiveUser());
+    const { repoOverride, selector } = extractRepoAndSelectorFromIssueArg(parsed.positionals[0], parsed.repoFlag);
+    const coords = await resolveRepoFromContext(context, repoOverride, backend.defaultHost, backend.getActiveUser());
     const repo = backend.getOrCreateRepo(coords.owner, coords.name);
-    const issue = backend.resolveIssue(repo, parsed.positionals[0] ?? "1");
+    const issue = backend.resolveIssue(repo, selector ?? "1");
     if (getBoolFlag(parsed, "list")) {
       await writeOut(issue.linkedBranches.map((b) => `${b}	${repo.url}/tree/${b}`).join("\n") + (issue.linkedBranches.length > 0 ? "\n" : ""));
       return 0;
@@ -8902,13 +8992,14 @@ Copyright (c) ${coords.owner}
         const parsed = parseCommandArgs(rest, [{ short: "c", long: "comments", type: "boolean" }]);
         if (parsed.help || getBoolFlag(parsed, "web"))
           return void 0;
-        const coords = resolveRepoSync(parsed.repoFlag, env, backend.defaultHost, backend.getActiveUser(), cwd, readFileSync);
+        const { repoOverride, selector } = extractRepoAndSelectorFromIssueArg(parsed.positionals[0], parsed.repoFlag);
+        const coords = resolveRepoSync(repoOverride, env, backend.defaultHost, backend.getActiveUser(), cwd, readFileSync);
         if (!coords)
           return void 0;
         const repo = backend.getOrCreateRepo(coords.owner, coords.name);
         let issue;
         try {
-          issue = backend.resolveIssue(repo, parsed.positionals[0] ?? "1");
+          issue = backend.resolveIssue(repo, selector ?? "1");
         } catch {
           return void 0;
         }
@@ -8944,13 +9035,14 @@ ${c.body}
           { short: "c", long: "comment", type: "string" },
           { short: "r", long: "reason", type: "string" }
         ]);
-        const coords = resolveRepoSync(parsed.repoFlag, env, backend.defaultHost, backend.getActiveUser(), cwd, readFileSync);
+        const { repoOverride, selector } = extractRepoAndSelectorFromIssueArg(parsed.positionals[0], parsed.repoFlag);
+        const coords = resolveRepoSync(repoOverride, env, backend.defaultHost, backend.getActiveUser(), cwd, readFileSync);
         if (!coords)
           return void 0;
         const repo = backend.getOrCreateRepo(coords.owner, coords.name);
         let issue;
         try {
-          issue = backend.resolveIssue(repo, parsed.positionals[0] ?? "1");
+          issue = backend.resolveIssue(repo, selector ?? "1");
         } catch {
           return void 0;
         }
@@ -8980,17 +9072,26 @@ ${c.body}
 `;
       }
       if (sub === "comment") {
-        const parsed = parseCommandArgs(rest, [{ short: "b", long: "body", type: "string" }]);
+        const parsed = parseCommandArgs(rest, [
+          { short: "b", long: "body", type: "string" },
+          { short: "F", long: "body-file", type: "string" },
+          { long: "edit-last", type: "boolean" },
+          { long: "delete-last", type: "boolean" },
+          { long: "create-if-none", type: "boolean" }
+        ]);
+        if (["body-file", "edit-last", "delete-last", "create-if-none"].some((flag) => parsed.flags.has(flag)))
+          return void 0;
         const body = getStringFlag(parsed, "body");
         if (body === void 0)
           return void 0;
-        const coords = resolveRepoSync(parsed.repoFlag, env, backend.defaultHost, backend.getActiveUser(), cwd, readFileSync);
+        const { repoOverride, selector } = extractRepoAndSelectorFromIssueArg(parsed.positionals[0], parsed.repoFlag);
+        const coords = resolveRepoSync(repoOverride, env, backend.defaultHost, backend.getActiveUser(), cwd, readFileSync);
         if (!coords)
           return void 0;
         const repo = backend.getOrCreateRepo(coords.owner, coords.name);
         let issue;
         try {
-          issue = backend.resolveIssue(repo, parsed.positionals[0] ?? "1");
+          issue = backend.resolveIssue(repo, selector ?? "1");
         } catch {
           return void 0;
         }

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

@@ -28,8 +28,8 @@ import {
   thresholdImage,
   tintImage,
   trimImage
-} from "../safe-bash/command-chunks/chunk-XYCWDGOG.js";
-import "../safe-bash/command-chunks/chunk-TCAGGM44.js";
+} from "../safe-bash/command-chunks/chunk-UCI6ZQFB.js";
+import "../safe-bash/command-chunks/chunk-S3SCPBHC.js";
 import {
   init_buffer
 } from "../safe-bash/command-chunks/chunk-HX3SHTCE.js";

package/dist/safe-bash-command-pandoc/command.js

@@ -2,11 +2,11 @@ import {
   createPandocCommand,
   createPandocCommands,
   pandocCommands
-} from "../safe-bash/command-chunks/chunk-L2C5TIII.js";
+} from "../safe-bash/command-chunks/chunk-MC4XXPQJ.js";
 import "../safe-bash/command-chunks/chunk-MKQVQMXO.js";
 import "../safe-bash/command-chunks/chunk-RDV7UCYZ.js";
-import "../safe-bash/command-chunks/chunk-XYCWDGOG.js";
-import "../safe-bash/command-chunks/chunk-TCAGGM44.js";
+import "../safe-bash/command-chunks/chunk-UCI6ZQFB.js";
+import "../safe-bash/command-chunks/chunk-S3SCPBHC.js";
 import "../safe-bash/command-chunks/chunk-Y2KHC6TZ.js";
 import "../safe-bash/command-chunks/chunk-YGYOVXTO.js";
 import "../safe-bash/command-chunks/chunk-I5GLTNVH.js";

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

@@ -21,11 +21,11 @@ import {
   readDocument,
   resolveConversionArgs,
   writeDocument
-} from "../safe-bash/command-chunks/chunk-L2C5TIII.js";
+} from "../safe-bash/command-chunks/chunk-MC4XXPQJ.js";
 import "../safe-bash/command-chunks/chunk-MKQVQMXO.js";
 import "../safe-bash/command-chunks/chunk-RDV7UCYZ.js";
-import "../safe-bash/command-chunks/chunk-XYCWDGOG.js";
-import "../safe-bash/command-chunks/chunk-TCAGGM44.js";
+import "../safe-bash/command-chunks/chunk-UCI6ZQFB.js";
+import "../safe-bash/command-chunks/chunk-S3SCPBHC.js";
 import {
   createLuaFilterCapability
 } from "../safe-bash/command-chunks/chunk-Y2KHC6TZ.js";

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

@@ -656,6 +656,7 @@ var messages_default = {
   "-5": "buffer error",
   "-6": "incompatible version"
 };
+var Z_BUF_ERROR = -5;
 var MAX_MEM_LEVEL = 9;
 var HEAP_SIZE = 573;
 var MIN_MATCH = 3;
@@ -22547,22 +22548,31 @@ function decodeFlate(bytes, parms, maxDecodedBytes = DEFAULT_MAX_DECODED_BYTES)
     inflated = new BoundedFlateStream(bytes, maxDecodedBytes).getBytes();
   } catch (error) {
     if (error instanceof PdfError && error.code === "E_LIMIT") throw error;
+    const wrapped = bytes[0] === 31 && bytes[1] === 139 || bytes.length >= 2 && (bytes[0] & 15) === 8 && bytes[0] >>> 4 <= 7 && (bytes[0] << 8 | bytes[1]) % 31 === 0;
     const decoder = new Inflate({
-      raw: !(bytes[0] === 31 && bytes[1] === 139),
+      raw: !wrapped,
       chunkSize: Math.max(1, Math.min(64 * 1024, maxDecodedBytes + 1))
     });
+    const chunks = [];
     let length = 0;
     decoder.onData = (chunk) => {
       length += chunk.length;
       if (length > maxDecodedBytes) {
         throw new PdfError("E_LIMIT", "FlateDecode output exceeds maximum decoded byte budget");
       }
-      decoder.chunks.push(chunk);
+      chunks.push(chunk);
     };
-    if (!decoder.push(bytes, true) || decoder.err || !decoder.ended) {
+    const complete = decoder.push(bytes, true);
+    const truncated = wrapped && decoder.err === Z_BUF_ERROR && length > 0;
+    if ((!complete || decoder.err || !decoder.ended) && !truncated) {
       throw new PdfError("E_CAPABILITY", "Invalid FlateDecode compressed stream");
     }
-    inflated = decoder.result;
+    inflated = new Uint8Array(length);
+    let offset = 0;
+    for (const chunk of chunks) {
+      inflated.set(chunk, offset);
+      offset += chunk.length;
+    }
   }
   return applyPredictor(inflated, parms);
 }
@@ -34796,7 +34806,7 @@ function resolvePageFonts(doc, resourcesDict) {
     const glyphNames = buildFontEncodingGlyphNamesMap(encNode);
     const widths = /* @__PURE__ */ new Map();
     let defaultWidth = 556;
-    const isTwoByteCid = subtype === "Type0" || Boolean(cmap?.isTwoByte);
+    const isTwoByteCid = subtype === "Type0";
     let fontMatrix;
     let charProcs;
     let fontResources;
@@ -36249,7 +36259,7 @@ function evaluateContentStreamToDisplayList(params) {
               const [x, y] = transformPoint(st.ctm, seg.x, seg.y);
               transformedSegments.push({ kind: "cubic", x1, y1, x2, y2, x, y });
             } else if (seg.kind === "rect") {
-              if (hasRotOrShear) {
+              if (hasRotOrShear || seg.width * st.ctm[0] < 0 || seg.height * st.ctm[3] < 0) {
                 const [p0x, p0y] = transformPoint(st.ctm, seg.x, seg.y);
                 const [p1x, p1y] = transformPoint(st.ctm, seg.x + seg.width, seg.y);
                 const [p2x, p2y] = transformPoint(st.ctm, seg.x + seg.width, seg.y + seg.height);
@@ -36282,7 +36292,12 @@ function evaluateContentStreamToDisplayList(params) {
               transformedSegments.push({ kind: "close" });
             }
           }
-          if (node.clip && transformedSegments.length > 0) {
+          const applyClip = () => {
+            if (!node.clip) return;
+            st.clipPaths = [...st.clipPaths ?? [], {
+              segments: transformedSegments,
+              fillRule: node.clip === "W*" ? "evenodd" : "nonzero"
+            }];
             let cMinX = Infinity, cMinY = Infinity, cMaxX = -Infinity, cMaxY = -Infinity;
             for (const s of transformedSegments) {
               if (s.kind === "move" || s.kind === "line") {
@@ -36310,8 +36325,11 @@ function evaluateContentStreamToDisplayList(params) {
                 Math.min(st.clipRect[3], cMaxY)
               ] : [cMinX, cMinY, cMaxX, cMaxY];
             }
+          };
+          if (node.paint === "n") {
+            applyClip();
+            break;
           }
-          if (node.paint === "n") break;
           const isFill = ["f", "F", "f*", "B", "B*", "b", "b*"].includes(node.paint);
           const isStroke = ["S", "s", "B", "B*", "b", "b*"].includes(node.paint);
           let evaluatedFillPattern = false;
@@ -36444,7 +36462,10 @@ function evaluateContentStreamToDisplayList(params) {
               }
             }
           }
-          if (evaluatedFillPattern && !isStroke) break;
+          if (evaluatedFillPattern && !isStroke) {
+            applyClip();
+            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;
@@ -36464,6 +36485,7 @@ function evaluateContentStreamToDisplayList(params) {
             ...st.dashPhase !== void 0 ? { dashPhase: st.dashPhase } : {},
             ...st.clipRect ? { clipRect: [...st.clipRect] } : {}
           } });
+          applyClip();
           break;
         }
         case "xobject": {
@@ -39941,8 +39963,8 @@ function segmentsToScreenEdges(segments, pageHeight, scale, closeSubpaths = fals
       if (closeSubpaths && hasOpenSubpath && (curX !== startX || curY !== startY)) {
         edges.push({ x0: curX, y0: curY, x1: startX, y1: startY });
       }
-      const [rx0, ry0] = toScreen(seg.x, seg.y + seg.height);
-      const [rx1, ry1] = toScreen(seg.x + seg.width, seg.y);
+      const [rx0, ry0] = toScreen(seg.x, seg.y);
+      const [rx1, ry1] = toScreen(seg.x + seg.width, seg.y + seg.height);
       edges.push(
         { x0: rx0, y0: ry0, x1: rx1, y1: ry0 },
         { x0: rx1, y0: ry0, x1: rx1, y1: ry1 },
@@ -40085,21 +40107,24 @@ function renderDisplayListToBitmap(displayList, options = {}) {
   }
   const aaVec = options.antialiasVector !== false;
   const aaTxt = options.antialiasText !== false;
-  const clipMasks = /* @__PURE__ */ new Map();
+  let cachedClips;
+  let cachedClipMask;
   const imageClipMasks = /* @__PURE__ */ new Map();
   for (const original of paintOperations(displayList)) {
     if (original.kind === "glyph" && (original.value.renderMode === 3 || !original.value.outline && !original.value.unicode.trim())) continue;
     const operation = original.kind === "glyph" ? { kind: "path", value: glyphPaint(original.value) } : original;
     const clips = original.value.clipPaths;
-    let clipMask = clips ? clipMasks.get(clips) : void 0;
+    let clipMask = clips && clips === cachedClips ? cachedClipMask : void 0;
     if (clips && !clipMask) {
       clipMask = new Uint8Array(width * height * 4).fill(255);
-      for (const segments of clips) {
+      for (const clip of clips) {
+        const { segments, fillRule } = "segments" in clip ? clip : { segments: clip, fillRule: "nonzero" };
         const layer = new Uint8Array(width * height * 4);
-        fillEdgesScanline4x4(layer, width, height, segmentsToScreenEdges(segments, displayList.height, scale, true), { r: 1, g: 1, b: 1 });
+        fillEdgesScanline4x4(layer, width, height, segmentsToScreenEdges(segments, displayList.height, scale, true), { r: 1, g: 1, b: 1 }, 1, fillRule);
         for (let i = 3; i < layer.length; i += 4) clipMask[i] = Math.round(clipMask[i] * layer[i] / 255);
       }
-      clipMasks.set(clips, clipMask);
+      cachedClips = clips;
+      cachedClipMask = clipMask;
     }
     const imageClips = original.value.clipImages;
     if (imageClips) {