reamkit 1.7.0 → 1.9.0

package/dist/esm/word/drawing-parser.js

@@ -353,10 +353,10 @@ function parseFill(spPr, resolveColor) {
 			} : { kind: "none" };
 		}
 		if (poIs(child, "a:gradFill")) {
-			const hex = colorFromGradient(child, resolveColor);
-			return hex ? {
-				kind: "solid",
-				colorHex: hex
+			const gradient = parseGradient(child, resolveColor);
+			return gradient ? {
+				kind: "gradient",
+				gradient
 			} : { kind: "none" };
 		}
 	}
@@ -404,13 +404,10 @@ function colorFromContainer(parent, resolveColor) {
 		if (hex) return hex;
 	}
 }
-function colorFromGradient(grad, resolveColor) {
+function parseGradient(grad, resolveColor) {
 	const gsLst = poChildren(grad).find((c) => poIs(c, "a:gsLst"));
 	if (!gsLst) return void 0;
-	let r = 0;
-	let g = 0;
-	let b = 0;
-	let n = 0;
+	const stops = [];
 	for (const gs of poChildren(gsLst)) {
 		if (!poIs(gs, "a:gs")) continue;
 		let hex;
@@ -419,15 +416,29 @@ function colorFromGradient(grad, resolveColor) {
 			if (hex) break;
 		}
 		if (!hex) continue;
-		const num = parseInt(hex, 16);
-		r += num >> 16 & 255;
-		g += num >> 8 & 255;
-		b += num & 255;
-		n++;
+		const pos = poIntAttr(gs, "pos");
+		const offset = pos !== void 0 ? clampUnit(pos / 1e5) : stops.length === 0 ? 0 : 1;
+		stops.push({
+			offset,
+			colorHex: hex
+		});
 	}
-	if (n === 0) return void 0;
-	const toHex = (x) => Math.round(x / n).toString(16).padStart(2, "0");
-	return (toHex(r) + toHex(g) + toHex(b)).toUpperCase();
+	if (stops.length === 0) return void 0;
+	stops.sort((a, b) => a.offset - b.offset);
+	if (poChildren(grad).some((c) => poIs(c, "a:path"))) return {
+		kind: "radial",
+		stops
+	};
+	const lin = poChildren(grad).find((c) => poIs(c, "a:lin"));
+	const ang = lin ? poIntAttr(lin, "ang") : void 0;
+	return {
+		kind: "linear",
+		angle: ang !== void 0 ? ang / 6e4 % 360 : 0,
+		stops
+	};
+}
+function clampUnit(x) {
+	return x < 0 ? 0 : x > 1 ? 1 : x;
 }
 //#endregion
 export { expandMcChildren, parseDrawing, parseVmlPicture };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reamkit",
-  "version": "1.7.0",
+  "version": "1.9.0",
   "description": "Ream — convert DOCX, XLSX and PDF to PDF, SVG, HTML, DOCX and XLSX, built from scratch on the ECMA-376 and ISO 32000 specifications. Parse once, convert anywhere.",
   "license": "MIT",
   "author": "Alex Krassavin <info@reamkit.dev>",