@uurtech/jdf-cli 0.2.5 → 0.2.7

package/dist/index.js

@@ -1488,7 +1488,8 @@ function merge(para, meta, pageWmm) {
   const style = { ...first.style ?? {}, lineHeight, ...indent > 0.5 ? { textIndent: Math.round(indent * 100) / 100 } : {} };
   const allText = para.every((e) => e.type === "text" && !e.link);
   const y = Math.max(0, first.position.y - (lineHeight - 1) / 2 * lineH);
-  const base = { position: { x, y: Math.round(y * 100) / 100 }, width: Math.round(width * 100) / 100, style };
+  const height = Math.round(para.length * lineHeight * lineH * 100) / 100;
+  const base = { position: { x, y: Math.round(y * 100) / 100 }, width: Math.round(width * 100) / 100, height, style };
   if (allText) {
     const content = para.map((e) => String(e.content ?? "").trim().replace(/[ \t]+/g, " ")).join(joiner());
     const { height: _hh2, ...firstRest } = first;
@@ -1767,6 +1768,11 @@ async function walkOps(page, OPS, viewport) {
     clip: void 0,
     fill: "#000000",
     stroke: "#000000",
+    // Blend mode from the ExtGState (BM). JDF has no blend modes; a multiply /
+    // darken layer is approximated by opacity ∝ how dark it is (a light-grey
+    // "light streak" over a blue banner becomes nearly transparent instead of
+    // an opaque grey blob), a screen / lighten layer by how light it is.
+    blend: "normal",
     lineWidth: 1,
     fillAlpha: 1,
     strokeAlpha: 1,
@@ -1780,6 +1786,24 @@ async function walkOps(page, OPS, viewport) {
     rise: 0
   };
   const snapshot = () => ({ ...gs, ctm: [...gs.ctm] });
+  const luma = (hex) => {
+    const m = /^#([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})$/i.exec(hex || "");
+    return m ? (0.2126 * parseInt(m[1], 16) + 0.7152 * parseInt(m[2], 16) + 0.0722 * parseInt(m[3], 16)) / 255 : 0.5;
+  };
+  const groupStack = [];
+  const isNormal = (b) => b === "normal" || b === "source-over" || b === "compatible";
+  const fillOpacity = (color) => {
+    let alpha = gs.fillAlpha;
+    let b = gs.blend;
+    for (let q = groupStack.length - 1; q >= 0; q--) {
+      alpha *= groupStack[q].alpha;
+      if (isNormal(b)) b = groupStack[q].blend;
+    }
+    const l = luma(color ?? gs.fill);
+    if (b === "multiply" || b === "darken" || b === "color-burn" || b === "colorburn") return alpha * Math.max(0.08, 1 - l);
+    if (b === "screen" || b === "lighten" || b === "color-dodge" || b === "colordodge") return alpha * Math.max(0.08, l);
+    return alpha;
+  };
   const stack = [];
   const textOps = [];
   const shapes = [];
@@ -1856,7 +1880,7 @@ async function walkOps(page, OPS, viewport) {
         gradient: isFill ? gs.fillGradient : void 0,
         stroke: isStroke ? gs.stroke : void 0,
         strokeWidth: isStroke ? gs.lineWidth * PT_TO_MM3 : void 0,
-        opacity: isFill ? gs.fillAlpha : gs.strokeAlpha
+        opacity: isFill ? fillOpacity() : gs.strokeAlpha
       });
     }
     pathRects = [];
@@ -1878,7 +1902,7 @@ async function walkOps(page, OPS, viewport) {
         gradient: isFill ? gs.fillGradient : void 0,
         stroke: isStroke ? gs.stroke : void 0,
         strokeWidth: isStroke ? gs.lineWidth * PT_TO_MM3 : void 0,
-        opacity: isFill ? gs.fillAlpha : gs.strokeAlpha
+        opacity: isFill ? fillOpacity() : gs.strokeAlpha
       });
     } else if (pathSegments.length === 2 && pathSegments[0].type === "M" && pathSegments[1].type === "L") {
       const a = pathSegments[0].pts;
@@ -1970,7 +1994,7 @@ async function walkOps(page, OPS, viewport) {
           gradient: isFill ? gs.fillGradient : void 0,
           stroke: isStroke ? gs.stroke : void 0,
           strokeWidth: isStroke ? gs.lineWidth * PT_TO_MM3 : void 0,
-          opacity: isFill ? gs.fillAlpha : gs.strokeAlpha,
+          opacity: isFill ? fillOpacity() : gs.strokeAlpha,
           path: thin ? void 0 : d
         });
       }
@@ -1991,11 +2015,15 @@ async function walkOps(page, OPS, viewport) {
       if (s) Object.assign(gs, s);
     } else if (fn === OPS.paintFormXObjectBegin) {
       stack.push(snapshot());
+      groupStack.push({ blend: gs.blend, alpha: gs.fillAlpha });
+      gs.blend = "normal";
+      gs.fillAlpha = 1;
       const matrix = args[0];
       if (Array.isArray(matrix) && matrix.length === 6) gs.ctm = multiplyCtm(matrix, gs.ctm);
     } else if (fn === OPS.paintFormXObjectEnd) {
       const s = stack.pop();
       if (s) Object.assign(gs, s);
+      groupStack.pop();
     } else if (fn === OPS.beginText) {
       tm = [1, 0, 0, 1, 0, 0];
       tlm = [1, 0, 0, 1, 0, 0];
@@ -2068,6 +2096,7 @@ async function walkOps(page, OPS, viewport) {
           if (key === "LW") gs.lineWidth = val;
           else if (key === "ca") gs.fillAlpha = val;
           else if (key === "CA") gs.strokeAlpha = val;
+          else if (key === "BM") gs.blend = String(Array.isArray(val) ? val[0] : val).toLowerCase();
         }
       }
     } else if (fn === OPS.showText) {
@@ -2152,18 +2181,37 @@ async function walkOps(page, OPS, viewport) {
       const isStroke = fn === OPS.stroke || fn === OPS.fillStroke || fn === OPS.eoFillStroke || fn === OPS.closeFillStroke || fn === OPS.closeStroke || fn === OPS.closeEOFillStroke;
       flushPath(isFill, isStroke);
     } else if (fn === OPS.endPath || fn === OPS.clip || fn === OPS.eoClip) {
-      if (fn !== OPS.endPath) gs.clip = clipFromPath();
+      if (fn !== OPS.endPath) {
+        const c = clipFromPath();
+        const prev = gs.clip;
+        if (c && prev) {
+          const x0 = Math.max(c.x, prev.x), y0 = Math.max(c.y, prev.y);
+          const x1 = Math.min(c.x + c.w, prev.x + prev.w), y1 = Math.min(c.y + c.h, prev.y + prev.h);
+          if (x1 <= x0 || y1 <= y0) gs.clip = { d: "", x: x0, y: y0, w: 0, h: 0 };
+          else if (c.d || !prev.d) gs.clip = c.d ? c : { d: "", x: x0, y: y0, w: x1 - x0, h: y1 - y0 };
+          else gs.clip = prev;
+        } else gs.clip = c ?? prev;
+      }
       pathSegments = [];
       pathRects = [];
       pathRect = null;
       pathStart = null;
       pathLast = null;
     } else if (fn === OPS.shadingFill) {
-      const ir = args[0];
+      let ir = args[0];
+      if (typeof ir === "string") {
+        try {
+          const store = ir.startsWith("g_") ? page.commonObjs : page.objs;
+          ir = typeof store?.has === "function" && store.has(ir) ? store.get(ir) : null;
+        } catch {
+          ir = null;
+        }
+      }
       const g = irToGradient(ir, (x, y) => toViewport(...Object.values(tx(gs.ctm, x, y))));
       const avg = Array.isArray(ir) && ir[0] === "RadialAxial" ? averageStops(ir[3]) : null;
-      if (g || avg) {
-        const area = gs.clip ?? { d: "", x: 0, y: 0, w: viewport.width, h: viewport.height };
+      const clipArea = gs.clip;
+      if ((g || avg) && !(clipArea && (clipArea.w < 0.5 || clipArea.h < 0.5))) {
+        const area = clipArea ?? { d: "", x: 0, y: 0, w: viewport.width, h: viewport.height };
         shapes.push({
           seq: opIndex,
           kind: area.d ? "path" : "rect",
@@ -2173,7 +2221,7 @@ async function walkOps(page, OPS, viewport) {
           height: Math.max(0.1, area.h * PT_TO_MM3),
           fill: avg ?? (g ? g.stops[0].color : void 0),
           gradient: g ?? void 0,
-          opacity: gs.fillAlpha,
+          opacity: fillOpacity(avg ?? g?.stops[0].color),
           path: area.d || void 0
         });
       }
@@ -2923,12 +2971,14 @@ async function importPdfToJdf(source, title, runtime, options = {}) {
           runs2.push(run);
         });
         const style2 = { fontSize: Math.round(first.fontSize * 10) / 10, fontFamily: base.cls.family, lineHeight: 1 };
+        const rowHeight = Math.round(first.fontSize * PT_TO_MM3 * 100) / 100;
         if (first.opacity < 0.999) style2.opacity = Math.round(first.opacity * 100) / 100;
         const rt = {
           type: "richtext",
           runs: runs2,
           position: { x: Math.max(0, Math.round(first.x * 100) / 100), y: Math.max(0, Math.round(Math.min(...row.map((i) => lines[i].y)) * 100) / 100) },
           width: Math.max(2, Math.round(Math.max(first.fontSize * PT_TO_MM3, Math.min(measuredW, cap2)) * 100) / 100),
+          height: rowHeight,
           style: style2
         };
         const dominant = row.map((i) => lines[i]).sort((a, b) => b.text.trim().length - a.text.trim().length)[0];
@@ -2957,6 +3007,8 @@ async function importPdfToJdf(source, title, runtime, options = {}) {
         content: l.text,
         position: { x: Math.max(0, Math.round(l.x * 100) / 100), y: Math.max(0, Math.round(l.y * 100) / 100) },
         width: Math.max(2, Math.round(elWidth * 100) / 100),
+        // One line at lineHeight 1: the box is exactly one em tall.
+        height: Math.round(l.fontSize * PT_TO_MM3 * 100) / 100,
         style
       };
       if ((cls.weight === "bold" || l.bold) && l.text.trim().length <= 120 && !consumedLines.has(lineIdx)) {
@@ -2975,6 +3027,7 @@ async function importPdfToJdf(source, title, runtime, options = {}) {
         prev.content = `${prev.content} ${text.content}`.replace(/\s+/g, " ");
         prev.tocEntry = prev.content;
         prev.width = Math.max(prev.width ?? 0, text.width ?? 0);
+        prev.height = Math.round((text.position.y + (text.height ?? 0) - prev.position.y) * 100) / 100;
         return;
       }
       lineMeta.set(text, { w: Math.max(l.fontSize * PT_TO_MM3, extent(l)), size: l.fontSize, face: fontKey(l.fontName) });
@@ -3023,6 +3076,9 @@ async function importPdfToJdf(source, title, runtime, options = {}) {
         elements.push({ type: "signature", ...baseEl, value: "" });
       }
     }
+    elements.forEach((e, k) => {
+      if (e.id == null) e.id = `p${pi}-e${k + 1}`;
+    });
     pages.push({
       id: `page-${pi}`,
       pageSize: { width: Math.round(pageW * PT_TO_MM3 * 100) / 100, height: Math.round(pageH * PT_TO_MM3 * 100) / 100 },

package/dist/jdf-schema.json

@@ -203,7 +203,7 @@
       "type": "object",
       "required": ["type", "name"],
       "properties": {
-        "type": { "const": "input" },
+        "type": { "const": "input" }, "id": { "type": "string" },
         "name": { "type": "string", "minLength": 1 },
         "inputType": { "type": "string", "enum": ["text","number","email","url","tel","date","time","datetime-local","password","color"] },
         "value": { "type": "string" },
@@ -222,7 +222,7 @@
       "type": "object",
       "required": ["type", "name"],
       "properties": {
-        "type": { "const": "textarea" },
+        "type": { "const": "textarea" }, "id": { "type": "string" },
         "name": { "type": "string", "minLength": 1 },
         "value": { "type": "string" },
         "placeholder": { "type": "string" },
@@ -240,7 +240,7 @@
       "type": "object",
       "required": ["type", "name"],
       "properties": {
-        "type": { "const": "checkbox" },
+        "type": { "const": "checkbox" }, "id": { "type": "string" },
         "name": { "type": "string", "minLength": 1 },
         "checked": { "type": "boolean" },
         "label": { "type": "string" },
@@ -256,7 +256,7 @@
       "type": "object",
       "required": ["type", "name", "options"],
       "properties": {
-        "type": { "const": "select" },
+        "type": { "const": "select" }, "id": { "type": "string" },
         "name": { "type": "string", "minLength": 1 },
         "options": {
           "type": "array",
@@ -285,7 +285,7 @@
       "type": "object",
       "required": ["type", "name"],
       "properties": {
-        "type": { "const": "signature" },
+        "type": { "const": "signature" }, "id": { "type": "string" },
         "name": { "type": "string", "minLength": 1 },
         "value": { "type": "string" },
         "label": { "type": "string" },
@@ -301,7 +301,7 @@
       "type": "object",
       "required": ["type", "content"],
       "properties": {
-        "type": { "const": "text" },
+        "type": { "const": "text" }, "id": { "type": "string" },
         "content": { "type": "string" },
         "style": { "$ref": "#/definitions/StyleRef" },
         "position": { "$ref": "#/definitions/Position" },
@@ -318,7 +318,7 @@
       "type": "object",
       "required": ["type", "runs"],
       "properties": {
-        "type": { "const": "richtext" },
+        "type": { "const": "richtext" }, "id": { "type": "string" },
         "runs": {
           "type": "array",
           "items": {
@@ -395,7 +395,7 @@
       "type": "object",
       "required": ["type", "rows"],
       "properties": {
-        "type": { "const": "table" },
+        "type": { "const": "table" }, "id": { "type": "string" },
         "columns": {
           "type": "array",
           "items": { "type": "object", "properties": { "width": { "oneOf": [{ "type": "string" }, { "type": "number" }] }, "header": { "type": "string" }, "align": { "type": "string", "enum": ["left","center","right","justify"] } } }
@@ -418,7 +418,7 @@
       "type": "object",
       "required": ["type", "items"],
       "properties": {
-        "type": { "const": "list" },
+        "type": { "const": "list" }, "id": { "type": "string" },
         "items": {
           "type": "array",
           "items": { "type": "object", "required": ["content"], "properties": { "content": { "type": "string" }, "style": { "$ref": "#/definitions/StyleRef" }, "children": { "type": "array", "items": { "$ref": "#/definitions/ListElement/properties/items/items" } }, "listType": { "type": "string", "enum": ["ordered","unordered"] } } }
@@ -433,7 +433,7 @@
       "type": "object",
       "required": ["type", "shape"],
       "properties": {
-        "type": { "const": "shape" },
+        "type": { "const": "shape" }, "id": { "type": "string" },
         "shape": { "type": "string", "enum": ["rect","circle","ellipse","line","path"] },
         "position": { "$ref": "#/definitions/Position" }, "width": { "type": "number" }, "height": { "type": "number" },
         "fill": { "type": "string" },
@@ -459,7 +459,7 @@
       "type": "object",
       "required": ["type", "title", "elements"],
       "properties": {
-        "type": { "const": "collapsible" },
+        "type": { "const": "collapsible" }, "id": { "type": "string" },
         "title": { "type": "string" },
         "elements": { "type": "array", "items": { "$ref": "#/definitions/Element" } },
         "expanded": { "type": "boolean" },
@@ -471,7 +471,7 @@
       "type": "object",
       "required": ["type"],
       "properties": {
-        "type": { "const": "toc" }, "title": { "type": "string" },
+        "type": { "const": "toc" }, "id": { "type": "string" }, "title": { "type": "string" },
         "position": { "$ref": "#/definitions/Position" }, "width": { "type": "number" },
         "depth": { "type": "integer", "minimum": 1, "maximum": 6 },
         "style": { "$ref": "#/definitions/StyleRef" }

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@uurtech/jdf-cli",
-  "version": "0.2.5",
+  "version": "0.2.7",
   "description": "Command-line tool for the JDF (JSON Document Format) — validate and convert documents.",
   "license": "MIT",
-  "author": "Ugur Kazdal",
+  "author": "Ugur Kazdal <ugur@jdf.dev>",
   "homepage": "https://github.com/uurtech/jdf#readme",
   "repository": {
     "type": "git",