@poe-platform/safe-bash 0.1.762 → 0.1.763

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

@@ -11606,14 +11606,18 @@ function evaluateContentStreamToDisplayList(params) {
   const paths = [];
   const images = [];
   const operations = [];
+  let capturedOperations;
+  let insideSoftMask = false;
   const emit = (operation) => {
-    const { clipPaths, clipImages } = curState();
-    if (clipPaths || clipImages) operation = { ...operation, value: {
+    const { clipPaths, clipImages, softMask } = curState();
+    if (clipPaths || clipImages || softMask) operation = { ...operation, value: {
       ...operation.value,
       ...clipPaths ? { clipPaths } : {},
-      ...clipImages ? { clipImages } : {}
+      ...clipImages ? { clipImages } : {},
+      ...softMask ? { softMask } : {}
     } };
-    operations.push(operation);
+    (capturedOperations ?? operations).push(operation);
+    if (insideSoftMask) return;
     switch (operation.kind) {
       case "path":
         paths.push(operation.value);
@@ -11719,7 +11723,7 @@ function evaluateContentStreamToDisplayList(params) {
     );
     return { r: kClamp(r), g: kClamp(g), b: kClamp(b) };
   };
-  const applyStateOperator = (st, operator, ops, activeResources) => {
+  const applyStateOperator = (st, operator, ops, activeResources, activeFonts, depth) => {
     const num = (i, fb = 0) => ops[i]?.kind === "number" ? ops[i].value : fb;
     if (operator === "cm") {
       const m = [num(0, 1), num(1, 0), num(2, 0), num(3, 1), num(4, 0), num(5, 0)];
@@ -11802,6 +11806,46 @@ function evaluateContentStreamToDisplayList(params) {
       const extDict = params.cosDoc.resolveDict(dictGet(activeResources, "ExtGState"));
       const gsDict = extDict ? params.cosDoc.resolveDict(dictGet(extDict, ops[0].decoded)) : void 0;
       if (gsDict) {
+        const mask = params.cosDoc.resolve(dictGet(gsDict, "SMask"));
+        if (mask?.kind === "name" && mask.decoded === "None") {
+          st.softMask = void 0;
+        } else if (mask?.kind === "dict") {
+          const subtype = params.cosDoc.resolve(dictGet(mask, "S"));
+          const form = params.cosDoc.resolve(dictGet(mask, "G"));
+          if (form?.kind === "stream" && subtype?.kind === "name" && (subtype.decoded === "Alpha" || subtype.decoded === "Luminosity")) {
+            if (depth >= 8) throw new PdfError("E_LIMIT", "Soft-mask nesting exceeds the form depth limit");
+            const parentOperations = capturedOperations;
+            const parentInsideSoftMask = insideSoftMask;
+            const savedTextState = { pendingTextClip, hasTextClip, activeTm, activeTlm };
+            const captured = [];
+            capturedOperations = captured;
+            insideSoftMask = true;
+            const maskState = { ...st, softMask: void 0, fillAlpha: 1, strokeAlpha: 1, blendMode: "Normal" };
+            delete maskState.clipPaths;
+            delete maskState.clipImages;
+            delete maskState.clipRect;
+            stateStack.push(maskState);
+            try {
+              paintForm(form, activeResources, activeFonts, depth, void 0, void 0, true);
+            } finally {
+              stateStack.pop();
+              capturedOperations = parentOperations;
+              insideSoftMask = parentInsideSoftMask;
+              ({ pendingTextClip, hasTextClip, activeTm, activeTlm } = savedTextState);
+            }
+            const group = params.cosDoc.resolveDict(dictGet(form.dict, "Group"));
+            const colorSpace = group ? dictGet(group, "CS") : void 0;
+            const bc = params.cosDoc.resolveArray(dictGet(mask, "BC"));
+            const components = bc?.items.map((item) => {
+              const value = params.cosDoc.resolve(item);
+              return value?.kind === "number" ? value.value : 0;
+            });
+            const [r, g, b] = components ? convertColorSpaceComponentsToRgb(params.cosDoc, colorSpace, "DeviceRGB", components, activeResources) : [0, 0, 0];
+            const transfer = params.cosDoc.resolve(dictGet(mask, "TR"));
+            const transferMap = transfer?.kind === "dict" || transfer?.kind === "stream" ? Uint8Array.from({ length: 256 }, (_, i) => Math.floor(kClamp(Math.fround(evalShadingFunctionToComponents(params.cosDoc, transfer, Math.fround(i / 255))[0] ?? 0)) * 255)) : void 0;
+            st.softMask = { subtype: subtype.decoded, operations: captured, backdrop: { r, g, b }, transferMap };
+          }
+        }
         const bmNode = params.cosDoc.resolve(dictGet(gsDict, "BM"));
         if (bmNode?.kind === "name") {
           st.blendMode = bmNode.decoded === "Compatible" ? "Normal" : bmNode.decoded;
@@ -11888,6 +11932,84 @@ function evaluateContentStreamToDisplayList(params) {
     ] }], void 0, void 0, resources, activeFonts, depth);
     stateStack.pop();
   };
+  const paintForm = (form, activeResources, activeFonts, depth, mcid, actualText, maskGroup = false) => {
+    const st = curState();
+    const group = params.cosDoc.resolveDict(dictGet(form.dict, "Group"));
+    const groupType = group ? params.cosDoc.resolve(dictGet(group, "S")) : void 0;
+    const isolated = group ? params.cosDoc.resolve(dictGet(group, "I")) : void 0;
+    const isolate = !maskGroup && groupType?.kind === "name" && groupType.decoded === "Transparency" && isolated?.kind === "boolean" && isolated.value;
+    const formStreamBytes = params.cosDoc.decodeStream(form);
+    const formNodes = parseContentStream(formStreamBytes);
+    const formResDict = params.cosDoc.resolveDict(dictGet(form.dict, "Resources")) ?? activeResources;
+    const formFonts = new Map(activeFonts);
+    for (const [k, v] of resolvePageFonts(params.cosDoc, formResDict).entries()) {
+      formFonts.set(k, v);
+    }
+    let nextCtm = [...st.ctm];
+    const matArr = params.cosDoc.resolveArray(dictGet(form.dict, "Matrix"));
+    if (matArr && matArr.items.length >= 6) {
+      const mn = (idx, fb = 0) => {
+        const resolved = params.cosDoc.resolve(matArr.items[idx]);
+        return resolved?.kind === "number" ? resolved.value : fb;
+      };
+      const formMat = [mn(0, 1), mn(1, 0), mn(2, 0), mn(3, 1), mn(4, 0), mn(5, 0)];
+      nextCtm = multiplyMatrices(formMat, nextCtm);
+    }
+    let nextClip = !isolate && st.clipRect ? [...st.clipRect] : void 0;
+    let nextClipPaths = isolate ? void 0 : st.clipPaths;
+    const bboxArr = params.cosDoc.resolveArray(dictGet(form.dict, "BBox"));
+    if (bboxArr && bboxArr.items.length >= 4) {
+      const bn = (idx, fb = 0) => {
+        const resolved = params.cosDoc.resolve(bboxArr.items[idx]);
+        return resolved?.kind === "number" ? resolved.value : fb;
+      };
+      const bx0 = bn(0, 0), by0 = bn(1, 0), bx1 = bn(2, 0), by1 = bn(3, 0);
+      const pts = [
+        transformPoint(nextCtm, bx0, by0),
+        transformPoint(nextCtm, bx1, by0),
+        transformPoint(nextCtm, bx1, by1),
+        transformPoint(nextCtm, bx0, by1)
+      ];
+      nextClipPaths = [...nextClipPaths ?? [], [
+        ...pts.map(([x, y], index) => ({ kind: index === 0 ? "move" : "line", x, y })),
+        { kind: "close" }
+      ]];
+      const fMinX = Math.min(...pts.map((p) => p[0]));
+      const fMinY = Math.min(...pts.map((p) => p[1]));
+      const fMaxX = Math.max(...pts.map((p) => p[0]));
+      const fMaxY = Math.max(...pts.map((p) => p[1]));
+      if (fMaxX > fMinX && fMaxY > fMinY) {
+        nextClip = nextClip ? [
+          Math.max(nextClip[0], fMinX),
+          Math.max(nextClip[1], fMinY),
+          Math.min(nextClip[2], fMaxX),
+          Math.min(nextClip[3], fMaxY)
+        ] : [fMinX, fMinY, fMaxX, fMaxY];
+      }
+    }
+    const parentOperations = capturedOperations;
+    const children = [];
+    const nextState = { ...st, ctm: nextCtm };
+    if (isolate) {
+      capturedOperations = children;
+      nextState.fillAlpha = nextState.strokeAlpha = 1;
+      nextState.blendMode = "Normal";
+      nextState.softMask = void 0;
+      delete nextState.clipImages;
+      delete nextState.clipPaths;
+      delete nextState.clipRect;
+    }
+    if (nextClip) nextState.clipRect = nextClip;
+    if (nextClipPaths) nextState.clipPaths = nextClipPaths;
+    stateStack.push(nextState);
+    try {
+      walkNodes(formNodes, mcid, actualText, formResDict, formFonts, depth + 1);
+    } finally {
+      stateStack.pop();
+      capturedOperations = parentOperations;
+    }
+    if (isolate) emit({ kind: "group", value: { operations: children, alpha: st.fillAlpha, blendMode: st.blendMode, clipRect: st.clipRect } });
+  };
   const walkNodes = (nodes, mcid, actualText, activeResources = params.resourcesDict, activeFonts = fonts, depth = 0) => {
     for (const node of nodes) {
       switch (node.kind) {
@@ -11932,7 +12054,7 @@ function evaluateContentStreamToDisplayList(params) {
           break;
         }
         case "state-op": {
-          applyStateOperator(curState(), node.operator, node.operands, activeResources);
+          applyStateOperator(curState(), node.operator, node.operands, activeResources, activeFonts, depth);
           break;
         }
         case "path-op": {
@@ -12218,53 +12340,7 @@ function evaluateContentStreamToDisplayList(params) {
                   ...st.clipRect ? { clipRect: [...st.clipRect] } : {}
                 }, patternMask, activeResources, activeFonts, depth);
               } else if (sub === "Form" && depth < 8) {
-                const formStreamBytes = params.cosDoc.decodeStream(xobjNode);
-                const formNodes = parseContentStream(formStreamBytes);
-                const formResDict = params.cosDoc.resolveDict(dictGet(xobjNode.dict, "Resources")) ?? activeResources;
-                const formFonts = new Map(activeFonts);
-                for (const [k, v] of resolvePageFonts(params.cosDoc, formResDict).entries()) {
-                  formFonts.set(k, v);
-                }
-                let nextCtm = [...st.ctm];
-                const matArr = params.cosDoc.resolveArray(dictGet(xobjNode.dict, "Matrix"));
-                if (matArr && matArr.items.length >= 6) {
-                  const mn = (idx, fb = 0) => {
-                    const resolved = params.cosDoc.resolve(matArr.items[idx]);
-                    return resolved?.kind === "number" ? resolved.value : fb;
-                  };
-                  const formMat = [mn(0, 1), mn(1, 0), mn(2, 0), mn(3, 1), mn(4, 0), mn(5, 0)];
-                  nextCtm = multiplyMatrices(formMat, nextCtm);
-                }
-                let nextClip = st.clipRect ? [...st.clipRect] : void 0;
-                const bboxArr = params.cosDoc.resolveArray(dictGet(xobjNode.dict, "BBox"));
-                if (bboxArr && bboxArr.items.length >= 4) {
-                  const bn = (idx, fb = 0) => {
-                    const resolved = params.cosDoc.resolve(bboxArr.items[idx]);
-                    return resolved?.kind === "number" ? resolved.value : fb;
-                  };
-                  const bx0 = bn(0, 0), by0 = bn(1, 0), bx1 = bn(2, 0), by1 = bn(3, 0);
-                  const pts = [
-                    transformPoint(nextCtm, bx0, by0),
-                    transformPoint(nextCtm, bx1, by0),
-                    transformPoint(nextCtm, bx0, by1),
-                    transformPoint(nextCtm, bx1, by1)
-                  ];
-                  const fMinX = Math.min(...pts.map((p) => p[0]));
-                  const fMinY = Math.min(...pts.map((p) => p[1]));
-                  const fMaxX = Math.max(...pts.map((p) => p[0]));
-                  const fMaxY = Math.max(...pts.map((p) => p[1]));
-                  if (fMaxX > fMinX && fMaxY > fMinY) {
-                    nextClip = nextClip ? [
-                      Math.max(nextClip[0], fMinX),
-                      Math.max(nextClip[1], fMinY),
-                      Math.min(nextClip[2], fMaxX),
-                      Math.min(nextClip[3], fMaxY)
-                    ] : [fMinX, fMinY, fMaxX, fMaxY];
-                  }
-                }
-                stateStack.push({ ...st, ctm: nextCtm, ...nextClip ? { clipRect: nextClip } : {} });
-                walkNodes(formNodes, mcid, actualText, formResDict, formFonts, depth + 1);
-                if (stateStack.length > 1) stateStack.pop();
+                paintForm(xobjNode, activeResources, activeFonts, depth, mcid, actualText);
               }
             }
           }
@@ -12483,7 +12559,7 @@ function evaluateContentStreamToDisplayList(params) {
                 st.textRenderMode = cmd.mode;
                 break;
               case "state-op":
-                applyStateOperator(st, cmd.operator, cmd.operands, activeResources);
+                applyStateOperator(st, cmd.operator, cmd.operands, activeResources, activeFonts, depth);
                 break;
               case "show-text":
                 emitTokenBytes(cmd.token.bytes);
@@ -14599,6 +14675,30 @@ function paintOperations(displayList) {
     ...displayList.glyphs.map((value) => ({ kind: "glyph", value }))
   ];
 }
+function renderSoftMask(mask, displayList, scale) {
+  const bitmap = renderDisplayListToBitmap({
+    ...displayList,
+    rotation: 0,
+    glyphs: [],
+    paths: [],
+    images: [],
+    operations: mask.operations
+  }, { scale, transparent: true });
+  const { data } = bitmap;
+  for (let i = 0; i < data.length; i += 4) {
+    let value = data[i + 3];
+    if (mask.subtype === "Luminosity") {
+      const alpha = value / 255;
+      const r = Math.round(data[i] * alpha + mask.backdrop.r * 255 * (1 - alpha));
+      const g = Math.round(data[i + 1] * alpha + mask.backdrop.g * 255 * (1 - alpha));
+      const b = Math.round(data[i + 2] * alpha + mask.backdrop.b * 255 * (1 - alpha));
+      value = Math.round(pdfLum(r, g, b));
+    }
+    data[i] = data[i + 1] = data[i + 2] = 0;
+    data[i + 3] = mask.transferMap?.[value] ?? value;
+  }
+  return bitmap;
+}
 function renderDisplayListToBitmap(displayList, options = {}) {
   const baseScale = options.scale ?? (options.dpi ? options.dpi / 72 : 1.5);
   const scaleX = options.dpiX !== void 0 ? options.dpiX / 72 : baseScale;
@@ -14622,10 +14722,28 @@ function renderDisplayListToBitmap(displayList, options = {}) {
   const aaTxt = options.antialiasText !== false;
   let cachedClips;
   let cachedClipMask;
+  let cachedSoftMask;
+  let cachedSoftMaskPixels;
   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;
+    let operation = original.kind === "glyph" ? { kind: "path", value: glyphPaint(original.value) } : original;
+    if (operation.kind === "group") {
+      const group = operation.value;
+      const bitmap = renderDisplayListToBitmap({ ...displayList, rotation: 0, operations: group.operations }, { ...options, scale, dpiX: void 0, dpiY: void 0, cropRect: void 0, transparent: true });
+      for (let i = 3; i < bitmap.data.length; i += 4) bitmap.data[i] = Math.round(bitmap.data[i] * group.alpha);
+      operation = { kind: "image", value: {
+        name: "TransparencyGroup",
+        width: bitmap.width,
+        height: bitmap.height,
+        decodedRgba: bitmap.data,
+        matrix: [bitmap.width / scale, 0, 0, bitmap.height / scale, 0, displayList.height - bitmap.height / scale],
+        colorSpace: "DeviceRGB",
+        bitsPerComponent: 8,
+        blendMode: group.blendMode,
+        clipRect: group.clipRect
+      } };
+    }
     const clips = original.value.clipPaths;
     let clipMask = clips && clips === cachedClips ? cachedClipMask : void 0;
     if (clips && !clipMask) {
@@ -14639,6 +14757,19 @@ function renderDisplayListToBitmap(displayList, options = {}) {
       cachedClips = clips;
       cachedClipMask = clipMask;
     }
+    const softMask = original.value.softMask;
+    if (softMask) {
+      if (softMask !== cachedSoftMask) {
+        cachedSoftMaskPixels = renderSoftMask(softMask, displayList, scale).data;
+        cachedSoftMask = softMask;
+      }
+      if (clipMask) {
+        clipMask = clipMask.slice();
+        for (let i = 3; i < clipMask.length; i += 4) clipMask[i] = Math.round(clipMask[i] * cachedSoftMaskPixels[i] / 255);
+      } else {
+        clipMask = cachedSoftMaskPixels;
+      }
+    }
     const imageClips = original.value.clipImages;
     if (imageClips) {
       let imageMask = imageClipMasks.get(imageClips);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@poe-platform/safe-bash",
-  "version": "0.1.762",
+  "version": "0.1.763",
   "description": "Extensible virtual shell with pluggable filesystems and streaming commands",
   "type": "module",
   "license": "MIT",
@@ -841,7 +841,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@poe-platform/safe-fs": "0.1.762",
+    "@poe-platform/safe-fs": "0.1.763",
     "pdf-lib": "1.17.1",
     "@noble/hashes": "2.4.0",
     "pako": "3.0.1",

package/third-party/pdf-ast/THIRD_PARTY_NOTICES.md

@@ -359,6 +359,19 @@ device pixel as the enlargement threshold. `image-downsampling.test.ts` adds
 memory-only stripe, alpha, transform, stencil, and save/reopen regressions;
 the unchanged upstream issue13372 fixture also covers reduced patterned masks.
 
+ExtGState soft-mask evaluation and rendering follow PDF.js `handleSMask`,
+`beginGroup`, `_prepareSMaskCanvas`, and `_bakeSMaskCanvas` at the same revision
+(Mozilla Foundation, Apache-2.0). The adapter captures page-coordinate mask
+paints, resets group alpha/blend/soft-mask state, converts the luminosity
+backdrop before filtering, and builds a 256-entry transfer table. Isolated
+Forms retain their own paint groups so outer opacity is applied once.
+Bitmap masks retain only the current prepared surface; SVG masks use the
+export resolution while isolated Form contents remain vector groups.
+`soft-mask.test.ts` ports four unchanged upstream equality fixtures, recorded
+in `src/fixtures/SOURCES.md`, and adds local alpha/transform/group tests plus
+the original issue17069 signature regression. Soft-mask evaluation is bounded
+by the existing eight-level Form limit; mask-only text is excluded from extraction.
+
 Malformed dictionary-key recovery follows PDF.js `Parser.getObj`, skipping
 stray non-Name tokens only in local repair mode. Damaged optional ToUnicode
 streams follow `PartialEvaluator.readToUnicode` error recovery while retaining