@tricoteuses/tisseuse 0.14.11 → 0.14.13

package/dist/server-f-legi.js

@@ -1,6 +1,6 @@
-import { n as e, r as t, t as n } from "./resolver-D5TCkLkD.js";
+import { a as e, i as t, o as n, r, t as i } from "./resolver-CuP8arVX.js";
 //#region src/lib/f_legi/resolver.ts
-var r = [
+var a = [
 	"article_location_diffs",
 	"article_num_candidate_stats",
 	"article_num_candidates",
@@ -9,18 +9,19 @@ var r = [
 	"legiarti",
 	"legitext",
 	"scta",
-	"text_titles_infos"
-], i;
-async function a(e) {
+	"text_titles_infos",
+	"text_titles_infos_parser_cache"
+], o, s;
+async function c(e) {
 	let t = await e`
     SELECT required.name
-    FROM unnest(${e.array([...r])}::text[]) AS required(name)
+    FROM unnest(${e.array([...a])}::text[]) AS required(name)
     WHERE to_regclass(required.name) IS NULL
     ORDER BY required.name
   `;
 	if (t.length > 0) throw Error(`The f_legi database is missing required relations: ${t.map(({ name: e }) => e).join(", ")}`);
 }
-var o = class extends n {
+var l = class extends i {
 	flegiDb;
 	articleRowsByNumByTextAndDate = /* @__PURE__ */ new Map();
 	articleNumsLoadedByTextAndDate = /* @__PURE__ */ new Map();
@@ -39,123 +40,222 @@ var o = class extends n {
 		return t === void 0 ? [] : (await this.getActiveArticleRowsByNum(n, e, t)).get(t) ?? [];
 	}
 	async getDirectSectionChildren({ date: e, parentPath: t }) {
-		let n = `${t}\0${e}`, r = this.directSectionChildrenByParentAndDate.get(n);
-		if (r === void 0) {
-			if (r = await this.getDirectSectionChildrenByExactParentPath({
+		let r = `${t}\0${e}`, i = this.directSectionChildrenByParentAndDate.get(r);
+		if (i === void 0) {
+			let a = new n("f_legi.getDirectSectionChildren"), o, s = !1;
+			if (i = await a.time("getDirectSectionChildrenByExactParentPath", () => this.getDirectSectionChildrenByExactParentPath({
 				date: e,
 				parentPath: t
-			}), r.length === 0 && !t.includes(".")) {
-				let n = await this.getRootTextIdsFromTextId(t);
-				n.length > 1 && (r = await this.flegiDb`
-            SELECT
-              dernier_segment AS id,
-              chemin::text AS path,
-              titre AS title,
-              date_debut::text AS "dateDebut",
-              date_fin::text AS "dateFin"
-            FROM scta
-            WHERE
-              subltree(chemin, 0, 1) = ANY(${this.flegiDb.array(n)}::ltree[])
-              AND nlevel(chemin) = 2
-              AND type_objet = 'scta'
-              AND date_debut <= ${e}::date
-              AND date_fin >= ${e}::date
-            ORDER BY tri_hierarchique
-          `);
+			})), i.length === 0 && !t.includes(".")) {
+				o = await a.time("getRootTextIdsFromTextId", () => this.getRootTextIdsFromTextId(t));
+				let n = o;
+				n.length > 1 && (s = !0, i = await a.time("queryRootDirectSectionChildren", () => this.flegiDb`
+              SELECT
+                dernier_segment AS id,
+                chemin::text AS path,
+                titre AS title,
+                date_debut::text AS "dateDebut",
+                date_fin::text AS "dateFin"
+              FROM scta
+              WHERE
+                subltree(chemin, 0, 1) = ANY(${this.flegiDb.array(n)}::ltree[])
+                AND nlevel(chemin) = 2
+                AND type_objet = 'scta'
+                AND date_debut <= ${e}::date
+                AND date_fin >= ${e}::date
+              ORDER BY tri_hierarchique
+            `, { count: o.length }));
 			}
-			this.directSectionChildrenByParentAndDate.set(n, r);
+			a.log({
+				exactResultCount: o === void 0 ? i.length : 0,
+				fallbackResultCount: s ? i.length : void 0,
+				fallbackRootTextIdCount: o?.length,
+				parentPath: t,
+				resultCount: i.length,
+				usedFallbackQuery: s
+			}), this.directSectionChildrenByParentAndDate.set(r, i);
 		}
-		return r;
+		return i;
 	}
 	async getTextIdFromSegmentId(e) {
 		let t = this.textIdBySegmentId.get(e);
 		return t === void 0 && (t = await this.getTextIdFromSegmentIdUsingContextHeuristic(e) ?? await this.getTextIdFromSegmentIdUsingSctaHeuristic(e) ?? null, this.textIdBySegmentId.set(e, t)), t ?? void 0;
 	}
-	async preloadTextTitlesInfos(n = {}) {
-		let r = (e, t = {}) => {
-			n.onProgress?.({
-				...t,
-				phase: e,
+	async preloadTextTitlesInfos(e = {}) {
+		let t = (t, n = {}) => {
+			e.onProgress?.({
+				...n,
+				phase: t,
 				resolver: "f_legi"
 			});
-		};
-		if (this.textTitlesInfosLoaded) {
-			r("already-loaded");
+		}, r = new n("f_legi.preloadTextTitlesInfos");
+		if (this.schemaValidationPromise ??= c(this.flegiDb).catch((e) => {
+			throw this.schemaValidationPromise = void 0, e;
+		}), await this.schemaValidationPromise, this.textTitlesInfosLoaded) {
+			let e = await this.getTextTitlesInfosParserCacheMeta(r);
+			if (e !== void 0 && e.formatVersion === 1 && e.generatedAt === o) {
+				t("already-loaded");
+				return;
+			}
+			this.textTitlesInfosLoaded = !1;
+		}
+		s === void 0 ? s = (async () => await this.loadOrBuildTextTitlesInfosParserCache({
+			progress: t,
+			timings: r
+		}))().catch((e) => {
+			throw s = void 0, e;
+		}) : t("waiting-for-shared-preload"), o = await s, s = void 0, t("setTextTitlesInfos:done"), r.log(), this.textTitlesInfosLoaded = !0;
+	}
+	async buildAndCacheTextTitlesInfos({ progress: n, sql: i, timings: a }) {
+		await a.time("lockTextTitlesInfos", () => i`SELECT lock_text_titles_infos_for_parser_cache()`), n("queryTextTitlesInfos:start");
+		let o = await a.time("queryTextTitlesInfos", () => i`
+        SELECT
+          cid,
+          date_texte::text AS "dateTexte",
+          legi_id::text AS id,
+          nature,
+          num,
+          title
+        FROM text_titles_infos
+        ORDER BY legi_id
+      `);
+		n("queryTextTitlesInfos:done", { count: o.length }), n("buildTextTitlesInfos:start", { count: o.length });
+		let s = performance.now(), c = await r(o, { onProgress: ({ count: e, phase: t }) => n(`buildTextTitlesInfos:${t}`, { count: e }) });
+		a.add({
+			count: o.length,
+			durationMs: Math.round((performance.now() - s) * 10) / 10,
+			phase: "buildTextTitlesInfos"
+		}), n("buildTextTitlesInfos:done"), n("writeTextTitlesInfosParserCache:start", { count: o.length });
+		let [l] = await a.time("writeTextTitlesInfosParserCache", () => i`
+        INSERT INTO text_titles_infos_parser_cache (
+          key,
+          format_version,
+          source_row_count,
+          generated_at,
+          data
+        ) VALUES (
+          ${e},
+          ${1},
+          ${o.length},
+          now(),
+          ${this.flegiDb.json(c)}
+        )
+        ON CONFLICT (key)
+        DO UPDATE SET
+          format_version = EXCLUDED.format_version,
+          source_row_count = EXCLUDED.source_row_count,
+          generated_at = EXCLUDED.generated_at,
+          data = EXCLUDED.data
+        RETURNING generated_at::text AS "generatedAt"
+      `);
+		return n("writeTextTitlesInfosParserCache:done", { count: o.length }), t(c), l.generatedAt;
+	}
+	async getTextTitlesInfosParserCacheMeta(t) {
+		let [n] = await t.time("queryTextTitlesInfosParserCacheMeta", () => this.flegiDb`
+        SELECT
+          format_version AS "formatVersion",
+          generated_at::text AS "generatedAt",
+          source_row_count AS "sourceRowCount"
+        FROM text_titles_infos_parser_cache
+        WHERE key = ${e}
+      `);
+		return n;
+	}
+	async loadTextTitlesInfosParserCache({ progress: n, sql: r, timings: i }) {
+		let a = r ?? this.flegiDb;
+		n("queryTextTitlesInfosParserCache:start");
+		let [o] = await i.time("queryTextTitlesInfosParserCache", () => a`
+        SELECT
+          data,
+          format_version AS "formatVersion",
+          generated_at::text AS "generatedAt",
+          source_row_count AS "sourceRowCount"
+        FROM text_titles_infos_parser_cache
+        WHERE key = ${e}
+      `);
+		if (o === void 0) {
+			n("queryTextTitlesInfosParserCache:miss");
 			return;
 		}
-		let o = new e("f_legi.preloadTextTitlesInfos");
-		this.schemaValidationPromise ??= a(this.flegiDb).catch((e) => {
-			throw this.schemaValidationPromise = void 0, e;
-		}), await this.schemaValidationPromise, i === void 0 ? (r("queryTextTitlesInfos:start"), i = (async () => {
-			let e = await o.time("queryTextTitlesInfos", () => this.flegiDb`
-          SELECT
-            cid,
-            date_texte::text AS "dateTexte",
-            legi_id::text AS id,
-            nature,
-            num,
-            title
-          FROM text_titles_infos
-          ORDER BY legi_id
-        `);
-			r("queryTextTitlesInfos:done", { count: e.length }), r("buildTextTitlesInfos:start", { count: e.length });
-			let n = performance.now();
-			await t(e, { onProgress: ({ count: e, phase: t }) => r(`buildTextTitlesInfos:${t}`, { count: e }) }), o.add({
-				count: e.length,
-				durationMs: Math.round((performance.now() - n) * 10) / 10,
-				phase: "buildTextTitlesInfos"
-			}), r("buildTextTitlesInfos:done");
-		})().catch((e) => {
-			throw i = void 0, e;
-		})) : r("waiting-for-shared-preload"), await i, r("setTextTitlesInfos:done"), o.log(), this.textTitlesInfosLoaded = !0;
+		if (o.formatVersion !== 1) {
+			n("queryTextTitlesInfosParserCache:format-mismatch");
+			return;
+		}
+		n("queryTextTitlesInfosParserCache:done", { count: o.sourceRowCount });
+		let s = performance.now();
+		return t(o.data), i.add({
+			count: o.sourceRowCount,
+			durationMs: Math.round((performance.now() - s) * 10) / 10,
+			phase: "installTextTitlesInfosParserCache"
+		}), o.generatedAt;
+	}
+	async loadOrBuildTextTitlesInfosParserCache({ progress: e, timings: t }) {
+		let n = await this.loadTextTitlesInfosParserCache({
+			progress: e,
+			timings: t
+		});
+		return n === void 0 ? await this.flegiDb.begin(async (n) => {
+			await t.time("waitTextTitlesInfosParserCacheLock", () => n`SELECT pg_advisory_xact_lock(hashtext('text_titles_infos_parser_cache'))`);
+			let r = await this.loadTextTitlesInfosParserCache({
+				progress: e,
+				sql: n,
+				timings: t
+			});
+			return r === void 0 ? await this.buildAndCacheTextTitlesInfos({
+				progress: e,
+				sql: n,
+				timings: t
+			}) : r;
+		}) : n;
 	}
 	async getUniqueActiveArticlesByNum({ date: e, num: t }) {
 		if (t === void 0) return [];
 		let n = `${t}\0${e}`, r = this.globalArticleRowsByNumAndDate.get(n);
 		return r === void 0 && (r = await this.queryUniqueActiveArticlesByNumsUsingContextHeuristic([t]), this.globalArticleRowsByNumAndDate.set(n, r)), r;
 	}
-	async preloadUniqueActiveArticlesByNums({ date: t, nums: n }) {
-		let r = [];
-		for (let e of n) {
-			if (e === void 0) continue;
-			let n = `${e}\0${t}`;
-			this.globalArticleRowsByNumAndDate.has(n) || r.push(e);
+	async preloadUniqueActiveArticlesByNums({ date: e, nums: t }) {
+		let r = [], i = /* @__PURE__ */ new Set();
+		for (let n of t) {
+			if (n === void 0 || i.has(n)) continue;
+			i.add(n);
+			let t = `${n}\0${e}`;
+			this.globalArticleRowsByNumAndDate.has(t) || r.push(n);
 		}
 		if (r.length === 0) return;
-		let i = new e("f_legi.preloadUniqueActiveArticlesByNums"), a = await i.time("queryGloballyUniqueArticleRowsByNums", () => this.queryGloballyUniqueArticleRowsByNums(r), { count: r.length }), o = new Set(a.map(({ num: e }) => e).filter((e) => e !== null)), s = r.filter((e) => !o.has(e)), c = await i.time("queryUniqueActiveArticlesByNumsUsingContextHeuristic", () => this.queryUniqueActiveArticlesByNumsUsingContextHeuristic(s), { count: s.length }), l = [...a, ...c].toSorted((e, t) => e.id < t.id ? -1 : +(e.id > t.id)), u = /* @__PURE__ */ new Map();
-		for (let e of r) u.set(e, []);
-		let d = /* @__PURE__ */ new Map();
-		for (let e of l) {
+		let a = new n("f_legi.preloadUniqueActiveArticlesByNums"), o = await a.time("queryGloballyUniqueArticleRowsByNums", () => this.queryGloballyUniqueArticleRowsByNums(r), { count: r.length }), s = new Set(o.map(({ num: e }) => e).filter((e) => e !== null)), c = r.filter((e) => !s.has(e)), l = await a.time("queryUniqueActiveArticlesByNumsUsingContextHeuristic", () => this.queryUniqueActiveArticlesByNumsUsingContextHeuristic(c), { count: c.length }), u = [...o, ...l].toSorted((e, t) => e.id < t.id ? -1 : +(e.id > t.id)), d = /* @__PURE__ */ new Map();
+		for (let e of r) d.set(e, []);
+		let f = /* @__PURE__ */ new Map();
+		for (let e of u) {
 			if (e.num === null) continue;
-			let t = d.get(e.num) ?? 0;
-			d.set(e.num, t + 1), !(t >= 100) && u.get(e.num)?.push(e);
+			let t = f.get(e.num) ?? 0;
+			f.set(e.num, t + 1), !(t >= 100) && d.get(e.num)?.push(e);
 		}
-		for (let [e, n] of u) this.globalArticleRowsByNumAndDate.set(`${e}\0${t}`, n);
-		i.log({
-			articleRowCount: l.length,
-			globallyUniqueArticleRowCount: a.length,
-			heuristicArticleRowCount: c.length,
-			heuristicNumCount: s.length,
+		for (let [t, n] of d) this.globalArticleRowsByNumAndDate.set(`${t}\0${e}`, n);
+		a.log({
+			articleRowCount: u.length,
+			globallyUniqueArticleRowCount: o.length,
+			heuristicArticleRowCount: l.length,
+			heuristicNumCount: c.length,
 			numCount: r.length
 		});
 	}
-	async preloadActiveArticlesByTextIds({ date: t, nums: n, textIds: r }) {
-		let i = n === void 0 ? void 0 : [...new Set(n)].filter(Boolean), a = [...new Set(r)].filter((e) => {
-			if (e === void 0) return !1;
-			let n = `${e}\0${t}`;
+	async preloadActiveArticlesByTextIds({ date: e, nums: t, textIds: r }) {
+		let i = t === void 0 ? void 0 : [...new Set(t)].filter(Boolean), a = [...new Set(r)].filter((t) => {
+			if (t === void 0) return !1;
+			let n = `${t}\0${e}`;
 			if (this.articleRowsByNumByTextAndDate.get(n) === void 0) return !0;
 			let r = this.articleNumsLoadedByTextAndDate.get(n);
 			return r === "all" ? !1 : i === void 0 ? !0 : i.some((e) => !r?.has(e));
 		});
 		if (a.length === 0) return;
-		let o = new e("f_legi.preloadActiveArticlesByTextIds"), s = await o.time("getContextTextIdsByTextIds", () => this.getContextTextIdsByTextIds(a)), c = [...new Set([...s.values()].flat())], l = await o.time("getActiveArticleRowsForContextTextIds", () => i === void 0 ? this.getActiveArticleRowsForContextTextIdsWithRoots(c) : this.queryActiveArticleRowsForContextTextIds(c, i), { count: c.length }), u = /* @__PURE__ */ new Map(), d = (e, t) => {
+		let o = new n("f_legi.preloadActiveArticlesByTextIds"), s = await o.time("getContextTextIdsByTextIds", () => this.getContextTextIdsByTextIds(a)), c = [...new Set([...s.values()].flat())], l = await o.time("getActiveArticleRowsForContextTextIds", () => i === void 0 ? this.getActiveArticleRowsForContextTextIdsWithRoots(c) : this.queryActiveArticleRowsForContextTextIds(c, i), { count: c.length }), u = /* @__PURE__ */ new Map(), d = (e, t) => {
 			if (e === null) return;
 			let n = u.get(e);
 			n === void 0 ? u.set(e, [t]) : n.push(t);
 		};
 		for (let e of l) d(e.rootTextId, e), d(e.textId, e);
-		for (let e of a) {
-			let n = `${e}\0${t}`, r = s.get(e) ?? [e], a = /* @__PURE__ */ new Map();
+		for (let t of a) {
+			let n = `${t}\0${e}`, r = s.get(t) ?? [t], a = /* @__PURE__ */ new Map();
 			for (let e of r) for (let t of u.get(e) ?? []) a.set(`${t.id}\0${t.textId}`, {
 				id: t.id,
 				textId: t.textId,
@@ -163,11 +263,14 @@ var o = class extends n {
 				dateDebut: t.dateDebut,
 				dateFin: t.dateFin
 			});
-			let o = this.articleRowsByNumByTextAndDate.get(n) ?? /* @__PURE__ */ new Map();
+			let o = this.articleRowsByNumByTextAndDate.get(n) ?? /* @__PURE__ */ new Map(), c = /* @__PURE__ */ new Map();
+			for (let [e, t] of o) c.set(e, new Set(t.map((e) => `${e.id}\0${e.textId}`)));
 			for (let e of a.values()) {
 				if (e.num === null) continue;
-				let t = o.get(e.num);
-				t === void 0 ? o.set(e.num, [e]) : t.some((t) => t.id === e.id && t.textId === e.textId) || t.push(e);
+				let t = `${e.id}\0${e.textId}`, n = c.get(e.num);
+				n === void 0 && (n = /* @__PURE__ */ new Set(), c.set(e.num, n));
+				let r = o.get(e.num);
+				r === void 0 ? (o.set(e.num, [e]), n.add(t)) : n.has(t) || (r.push(e), n.add(t));
 			}
 			if (this.articleRowsByNumByTextAndDate.set(n, o), i === void 0) this.articleNumsLoadedByTextAndDate.set(n, "all");
 			else {
@@ -420,6 +523,23 @@ var o = class extends n {
     `).toSorted((e, t) => e.id.localeCompare(t.id));
 	}
 	async getDirectSectionChildrenByExactParentPath({ date: e, parentPath: t }) {
+		if (!t.includes(".")) return await this.flegiDb`
+        SELECT
+          dernier_segment AS id,
+          chemin::text AS path,
+          titre AS title,
+          date_debut::text AS "dateDebut",
+          date_fin::text AS "dateFin"
+        FROM scta
+        WHERE
+          subltree(chemin, 0, 1) = ${t}::ltree
+          AND nlevel(chemin) = 2
+          AND type_objet = 'scta'
+          AND date_debut <= ${e}::date
+          AND date_fin >= ${e}::date
+        ORDER BY tri_hierarchique
+      `;
+		let n = `${t}.*{1}`;
 		return await this.flegiDb`
       SELECT
         dernier_segment AS id,
@@ -429,8 +549,7 @@ var o = class extends n {
         date_fin::text AS "dateFin"
       FROM scta
       WHERE
-        chemin <@ ${t}::ltree
-        AND nlevel(chemin) = nlevel(${t}::ltree) + 1
+        chemin ~ ${n}::lquery
         AND type_objet = 'scta'
         AND date_debut <= ${e}::date
         AND date_fin >= ${e}::date
@@ -476,14 +595,14 @@ var o = class extends n {
 		return t === void 0 && (t = (await this.getContextTextIdsByTextIds([e])).get(e) ?? [e], this.contextTextIdsByTextId.set(e, t)), t;
 	}
 	async getContextTextIdsByTextIds(e) {
-		let t = /* @__PURE__ */ new Map(), n = e.filter((e) => !this.contextTextIdsByTextId.has(e));
+		let t = /* @__PURE__ */ new Map(), n = e.filter((e) => !this.contextTextIdsByTextId.has(e)), r = new Set(n);
 		for (let n of e) {
 			let e = this.contextTextIdsByTextId.get(n);
 			e !== void 0 && t.set(n, e);
 		}
 		if (n.length === 0) return t;
 		for (let e of n) t.set(e, [e]);
-		let r = await this.flegiDb`
+		let i = await this.flegiDb`
       SELECT legi_id AS "textId", cid AS "contextTextId"
       FROM legitext
       WHERE legi_id IN ${this.flegiDb(n)} OR cid IN ${this.flegiDb(n)}
@@ -496,10 +615,10 @@ var o = class extends n {
 
       ORDER BY "textId", "contextTextId"
     `;
-		for (let { contextTextId: e, textId: i } of r) for (let r of [i, e]) {
-			if (!n.includes(r)) continue;
-			let i = t.get(r) ?? [r];
-			i.includes(e) || i.push(e), t.set(r, i);
+		for (let { contextTextId: e, textId: n } of i) for (let i of [n, e]) {
+			if (!r.has(i)) continue;
+			let n = t.get(i) ?? [i];
+			n.includes(e) || n.push(e), t.set(i, n);
 		}
 		for (let e of n) this.contextTextIdsByTextId.set(e, t.get(e) ?? [e]);
 		return t;
@@ -509,14 +628,14 @@ var o = class extends n {
 		return t === void 0 && (t = (await this.getRootTextIdsByTextIds([e])).get(e) ?? [e], this.rootTextIdsByTextId.set(e, t)), t;
 	}
 	async getRootTextIdsByTextIds(e) {
-		let t = /* @__PURE__ */ new Map(), n = e.filter((e) => !this.rootTextIdsByTextId.has(e));
+		let t = /* @__PURE__ */ new Map(), n = e.filter((e) => !this.rootTextIdsByTextId.has(e)), r = new Set(n);
 		for (let n of e) {
 			let e = this.rootTextIdsByTextId.get(n);
 			e !== void 0 && t.set(n, e);
 		}
 		if (n.length === 0) return t;
 		for (let e of n) t.set(e, [e]);
-		let r = await this.flegiDb`
+		let i = await this.flegiDb`
       SELECT cid AS "textId", legi_id AS "rootTextId"
       FROM legitext
       WHERE cid IN ${this.flegiDb(n)}
@@ -529,13 +648,14 @@ var o = class extends n {
 
       ORDER BY "textId", "rootTextId"
     `;
-		for (let { textId: e, rootTextId: n } of r) {
-			let r = t.get(e) ?? [e];
-			r.includes(n) || r.push(n), t.set(e, r);
+		for (let { textId: e, rootTextId: n } of i) {
+			if (!r.has(e)) continue;
+			let i = t.get(e) ?? [e];
+			i.includes(n) || i.push(n), t.set(e, i);
 		}
 		for (let e of n) this.rootTextIdsByTextId.set(e, t.get(e) ?? [e]);
 		return t;
 	}
 };
 //#endregion
-export { o as FlegiResolver, a as checkFlegiResolverDatabase };
+export { l as FlegiResolver, c as checkFlegiResolverDatabase };