@tricoteuses/tisseuse 0.10.0 → 0.12.0

package/dist/lib/articles.d.ts

@@ -14,7 +14,7 @@ export declare const getArticleDateSignature: (article: JorfArticle | LegiArticl
  * - Handle date to filter articles outside date
  * - Migrate everything @tricoteuses/legifrance.
  */
-export declare function getOrLoadArticleSiblingId(legiDb: Sql, legifranceObjectCache: LegifranceObjectCache, id: string, offset: -1 | 1): Promise<string | undefined>;
+export declare function getOrLoadArticleSiblingId(canutesDb: Sql, legifranceObjectCache: LegifranceObjectCache, id: string, offset: -1 | 1): Promise<string | undefined>;
 /**
  * TODO: Migrate to @tricoteuses/legifrance
  */

package/dist/lib/extractors/action_directives.d.ts

@@ -33,6 +33,7 @@ export type ActionDirective = {
     reference: TextAstReference;
     portionSelectors: PortionSelector[];
     targetText: string;
+    occurrenceIndex?: number;
     sourcePosition: FragmentPosition;
     sourceText: string;
 } | {

package/dist/lib/extractors/links.d.ts

@@ -101,11 +101,10 @@ export interface TextLinksParserState {
     sectionTaId?: string;
     textId?: string;
 }
-export declare function extractTextLinks({ context, date, europeDb, legiDb, logIgnoredReferencesTypes, logPartialReferences, logReferences, state: inputState, transformation, }: {
+export declare function extractTextLinks({ context, date, canutesDb, logIgnoredReferencesTypes, logPartialReferences, logReferences, state: inputState, transformation, }: {
     context: TextParserContext;
     date: string;
-    europeDb: Sql;
-    legiDb: Sql;
+    canutesDb: Sql;
     logIgnoredReferencesTypes?: boolean;
     logPartialReferences?: boolean;
     logReferences?: boolean;
@@ -117,12 +116,11 @@ export declare function extractTextLinks({ context, date, europeDb, legiDb, logI
     state?: TextLinksParserState;
     transformation?: Transformation;
 }): AsyncGenerator<DefinitionOrLink, void>;
-export declare function iterReferenceLinks({ articleDefinitionByNumByTextId: articleDefinitionByNumByTextIdInput, context, date, europeDb, legiDb, logIgnoredReferencesTypes, logPartialReferences, originalPositionsFromTransformedIterator, reference, state: inputState, }: {
+export declare function iterReferenceLinks({ articleDefinitionByNumByTextId: articleDefinitionByNumByTextIdInput, canutesDb, context, date, logIgnoredReferencesTypes, logPartialReferences, originalPositionsFromTransformedIterator, reference, state: inputState, }: {
     articleDefinitionByNumByTextId?: Record<string, Record<string, ArticleDefinition>>;
+    canutesDb: Sql;
     context: TextParserContext;
     date: string;
-    europeDb: Sql;
-    legiDb: Sql;
     logIgnoredReferencesTypes?: boolean;
     logPartialReferences?: boolean;
     originalPositionsFromTransformedIterator?: Generator<FragmentReverseTransformation, void, FragmentPosition | undefined>;

package/dist/lib/linkers/html.d.ts

@@ -3,11 +3,10 @@ import { DefinitionOrLink, TextLinksParserState } from '../extractors/links.js';
 import { LinkType } from '../links.js';
 import { TextParserContext } from '../text_parsers/parsers.js';
 import { Transformation } from '../text_parsers/transformers.js';
-export declare function addLinksToHtml({ date, europeDb, html, legiDb, linkBaseUrl, linkType, logIgnoredReferencesTypes, logPartialReferences, logReferences, onLink, previousContext, state, }: {
+export declare function addLinksToHtml({ canutesDb, date, html, linkBaseUrl, linkType, logIgnoredReferencesTypes, logPartialReferences, logReferences, onLink, previousContext, state, }: {
+    canutesDb: Sql;
     date: string;
-    europeDb: Sql;
     html: string;
-    legiDb: Sql;
     linkBaseUrl: string;
     linkType: LinkType;
     logIgnoredReferencesTypes?: boolean;
@@ -25,13 +24,12 @@ export type OutputByType = Partial<Record<OutputType, {
     offset: number;
 }>>;
 export type OutputType = "links" | "links_or_references" | "references";
-export declare function addLinksOrReferencesToHtmlPage({ date, defaultTextId, europeDb, htmlTransformation, inputHtml, legiDb, linkBaseUrl, linkType, logIgnoredReferencesTypes, logPartialReferences, logReferences, outputTypes: requestedOutputTypes, referredLegifranceTextsInfos, }: {
+export declare function addLinksOrReferencesToHtmlPage({ canutesDb, date, defaultTextId, htmlTransformation, inputHtml, linkBaseUrl, linkType, logIgnoredReferencesTypes, logPartialReferences, logReferences, outputTypes: requestedOutputTypes, referredLegifranceTextsInfos, }: {
+    canutesDb: Sql;
     date: string;
     defaultTextId?: string;
-    europeDb: Sql;
     htmlTransformation: Transformation;
     inputHtml: string;
-    legiDb: Sql;
     linkBaseUrl: string;
     linkType: LinkType;
     logIgnoredReferencesTypes?: boolean;

package/dist/lib/linkers/markdown.d.ts

@@ -1,10 +1,9 @@
 import { Sql } from 'postgres';
 import { LinkType } from '../links.js';
 import { TextParserContext } from '../text_parsers/parsers.js';
-export declare function addLinksToMarkdown({ date, europeDb, legiDb, linkBaseUrl, linkType, previousContext, text, }: {
+export declare function addLinksToMarkdown({ canutesDb, date, linkBaseUrl, linkType, previousContext, text, }: {
+    canutesDb: Sql;
     date: string;
-    europeDb: Sql;
-    legiDb: Sql;
     linkBaseUrl: string;
     linkType: LinkType;
     previousContext?: TextParserContext;

package/dist/lib/loaders/assemblee.d.ts

@@ -1,6 +1,6 @@
 import { Document, DossierParlementaire } from '@tricoteuses/assemblee';
 import { Sql } from 'postgres';
 import { AssembleeObjectCache } from '../cache.js';
-export declare function getOrLoadDocument(assembleeDb: Sql, assembleeObjectCache: AssembleeObjectCache, uid: string): Promise<Document | undefined>;
-export declare function getOrLoadDocumentsByDossierParlementaireUid(assembleeDb: Sql, assembleeObjectCache: AssembleeObjectCache, dossierUid: string): Promise<Document[]>;
-export declare function getOrLoadDossierParlementaire(assembleeDb: Sql, assembleeObjectCache: AssembleeObjectCache, uid: string): Promise<DossierParlementaire | undefined>;
+export declare function getOrLoadDocument(canutesDb: Sql, assembleeObjectCache: AssembleeObjectCache, uid: string): Promise<Document | undefined>;
+export declare function getOrLoadDocumentsByDossierParlementaireUid(canutesDb: Sql, assembleeObjectCache: AssembleeObjectCache, dossierUid: string): Promise<Document[]>;
+export declare function getOrLoadDossierParlementaire(canutesDb: Sql, assembleeObjectCache: AssembleeObjectCache, uid: string): Promise<DossierParlementaire | undefined>;

package/dist/lib/loaders/legifrance.d.ts

@@ -10,13 +10,13 @@ export declare function extendLoadedArticle<ArticleType extends JorfArticle | Le
     data: ArticleType;
     num: string | null;
 }): ArticleType & ArticleExtension;
-export declare function getOrLoadArticle<ArticleType extends JorfArticle | LegiArticle>(legiDb: Sql, legifranceObjectCache: LegifranceObjectCache, id: string): Promise<(ArticleType & ArticleExtension) | undefined>;
-export declare function getOrLoadArticles<ArticleType extends JorfArticle | LegiArticle>(legiDb: Sql, legifranceObjectCache: LegifranceObjectCache, ids: string[]): Promise<Array<ArticleType & ArticleExtension>>;
-export declare function getOrLoadJo<JoType extends Jo>(legiDb: Sql, legifranceObjectCache: LegifranceObjectCache, id: string): Promise<JoType | undefined>;
-export declare function getOrLoadSectionTa<SectionTaType extends JorfSectionTa | LegiSectionTa>(legiDb: Sql, legifranceObjectCache: LegifranceObjectCache, id: string): Promise<SectionTaType | undefined>;
-export declare function getOrLoadSectionsTa<SectionTaType extends JorfSectionTa | LegiSectionTa>(legiDb: Sql, legifranceObjectCache: LegifranceObjectCache, ids: string[]): Promise<SectionTaType[]>;
-export declare function getOrLoadTextelr<TextelrType extends JorfTextelr | LegiTextelr>(legiDb: Sql, legifranceObjectCache: LegifranceObjectCache, id: string): Promise<TextelrType | undefined>;
-export declare function getOrLoadTexteslr<TextelrType extends JorfTextelr | LegiTextelr>(legiDb: Sql, legifranceObjectCache: LegifranceObjectCache, ids: string[]): Promise<Array<TextelrType>>;
-export declare function getOrLoadTextesVersions<TexteVersionType extends JorfTexteVersion | LegiTexteVersion>(legiDb: Sql, legifranceObjectCache: LegifranceObjectCache, ids: string[]): Promise<Array<TexteVersionType>>;
-export declare function getOrLoadTexteVersion<TexteVersionType extends JorfTexteVersion | LegiTexteVersion>(legiDb: Sql, legifranceObjectCache: LegifranceObjectCache, id: string): Promise<TexteVersionType | undefined>;
-export declare function loadArticles<ArticleType extends JorfArticle | LegiArticle>(legiDb: Sql, legifranceObjectCache: LegifranceObjectCache, whereClause: PendingQuery<Row[]> | Array<PendingQuery<Row[]>>): Promise<Array<ArticleType & ArticleExtension>>;
+export declare function getOrLoadArticle<ArticleType extends JorfArticle | LegiArticle>(canutesDb: Sql, legifranceObjectCache: LegifranceObjectCache, id: string): Promise<(ArticleType & ArticleExtension) | undefined>;
+export declare function getOrLoadArticles<ArticleType extends JorfArticle | LegiArticle>(canutesDb: Sql, legifranceObjectCache: LegifranceObjectCache, ids: string[]): Promise<Array<ArticleType & ArticleExtension>>;
+export declare function getOrLoadJo<JoType extends Jo>(canutesDb: Sql, legifranceObjectCache: LegifranceObjectCache, id: string): Promise<JoType | undefined>;
+export declare function getOrLoadSectionTa<SectionTaType extends JorfSectionTa | LegiSectionTa>(canutesDb: Sql, legifranceObjectCache: LegifranceObjectCache, id: string): Promise<SectionTaType | undefined>;
+export declare function getOrLoadSectionsTa<SectionTaType extends JorfSectionTa | LegiSectionTa>(canutesDb: Sql, legifranceObjectCache: LegifranceObjectCache, ids: string[]): Promise<SectionTaType[]>;
+export declare function getOrLoadTextelr<TextelrType extends JorfTextelr | LegiTextelr>(canutesDb: Sql, legifranceObjectCache: LegifranceObjectCache, id: string): Promise<TextelrType | undefined>;
+export declare function getOrLoadTexteslr<TextelrType extends JorfTextelr | LegiTextelr>(canutesDb: Sql, legifranceObjectCache: LegifranceObjectCache, ids: string[]): Promise<Array<TextelrType>>;
+export declare function getOrLoadTextesVersions<TexteVersionType extends JorfTexteVersion | LegiTexteVersion>(canutesDb: Sql, legifranceObjectCache: LegifranceObjectCache, ids: string[]): Promise<Array<TexteVersionType>>;
+export declare function getOrLoadTexteVersion<TexteVersionType extends JorfTexteVersion | LegiTexteVersion>(canutesDb: Sql, legifranceObjectCache: LegifranceObjectCache, id: string): Promise<TexteVersionType | undefined>;
+export declare function loadArticles<ArticleType extends JorfArticle | LegiArticle>(canutesDb: Sql, legifranceObjectCache: LegifranceObjectCache, whereClause: PendingQuery<Row[]> | Array<PendingQuery<Row[]>>): Promise<Array<ArticleType & ArticleExtension>>;

package/dist/lib/server/config.d.ts

@@ -1,9 +1,6 @@
 import { LinkType } from '../links';
 export interface Config {
-    assembleeDb: DatabaseConfig;
-    europeDb: DatabaseConfig;
-    legiAnomaliesDb: DatabaseConfig;
-    legiDb: DatabaseConfig;
+    canutesDb: DatabaseConfig;
     linkBaseUrl: string;
     linkType: LinkType;
 }

package/dist/lib/server/databases/index.d.ts

@@ -2,23 +2,13 @@ import { default as postgres } from 'postgres';
 export interface Version {
     number: number;
 }
-export declare const assembleeDb: postgres.Sql<{}>;
+export declare const canutesDb: postgres.Sql<{}>;
 export declare const assembleeVersionNumber = 7;
-export declare const europeDb: postgres.Sql<{}>;
-export declare const legiAnomaliesDb: postgres.Sql<{}>;
 export declare const legiAnomaliesVersionNumber = 1;
-export declare const legiDb: postgres.Sql<{}>;
 export declare const legiVersionNumber = 19;
 export declare const tisseuseVersionNumber = 3;
-/**
- * Check that assemblee database exists and is up to date.
- */
 export declare function checkAssembleeDb(): Promise<void>;
-/**
- * Check that legi_anomalies database exists and is up to date.
- */
 export declare function checkLegiAnomaliesDb(): Promise<void>;
-/**
- * Check that legi database exists and is up to date.
- */
 export declare function checkLegiDb(): Promise<void>;
+export declare function checkTisseuseDb(): Promise<void>;
+export declare function configureTisseuseDatabase(): Promise<void>;

package/dist/lib/server/linkers/html.d.ts

@@ -1,9 +1,9 @@
 import { LinkType } from '../../links.js';
 import { Sql } from 'postgres';
-export declare function addLinksOrReferencesToHtmlFile({ date, defaultTextId, europeDb, htmlFilePath, htmlTransformationsInputDir, htmlTransformationsOutputDir, htmlWithLinksFilePath, htmlWithLinksOrReferencesFilePath, htmlWithLinksTransformationsOutputDir, htmlWithReferencesFilePath, legiDb, linkBaseUrl, linkType, logIgnoredReferencesTypes, logPartialReferences, logReferences, referredLegifranceTextsInfosFilePath, }: {
+export declare function addLinksOrReferencesToHtmlFile({ canutesDb, date, defaultTextId, htmlFilePath, htmlTransformationsInputDir, htmlTransformationsOutputDir, htmlWithLinksFilePath, htmlWithLinksOrReferencesFilePath, htmlWithLinksTransformationsOutputDir, htmlWithReferencesFilePath, linkBaseUrl, linkType, logIgnoredReferencesTypes, logPartialReferences, logReferences, referredLegifranceTextsInfosFilePath, }: {
+    canutesDb: Sql;
     date: string;
     defaultTextId?: string;
-    europeDb: Sql;
     htmlFilePath: string;
     htmlTransformationsInputDir?: string;
     htmlTransformationsOutputDir?: string;
@@ -11,7 +11,6 @@ export declare function addLinksOrReferencesToHtmlFile({ date, defaultTextId, eu
     htmlWithLinksOrReferencesFilePath?: string;
     htmlWithLinksTransformationsOutputDir?: string;
     htmlWithReferencesFilePath?: string;
-    legiDb: Sql;
     linkBaseUrl: string;
     linkType: LinkType;
     logIgnoredReferencesTypes?: boolean;

package/dist/lib/text_parsers/numbers.d.ts

@@ -16,4 +16,9 @@ export declare const adjectifNumeralCardinalLong: import('./parsers.js').TextPar
 export declare const adjectifNumeralCardinal: import('./parsers.js').TextParser<TextAst>;
 export declare const adjectifNumeralOrdinalLong: import('./parsers.js').TextParser<TextAst>;
 export declare const adjectifNumeralOrdinal: import('./parsers.js').TextParser<TextAst>;
+export declare const multiplicativeLatinSuffixes: Array<{
+    pattern: string;
+    value: number;
+}>;
+export declare const multiplicativeLatinSuffixPattern: string;
 export declare const adverbeMultiplicatifLatin: import('./parsers.js').TextParser<TextAst>;

package/dist/lib/text_parsers/text_titles_infos.json.d.ts

@@ -0,0 +1,4 @@
+declare const _default: {}
+;
+
+export default _default;

package/dist/scripts/associate_jorf_textes_with_assemblee_commissions.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/scripts/associate_jorf_textes_with_dossiers_legislatifs_assemblee.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/scripts/configure.d.ts

@@ -0,0 +1 @@
+export declare function configure(): Promise<void>;

package/dist/scripts/enrich_senat_documents.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/server.js

@@ -1,4 +1,4 @@
-import { $ as e, a as t, g as n, mn as r, o as i, t as a } from "./html-B_uf_8Zi.js";
+import { $ as e, a as t, g as n, gn as r, o as i, t as a } from "./html-kKhAILq4.js";
 import * as o from "node:crypto";
 import s from "fs-extra";
 import c from "node:path";
@@ -19445,32 +19445,31 @@ function N(e, t, n = "1") {
 }
 //#endregion
 //#region src/lib/server/linkers/html.ts
-async function P({ date: e, defaultTextId: t, europeDb: r, htmlFilePath: i, htmlTransformationsInputDir: o, htmlTransformationsOutputDir: c, htmlWithLinksFilePath: l, htmlWithLinksOrReferencesFilePath: u, htmlWithLinksTransformationsOutputDir: d, htmlWithReferencesFilePath: f, legiDb: p, linkBaseUrl: m, linkType: h, logIgnoredReferencesTypes: g, logPartialReferences: _, logReferences: v, referredLegifranceTextsInfosFilePath: y }) {
-	let b = await s.readFile(i, { encoding: "utf-8" }), x;
-	o === void 0 ? (x = n({ removeAWithHref: !0 })(b), c !== void 0 && N(x, c)) : x = j(b, o);
-	let S = [];
-	l !== void 0 && S.push("links"), u !== void 0 && S.push("links_or_references"), f !== void 0 && S.push("references");
-	let { outputByType: C, referredLegifranceTextCountByCid: w } = await a({
-		date: e,
-		defaultTextId: t,
-		europeDb: r,
-		htmlTransformation: x,
-		inputHtml: b,
-		legiDb: p,
-		linkBaseUrl: m,
-		linkType: h,
-		logIgnoredReferencesTypes: g,
-		logPartialReferences: _,
-		logReferences: v,
-		outputTypes: S,
-		referredLegifranceTextsInfos: y !== void 0
-	}), T = {};
-	l !== void 0 && (T.links = l), u !== void 0 && (T.links_or_references = u), f !== void 0 && (T.references = f);
-	for (let [e, t] of Object.entries(C)) {
-		let n = T[e];
+async function P({ canutesDb: e, date: t, defaultTextId: r, htmlFilePath: i, htmlTransformationsInputDir: o, htmlTransformationsOutputDir: c, htmlWithLinksFilePath: l, htmlWithLinksOrReferencesFilePath: u, htmlWithLinksTransformationsOutputDir: d, htmlWithReferencesFilePath: f, linkBaseUrl: p, linkType: m, logIgnoredReferencesTypes: h, logPartialReferences: g, logReferences: _, referredLegifranceTextsInfosFilePath: v }) {
+	let y = await s.readFile(i, { encoding: "utf-8" }), b;
+	o === void 0 ? (b = n({ removeAWithHref: !0 })(y), c !== void 0 && N(b, c)) : b = j(y, o);
+	let x = [];
+	l !== void 0 && x.push("links"), u !== void 0 && x.push("links_or_references"), f !== void 0 && x.push("references");
+	let { outputByType: S, referredLegifranceTextCountByCid: C } = await a({
+		canutesDb: e,
+		date: t,
+		defaultTextId: r,
+		htmlTransformation: b,
+		inputHtml: y,
+		linkBaseUrl: p,
+		linkType: m,
+		logIgnoredReferencesTypes: h,
+		logPartialReferences: g,
+		logReferences: _,
+		outputTypes: x,
+		referredLegifranceTextsInfos: v !== void 0
+	}), w = {};
+	l !== void 0 && (w.links = l), u !== void 0 && (w.links_or_references = u), f !== void 0 && (w.references = f);
+	for (let [e, t] of Object.entries(S)) {
+		let n = w[e];
 		n !== void 0 && await s.writeFile(n, t.html, { encoding: "utf-8" });
 	}
-	C.links !== void 0 && d !== void 0 && N(n()(C.links.html), d), y !== void 0 && await s.writeJson(y, w, {
+	S.links !== void 0 && d !== void 0 && N(n()(S.links.html), d), v !== void 0 && await s.writeJson(v, C, {
 		encoding: "utf-8",
 		spaces: 2
 	});

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tricoteuses/tisseuse",
   "description": "Find links in/to French legislative documents",
-  "version": "0.10.0",
+  "version": "0.12.0",
   "keywords": [
     "Assemblée nationale",
     "France",
@@ -50,6 +50,8 @@
     "access": "public"
   },
   "scripts": {
+    "associate:jorf:commissions": "tsx src/scripts/associate_jorf_textes_with_assemblee_commissions.ts",
+    "associate:jorf:dossiers": "tsx src/scripts/associate_jorf_textes_with_dossiers_legislatifs_assemblee.ts",
     "build": "vite build",
     "configure": "tsx src/scripts/configure.ts",
     "format": "prettier --write \"src/**/*.ts\" \"*.md\"",
@@ -62,26 +64,28 @@
   },
   "devDependencies": {
     "@auditors/core": "^0.7.4",
-    "@tricoteuses/assemblee": "^3.0.18",
-    "@tricoteuses/legifrance": "^0.17.0",
-    "@tricoteuses/senat": "^2.22.16",
+    "@tricoteuses/assemblee": "^3.2.0",
+    "@tricoteuses/legifrance": "^0.18.0",
+    "@tricoteuses/senat": "^3.0.1",
     "@types/fs-extra": "^11.0.4",
     "@types/node": "^25.5.0",
-    "@typescript-eslint/eslint-plugin": "^8.57.1",
-    "@typescript-eslint/parser": "^8.57.1",
+    "@types/papaparse": "^5.5.2",
+    "@typescript-eslint/eslint-plugin": "^8.57.2",
+    "@typescript-eslint/parser": "^8.57.2",
     "cheerio": "^1.2.0",
     "dedent-js": "^1.0.1",
     "dotenv": "^17.3.1",
-    "eslint": "^10.0.3",
+    "eslint": "^10.1.0",
     "fs-extra": "^11.3.4",
+    "papaparse": "^5.5.3",
     "postgres": "^3.4.8",
     "prettier": "^3.8.1",
     "sade": "^1.8.1",
     "tsx": "^4.21.0",
     "typescript": "^5.9.3",
-    "typesense": "^3.0.3",
-    "vite": "^8.0.0",
+    "typesense": "^3.0.4",
+    "vite": "^8.0.3",
     "vite-plugin-dts": "^4.5.4",
-    "vitest": "^4.1.0"
+    "vitest": "^4.1.2"
   }
 }