@poe-platform/safe-bash 0.1.754 → 0.1.756

package/dist/image-ast/index.browser.js

@@ -34663,17 +34663,22 @@ function parseTrueTypeFont(bytes) {
   const cmapNumTables = cmap ? readU16(view, cmapOffset + 2) : 0;
   let format4Offset = 0;
   let format12Offset = 0;
+  let format4IsSymbolic = false;
+  let format12IsSymbolic = false;
   for (let i = 0; i < cmapNumTables; i++) {
     const rec = cmapOffset + 4 + i * 8;
     if (rec + 8 > bytes.byteLength) break;
     const platformID = readU16(view, rec);
+    const encodingID = readU16(view, rec + 2);
     const subOffset = cmapOffset + readU32(view, rec + 4);
     if (subOffset + 4 > bytes.byteLength) continue;
     const fmt = readU16(view, subOffset);
     if (fmt === 12 && (platformID === 3 || platformID === 0)) {
       format12Offset = subOffset;
+      format12IsSymbolic = platformID === 3 && encodingID === 0;
     } else if (fmt === 4 && (platformID === 3 || platformID === 0)) {
       format4Offset = subOffset;
+      format4IsSymbolic = platformID === 3 && encodingID === 0;
     }
   }
   if (format12Offset > 0) {
@@ -34962,6 +34967,7 @@ function parseTrueTypeFont(bytes) {
     numGlyphs,
     isCff: renderCffGlyph !== void 0,
     hasCmap: cmap !== void 0,
+    isSymbolicCmap: format12Offset > 0 ? format12IsSymbolic : format4IsSymbolic,
     glyphNames,
     getGlyphId(codePoint) {
       return codePointToGlyph.get(codePoint) ?? 0;
@@ -42547,7 +42553,13 @@ function resolvePageFonts(doc, resourcesDict) {
           embeddedCff = parseEmbeddedCffFont(doc.decodeStream(program), baseEncoding?.kind === "name" ? baseEncoding.decoded : void 0, glyphNames);
         } else {
           embeddedTrueType = parseTrueTypeFont(doc.decodeStream(program));
-          if (subtype !== "Type0" && !embeddedTrueType.hasCmap) {
+          if (subtype !== "Type0" && embeddedTrueType.isSymbolicCmap) {
+            simpleToGid = /* @__PURE__ */ new Map();
+            for (let code = 0; code < 256; code++) {
+              const gid = embeddedTrueType.getGlyphId(61440 + code) || embeddedTrueType.getGlyphId(code);
+              if (gid > 0) simpleToGid.set(code, gid);
+            }
+          } else if (subtype !== "Type0" && !embeddedTrueType.hasCmap) {
             simpleToGid = /* @__PURE__ */ new Map();
             const encoding = baseEncoding?.kind === "name" ? getEncoding(baseEncoding.decoded) : void 0;
             for (let code = 0; code < 256; code++) {
@@ -46124,7 +46136,7 @@ var PdfPage = class {
     this.cachedContentAst = parseContentStream(bytes);
     this.isolatedInitialStream = false;
     const stm = cosStream(bytes, { compress });
-    dictSet(this.pageDict, "Contents", this.cosDoc.allocateObject(stm));
+    this.replaceContentStream(stm);
     this.cachedContentsNode = dictGet(this.pageDict, "Contents");
   }
   getIsolatedContentAst() {
@@ -46141,9 +46153,33 @@ var PdfPage = class {
     this.cachedContentAst = [...nodes];
     const bytes = serializeContentAst(this.cachedContentAst);
     const streamObj = cosStream(bytes, { compress });
-    dictSet(this.pageDict, "Contents", this.cosDoc.allocateObject(streamObj));
+    this.replaceContentStream(streamObj);
     this.cachedContentsNode = dictGet(this.pageDict, "Contents");
   }
+  replaceContentStream(stream) {
+    const contents = dictGet(this.pageDict, "Contents");
+    if (contents?.kind === "ref") {
+      let references = 0;
+      const pending = [...this.cosDoc.objects.values()].map((object) => object.value);
+      const visited = /* @__PURE__ */ new Set();
+      while (pending.length > 0 && references < 2) {
+        const node = pending.pop();
+        if (node.kind === "ref") {
+          if (node.objectNumber === contents.objectNumber && node.generationNumber === contents.generationNumber) references++;
+        } else if (!visited.has(node)) {
+          visited.add(node);
+          if (node.kind === "array") for (const item of node.items) pending.push(item);
+          else if (node.kind === "dict") for (const entry of node.entries) pending.push(entry.value);
+          else if (node.kind === "stream") pending.push(node.dict);
+        }
+      }
+      if (references === 1) {
+        this.cosDoc.setObject(contents.objectNumber, stream, contents.generationNumber);
+        return;
+      }
+    }
+    dictSet(this.pageDict, "Contents", this.cosDoc.allocateObject(stream));
+  }
   drawText(text, options) {
     const size = options.size ?? options.fontSize ?? 12;
     const color = options.color ?? { r: 0, g: 0, b: 0 };

package/dist/image-ast/index.js

@@ -34663,17 +34663,22 @@ function parseTrueTypeFont(bytes) {
   const cmapNumTables = cmap ? readU16(view, cmapOffset + 2) : 0;
   let format4Offset = 0;
   let format12Offset = 0;
+  let format4IsSymbolic = false;
+  let format12IsSymbolic = false;
   for (let i = 0; i < cmapNumTables; i++) {
     const rec = cmapOffset + 4 + i * 8;
     if (rec + 8 > bytes.byteLength) break;
     const platformID = readU16(view, rec);
+    const encodingID = readU16(view, rec + 2);
     const subOffset = cmapOffset + readU32(view, rec + 4);
     if (subOffset + 4 > bytes.byteLength) continue;
     const fmt = readU16(view, subOffset);
     if (fmt === 12 && (platformID === 3 || platformID === 0)) {
       format12Offset = subOffset;
+      format12IsSymbolic = platformID === 3 && encodingID === 0;
     } else if (fmt === 4 && (platformID === 3 || platformID === 0)) {
       format4Offset = subOffset;
+      format4IsSymbolic = platformID === 3 && encodingID === 0;
     }
   }
   if (format12Offset > 0) {
@@ -34962,6 +34967,7 @@ function parseTrueTypeFont(bytes) {
     numGlyphs,
     isCff: renderCffGlyph !== void 0,
     hasCmap: cmap !== void 0,
+    isSymbolicCmap: format12Offset > 0 ? format12IsSymbolic : format4IsSymbolic,
     glyphNames,
     getGlyphId(codePoint) {
       return codePointToGlyph.get(codePoint) ?? 0;
@@ -42547,7 +42553,13 @@ function resolvePageFonts(doc, resourcesDict) {
           embeddedCff = parseEmbeddedCffFont(doc.decodeStream(program), baseEncoding?.kind === "name" ? baseEncoding.decoded : void 0, glyphNames);
         } else {
           embeddedTrueType = parseTrueTypeFont(doc.decodeStream(program));
-          if (subtype !== "Type0" && !embeddedTrueType.hasCmap) {
+          if (subtype !== "Type0" && embeddedTrueType.isSymbolicCmap) {
+            simpleToGid = /* @__PURE__ */ new Map();
+            for (let code = 0; code < 256; code++) {
+              const gid = embeddedTrueType.getGlyphId(61440 + code) || embeddedTrueType.getGlyphId(code);
+              if (gid > 0) simpleToGid.set(code, gid);
+            }
+          } else if (subtype !== "Type0" && !embeddedTrueType.hasCmap) {
             simpleToGid = /* @__PURE__ */ new Map();
             const encoding = baseEncoding?.kind === "name" ? getEncoding(baseEncoding.decoded) : void 0;
             for (let code = 0; code < 256; code++) {
@@ -46124,7 +46136,7 @@ var PdfPage = class {
     this.cachedContentAst = parseContentStream(bytes);
     this.isolatedInitialStream = false;
     const stm = cosStream(bytes, { compress });
-    dictSet(this.pageDict, "Contents", this.cosDoc.allocateObject(stm));
+    this.replaceContentStream(stm);
     this.cachedContentsNode = dictGet(this.pageDict, "Contents");
   }
   getIsolatedContentAst() {
@@ -46141,9 +46153,33 @@ var PdfPage = class {
     this.cachedContentAst = [...nodes];
     const bytes = serializeContentAst(this.cachedContentAst);
     const streamObj = cosStream(bytes, { compress });
-    dictSet(this.pageDict, "Contents", this.cosDoc.allocateObject(streamObj));
+    this.replaceContentStream(streamObj);
     this.cachedContentsNode = dictGet(this.pageDict, "Contents");
   }
+  replaceContentStream(stream) {
+    const contents = dictGet(this.pageDict, "Contents");
+    if (contents?.kind === "ref") {
+      let references = 0;
+      const pending = [...this.cosDoc.objects.values()].map((object) => object.value);
+      const visited = /* @__PURE__ */ new Set();
+      while (pending.length > 0 && references < 2) {
+        const node = pending.pop();
+        if (node.kind === "ref") {
+          if (node.objectNumber === contents.objectNumber && node.generationNumber === contents.generationNumber) references++;
+        } else if (!visited.has(node)) {
+          visited.add(node);
+          if (node.kind === "array") for (const item of node.items) pending.push(item);
+          else if (node.kind === "dict") for (const entry of node.entries) pending.push(entry.value);
+          else if (node.kind === "stream") pending.push(node.dict);
+        }
+      }
+      if (references === 1) {
+        this.cosDoc.setObject(contents.objectNumber, stream, contents.generationNumber);
+        return;
+      }
+    }
+    dictSet(this.pageDict, "Contents", this.cosDoc.allocateObject(stream));
+  }
   drawText(text, options) {
     const size = options.size ?? options.fontSize ?? 12;
     const color = options.color ?? { r: 0, g: 0, b: 0 };

package/dist/pdf-ast/canvas.d.ts

@@ -103,6 +103,7 @@ export declare class PdfPage {
     setRawContentStream(bytesOrText: Uint8Array | string, compress?: boolean): void;
     private getIsolatedContentAst;
     setContentAst(nodes: PdfContentNode[], compress?: boolean): void;
+    private replaceContentStream;
     drawText(text: string, options: DrawTextOptions): void;
     drawRect(options: DrawRectOptions): void;
     drawLine(options: DrawLineOptions): void;

package/dist/pdf-ast/fonts/truetype.d.ts

@@ -13,6 +13,7 @@ export interface ParsedTrueTypeFont {
     readonly numGlyphs: number;
     readonly isCff: boolean;
     readonly hasCmap: boolean;
+    readonly isSymbolicCmap: boolean;
     readonly glyphNames: readonly (string | undefined)[];
     getGlyphId(codePoint: number): number;
     getAdvanceWidthUnits(glyphId: number): number;

package/dist/pdf-ast/index.js

@@ -27006,17 +27006,22 @@ function parseTrueTypeFont(bytes) {
   const cmapNumTables = cmap ? readU16(view, cmapOffset + 2) : 0;
   let format4Offset = 0;
   let format12Offset = 0;
+  let format4IsSymbolic = false;
+  let format12IsSymbolic = false;
   for (let i = 0; i < cmapNumTables; i++) {
     const rec = cmapOffset + 4 + i * 8;
     if (rec + 8 > bytes.byteLength) break;
     const platformID = readU16(view, rec);
+    const encodingID = readU16(view, rec + 2);
     const subOffset = cmapOffset + readU32(view, rec + 4);
     if (subOffset + 4 > bytes.byteLength) continue;
     const fmt = readU16(view, subOffset);
     if (fmt === 12 && (platformID === 3 || platformID === 0)) {
       format12Offset = subOffset;
+      format12IsSymbolic = platformID === 3 && encodingID === 0;
     } else if (fmt === 4 && (platformID === 3 || platformID === 0)) {
       format4Offset = subOffset;
+      format4IsSymbolic = platformID === 3 && encodingID === 0;
     }
   }
   if (format12Offset > 0) {
@@ -27305,6 +27310,7 @@ function parseTrueTypeFont(bytes) {
     numGlyphs,
     isCff: renderCffGlyph !== void 0,
     hasCmap: cmap !== void 0,
+    isSymbolicCmap: format12Offset > 0 ? format12IsSymbolic : format4IsSymbolic,
     glyphNames,
     getGlyphId(codePoint) {
       return codePointToGlyph.get(codePoint) ?? 0;
@@ -35261,7 +35267,13 @@ function resolvePageFonts(doc, resourcesDict) {
           embeddedCff = parseEmbeddedCffFont(doc.decodeStream(program), baseEncoding?.kind === "name" ? baseEncoding.decoded : void 0, glyphNames);
         } else {
           embeddedTrueType = parseTrueTypeFont(doc.decodeStream(program));
-          if (subtype !== "Type0" && !embeddedTrueType.hasCmap) {
+          if (subtype !== "Type0" && embeddedTrueType.isSymbolicCmap) {
+            simpleToGid = /* @__PURE__ */ new Map();
+            for (let code = 0; code < 256; code++) {
+              const gid = embeddedTrueType.getGlyphId(61440 + code) || embeddedTrueType.getGlyphId(code);
+              if (gid > 0) simpleToGid.set(code, gid);
+            }
+          } else if (subtype !== "Type0" && !embeddedTrueType.hasCmap) {
             simpleToGid = /* @__PURE__ */ new Map();
             const encoding = baseEncoding?.kind === "name" ? getEncoding(baseEncoding.decoded) : void 0;
             for (let code = 0; code < 256; code++) {
@@ -39527,7 +39539,7 @@ var PdfPage = class {
     this.cachedContentAst = parseContentStream(bytes);
     this.isolatedInitialStream = false;
     const stm = cosStream(bytes, { compress });
-    dictSet(this.pageDict, "Contents", this.cosDoc.allocateObject(stm));
+    this.replaceContentStream(stm);
     this.cachedContentsNode = dictGet(this.pageDict, "Contents");
   }
   getIsolatedContentAst() {
@@ -39544,9 +39556,33 @@ var PdfPage = class {
     this.cachedContentAst = [...nodes];
     const bytes = serializeContentAst(this.cachedContentAst);
     const streamObj = cosStream(bytes, { compress });
-    dictSet(this.pageDict, "Contents", this.cosDoc.allocateObject(streamObj));
+    this.replaceContentStream(streamObj);
     this.cachedContentsNode = dictGet(this.pageDict, "Contents");
   }
+  replaceContentStream(stream) {
+    const contents = dictGet(this.pageDict, "Contents");
+    if (contents?.kind === "ref") {
+      let references = 0;
+      const pending = [...this.cosDoc.objects.values()].map((object) => object.value);
+      const visited = /* @__PURE__ */ new Set();
+      while (pending.length > 0 && references < 2) {
+        const node = pending.pop();
+        if (node.kind === "ref") {
+          if (node.objectNumber === contents.objectNumber && node.generationNumber === contents.generationNumber) references++;
+        } else if (!visited.has(node)) {
+          visited.add(node);
+          if (node.kind === "array") for (const item of node.items) pending.push(item);
+          else if (node.kind === "dict") for (const entry of node.entries) pending.push(entry.value);
+          else if (node.kind === "stream") pending.push(node.dict);
+        }
+      }
+      if (references === 1) {
+        this.cosDoc.setObject(contents.objectNumber, stream, contents.generationNumber);
+        return;
+      }
+    }
+    dictSet(this.pageDict, "Contents", this.cosDoc.allocateObject(stream));
+  }
   drawText(text, options) {
     const size = options.size ?? options.fontSize ?? 12;
     const color = options.color ?? { r: 0, g: 0, b: 0 };