@tricoteuses/senat 3.2.1 → 3.2.3

package/package.json

@@ -1,123 +1,123 @@
-{
-  "name": "@tricoteuses/senat",
-  "version": "3.2.1",
-  "description": "Handle French Sénat's open data",
-  "keywords": [
-    "France",
-    "open data",
-    "Parliament",
-    "Sénat"
-  ],
-  "author": "Emmanuel Raviart <emmanuel@raviart.com>",
-  "contributors": [
-    "Henry Boisgibault <henry.boisgibault@proton.me>",
-    "Pierre Drege <dregop@proton.me>",
-    "Hélène Jonin <helene.jonin@gmail.com>",
-    "Paul-Henry Ngounou <ngpaulhenry@gmail.com>"
-  ],
-  "bugs": {
-    "url": "https://git.tricoteuses.fr/logiciels/tricoteuses-senat/issues"
-  },
-  "homepage": "https://tricoteuses.fr/",
-  "license": "AGPL-3.0-or-later",
-  "repository": {
-    "type": "git",
-    "url": "https://git.tricoteuses.fr/logiciels/tricoteuses-senat.git"
-  },
-  "type": "module",
-  "engines": {
-    "node": ">=22"
-  },
-  "files": [
-    "lib"
-  ],
-  "exports": {
-    ".": {
-      "import": "./lib/src/index.js",
-      "types": "./lib/src/index.d.ts"
-    },
-    "./kysely": {
-      "import": "./lib/src/kysely/index.js",
-      "types": "./lib/src/kysely/index.d.ts"
-    },
-    "./server": {
-      "import": "./lib/src/server/index.js",
-      "types": "./lib/src/server/index.d.ts"
-    },
-    "./package.json": "./package.json"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "scripts": {
-    "build": "tsc",
-    "build:types": "tsc --emitDeclarationOnly",
-    "data:convert_data": "tsx src/scripts/convert_data.ts",
-    "data:download": "tsx src/scripts/data-download.ts",
-    "data:generate_schemas": "tsx src/scripts/retrieve_open_data.ts --schema",
-    "data:retrieve_agenda": "cross-env TZ='Etc/UTC' tsx src/scripts/retrieve_agenda.ts",
-    "data:retrieve_cr_seance": "tsx src/scripts/retrieve_cr_seance.ts",
-    "data:retrieve_cr_commission": "tsx src/scripts/retrieve_cr_commission.ts",
-    "data:retrieve_documents": "tsx src/scripts/retrieve_documents.ts",
-    "data:retrieve_open_data": "tsx src/scripts/retrieve_open_data.ts --all",
-    "data:retrieve_collaborateurs": "tsx src/scripts/retrieve_collaborateurs.ts",
-    "data:retrieve_senateurs_photos": "tsx src/scripts/retrieve_senateurs_photos.ts --fetch",
-    "data:retrieve_videos": "tsx src/scripts/retrieve_videos.ts",
-    "data:validate_prefixed_tables": "tsx src/scripts/validate_prefixed_tables.ts",
-    "lint": "eslint src",
-    "lint:fix": "eslint src --fix",
-    "prepare": "npm run build",
-    "prepublishOnly": "npm run build",
-    "prettier": "prettier --write 'src/**/*.ts'",
-    "test": "vitest run",
-    "test:iter_load": "vitest tests/test_iter_load.test.ts",
-    "type-check": "tsc --noEmit",
-    "type-check:watch": "npm run type-check -- --watch",
-    "test:video-matching": "vitest tests/videoMatching.test.ts",
-    "test:texte": "vitest tests/parsers/texte.test.ts",
-    "test:prefixed-tables": "vitest tests/prefixedTables.test.ts tests/validatePrefixedTables.test.ts"
-  },
-  "dependencies": {
-    "cheerio": "^1.2.0",
-    "command-line-args": "^6.0.2",
-    "domhandler": "^6.0.1",
-    "dotenv": "^17.4.2",
-    "fast-xml-parser": "^5.9.3",
-    "fs-extra": "^11.3.6",
-    "jsdom": "^29.1.1",
-    "luxon": "^3.7.2",
-    "node-stream-zip": "^1.15.0",
-    "p-limit": "^7.3.0",
-    "pg": "^8.22.0",
-    "pg-cursor": "^2.21.0",
-    "slug": "^11.0.1",
-    "unpdf": "^1.8.0",
-    "windows-1252": "^3.0.4",
-    "zod": "^4.4.3"
-  },
-  "devDependencies": {
-    "@eslint/js": "^10.0.1",
-    "@types/command-line-args": "^5.2.3",
-    "@types/fs-extra": "^11.0.4",
-    "@types/jsdom": "^28.0.3",
-    "@types/luxon": "^3.7.2",
-    "@types/node": "^26.1.1",
-    "@types/pg": "^8.20.0",
-    "@types/pg-cursor": "^2.7.2",
-    "@types/slug": "^5.0.9",
-    "@typescript-eslint/eslint-plugin": "^8.63.0",
-    "@typescript-eslint/parser": "^8.63.0",
-    "cross-env": "^10.1.0",
-    "eslint": "^10.6.0",
-    "extract-pg-schema": "^5.8.2",
-    "globals": "^17.7.0",
-    "kanel": "^4.0.2",
-    "kanel-kysely": "^4.0.0",
-    "kanel-zod": "^4.0.0",
-    "kysely": "^0.29.3",
-    "prettier": "^3.9.4",
-    "tsx": "^4.23.0",
-    "typescript": "^6.0.3",
-    "vitest": "^4.1.10"
-  }
-}
+{
+  "name": "@tricoteuses/senat",
+  "version": "3.2.3",
+  "description": "Handle French Sénat's open data",
+  "keywords": [
+    "France",
+    "open data",
+    "Parliament",
+    "Sénat"
+  ],
+  "author": "Emmanuel Raviart <emmanuel@raviart.com>",
+  "contributors": [
+    "Henry Boisgibault <henry.boisgibault@proton.me>",
+    "Pierre Drege <dregop@proton.me>",
+    "Hélène Jonin <helene.jonin@gmail.com>",
+    "Paul-Henry Ngounou <ngpaulhenry@gmail.com>"
+  ],
+  "bugs": {
+    "url": "https://git.tricoteuses.fr/logiciels/tricoteuses-senat/issues"
+  },
+  "homepage": "https://tricoteuses.fr/",
+  "license": "AGPL-3.0-or-later",
+  "repository": {
+    "type": "git",
+    "url": "https://git.tricoteuses.fr/logiciels/tricoteuses-senat.git"
+  },
+  "type": "module",
+  "engines": {
+    "node": ">=22"
+  },
+  "files": [
+    "lib"
+  ],
+  "exports": {
+    ".": {
+      "import": "./lib/src/index.js",
+      "types": "./lib/src/index.d.ts"
+    },
+    "./kysely": {
+      "import": "./lib/src/kysely/index.js",
+      "types": "./lib/src/kysely/index.d.ts"
+    },
+    "./server": {
+      "import": "./lib/src/server/index.js",
+      "types": "./lib/src/server/index.d.ts"
+    },
+    "./package.json": "./package.json"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "scripts": {
+    "build": "tsc",
+    "build:types": "tsc --emitDeclarationOnly",
+    "data:convert_data": "tsx src/scripts/convert_data.ts",
+    "data:download": "tsx src/scripts/data-download.ts",
+    "data:generate_schemas": "tsx src/scripts/retrieve_open_data.ts --schema",
+    "data:retrieve_agenda": "cross-env TZ='Etc/UTC' tsx src/scripts/retrieve_agenda.ts",
+    "data:retrieve_cr_seance": "tsx src/scripts/retrieve_cr_seance.ts",
+    "data:retrieve_cr_commission": "tsx src/scripts/retrieve_cr_commission.ts",
+    "data:retrieve_documents": "tsx src/scripts/retrieve_documents.ts",
+    "data:retrieve_open_data": "tsx src/scripts/retrieve_open_data.ts --all",
+    "data:retrieve_collaborateurs": "tsx src/scripts/retrieve_collaborateurs.ts",
+    "data:retrieve_senateurs_photos": "tsx src/scripts/retrieve_senateurs_photos.ts --fetch",
+    "data:retrieve_videos": "tsx src/scripts/retrieve_videos.ts",
+    "data:validate_prefixed_tables": "tsx src/scripts/validate_prefixed_tables.ts",
+    "lint": "eslint src",
+    "lint:fix": "eslint src --fix",
+    "prepare": "npm run build",
+    "prepublishOnly": "npm run build",
+    "prettier": "prettier --write 'src/**/*.ts'",
+    "test": "vitest run",
+    "test:iter_load": "vitest tests/test_iter_load.test.ts",
+    "type-check": "tsc --noEmit",
+    "type-check:watch": "npm run type-check -- --watch",
+    "test:video-matching": "vitest tests/videoMatching.test.ts",
+    "test:texte": "vitest tests/parsers/texte.test.ts",
+    "test:prefixed-tables": "vitest tests/prefixedTables.test.ts tests/validatePrefixedTables.test.ts"
+  },
+  "dependencies": {
+    "cheerio": "^1.2.0",
+    "command-line-args": "^6.0.2",
+    "domhandler": "^6.0.1",
+    "dotenv": "^17.4.2",
+    "fast-xml-parser": "^5.9.3",
+    "fs-extra": "^11.3.6",
+    "jsdom": "^29.1.1",
+    "luxon": "^3.7.2",
+    "node-stream-zip": "^1.15.0",
+    "p-limit": "^7.3.0",
+    "pg": "^8.22.0",
+    "pg-cursor": "^2.21.0",
+    "slug": "^11.0.1",
+    "unpdf": "^1.8.0",
+    "windows-1252": "^3.0.4",
+    "zod": "^4.4.3"
+  },
+  "devDependencies": {
+    "@eslint/js": "^10.0.1",
+    "@types/command-line-args": "^5.2.3",
+    "@types/fs-extra": "^11.0.4",
+    "@types/jsdom": "^28.0.3",
+    "@types/luxon": "^3.7.2",
+    "@types/node": "^26.1.1",
+    "@types/pg": "^8.20.0",
+    "@types/pg-cursor": "^2.7.2",
+    "@types/slug": "^5.0.9",
+    "@typescript-eslint/eslint-plugin": "^8.63.0",
+    "@typescript-eslint/parser": "^8.63.0",
+    "cross-env": "^10.1.0",
+    "eslint": "^10.6.0",
+    "extract-pg-schema": "^5.8.2",
+    "globals": "^17.7.0",
+    "kanel": "^4.0.2",
+    "kanel-kysely": "^4.0.0",
+    "kanel-zod": "^4.0.0",
+    "kysely": "^0.29.3",
+    "prettier": "^3.9.4",
+    "tsx": "^4.23.0",
+    "typescript": "^6.0.3",
+    "vitest": "^4.1.10"
+  }
+}

package/lib/src/scripts/extract_plf_fixtures.d.ts

@@ -1 +0,0 @@
-export declare function extractEtats(srcPath: string): Promise<Element[]>;

package/lib/src/scripts/extract_plf_fixtures.js

@@ -1,101 +0,0 @@
-import fs from "fs-extra";
-import { JSDOM } from "jsdom";
-import path from "path";
-import { commonOptions } from "./shared/cli_helpers.js";
-const optionsDefinitions = [
-    { name: "src", type: String },
-    {
-        help: [
-            "extract the 'etat' articles of a real Sénat AKN XML into a minimal fixture",
-            "named <name>.xml under tests/fixtures/plf/",
-        ].join(" "),
-        name: "name",
-        type: String,
-    },
-    {
-        help: "keep only the parsed budget states (B, C, D); drop the large A/G tables",
-        name: "only-parsed",
-        type: Boolean,
-    },
-    ...commonOptions,
-];
-const KEEP_DATA_ROWS = 6;
-function trimTable(table) {
-    const rows = [...table.querySelectorAll("tr")];
-    // Les 2 premières lignes sont les en-têtes réels : « (En euros) » puis « Mission / Programme ».
-    const headerCount = Math.min(2, rows.length);
-    const dataRows = rows.slice(headerCount);
-    const dataStartIndex = rows.length - dataRows.length;
-    const totalRows = dataRows.filter((row) => {
-        const firstTd = row.querySelector("td");
-        return /^total/i.test(firstTd?.textContent?.trim() ?? "");
-    });
-    const totalIndexes = new Set(totalRows.map((row) => rows.indexOf(row)));
-    let kept = 0;
-    for (const row of rows) {
-        const index = rows.indexOf(row);
-        if (index < dataStartIndex)
-            continue; // en-têtes conservés
-        if (totalIndexes.has(index))
-            continue; // lignes Total conservées
-        if (kept < KEEP_DATA_ROWS) {
-            kept++;
-            continue;
-        }
-        row.parentNode?.removeChild(row);
-    }
-}
-export async function extractEtats(srcPath) {
-    const xml = await fs.readFile(srcPath, "utf-8");
-    const { document } = new JSDOM(xml, { contentType: "text/xml" }).window;
-    const body = document.querySelector("body");
-    if (!body)
-        throw new Error(`No <body> found in ${srcPath}`);
-    return [...body.querySelectorAll('article[class="etat"]')];
-}
-async function main() {
-    const commandLineArgs = (await import("command-line-args")).default;
-    const options = commandLineArgs(optionsDefinitions);
-    const srcPath = options.src;
-    const fixtureName = options.name;
-    if (!srcPath)
-        throw new Error("Missing <src> path to a Sénat AKN XML");
-    if (!fixtureName)
-        throw new Error("Missing --name");
-    const etatArticles = await extractEtats(srcPath);
-    const kept = options["only-parsed"]
-        ? etatArticles.filter((article) => {
-            const num = article.querySelector(":scope > num")?.textContent?.trim();
-            return num === "État B" || num === "État C" || num === "État D";
-        })
-        : etatArticles;
-    if (kept.length === 0)
-        throw new Error(`No B/C/D etat articles found in ${srcPath}`);
-    for (const article of kept) {
-        for (const table of article.querySelectorAll("table.alinea-table.etat-tableau")) {
-            trimTable(table);
-        }
-    }
-    const outDir = path.join("tests", "fixtures", "plf");
-    await fs.ensureDir(outDir);
-    const outPath = path.join(outDir, `${fixtureName}.xml`);
-    const fixture = `<?xml version="1.0" encoding="UTF-8"?>
-<akomaNtoso xmlns="http://docs.oasis-open.org/legaldocml/ns/akn/3.0" xmlns:data="http://data.parlement.fr/v1">
-  <bill contains="singleVersion" name="plf">
-    <body>${kept.map((el) => el.outerHTML).join("\n")}</body>
-  </bill>
-</akomaNtoso>
-`;
-    await fs.writeFile(outPath, fixture);
-    if (!options.silent) {
-        const sizeKb = (Buffer.byteLength(fixture) / 1024).toFixed(1);
-        console.log(`Wrote ${outPath} (${kept.length} etat articles, ${sizeKb} KB)`);
-    }
-}
-if (process.argv[1].endsWith("extract_plf_fixtures.ts")) {
-    main()
-        .catch((error) => {
-        console.error(error);
-        process.exit(1);
-    });
-}