@tricoteuses/assemblee 3.6.0 → 3.6.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -28,6 +28,8 @@ export interface EliasseSyncState {
28
28
  amendements: EliasseStoredAmendement[];
29
29
  }
30
30
  export interface EliasseSyncCounts {
31
+ source: "http" | "patch";
32
+ version: number;
31
33
  stored: number;
32
34
  /** Actual open data changes, not attempted writes. */
33
35
  patched: number;
@@ -36,7 +38,7 @@ export interface EliasseSyncCounts {
36
38
  export interface EliasseSyncRepository {
37
39
  load(uidExamen: string): Promise<EliasseSyncState>;
38
40
  /** Must be atomic; a rejection must leave the previous checkpoint intact. */
39
- commit(target: EliasseSyncTarget, state: EliasseSyncState, statistiques?: EliasseStatistiques): Promise<Omit<EliasseSyncCounts, "pendingDetails">>;
41
+ commit(target: EliasseSyncTarget, state: EliasseSyncState, statistiques?: EliasseStatistiques): Promise<Pick<EliasseSyncCounts, "stored" | "patched">>;
40
42
  saveStatistics(uidExamen: string, statistiques: EliasseStatistiques): Promise<void>;
41
43
  }
42
44
  export interface EliasseSynchronizerOptions {
@@ -3,7 +3,10 @@ import { applyEliasseDerouleurUpdate as e, compareEliasseOrdre as t } from "./el
3
3
  function n(e) {
4
4
  return e != null && e !== "" && e !== "Aucun";
5
5
  }
6
- var r = class {
6
+ function r(e) {
7
+ return JSON.stringify(e, (e, t) => typeof t != "object" || !t || Array.isArray(t) ? t : Object.fromEntries(Object.entries(t).sort(([e], [t]) => e < t ? -1 : +(e > t))));
8
+ }
9
+ var i = class {
7
10
  constructor(e) {
8
11
  this.options = e, this.tails = /* @__PURE__ */ new Map();
9
12
  }
@@ -24,7 +27,7 @@ var r = class {
24
27
  libelle: e.libelle ?? r.derouleur.places.find((t) => t.id === e.id)?.libelle
25
28
  }
26
29
  })));
27
- return this.process(t, r, e(r.derouleur, n), i);
30
+ return this.process(t, r, e(r.derouleur, n), i, void 0, "patch");
28
31
  });
29
32
  }
30
33
  saveStatistics(e, t) {
@@ -42,59 +45,61 @@ var r = class {
42
45
  })]);
43
46
  return this.process(e, t, n, [], r);
44
47
  }
45
- async process(e, r, i, a, o) {
46
- let s = this.options.now?.() ?? Date.now(), c = new Map(r.amendements.map((e) => [e.uid, { ...e }])), l = i.places.flatMap((e) => e.amendements.map((t) => ({
48
+ async process(e, i, a, o, s, c = "http") {
49
+ let l = this.options.now?.() ?? Date.now(), u = new Map(i.amendements.map((e) => [e.uid, { ...e }])), d = a.places.flatMap((e) => e.amendements.map((t) => ({
47
50
  amendement: t,
48
51
  place: {
49
52
  id: e.id,
50
53
  libelle: e.libelle
51
54
  }
52
55
  })));
53
- l.sort((e, n) => t(e.amendement.ordre, n.amendement.ordre));
54
- let u = new Set(l.filter((e) => e.amendement.estVisible !== !1).map((e) => e.amendement.uid)), d = new Set(l.filter((e) => e.amendement.estVisible !== !1 && !n(e.amendement.sort)).slice(0, this.options.limit ?? 25).map((e) => e.amendement.uid)), f = e.uidAmendement ?? void 0;
55
- for (let e of [...l, ...a]) {
56
- let t = e.amendement.uid, r = c.get(t), i = JSON.stringify(r?.row) !== JSON.stringify(e), a = n(e.amendement.sort) || t === f || d.has(t) || r?.present === !0 && !u.has(t);
57
- c.set(t, {
58
- ...r,
56
+ d.sort((e, n) => t(e.amendement.ordre, n.amendement.ordre));
57
+ let f = new Set(d.filter((e) => e.amendement.estVisible !== !1).map((e) => e.amendement.uid)), p = new Set(d.filter((e) => e.amendement.estVisible !== !1 && !n(e.amendement.sort)).slice(0, this.options.limit ?? 25).map((e) => e.amendement.uid)), m = e.uidAmendement ?? void 0;
58
+ for (let e of [...d, ...o]) {
59
+ let t = e.amendement.uid, i = u.get(t), a = r(i?.row) !== r(e), o = n(e.amendement.sort) || t === m || p.has(t) || i?.present === !0 && !f.has(t);
60
+ u.set(t, {
61
+ ...i,
59
62
  uid: t,
60
63
  row: e,
61
- present: u.has(t),
62
- detailPending: r?.detailPending === !0 || a && (r?.detail === void 0 || i || (t === f || d.has(t)) && s - (r?.detailFetchedAt ?? 0) >= (this.options.detailRefreshMs ?? 6e4)),
63
- detailRetryAt: i ? void 0 : r?.detailRetryAt
64
+ present: f.has(t),
65
+ detailPending: i?.detailPending === !0 || o && (i?.detail === void 0 || a || (t === m || p.has(t)) && l - (i?.detailFetchedAt ?? 0) >= (this.options.detailRefreshMs ?? 6e4)),
66
+ detailRetryAt: a ? void 0 : i?.detailRetryAt
64
67
  });
65
68
  }
66
- for (let e of c.values()) u.has(e.uid) || (e.present && (e.detailPending = !0, e.detailRetryAt = void 0), e.present = !1);
67
- f !== void 0 && !c.has(f) && c.set(f, {
68
- uid: f,
69
+ for (let e of u.values()) f.has(e.uid) || (e.present && (e.detailPending = !0, e.detailRetryAt = void 0), e.present = !1);
70
+ m !== void 0 && !u.has(m) && u.set(m, {
71
+ uid: m,
69
72
  present: !1,
70
73
  detailPending: !0
71
74
  });
72
- let p = f === void 0 ? void 0 : c.get(f);
73
- p !== void 0 && s - (p.detailFetchedAt ?? 0) >= (this.options.detailRefreshMs ?? 6e4) && (p.detailPending = !0), p?.detailRetryAt !== void 0 && (p.detailRetryAt = Math.min(p.detailRetryAt, s + Math.min(this.options.retryMs ?? 6e4, 15e3)));
74
- let m = (e) => e.uid === f ? 0 : n(e.row?.amendement.sort) ? 1 : e.present ? 3 : 2, h = [...c.values()].filter((e) => e.detailPending && (e.detailRetryAt ?? 0) <= s).sort((e, n) => m(e) - m(n) || (e.detailFetchedAt ?? 0) - (n.detailFetchedAt ?? 0) || t(e.row?.amendement.ordre ?? "", n.row?.amendement.ordre ?? "")).slice(0, Math.max(0, this.options.limit ?? 25)), g = /* @__PURE__ */ new Map();
75
- if (h.length > 0) try {
76
- g = await this.options.fetchDetails(e, h.map((e) => e.uid));
75
+ let h = m === void 0 ? void 0 : u.get(m);
76
+ h !== void 0 && l - (h.detailFetchedAt ?? 0) >= (this.options.detailRefreshMs ?? 6e4) && (h.detailPending = !0), h?.detailRetryAt !== void 0 && (h.detailRetryAt = Math.min(h.detailRetryAt, l + Math.min(this.options.retryMs ?? 6e4, 15e3)));
77
+ let g = (e) => e.uid === m ? 0 : n(e.row?.amendement.sort) ? 1 : e.present ? 3 : 2, _ = [...u.values()].filter((e) => e.detailPending && (e.detailRetryAt ?? 0) <= l).sort((e, n) => g(e) - g(n) || (e.detailFetchedAt ?? 0) - (n.detailFetchedAt ?? 0) || t(e.row?.amendement.ordre ?? "", n.row?.amendement.ordre ?? "")).slice(0, Math.max(0, this.options.limit ?? 25)), v = /* @__PURE__ */ new Map();
78
+ if (_.length > 0) try {
79
+ v = await this.options.fetchDetails(e, _.map((e) => e.uid));
77
80
  } catch (e) {
78
81
  this.options.onError?.(e);
79
82
  }
80
- for (let e of h) {
81
- let t = g.get(e.uid);
82
- if (t !== void 0) e.detail = t, e.detailFetchedAt = s, e.detailPending = !1, e.detailRetryAt = void 0;
83
+ for (let e of _) {
84
+ let t = v.get(e.uid);
85
+ if (t !== void 0) e.detail = t, e.detailFetchedAt = l, e.detailPending = !1, e.detailRetryAt = void 0;
83
86
  else {
84
87
  let t = this.options.retryMs ?? 6e4;
85
- e.detailRetryAt = s + (e.uid === f ? Math.min(t, 15e3) : t);
88
+ e.detailRetryAt = l + (e.uid === m ? Math.min(t, 15e3) : t);
86
89
  }
87
90
  }
88
- let _ = {
89
- revision: r.revision,
90
- derouleur: i,
91
- amendements: [...c.values()]
91
+ let y = {
92
+ revision: i.revision,
93
+ derouleur: a,
94
+ amendements: [...u.values()]
92
95
  };
93
96
  return {
94
- ...await this.options.repository.commit(e, _, o),
95
- pendingDetails: _.amendements.filter((e) => e.detailPending).length
97
+ ...await this.options.repository.commit(e, y, s),
98
+ source: c,
99
+ version: a.version,
100
+ pendingDetails: y.amendements.filter((e) => e.detailPending).length
96
101
  };
97
102
  }
98
103
  };
99
104
  //#endregion
100
- export { r as EliasseSynchronizer, n as isEliasseKnownSort };
105
+ export { i as EliasseSynchronizer, n as isEliasseKnownSort };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tricoteuses/assemblee",
3
- "version": "3.6.0",
3
+ "version": "3.6.1",
4
4
  "description": "Retrieve, clean up & handle French Assemblée nationale's open data",
5
5
  "keywords": [
6
6
  "Assemblée nationale",