@tricoteuses/tisseuse 0.14.13 → 0.14.14

package/dist/index.js

@@ -1,4 +1,4 @@
-import { $ as e, A as t, At as n, B as r, Bt as i, Ct as a, Dt as o, Et as s, F as c, Ft as l, G as u, Gt as d, H as f, Ht as p, I as m, It as ee, J as te, K as ne, L as re, Lt as ie, M as ae, Mt as oe, N as se, Nt as ce, Ot as le, P as ue, Pt as de, Q as fe, R as pe, Rt as me, S as he, St as ge, U as _e, Ut as ve, V as ye, Vt as be, W as xe, Wt as Se, Y as Ce, Z as we, _ as Te, _t as h, a as g, at as Ee, bt as De, c as Oe, ct as ke, d as Ae, dt as je, et as Me, f as Ne, ft as Pe, g as Fe, gt as Ie, h as Le, ht as Re, i as _, it as ze, j as Be, jt as Ve, kt as He, l as Ue, lt as We, m as Ge, mt as Ke, n as qe, o as Je, ot as Ye, pt as Xe, q as Ze, r as Qe, rt as $e, s as et, st as tt, t as nt, tt as rt, u as v, ut as it, v as at, vt as y, wt as ot, xt as st, yt as ct, z as lt, zt as ut } from "./html-D6-bRvBF.js";
+import { $ as e, A as t, At as n, B as r, Bt as i, Ct as a, Dt as o, Et as s, F as c, Ft as l, G as u, Gt as d, H as f, Ht as p, I as m, It as ee, J as te, K as ne, L as re, Lt as ie, M as ae, Mt as oe, N as se, Nt as ce, Ot as le, P as ue, Pt as de, Q as fe, R as pe, Rt as me, S as he, St as ge, U as _e, Ut as ve, V as ye, Vt as be, W as xe, Wt as Se, Y as Ce, Z as we, _ as Te, _t as h, a as g, at as Ee, bt as De, c as Oe, ct as ke, d as Ae, dt as je, et as Me, f as Ne, ft as Pe, g as Fe, gt as Ie, h as Le, ht as Re, i as _, it as ze, j as Be, jt as Ve, kt as He, l as Ue, lt as We, m as Ge, mt as Ke, n as qe, o as Je, ot as Ye, pt as Xe, q as Ze, r as Qe, rt as $e, s as et, st as tt, t as nt, tt as rt, u as v, ut as it, v as at, vt as y, wt as ot, xt as st, yt as ct, z as lt, zt as ut } from "./html-CnfkCnJt.js";
 import { $ as dt, A as ft, C as pt, D as mt, Dt as b, E as ht, Et as x, F as gt, Ft as _t, H as vt, I as yt, It as bt, J as xt, K as St, L as S, Lt as C, M as Ct, Mt as wt, N as Tt, Nt as w, O as Et, Ot as T, P as Dt, Pt as Ot, Q as kt, R as E, S as At, St as jt, T as Mt, Tt as D, V as Nt, W as Pt, X as Ft, Y as It, Z as Lt, _ as Rt, b as O, bt as zt, c as Bt, ct as Vt, d as Ht, dt as Ut, et as k, f as Wt, ft as Gt, g as Kt, h as qt, j as Jt, jt as A, k as j, l as Yt, m as Xt, mt as Zt, n as Qt, ot as $t, p as en, pt as tn, q as nn, r as rn, rt as an, s as on, t as sn, tt as cn, u as ln, ut as un, v as dn, vt as M, w as fn, wt as pn, x as mn, xt as hn, y as N } from "./resolver-CuP8arVX.js";
 //#region ../../node_modules/@tricoteuses/legifrance/dist/legal/index.js
 function gn(e, t) {

package/dist/server-f-legi.js

@@ -27,6 +27,8 @@ var l = class extends i {
 	articleNumsLoadedByTextAndDate = /* @__PURE__ */ new Map();
 	articleRowsByContextTextId = /* @__PURE__ */ new Map();
 	directSectionChildrenByParentAndDate = /* @__PURE__ */ new Map();
+	directSectionChildrenLoadedRootsAndDate = /* @__PURE__ */ new Set();
+	directSectionChildrenRootPromises = /* @__PURE__ */ new Map();
 	globalArticleRowsByNumAndDate = /* @__PURE__ */ new Map();
 	rootTextIdsByTextId = /* @__PURE__ */ new Map();
 	contextTextIdsByTextId = /* @__PURE__ */ new Map();
@@ -43,10 +45,7 @@ var l = class extends i {
 		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
-			})), i.length === 0 && !t.includes(".")) {
+			if (await a.time("preloadDirectSectionChildrenByRootPath", () => this.preloadDirectSectionChildrenByRootPath(t, e)), i = this.directSectionChildrenByParentAndDate.get(r) ?? [], 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`
@@ -522,39 +521,40 @@ var l = class extends i {
         article_rows.order_id
     `).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,
-        chemin::text AS path,
-        titre AS title,
-        date_debut::text AS "dateDebut",
-        date_fin::text AS "dateFin"
-      FROM scta
-      WHERE
-        chemin ~ ${n}::lquery
-        AND type_objet = 'scta'
-        AND date_debut <= ${e}::date
-        AND date_fin >= ${e}::date
-      ORDER BY tri_hierarchique
-    `;
+	async preloadDirectSectionChildrenByRootPath(e, t) {
+		let n = e.split(".", 1)[0], r = `${n}\0${t}`;
+		if (this.directSectionChildrenLoadedRootsAndDate.has(r)) {
+			this.directSectionChildrenByParentAndDate.set(`${e}\0${t}`, this.directSectionChildrenByParentAndDate.get(`${e}\0${t}`) ?? []);
+			return;
+		}
+		let i = this.directSectionChildrenRootPromises.get(r);
+		i === void 0 && (i = (async () => {
+			let i = /* @__PURE__ */ new Map(), a = await this.flegiDb`
+          SELECT
+            subltree(chemin, 0, nlevel(chemin) - 1)::text AS "parentPath",
+            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) = ${n}::ltree
+            AND nlevel(chemin) > 1
+            AND type_objet = 'scta'
+            AND date_debut <= ${t}::date
+            AND date_fin >= ${t}::date
+          ORDER BY tri_hierarchique
+        `;
+			for (let { parentPath: e, ...t } of a) {
+				let n = i.get(e);
+				n === void 0 ? i.set(e, [t]) : n.push(t);
+			}
+			for (let [e, n] of i) this.directSectionChildrenByParentAndDate.set(`${e}\0${t}`, n);
+			this.directSectionChildrenByParentAndDate.set(`${e}\0${t}`, i.get(e) ?? []), this.directSectionChildrenLoadedRootsAndDate.add(r);
+		})().finally(() => {
+			this.directSectionChildrenRootPromises.delete(r);
+		}), this.directSectionChildrenRootPromises.set(r, i)), await i;
 	}
 	async getTextIdFromSegmentIdUsingContextHeuristic(e) {
 		if (e.startsWith("LEGIARTI")) return (await this.flegiDb`

package/dist/server.js

@@ -1,4 +1,4 @@
-import { C as e, D as t, E as n, I as r, K as i, Mt as a, Nt as o, O as s, St as c, T as l, Tt as u, X as d, Y as f, b as p, bt as m, et as h, f as g, g as _, ht as v, k as y, l as b, n as x, nt as S, o as ee, p as C, s as te, t as ne, w as re, x as ie, xt as w, y as ae, yt as oe } from "./html-D6-bRvBF.js";
+import { C as e, D as t, E as n, I as r, K as i, Mt as a, Nt as o, O as s, St as c, T as l, Tt as u, X as d, Y as f, b as p, bt as m, et as h, f as g, g as _, ht as v, k as y, l as b, n as x, nt as S, o as ee, p as C, s as te, t as ne, w as re, x as ie, xt as w, y as ae, yt as oe } from "./html-CnfkCnJt.js";
 import { Dt as T, Et as E, F as se, N as ce, Nt as D, O as le, Tt as ue, ct as de, et as fe, ht as pe, jt as O, k as me, n as he, o as ge, r as _e, t as ve, vt as k } from "./resolver-CuP8arVX.js";
 import * as ye from "node:crypto";
 import { createHash as be } from "node:crypto";

package/dist/src/lib/f_legi/resolver.d.ts

@@ -9,6 +9,8 @@ export declare class FlegiResolver extends LegiResolver {
     private readonly articleNumsLoadedByTextAndDate;
     private readonly articleRowsByContextTextId;
     private readonly directSectionChildrenByParentAndDate;
+    private readonly directSectionChildrenLoadedRootsAndDate;
+    private readonly directSectionChildrenRootPromises;
     private readonly globalArticleRowsByNumAndDate;
     private readonly rootTextIdsByTextId;
     private readonly contextTextIdsByTextId;
@@ -46,7 +48,7 @@ export declare class FlegiResolver extends LegiResolver {
     private getActiveArticleRowsForContextTextIds;
     private getActiveArticleRowsForContextTextIdsWithRoots;
     private queryActiveArticleRowsForContextTextIds;
-    private getDirectSectionChildrenByExactParentPath;
+    private preloadDirectSectionChildrenByRootPath;
     private getTextIdFromSegmentIdUsingContextHeuristic;
     private getTextIdFromSegmentIdUsingSctaHeuristic;
     private getContextTextIdsFromTextId;

package/package.json

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