@tricoteuses/tisseuse 0.17.0 → 0.17.1

package/dist/server.js

@@ -1359,15 +1359,27 @@ function dn(e, t) {
 	if (!n.includes("«") || !n.includes("»") || e(t).find("table").length > 0) return;
 	let r = e(t).find("tr").get().filter((n) => e(n).closest("table").get(0) === t);
 	if (r.length === 0) return;
-	let i = r.map((t) => {
-		let n = e(t).children("td,th").get();
-		return n.length >= 3 ? [n[0], n.at(-1)] : [];
+	let i = 0, a = 0, o = r.map((t, n) => {
+		let o = e(t).children("td,th").get(), s = i === 0, c = a === 0;
+		if (i > 0 && i--, a > 0 && a--, o.length < 1 + Number(s) + Number(c)) return [];
+		let l = s ? o[0] : void 0, u = c ? o.at(-1) : void 0;
+		if (l) {
+			let t = Number(e(l).attr("rowspan") ?? "1");
+			if (!Number.isInteger(t) || t < 1 || t > r.length - n || t > 1 && M(e(l).text()) !== "«") return [];
+			i = t - 1;
+		}
+		if (u) {
+			let t = Number(e(u).attr("rowspan") ?? "1");
+			if (!Number.isInteger(t) || t < 1 || t > r.length - n || t > 1 && !/^»\s*;?$/u.test(M(e(u).text()))) return [];
+			a = t - 1;
+		}
+		return [l, u];
 	});
-	if (i.some((e) => e.length !== 2)) return;
-	let a = i.map(([t]) => M(e(t).text())), o = i.map(([, t]) => M(e(t).text()));
-	if (!(a.filter((e) => e === "«").length !== 1 || o.filter((e) => /^»\s*;?$/u.test(e)).length !== 1 || a.some((e) => e !== "" && e !== "«") || o.some((e) => e !== "" && !/^»\s*;?$/u.test(e)) || i.some(([t, n]) => [t, n].some((t) => e(t).attr("colspan") !== void 0 || e(t).attr("rowspan") !== void 0))) && !(a.indexOf("«") > o.findIndex((e) => e.startsWith("»")))) {
+	if (o.some((e) => e.length !== 2)) return;
+	let s = o.map(([t]) => t ? M(e(t).text()) : ""), c = o.map(([, t]) => t ? M(e(t).text()) : "");
+	if (!(s.filter((e) => e === "«").length !== 1 || c.filter((e) => /^»\s*;?$/u.test(e)).length !== 1 || s.some((e) => e !== "" && e !== "«") || c.some((e) => e !== "" && !/^»\s*;?$/u.test(e)) || o.some(([t, n]) => [t, n].some((t) => t && e(t).attr("colspan") !== void 0))) && !(s.indexOf("«") > c.findIndex((e) => e.startsWith("»")))) {
 		e(t).addClass("akn-quoted-table");
-		for (let [t, n] of i) e(t).addClass("akn-quote-column"), e(n).addClass("akn-quote-column");
+		for (let [t, n] of o) t && e(t).addClass("akn-quote-column"), n && e(n).addClass("akn-quote-column");
 	}
 }
 function fn(e, t) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tricoteuses/tisseuse",
   "description": "Find links in/to French legislative documents",
-  "version": "0.17.0",
+  "version": "0.17.1",
   "keywords": [
     "Assemblée nationale",
     "France",