@tricoteuses/senat 1.1.2 → 1.3.1

package/lib/types/texte.d.ts

@@ -0,0 +1,65 @@
+export declare enum DivisionType {
+    tome = 1,
+    part = 2,
+    book = 3,
+    title = 4,
+    subtitle = 5,
+    chapter = 6,
+    section = 7,
+    subsection = 8,
+    paragraph = 9,
+    article = 10,
+    alinea = 11,
+    division = 12
+}
+export type DivisionTag = keyof typeof DivisionType;
+export interface FlatTexte {
+    titre: string | null;
+    titreCourt: string | null;
+    signetDossier: string | null;
+    urlDossierSenat: string | null;
+    urlDossierAssemblee: string | null;
+    type: string | null;
+    session: string | null;
+    numero: number | null;
+    datePresentation: Date | null;
+    dateDepot: Date | null;
+    datePublicationXml: Date | null;
+    version: Version | null;
+    workflow: Step[];
+    divisions: Division[];
+    exposeDesMotifs?: ExposeDesMotifs | null;
+}
+export type Version = "RECT" | "RECT_BIS" | "RECT_TER" | "RECT_QUATER" | "RECT_QUINQUIES";
+export interface Step {
+    eId: string;
+    date: Date | null;
+    type: string | null;
+    session: string | null;
+    numero: string | null;
+    version: Version | null;
+    outcome: string | null;
+}
+export interface Division {
+    index: number;
+    eId: string;
+    tag: DivisionTag;
+    level: number;
+    headings: DivisionContent[];
+}
+export interface Article extends Division {
+    alineas: Alinea[];
+}
+export interface DivisionContent {
+    text: string | null;
+    html?: string | null;
+}
+export interface Alinea extends DivisionContent {
+    eId: string;
+    heading: DivisionContent;
+    pastille: string | null;
+}
+export interface ExposeDesMotifs {
+    text: string | null;
+    html: string | null;
+}

package/lib/types/texte.js

@@ -0,0 +1,24 @@
+"use strict";
+
+require("core-js/modules/es.object.define-property.js");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.DivisionType = void 0;
+/* eslint no-use-before-define: 0 */
+var DivisionType = exports.DivisionType = /*#__PURE__*/function (DivisionType) {
+  DivisionType[DivisionType["tome"] = 1] = "tome";
+  DivisionType[DivisionType["part"] = 2] = "part";
+  DivisionType[DivisionType["book"] = 3] = "book";
+  DivisionType[DivisionType["title"] = 4] = "title";
+  DivisionType[DivisionType["subtitle"] = 5] = "subtitle";
+  DivisionType[DivisionType["chapter"] = 6] = "chapter";
+  DivisionType[DivisionType["section"] = 7] = "section";
+  DivisionType[DivisionType["subsection"] = 8] = "subsection";
+  DivisionType[DivisionType["paragraph"] = 9] = "paragraph";
+  DivisionType[DivisionType["article"] = 10] = "article";
+  DivisionType[DivisionType["alinea"] = 11] = "alinea";
+  DivisionType[DivisionType["division"] = 12] = "division"; // TODO annexe
+  return DivisionType;
+}({});
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJEaXZpc2lvblR5cGUiLCJleHBvcnRzIl0sInNvdXJjZXMiOlsiLi4vLi4vc3JjL3R5cGVzL3RleHRlLnRzIl0sInNvdXJjZXNDb250ZW50IjpbIi8qIGVzbGludCBuby11c2UtYmVmb3JlLWRlZmluZTogMCAqL1xuXG5leHBvcnQgZW51bSBEaXZpc2lvblR5cGUge1xuICB0b21lID0gMSxcbiAgcGFydCxcbiAgYm9vayxcbiAgdGl0bGUsXG4gIHN1YnRpdGxlLFxuICBjaGFwdGVyLFxuICBzZWN0aW9uLFxuICBzdWJzZWN0aW9uLFxuICBwYXJhZ3JhcGgsXG4gIGFydGljbGUsXG4gIGFsaW5lYSxcbiAgZGl2aXNpb24gLy8gVE9ETyBhbm5leGVcbn1cblxuZXhwb3J0IHR5cGUgRGl2aXNpb25UYWcgPSBrZXlvZiB0eXBlb2YgRGl2aXNpb25UeXBlO1xuXG5leHBvcnQgaW50ZXJmYWNlIEZsYXRUZXh0ZSB7XG4gIHRpdHJlOiBzdHJpbmcgfCBudWxsXG4gIHRpdHJlQ291cnQ6IHN0cmluZyB8IG51bGxcbiAgc2lnbmV0RG9zc2llcjogc3RyaW5nIHwgbnVsbFxuICB1cmxEb3NzaWVyU2VuYXQ6IHN0cmluZyB8IG51bGxcbiAgdXJsRG9zc2llckFzc2VtYmxlZTogc3RyaW5nIHwgbnVsbFxuICB0eXBlOiBzdHJpbmcgfCBudWxsXG4gIHNlc3Npb246IHN0cmluZyB8IG51bGxcbiAgbnVtZXJvOiBudW1iZXIgfCBudWxsXG4gIGRhdGVQcmVzZW50YXRpb246IERhdGUgfCBudWxsLFxuICBkYXRlRGVwb3Q6IERhdGUgfCBudWxsLFxuICBkYXRlUHVibGljYXRpb25YbWw6IERhdGUgfCBudWxsLFxuICB2ZXJzaW9uOiBWZXJzaW9uIHwgbnVsbFxuICB3b3JrZmxvdzogU3RlcFtdXG4gIGRpdmlzaW9uczogRGl2aXNpb25bXVxuICBleHBvc2VEZXNNb3RpZnM/OiBFeHBvc2VEZXNNb3RpZnMgfCBudWxsXG59XG5cbmV4cG9ydCB0eXBlIFZlcnNpb24gPSBcIlJFQ1RcIiB8IFwiUkVDVF9CSVNcIiB8IFwiUkVDVF9URVJcIiB8IFwiUkVDVF9RVUFURVJcIiB8IFwiUkVDVF9RVUlOUVVJRVNcIlxuXG5leHBvcnQgaW50ZXJmYWNlIFN0ZXAge1xuICBlSWQ6IHN0cmluZ1xuICBkYXRlOiBEYXRlIHwgbnVsbFxuICB0eXBlOiBzdHJpbmcgfCBudWxsXG4gIHNlc3Npb246IHN0cmluZyB8IG51bGxcbiAgbnVtZXJvOiBzdHJpbmcgfCBudWxsXG4gIHZlcnNpb246IFZlcnNpb24gfCBudWxsXG4gIG91dGNvbWU6IHN0cmluZyB8IG51bGxcbn1cblxuZXhwb3J0IGludGVyZmFjZSBEaXZpc2lvbiB7XG4gIGluZGV4OiBudW1iZXJcbiAgZUlkOiBzdHJpbmdcbiAgdGFnOiBEaXZpc2lvblRhZ1xuICBsZXZlbDogbnVtYmVyXG4gIGhlYWRpbmdzOiBEaXZpc2lvbkNvbnRlbnRbXVxufVxuXG5leHBvcnQgaW50ZXJmYWNlIEFydGljbGUgZXh0ZW5kcyBEaXZpc2lvbiB7XG4gIGFsaW5lYXM6IEFsaW5lYVtdXG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgRGl2aXNpb25Db250ZW50IHtcbiAgdGV4dDogc3RyaW5nIHwgbnVsbFxuICBodG1sPzogc3RyaW5nIHwgbnVsbFxufVxuXG5leHBvcnQgaW50ZXJmYWNlIEFsaW5lYSBleHRlbmRzIERpdmlzaW9uQ29udGVudCB7XG4gIGVJZDogc3RyaW5nXG4gIGhlYWRpbmc6IERpdmlzaW9uQ29udGVudFxuICBwYXN0aWxsZTogc3RyaW5nIHwgbnVsbFxufVxuXG5leHBvcnQgaW50ZXJmYWNlIEV4cG9zZURlc01vdGlmcyB7XG4gIHRleHQ6IHN0cmluZyB8IG51bGxcbiAgaHRtbDogc3RyaW5nIHwgbnVsbFxufVxuIl0sIm1hcHBpbmdzIjoiOzs7Ozs7O0FBQUE7QUFBQSxJQUVZQSxZQUFZLEdBQUFDLE9BQUEsQ0FBQUQsWUFBQSwwQkFBWkEsWUFBWTtFQUFaQSxZQUFZLENBQVpBLFlBQVk7RUFBWkEsWUFBWSxDQUFaQSxZQUFZO0VBQVpBLFlBQVksQ0FBWkEsWUFBWTtFQUFaQSxZQUFZLENBQVpBLFlBQVk7RUFBWkEsWUFBWSxDQUFaQSxZQUFZO0VBQVpBLFlBQVksQ0FBWkEsWUFBWTtFQUFaQSxZQUFZLENBQVpBLFlBQVk7RUFBWkEsWUFBWSxDQUFaQSxZQUFZO0VBQVpBLFlBQVksQ0FBWkEsWUFBWTtFQUFaQSxZQUFZLENBQVpBLFlBQVk7RUFBWkEsWUFBWSxDQUFaQSxZQUFZO0VBQVpBLFlBQVksQ0FBWkEsWUFBWSxpQ0FZYjtFQUFBLE9BWkNBLFlBQVk7QUFBQSIsImlnbm9yZUxpc3QiOltdfQ==

package/lib/types/texte.mjs

@@ -0,0 +1,16 @@
+/* eslint no-use-before-define: 0 */
+export var DivisionType;
+(function (DivisionType) {
+    DivisionType[DivisionType["tome"] = 1] = "tome";
+    DivisionType[DivisionType["part"] = 2] = "part";
+    DivisionType[DivisionType["book"] = 3] = "book";
+    DivisionType[DivisionType["title"] = 4] = "title";
+    DivisionType[DivisionType["subtitle"] = 5] = "subtitle";
+    DivisionType[DivisionType["chapter"] = 6] = "chapter";
+    DivisionType[DivisionType["section"] = 7] = "section";
+    DivisionType[DivisionType["subsection"] = 8] = "subsection";
+    DivisionType[DivisionType["paragraph"] = 9] = "paragraph";
+    DivisionType[DivisionType["article"] = 10] = "article";
+    DivisionType[DivisionType["alinea"] = 11] = "alinea";
+    DivisionType[DivisionType["division"] = 12] = "division"; // TODO annexe
+})(DivisionType || (DivisionType = {}));

package/lib/types/texte.ts

@@ -0,0 +1,76 @@
+/* eslint no-use-before-define: 0 */
+
+export enum DivisionType {
+  tome = 1,
+  part,
+  book,
+  title,
+  subtitle,
+  chapter,
+  section,
+  subsection,
+  paragraph,
+  article,
+  alinea,
+  division // TODO annexe
+}
+
+export type DivisionTag = keyof typeof DivisionType;
+
+export interface FlatTexte {
+  titre: string | null
+  titreCourt: string | null
+  signetDossier: string | null
+  urlDossierSenat: string | null
+  urlDossierAssemblee: string | null
+  type: string | null
+  session: string | null
+  numero: number | null
+  datePresentation: Date | null,
+  dateDepot: Date | null,
+  datePublicationXml: Date | null,
+  version: Version | null
+  workflow: Step[]
+  divisions: Division[]
+  exposeDesMotifs?: ExposeDesMotifs | null
+}
+
+export type Version = "RECT" | "RECT_BIS" | "RECT_TER" | "RECT_QUATER" | "RECT_QUINQUIES"
+
+export interface Step {
+  eId: string
+  date: Date | null
+  type: string | null
+  session: string | null
+  numero: string | null
+  version: Version | null
+  outcome: string | null
+}
+
+export interface Division {
+  index: number
+  eId: string
+  tag: DivisionTag
+  level: number
+  headings: DivisionContent[]
+}
+
+export interface Article extends Division {
+  alineas: Alinea[]
+}
+
+export interface DivisionContent {
+  text: string | null
+  html?: string | null
+}
+
+export interface Alinea extends DivisionContent {
+  eId: string
+  heading: DivisionContent
+  pastille: string | null
+}
+
+export interface ExposeDesMotifs {
+  text: string | null
+  html: string | null
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tricoteuses/senat",
-  "version": "1.1.2",
+  "version": "1.3.1",
   "description": "Handle French Sénat's open data",
   "keywords": [
     "France",
@@ -29,6 +29,11 @@
       "require": "./lib/index.js",
       "types": "./lib/index.d.ts"
     },
+    "./lib/loaders": {
+      "import": "./lib/loaders.mjs",
+      "require": "./lib/loaders.js",
+      "types": "./lib/loaders.d.ts"
+    },
     "./package.json": "./package.json"
   },
   "typesVersions": {
@@ -43,11 +48,19 @@
   },
   "scripts": {
     "build": "npm run build:types && npm run build:js && npm run build:mjs && npm run build:cjs && npm run build:static",
-    "build:js": "npx babel src --out-dir lib --extensions \".ts\" --source-maps inline",
-    "build:cjs": "babel src --out-dir lib --extensions \".ts\" --source-maps inline",
+    "build:cjs": "babel src --out-dir lib --extensions '.ts' --source-maps inline",
+    "build:js": "npx babel src --out-dir lib --extensions '.ts' --source-maps inline",
     "build:mjs": "tsc && for file in lib/*.js lib/**/*.js; do new_file=`echo $file | sed 's/.js/.mjs/'`; mv $file $new_file; done",
-    "build:types": "tsc --emitDeclarationOnly",
     "build:static": "npx babel src --out-dir lib --copy-files",
+    "build:types": "tsc --emitDeclarationOnly",
+    "data:convert_data": "npx babel-node --extensions '.ts' -- src/scripts/convert_data.ts",
+    "data:download": "bash -c 'npm run data:retrieve_open_data -- $@ && npm run data:convert_data -- $@' bash",
+    "data:generate_schemas": "npx babel-node --extensions '.ts' -- src/scripts/retrieve_open_data.ts --schema",
+    "data:retrieve_open_data": "npx babel-node --extensions '.ts' -- src/scripts/retrieve_open_data.ts --all",
+    "data:retrieve_senateurs_photos": "npx babel-node --extensions '.ts' -- src/scripts/retrieve_senateurs_photos.ts --fetch",
+    "data:retrieve_documents": "npx babel-node --extensions '.ts' -- src/scripts/retrieve_documents.ts",
+    "data:parse_textes_lois": "npx babel-node --extensions '.ts' -- src/scripts/parse_textes.ts",
+    "prepare": "npm run build",
     "prepublishOnly": "npm run build",
     "prettier": "prettier --write 'src/**/*.ts' 'tests/**/*.test.ts'",
     "type-check": "tsc --noEmit",
@@ -55,11 +68,16 @@
   },
   "dependencies": {
     "@biryani/core": "^0.2.1",
+    "@types/pg": "^8.11.10",
     "command-line-args": "^5.1.1",
-    "cross-fetch": "^3.0.4",
     "dotenv": "^8.2.0",
     "fs-extra": "^9.1.0",
+    "jsdom": "^26.0.0",
+    "kysely": "^0.27.4",
+    "luxon": "^3.5.0",
     "node-stream-zip": "^1.8.2",
+    "pg": "^8.13.1",
+    "pg-cursor": "^2.12.1",
     "pg-promise": "^10.9.2",
     "slug": "^4.0.2",
     "windows-1252": "^1.0.0"
@@ -67,6 +85,8 @@
   "devDependencies": {
     "@babel/cli": "^7.11.6",
     "@babel/core": "^7.11.6",
+    "@babel/eslint-parser": "^7.23.10",
+    "@babel/eslint-plugin": "^7.25.9",
     "@babel/node": "^7.10.5",
     "@babel/plugin-proposal-class-properties": "^7.10.4",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
@@ -75,17 +95,22 @@
     "@typed-code/schemats": "^5.0.1",
     "@types/command-line-args": "^5.0.0",
     "@types/fs-extra": "^9.0.7",
-    "@types/node": "^14.14.28",
+    "@types/jsdom": "^21.1.7",
+    "@types/luxon": "^3.4.2",
+    "@types/node": "^20.17.6",
+    "@types/pg-cursor": "^2.7.2",
     "@types/slug": "^0.9.1",
-    "babel-eslint": "^10.1.0",
+    "@typescript-eslint/eslint-plugin": "^8.13.0",
+    "@typescript-eslint/parser": "^8.13.0",
     "core-js": "^3.3.2",
-    "eslint": "^8.22.0",
+    "eslint": "^8.57.1",
+    "kysely-codegen": "^0.18.0",
     "prettier": "^2.2.1",
     "regenerator-runtime": "^0.13.3",
     "tslib": "^2.1.0",
-    "typescript": "^4.1.5"
+    "typescript": "^5.7.2"
   },
   "engines": {
-    "node": ">=16"
+    "node": ">=22"
   }
 }