@tricoteuses/assemblee 2.5.15 → 2.5.17

package/README.md

@@ -43,6 +43,7 @@ npm install
 ### Basic usage
 
 Create a directory to store the data, then run the following command to download, reorganize and clean the data.
+
 ```bash
 mkdir ../assemblee-data/
 npm run data:download ../assemblee-data
@@ -59,7 +60,6 @@ npm run data:download ../assemblee-data
 - `npm run data:retrieve_documents <dir>`: Retrieval of legislative documents from Assemblée nationale's website
 - `npm run data:retrieve_pending_amendements <dir>`: Retrieval of pending amendments from Assemblée nationale's website (waiting to be processed by Assemblée services)
 
-
 _Notes_:
 
 - Reorganized files (generated by the _data:reorganize_data_ command) are also available in [Tricoteuses / Data / Données brutes de l'Assemblée](https://git.en-root.org/tricoteuses/data/assemblee-brut). They are updated on a regular basis.
@@ -92,6 +92,7 @@ npm run data:download ../assemblee-data -- -l 16 -l 17
 - `--pull` or `-p`: Pull repositories before starting
 - `--clone` or `-C <url>`: Clone Git repositories from a remote group or organization
 - `--remote` or `-r <name>`: Push commits to specified Git remote(s)
+- `--keepDir`: Keep Dir (Implement before cleaning data)
 
 If you use such options, use them in all subsequent commands too (_data:regorganize_data_ and _data:clean_data_).
 
@@ -109,7 +110,6 @@ If you use such options, use them in all subsequent commands too (_data:regorgan
 - `--full` or `-f`: Retrieve all documents, even those already downloaded
 - `--document-type` or `-T <type>`: Restrict to specific document types (e.g., `PION`)
 
-
 ## Download using Docker
 
 A Docker image that downloads and cleans the data all at once is available. Build it locally or run it from the container registry.
@@ -139,7 +139,7 @@ import {
   iterLoadAssembleeAmendements,
   iterLoadAssembleeQuestions,
   iterLoadAssembleeComptesRendus,
-} from "@tricoteuses/assemblee/loaders";
+} from "@tricoteuses/assemblee/loaders"
 
 // Pass data directory and legislature as arguments
 for (const { acteur } of iterLoadAssembleeActeurs("../assemblee-data", 17)) {

package/lib/git.d.ts

@@ -4,4 +4,3 @@ export declare function resetAndPull(gitDir: string): boolean;
 export declare function clone(gitGroupUrl: string | undefined, gitName: string, workingDir: string): void;
 export declare function run(repositoryDir: string, args: string, verbose?: boolean): string;
 export declare function test(repositoryDir: string, args: string, verbose?: boolean): boolean;
-export declare function uidBranchUpdate(repositoryDir: string, subdirectories: any, notHard: boolean): boolean;

package/lib/git.js

@@ -1,121 +1,98 @@
-import l from "fs-extra";
-import { execSync as r } from "node:child_process";
-import $ from "node:path";
-import { g as p } from "./file_systems-CzTtoLWb.js";
-const a = 50 * 1024 * 1024;
-function v(e, c) {
-  r("git add .", {
-    cwd: e,
+import { execSync as i } from "node:child_process";
+const r = 50 * 1024 * 1024;
+function u(t, n) {
+  i("git add .", {
+    cwd: t,
     env: process.env,
     encoding: "utf-8",
     stdio: ["ignore", "ignore", "pipe"],
-    maxBuffer: a
+    maxBuffer: r
   });
   try {
-    return r(`git commit -m "${c}" --quiet`, {
-      cwd: e,
+    return i(`git commit -m "${n}" --quiet`, {
+      cwd: t,
       env: process.env,
       encoding: "utf-8",
       stdio: ["ignore", "pipe", "pipe"]
     }), !0;
-  } catch (t) {
-    if (t.stdout === null || !/nothing to commit/.test(t.stdout))
-      throw console.error(t.output), t;
+  } catch (e) {
+    if (e.stdout === null || !/nothing to commit/.test(e.stdout))
+      throw console.error(e.output), e;
     return !1;
   }
 }
-function E(e, c, t) {
-  let n = 0;
-  if (v(e, c))
-    for (const s of t || [])
+function f(t, n, e) {
+  let o = 0;
+  if (u(t, n))
+    for (const c of e || [])
       try {
-        r(`git push ${s} master`, {
-          cwd: e,
+        i(`git push ${c} master`, {
+          cwd: t,
           env: process.env,
           encoding: "utf-8",
           stdio: ["ignore", "ignore", "pipe"]
         });
-      } catch (i) {
-        console.error(i.output), n = i.status;
+      } catch (s) {
+        console.error(s.output), o = s.status;
       }
   else
-    n = 10;
-  return n;
+    o = 10;
+  return o;
 }
-function P(e) {
-  return r("git reset --hard origin/master", {
-    cwd: e,
+function g(t) {
+  return i("git reset --hard origin/master", {
+    cwd: t,
     env: process.env,
     encoding: "utf-8",
     stdio: ["ignore", "ignore", "pipe"]
-  }), r("git pull --rebase", {
-    cwd: e,
+  }), i("git pull --rebase", {
+    cwd: t,
     env: process.env,
     encoding: "utf-8",
     stdio: ["ignore", "ignore", "pipe"]
   }), !0;
 }
-function H(e, c, t) {
-  e !== void 0 && r(`git clone ${e}/${c}.git`, {
-    cwd: t,
+function p(t, n, e) {
+  t !== void 0 && i(`git clone ${t}/${n}.git`, {
+    cwd: e,
     env: process.env,
     encoding: "utf-8",
     stdio: ["ignore", "ignore", "pipe"]
   });
 }
-function o(e, c, t) {
+function l(t, n, e) {
   try {
-    t && console.log(`git -C ${e} ${c}`);
-    const n = r(`git ${c}`, {
-      cwd: e,
-      maxBuffer: a
+    e && console.log(`git -C ${t} ${n}`);
+    const o = i(`git ${n}`, {
+      cwd: t,
+      maxBuffer: r
     }).toString().trim();
-    return t && console.log(n), n;
-  } catch (n) {
-    for (const s of ["stdout", "stderr"])
-      console.error(`${s}: ${n[s]}`);
-    throw n;
+    return e && console.log(o), o;
+  } catch (o) {
+    for (const c of ["stdout", "stderr"])
+      console.error(`${c}: ${o[c]}`);
+    throw o;
   }
 }
-function d(e, c, t) {
+function m(t, n, e) {
   try {
-    t && console.log(`git -C ${e} ${c}`);
-    const n = r(`git ${c}`, {
-      cwd: e,
+    e && console.log(`git -C ${t} ${n}`);
+    const o = i(`git ${n}`, {
+      cwd: t,
       stdio: ["ignore", "pipe", "pipe"],
-      maxBuffer: a
+      maxBuffer: r
     }).toString().trim();
-    return t && console.log(n), !0;
-  } catch (n) {
-    if (n.status != 0) return !1;
-    throw n;
-  }
-}
-function S(e, c, t) {
-  const n = o(e, "rev-parse --abbrev-ref HEAD"), s = "uid", i = process.cwd();
-  process.chdir(e);
-  for (const f of c) {
-    const u = `${f}/uid`;
-    l.ensureDirSync(u);
-    for (const g of p([`${f}/**/*.json`])) {
-      const h = $.basename(g);
-      l.renameSync(g, `${u}/${h}`);
-    }
-  }
-  process.chdir(i), d(e, `rev-parse remotes/origin/${s}`) ? (o(e, `branch --force ${s} origin/${s}`), o(e, `symbolic-ref HEAD refs/heads/${s}`), o(e, "reset")) : d(e, `rev-parse refs/heads/${s}`) ? (o(e, `symbolic-ref HEAD refs/heads/${s}`), o(e, "reset")) : (o(e, `branch --force ${s} master`), o(e, `symbolic-ref HEAD refs/heads/${s}`), o(e, "reset"), o(e, "rm -r ."));
-  for (const f of c) {
-    const u = `${f}/uid`;
-    o(e, `add ${u}`);
+    return e && console.log(o), !0;
+  } catch (o) {
+    if (o.status != 0) return !1;
+    throw o;
   }
-  let m = !1;
-  return d(e, "diff --quiet --cached") || (o(e, "commit -m 'Update'"), m = !0), o(e, `symbolic-ref HEAD refs/heads/${n}`), o(e, `reset ${t ? "" : "--hard"}`), m;
 }
 export {
-  H as clone,
-  v as commit,
-  E as commitAndPush,
-  P as resetAndPull,
-  o as run,
-  d as test,
-  S as uidBranchUpdate
+  p as clone,
+  u as commit,
+  f as commitAndPush,
+  g as resetAndPull,
+  l as run,
+  m as test
 };