@tricoteuses/assemblee 1.10.3 → 1.10.5
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.
- package/lib/cleaners/xml.js +29 -50
- package/lib/cleaners/xml.mjs +26 -25
- package/lib/parsers/documents.js +1 -1
- package/lib/raw_types/acteurs_et_organes.d.ts +4 -2
- package/lib/raw_types/acteurs_et_organes.js +6 -4
- package/lib/raw_types/acteurs_et_organes.mjs +6 -4
- package/lib/raw_types/dossiers_legislatifs.d.ts +2 -2
- package/lib/raw_types/dossiers_legislatifs.js +3 -3
- package/lib/raw_types/dossiers_legislatifs.mjs +3 -3
- package/lib/scripts/clean_reorganized_data.js +13 -10
- package/lib/scripts/clean_reorganized_data.mjs +12 -9
- package/lib/types/acteurs_et_organes.d.ts +4 -2
- package/lib/types/acteurs_et_organes.js +6 -4
- package/lib/types/acteurs_et_organes.mjs +6 -4
- package/package.json +4 -4
package/lib/cleaners/xml.js
CHANGED
|
@@ -1,19 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
require("core-js/modules/es.symbol.js");
|
|
4
|
-
require("core-js/modules/es.symbol.description.js");
|
|
5
|
-
require("core-js/modules/es.symbol.iterator.js");
|
|
6
|
-
require("core-js/modules/es.array.from.js");
|
|
7
|
-
require("core-js/modules/es.array.iterator.js");
|
|
8
|
-
require("core-js/modules/es.array.slice.js");
|
|
9
|
-
require("core-js/modules/es.date.to-string.js");
|
|
10
|
-
require("core-js/modules/es.function.name.js");
|
|
11
3
|
require("core-js/modules/es.object.define-property.js");
|
|
12
|
-
require("core-js/modules/es.object.to-string.js");
|
|
13
|
-
require("core-js/modules/es.regexp.exec.js");
|
|
14
|
-
require("core-js/modules/es.regexp.to-string.js");
|
|
15
|
-
require("core-js/modules/es.string.iterator.js");
|
|
16
|
-
require("core-js/modules/web.dom-collections.iterator.js");
|
|
17
4
|
Object.defineProperty(exports, "__esModule", {
|
|
18
5
|
value: true
|
|
19
6
|
});
|
|
@@ -22,29 +9,26 @@ exports.cleanIntegerAttribute = cleanIntegerAttribute;
|
|
|
22
9
|
exports.cleanXmlArtefacts = cleanXmlArtefacts;
|
|
23
10
|
require("core-js/modules/es.array.concat.js");
|
|
24
11
|
require("core-js/modules/es.array.is-array.js");
|
|
25
|
-
require("core-js/modules/es.
|
|
12
|
+
require("core-js/modules/es.number.is-nan.js");
|
|
13
|
+
require("core-js/modules/es.number.parse-int.js");
|
|
26
14
|
require("core-js/modules/es.object.keys.js");
|
|
27
|
-
require("
|
|
28
|
-
var _assert = _interopRequireDefault(require("assert"));
|
|
15
|
+
var _nodeAssert = _interopRequireDefault(require("node:assert"));
|
|
29
16
|
function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
|
|
33
|
-
function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
|
|
34
|
-
function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
|
|
35
|
-
function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
|
|
36
|
-
var booleanByString = {
|
|
17
|
+
// Move constant to module scope to avoid recreation
|
|
18
|
+
var BOOLEAN_MAP = {
|
|
37
19
|
"false": false,
|
|
38
20
|
"true": true
|
|
39
21
|
};
|
|
22
|
+
var XML_NAMESPACE = "http://schemas.assemblee-nationale.fr/referentiel";
|
|
23
|
+
var XSI_NAMESPACE = "http://www.w3.org/2001/XMLSchema-instance";
|
|
40
24
|
function cleanBooleanAttribute(o, key) {
|
|
41
25
|
var stringValue = o[key];
|
|
42
26
|
if (stringValue === undefined || stringValue === null) {
|
|
43
27
|
delete o[key];
|
|
44
28
|
return undefined;
|
|
45
29
|
}
|
|
46
|
-
var booleanValue =
|
|
47
|
-
|
|
30
|
+
var booleanValue = BOOLEAN_MAP[stringValue];
|
|
31
|
+
_nodeAssert["default"].notStrictEqual(booleanValue, undefined, "Invalid boolean value: ".concat(key, " = ").concat(stringValue));
|
|
48
32
|
o[key] = booleanValue;
|
|
49
33
|
return booleanValue;
|
|
50
34
|
}
|
|
@@ -54,42 +38,37 @@ function cleanIntegerAttribute(o, key) {
|
|
|
54
38
|
delete o[key];
|
|
55
39
|
return undefined;
|
|
56
40
|
}
|
|
57
|
-
var integerValue = parseInt(stringValue);
|
|
58
|
-
(0,
|
|
41
|
+
var integerValue = Number.parseInt(stringValue);
|
|
42
|
+
(0, _nodeAssert["default"])(!Number.isNaN(integerValue), "Invalid number value: ".concat(key, " = ").concat(stringValue));
|
|
59
43
|
o[key] = integerValue;
|
|
60
44
|
return integerValue;
|
|
61
45
|
}
|
|
62
46
|
|
|
63
47
|
/// Remove XML fields that have no use in JSON.
|
|
64
48
|
function cleanXmlArtefacts(o) {
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
delete o["xmlns"];
|
|
73
|
-
}
|
|
74
|
-
}
|
|
49
|
+
var _o$Xmlns;
|
|
50
|
+
// Optimize namespace checks with direct property access
|
|
51
|
+
var xmlns = (_o$Xmlns = o["@xmlns"]) !== null && _o$Xmlns !== void 0 ? _o$Xmlns : o["xmlns"];
|
|
52
|
+
if (xmlns !== undefined) {
|
|
53
|
+
_nodeAssert["default"].strictEqual(xmlns, XML_NAMESPACE);
|
|
54
|
+
delete o["@xmlns"];
|
|
55
|
+
delete o["xmlns"];
|
|
75
56
|
}
|
|
76
|
-
|
|
77
|
-
cleanXmlns(o["xmlns"]);
|
|
78
|
-
var xmlnsXsi = o["@xmlns:xsi"];
|
|
79
|
-
if (xmlnsXsi !== undefined) {
|
|
80
|
-
_assert["default"].strictEqual(xmlnsXsi, "http://www.w3.org/2001/XMLSchema-instance");
|
|
57
|
+
if (o["@xmlns:xsi"] === XSI_NAMESPACE) {
|
|
81
58
|
delete o["@xmlns:xsi"];
|
|
82
59
|
}
|
|
83
60
|
|
|
84
|
-
//
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
61
|
+
// Optimize empty checks with direct property access
|
|
62
|
+
for (var key in o) {
|
|
63
|
+
var value = o[key];
|
|
64
|
+
if (value === null) {
|
|
65
|
+
delete o[key];
|
|
66
|
+
continue;
|
|
67
|
+
}
|
|
68
|
+
if (value === undefined) continue;
|
|
69
|
+
if (value["@xsi:nil"] === "true" || Array.isArray(value) && value.length === 0 || !Array.isArray(value) && value.constructor === Object && Object.keys(value).length === 0) {
|
|
91
70
|
delete o[key];
|
|
92
71
|
}
|
|
93
72
|
}
|
|
94
73
|
}
|
|
95
|
-
//# sourceMappingURL=data:application/json;charset=utf-8;base64,
|
|
74
|
+
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJfbm9kZUFzc2VydCIsIl9pbnRlcm9wUmVxdWlyZURlZmF1bHQiLCJyZXF1aXJlIiwiZSIsIl9fZXNNb2R1bGUiLCJCT09MRUFOX01BUCIsIlhNTF9OQU1FU1BBQ0UiLCJYU0lfTkFNRVNQQUNFIiwiY2xlYW5Cb29sZWFuQXR0cmlidXRlIiwibyIsImtleSIsInN0cmluZ1ZhbHVlIiwidW5kZWZpbmVkIiwiYm9vbGVhblZhbHVlIiwiYXNzZXJ0Iiwibm90U3RyaWN0RXF1YWwiLCJjb25jYXQiLCJjbGVhbkludGVnZXJBdHRyaWJ1dGUiLCJpbnRlZ2VyVmFsdWUiLCJOdW1iZXIiLCJwYXJzZUludCIsImlzTmFOIiwiY2xlYW5YbWxBcnRlZmFjdHMiLCJfbyRYbWxucyIsInhtbG5zIiwic3RyaWN0RXF1YWwiLCJ2YWx1ZSIsIkFycmF5IiwiaXNBcnJheSIsImxlbmd0aCIsImNvbnN0cnVjdG9yIiwiT2JqZWN0Iiwia2V5cyJdLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jbGVhbmVycy94bWwudHMiXSwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IGFzc2VydCBmcm9tIFwibm9kZTphc3NlcnRcIlxuXG4vLyBNb3ZlIGNvbnN0YW50IHRvIG1vZHVsZSBzY29wZSB0byBhdm9pZCByZWNyZWF0aW9uXG5jb25zdCBCT09MRUFOX01BUCA9IHtcbiAgZmFsc2U6IGZhbHNlLFxuICB0cnVlOiB0cnVlLFxufSBhcyBjb25zdFxuXG5jb25zdCBYTUxfTkFNRVNQQUNFID0gXCJodHRwOi8vc2NoZW1hcy5hc3NlbWJsZWUtbmF0aW9uYWxlLmZyL3JlZmVyZW50aWVsXCJcbmNvbnN0IFhTSV9OQU1FU1BBQ0UgPSBcImh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hLWluc3RhbmNlXCJcblxuZXhwb3J0IGZ1bmN0aW9uIGNsZWFuQm9vbGVhbkF0dHJpYnV0ZShcbiAgbzogeyBba2V5OiBzdHJpbmddOiBhbnkgfSxcbiAga2V5OiBzdHJpbmcsXG4pOiBib29sZWFuIHwgdW5kZWZpbmVkIHtcbiAgY29uc3Qgc3RyaW5nVmFsdWUgPSBvW2tleV1cbiAgaWYgKHN0cmluZ1ZhbHVlID09PSB1bmRlZmluZWQgfHwgc3RyaW5nVmFsdWUgPT09IG51bGwpIHtcbiAgICBkZWxldGUgb1trZXldXG4gICAgcmV0dXJuIHVuZGVmaW5lZFxuICB9XG4gIGNvbnN0IGJvb2xlYW5WYWx1ZTogYm9vbGVhbiA9XG4gICAgQk9PTEVBTl9NQVBbc3RyaW5nVmFsdWUgYXMga2V5b2YgdHlwZW9mIEJPT0xFQU5fTUFQXVxuICBhc3NlcnQubm90U3RyaWN0RXF1YWwoXG4gICAgYm9vbGVhblZhbHVlLFxuICAgIHVuZGVmaW5lZCxcbiAgICBgSW52YWxpZCBib29sZWFuIHZhbHVlOiAke2tleX0gPSAke3N0cmluZ1ZhbHVlfWAsXG4gIClcbiAgb1trZXldID0gYm9vbGVhblZhbHVlXG4gIHJldHVybiBib29sZWFuVmFsdWVcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGNsZWFuSW50ZWdlckF0dHJpYnV0ZShcbiAgbzogeyBba2V5OiBzdHJpbmddOiBhbnkgfSxcbiAga2V5OiBzdHJpbmcsXG4pOiBudW1iZXIgfCB1bmRlZmluZWQge1xuICBjb25zdCBzdHJpbmdWYWx1ZSA9IG9ba2V5XVxuICBpZiAoc3RyaW5nVmFsdWUgPT09IHVuZGVmaW5lZCB8fCBzdHJpbmdWYWx1ZSA9PT0gbnVsbCkge1xuICAgIGRlbGV0ZSBvW2tleV1cbiAgICByZXR1cm4gdW5kZWZpbmVkXG4gIH1cbiAgY29uc3QgaW50ZWdlclZhbHVlID0gTnVtYmVyLnBhcnNlSW50KHN0cmluZ1ZhbHVlKVxuICBhc3NlcnQoXG4gICAgIU51bWJlci5pc05hTihpbnRlZ2VyVmFsdWUpLFxuICAgIGBJbnZhbGlkIG51bWJlciB2YWx1ZTogJHtrZXl9ID0gJHtzdHJpbmdWYWx1ZX1gLFxuICApXG4gIG9ba2V5XSA9IGludGVnZXJWYWx1ZVxuICByZXR1cm4gaW50ZWdlclZhbHVlXG59XG5cbi8vLyBSZW1vdmUgWE1MIGZpZWxkcyB0aGF0IGhhdmUgbm8gdXNlIGluIEpTT04uXG5leHBvcnQgZnVuY3Rpb24gY2xlYW5YbWxBcnRlZmFjdHMobzogeyBba2V5OiBzdHJpbmddOiBhbnkgfSk6IHZvaWQge1xuICAvLyBPcHRpbWl6ZSBuYW1lc3BhY2UgY2hlY2tzIHdpdGggZGlyZWN0IHByb3BlcnR5IGFjY2Vzc1xuICBjb25zdCB4bWxucyA9IG9bXCJAeG1sbnNcIl0gPz8gb1tcInhtbG5zXCJdXG4gIGlmICh4bWxucyAhPT0gdW5kZWZpbmVkKSB7XG4gICAgYXNzZXJ0LnN0cmljdEVxdWFsKHhtbG5zLCBYTUxfTkFNRVNQQUNFKVxuICAgIGRlbGV0ZSBvW1wiQHhtbG5zXCJdXG4gICAgZGVsZXRlIG9bXCJ4bWxuc1wiXVxuICB9XG5cbiAgaWYgKG9bXCJAeG1sbnM6eHNpXCJdID09PSBYU0lfTkFNRVNQQUNFKSB7XG4gICAgZGVsZXRlIG9bXCJAeG1sbnM6eHNpXCJdXG4gIH1cblxuICAvLyBPcHRpbWl6ZSBlbXB0eSBjaGVja3Mgd2l0aCBkaXJlY3QgcHJvcGVydHkgYWNjZXNzXG4gIGZvciAoY29uc3Qga2V5IGluIG8pIHtcbiAgICBjb25zdCB2YWx1ZSA9IG9ba2V5XVxuICAgIGlmICh2YWx1ZSA9PT0gbnVsbCkge1xuICAgICAgZGVsZXRlIG9ba2V5XVxuICAgICAgY29udGludWVcbiAgICB9XG5cbiAgICBpZiAodmFsdWUgPT09IHVuZGVmaW5lZCkgY29udGludWVcblxuICAgIGlmIChcbiAgICAgIHZhbHVlW1wiQHhzaTpuaWxcIl0gPT09IFwidHJ1ZVwiIHx8XG4gICAgICAoQXJyYXkuaXNBcnJheSh2YWx1ZSkgJiYgdmFsdWUubGVuZ3RoID09PSAwKSB8fFxuICAgICAgKCFBcnJheS5pc0FycmF5KHZhbHVlKSAmJlxuICAgICAgICB2YWx1ZS5jb25zdHJ1Y3RvciA9PT0gT2JqZWN0ICYmXG4gICAgICAgIE9iamVjdC5rZXlzKHZhbHVlKS5sZW5ndGggPT09IDApXG4gICAgKSB7XG4gICAgICBkZWxldGUgb1trZXldXG4gICAgfVxuICB9XG59XG4iXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7O0FBQUEsSUFBQUEsV0FBQSxHQUFBQyxzQkFBQSxDQUFBQyxPQUFBO0FBQWdDLFNBQUFELHVCQUFBRSxDQUFBLFdBQUFBLENBQUEsSUFBQUEsQ0FBQSxDQUFBQyxVQUFBLEdBQUFELENBQUEsZ0JBQUFBLENBQUE7QUFFaEM7QUFDQSxJQUFNRSxXQUFXLEdBQUc7RUFDbEIsU0FBTyxLQUFLO0VBQ1osUUFBTTtBQUNSLENBQVU7QUFFVixJQUFNQyxhQUFhLEdBQUcsbURBQW1EO0FBQ3pFLElBQU1DLGFBQWEsR0FBRywyQ0FBMkM7QUFFMUQsU0FBU0MscUJBQXFCQSxDQUNuQ0MsQ0FBeUIsRUFDekJDLEdBQVcsRUFDVTtFQUNyQixJQUFNQyxXQUFXLEdBQUdGLENBQUMsQ0FBQ0MsR0FBRyxDQUFDO0VBQzFCLElBQUlDLFdBQVcsS0FBS0MsU0FBUyxJQUFJRCxXQUFXLEtBQUssSUFBSSxFQUFFO0lBQ3JELE9BQU9GLENBQUMsQ0FBQ0MsR0FBRyxDQUFDO0lBQ2IsT0FBT0UsU0FBUztFQUNsQjtFQUNBLElBQU1DLFlBQXFCLEdBQ3pCUixXQUFXLENBQUNNLFdBQVcsQ0FBNkI7RUFDdERHLHNCQUFNLENBQUNDLGNBQWMsQ0FDbkJGLFlBQVksRUFDWkQsU0FBUyw0QkFBQUksTUFBQSxDQUNpQk4sR0FBRyxTQUFBTSxNQUFBLENBQU1MLFdBQVcsQ0FDaEQsQ0FBQztFQUNERixDQUFDLENBQUNDLEdBQUcsQ0FBQyxHQUFHRyxZQUFZO0VBQ3JCLE9BQU9BLFlBQVk7QUFDckI7QUFFTyxTQUFTSSxxQkFBcUJBLENBQ25DUixDQUF5QixFQUN6QkMsR0FBVyxFQUNTO0VBQ3BCLElBQU1DLFdBQVcsR0FBR0YsQ0FBQyxDQUFDQyxHQUFHLENBQUM7RUFDMUIsSUFBSUMsV0FBVyxLQUFLQyxTQUFTLElBQUlELFdBQVcsS0FBSyxJQUFJLEVBQUU7SUFDckQsT0FBT0YsQ0FBQyxDQUFDQyxHQUFHLENBQUM7SUFDYixPQUFPRSxTQUFTO0VBQ2xCO0VBQ0EsSUFBTU0sWUFBWSxHQUFHQyxNQUFNLENBQUNDLFFBQVEsQ0FBQ1QsV0FBVyxDQUFDO0VBQ2pELElBQUFHLHNCQUFNLEVBQ0osQ0FBQ0ssTUFBTSxDQUFDRSxLQUFLLENBQUNILFlBQVksQ0FBQywyQkFBQUYsTUFBQSxDQUNGTixHQUFHLFNBQUFNLE1BQUEsQ0FBTUwsV0FBVyxDQUMvQyxDQUFDO0VBQ0RGLENBQUMsQ0FBQ0MsR0FBRyxDQUFDLEdBQUdRLFlBQVk7RUFDckIsT0FBT0EsWUFBWTtBQUNyQjs7QUFFQTtBQUNPLFNBQVNJLGlCQUFpQkEsQ0FBQ2IsQ0FBeUIsRUFBUTtFQUFBLElBQUFjLFFBQUE7RUFDakU7RUFDQSxJQUFNQyxLQUFLLElBQUFELFFBQUEsR0FBR2QsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxjQUFBYyxRQUFBLGNBQUFBLFFBQUEsR0FBSWQsQ0FBQyxDQUFDLE9BQU8sQ0FBQztFQUN2QyxJQUFJZSxLQUFLLEtBQUtaLFNBQVMsRUFBRTtJQUN2QkUsc0JBQU0sQ0FBQ1csV0FBVyxDQUFDRCxLQUFLLEVBQUVsQixhQUFhLENBQUM7SUFDeEMsT0FBT0csQ0FBQyxDQUFDLFFBQVEsQ0FBQztJQUNsQixPQUFPQSxDQUFDLENBQUMsT0FBTyxDQUFDO0VBQ25CO0VBRUEsSUFBSUEsQ0FBQyxDQUFDLFlBQVksQ0FBQyxLQUFLRixhQUFhLEVBQUU7SUFDckMsT0FBT0UsQ0FBQyxDQUFDLFlBQVksQ0FBQztFQUN4Qjs7RUFFQTtFQUNBLEtBQUssSUFBTUMsR0FBRyxJQUFJRCxDQUFDLEVBQUU7SUFDbkIsSUFBTWlCLEtBQUssR0FBR2pCLENBQUMsQ0FBQ0MsR0FBRyxDQUFDO0lBQ3BCLElBQUlnQixLQUFLLEtBQUssSUFBSSxFQUFFO01BQ2xCLE9BQU9qQixDQUFDLENBQUNDLEdBQUcsQ0FBQztNQUNiO0lBQ0Y7SUFFQSxJQUFJZ0IsS0FBSyxLQUFLZCxTQUFTLEVBQUU7SUFFekIsSUFDRWMsS0FBSyxDQUFDLFVBQVUsQ0FBQyxLQUFLLE1BQU0sSUFDM0JDLEtBQUssQ0FBQ0MsT0FBTyxDQUFDRixLQUFLLENBQUMsSUFBSUEsS0FBSyxDQUFDRyxNQUFNLEtBQUssQ0FBRSxJQUMzQyxDQUFDRixLQUFLLENBQUNDLE9BQU8sQ0FBQ0YsS0FBSyxDQUFDLElBQ3BCQSxLQUFLLENBQUNJLFdBQVcsS0FBS0MsTUFBTSxJQUM1QkEsTUFBTSxDQUFDQyxJQUFJLENBQUNOLEtBQUssQ0FBQyxDQUFDRyxNQUFNLEtBQUssQ0FBRSxFQUNsQztNQUNBLE9BQU9wQixDQUFDLENBQUNDLEdBQUcsQ0FBQztJQUNmO0VBQ0Y7QUFDRiIsImlnbm9yZUxpc3QiOltdfQ==
|
package/lib/cleaners/xml.mjs
CHANGED
|
@@ -1,15 +1,19 @@
|
|
|
1
|
-
import assert from "assert";
|
|
2
|
-
|
|
1
|
+
import assert from "node:assert";
|
|
2
|
+
|
|
3
|
+
// Move constant to module scope to avoid recreation
|
|
4
|
+
const BOOLEAN_MAP = {
|
|
3
5
|
false: false,
|
|
4
6
|
true: true
|
|
5
7
|
};
|
|
8
|
+
const XML_NAMESPACE = "http://schemas.assemblee-nationale.fr/referentiel";
|
|
9
|
+
const XSI_NAMESPACE = "http://www.w3.org/2001/XMLSchema-instance";
|
|
6
10
|
export function cleanBooleanAttribute(o, key) {
|
|
7
11
|
const stringValue = o[key];
|
|
8
12
|
if (stringValue === undefined || stringValue === null) {
|
|
9
13
|
delete o[key];
|
|
10
14
|
return undefined;
|
|
11
15
|
}
|
|
12
|
-
const booleanValue =
|
|
16
|
+
const booleanValue = BOOLEAN_MAP[stringValue];
|
|
13
17
|
assert.notStrictEqual(booleanValue, undefined, `Invalid boolean value: ${key} = ${stringValue}`);
|
|
14
18
|
o[key] = booleanValue;
|
|
15
19
|
return booleanValue;
|
|
@@ -20,39 +24,36 @@ export function cleanIntegerAttribute(o, key) {
|
|
|
20
24
|
delete o[key];
|
|
21
25
|
return undefined;
|
|
22
26
|
}
|
|
23
|
-
const integerValue = parseInt(stringValue);
|
|
24
|
-
assert(!isNaN(integerValue), `Invalid number value: ${key} = ${stringValue}`);
|
|
27
|
+
const integerValue = Number.parseInt(stringValue);
|
|
28
|
+
assert(!Number.isNaN(integerValue), `Invalid number value: ${key} = ${stringValue}`);
|
|
25
29
|
o[key] = integerValue;
|
|
26
30
|
return integerValue;
|
|
27
31
|
}
|
|
28
32
|
|
|
29
33
|
/// Remove XML fields that have no use in JSON.
|
|
30
34
|
export function cleanXmlArtefacts(o) {
|
|
31
|
-
//
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
} else {
|
|
38
|
-
delete o["xmlns"];
|
|
39
|
-
}
|
|
40
|
-
}
|
|
35
|
+
// Optimize namespace checks with direct property access
|
|
36
|
+
const xmlns = o["@xmlns"] ?? o["xmlns"];
|
|
37
|
+
if (xmlns !== undefined) {
|
|
38
|
+
assert.strictEqual(xmlns, XML_NAMESPACE);
|
|
39
|
+
delete o["@xmlns"];
|
|
40
|
+
delete o["xmlns"];
|
|
41
41
|
}
|
|
42
|
-
|
|
43
|
-
cleanXmlns(o["xmlns"]);
|
|
44
|
-
const xmlnsXsi = o["@xmlns:xsi"];
|
|
45
|
-
if (xmlnsXsi !== undefined) {
|
|
46
|
-
assert.strictEqual(xmlnsXsi, "http://www.w3.org/2001/XMLSchema-instance");
|
|
42
|
+
if (o["@xmlns:xsi"] === XSI_NAMESPACE) {
|
|
47
43
|
delete o["@xmlns:xsi"];
|
|
48
44
|
}
|
|
49
45
|
|
|
50
|
-
//
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
if (value === null
|
|
46
|
+
// Optimize empty checks with direct property access
|
|
47
|
+
for (const key in o) {
|
|
48
|
+
const value = o[key];
|
|
49
|
+
if (value === null) {
|
|
50
|
+
delete o[key];
|
|
51
|
+
continue;
|
|
52
|
+
}
|
|
53
|
+
if (value === undefined) continue;
|
|
54
|
+
if (value["@xsi:nil"] === "true" || Array.isArray(value) && value.length === 0 || !Array.isArray(value) && value.constructor === Object && Object.keys(value).length === 0) {
|
|
54
55
|
delete o[key];
|
|
55
56
|
}
|
|
56
57
|
}
|
|
57
58
|
}
|
|
58
|
-
//# sourceMappingURL=data:application/json;charset=utf-8;base64,
|
|
59
|
+
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJhc3NlcnQiLCJCT09MRUFOX01BUCIsImZhbHNlIiwidHJ1ZSIsIlhNTF9OQU1FU1BBQ0UiLCJYU0lfTkFNRVNQQUNFIiwiY2xlYW5Cb29sZWFuQXR0cmlidXRlIiwibyIsImtleSIsInN0cmluZ1ZhbHVlIiwidW5kZWZpbmVkIiwiYm9vbGVhblZhbHVlIiwibm90U3RyaWN0RXF1YWwiLCJjbGVhbkludGVnZXJBdHRyaWJ1dGUiLCJpbnRlZ2VyVmFsdWUiLCJOdW1iZXIiLCJwYXJzZUludCIsImlzTmFOIiwiY2xlYW5YbWxBcnRlZmFjdHMiLCJ4bWxucyIsInN0cmljdEVxdWFsIiwidmFsdWUiLCJBcnJheSIsImlzQXJyYXkiLCJsZW5ndGgiLCJjb25zdHJ1Y3RvciIsIk9iamVjdCIsImtleXMiXSwic291cmNlcyI6WyIuLi8uLi9zcmMvY2xlYW5lcnMveG1sLnRzIl0sInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBhc3NlcnQgZnJvbSBcIm5vZGU6YXNzZXJ0XCJcblxuLy8gTW92ZSBjb25zdGFudCB0byBtb2R1bGUgc2NvcGUgdG8gYXZvaWQgcmVjcmVhdGlvblxuY29uc3QgQk9PTEVBTl9NQVAgPSB7XG4gIGZhbHNlOiBmYWxzZSxcbiAgdHJ1ZTogdHJ1ZSxcbn0gYXMgY29uc3RcblxuY29uc3QgWE1MX05BTUVTUEFDRSA9IFwiaHR0cDovL3NjaGVtYXMuYXNzZW1ibGVlLW5hdGlvbmFsZS5mci9yZWZlcmVudGllbFwiXG5jb25zdCBYU0lfTkFNRVNQQUNFID0gXCJodHRwOi8vd3d3LnczLm9yZy8yMDAxL1hNTFNjaGVtYS1pbnN0YW5jZVwiXG5cbmV4cG9ydCBmdW5jdGlvbiBjbGVhbkJvb2xlYW5BdHRyaWJ1dGUoXG4gIG86IHsgW2tleTogc3RyaW5nXTogYW55IH0sXG4gIGtleTogc3RyaW5nLFxuKTogYm9vbGVhbiB8IHVuZGVmaW5lZCB7XG4gIGNvbnN0IHN0cmluZ1ZhbHVlID0gb1trZXldXG4gIGlmIChzdHJpbmdWYWx1ZSA9PT0gdW5kZWZpbmVkIHx8IHN0cmluZ1ZhbHVlID09PSBudWxsKSB7XG4gICAgZGVsZXRlIG9ba2V5XVxuICAgIHJldHVybiB1bmRlZmluZWRcbiAgfVxuICBjb25zdCBib29sZWFuVmFsdWU6IGJvb2xlYW4gPVxuICAgIEJPT0xFQU5fTUFQW3N0cmluZ1ZhbHVlIGFzIGtleW9mIHR5cGVvZiBCT09MRUFOX01BUF1cbiAgYXNzZXJ0Lm5vdFN0cmljdEVxdWFsKFxuICAgIGJvb2xlYW5WYWx1ZSxcbiAgICB1bmRlZmluZWQsXG4gICAgYEludmFsaWQgYm9vbGVhbiB2YWx1ZTogJHtrZXl9ID0gJHtzdHJpbmdWYWx1ZX1gLFxuICApXG4gIG9ba2V5XSA9IGJvb2xlYW5WYWx1ZVxuICByZXR1cm4gYm9vbGVhblZhbHVlXG59XG5cbmV4cG9ydCBmdW5jdGlvbiBjbGVhbkludGVnZXJBdHRyaWJ1dGUoXG4gIG86IHsgW2tleTogc3RyaW5nXTogYW55IH0sXG4gIGtleTogc3RyaW5nLFxuKTogbnVtYmVyIHwgdW5kZWZpbmVkIHtcbiAgY29uc3Qgc3RyaW5nVmFsdWUgPSBvW2tleV1cbiAgaWYgKHN0cmluZ1ZhbHVlID09PSB1bmRlZmluZWQgfHwgc3RyaW5nVmFsdWUgPT09IG51bGwpIHtcbiAgICBkZWxldGUgb1trZXldXG4gICAgcmV0dXJuIHVuZGVmaW5lZFxuICB9XG4gIGNvbnN0IGludGVnZXJWYWx1ZSA9IE51bWJlci5wYXJzZUludChzdHJpbmdWYWx1ZSlcbiAgYXNzZXJ0KFxuICAgICFOdW1iZXIuaXNOYU4oaW50ZWdlclZhbHVlKSxcbiAgICBgSW52YWxpZCBudW1iZXIgdmFsdWU6ICR7a2V5fSA9ICR7c3RyaW5nVmFsdWV9YCxcbiAgKVxuICBvW2tleV0gPSBpbnRlZ2VyVmFsdWVcbiAgcmV0dXJuIGludGVnZXJWYWx1ZVxufVxuXG4vLy8gUmVtb3ZlIFhNTCBmaWVsZHMgdGhhdCBoYXZlIG5vIHVzZSBpbiBKU09OLlxuZXhwb3J0IGZ1bmN0aW9uIGNsZWFuWG1sQXJ0ZWZhY3RzKG86IHsgW2tleTogc3RyaW5nXTogYW55IH0pOiB2b2lkIHtcbiAgLy8gT3B0aW1pemUgbmFtZXNwYWNlIGNoZWNrcyB3aXRoIGRpcmVjdCBwcm9wZXJ0eSBhY2Nlc3NcbiAgY29uc3QgeG1sbnMgPSBvW1wiQHhtbG5zXCJdID8/IG9bXCJ4bWxuc1wiXVxuICBpZiAoeG1sbnMgIT09IHVuZGVmaW5lZCkge1xuICAgIGFzc2VydC5zdHJpY3RFcXVhbCh4bWxucywgWE1MX05BTUVTUEFDRSlcbiAgICBkZWxldGUgb1tcIkB4bWxuc1wiXVxuICAgIGRlbGV0ZSBvW1wieG1sbnNcIl1cbiAgfVxuXG4gIGlmIChvW1wiQHhtbG5zOnhzaVwiXSA9PT0gWFNJX05BTUVTUEFDRSkge1xuICAgIGRlbGV0ZSBvW1wiQHhtbG5zOnhzaVwiXVxuICB9XG5cbiAgLy8gT3B0aW1pemUgZW1wdHkgY2hlY2tzIHdpdGggZGlyZWN0IHByb3BlcnR5IGFjY2Vzc1xuICBmb3IgKGNvbnN0IGtleSBpbiBvKSB7XG4gICAgY29uc3QgdmFsdWUgPSBvW2tleV1cbiAgICBpZiAodmFsdWUgPT09IG51bGwpIHtcbiAgICAgIGRlbGV0ZSBvW2tleV1cbiAgICAgIGNvbnRpbnVlXG4gICAgfVxuXG4gICAgaWYgKHZhbHVlID09PSB1bmRlZmluZWQpIGNvbnRpbnVlXG5cbiAgICBpZiAoXG4gICAgICB2YWx1ZVtcIkB4c2k6bmlsXCJdID09PSBcInRydWVcIiB8fFxuICAgICAgKEFycmF5LmlzQXJyYXkodmFsdWUpICYmIHZhbHVlLmxlbmd0aCA9PT0gMCkgfHxcbiAgICAgICghQXJyYXkuaXNBcnJheSh2YWx1ZSkgJiZcbiAgICAgICAgdmFsdWUuY29uc3RydWN0b3IgPT09IE9iamVjdCAmJlxuICAgICAgICBPYmplY3Qua2V5cyh2YWx1ZSkubGVuZ3RoID09PSAwKVxuICAgICkge1xuICAgICAgZGVsZXRlIG9ba2V5XVxuICAgIH1cbiAgfVxufVxuIl0sIm1hcHBpbmdzIjoiQUFBQSxPQUFPQSxNQUFNLE1BQU0sYUFBYTs7QUFFaEM7QUFDQSxNQUFNQyxXQUFXLEdBQUc7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
|
package/lib/parsers/documents.js
CHANGED
|
@@ -20,7 +20,6 @@ require("core-js/modules/es.object.create.js");
|
|
|
20
20
|
require("core-js/modules/es.object.define-property.js");
|
|
21
21
|
require("core-js/modules/es.object.get-prototype-of.js");
|
|
22
22
|
require("core-js/modules/es.object.set-prototype-of.js");
|
|
23
|
-
require("core-js/modules/es.object.to-string.js");
|
|
24
23
|
require("core-js/modules/es.promise.js");
|
|
25
24
|
require("core-js/modules/es.regexp.to-string.js");
|
|
26
25
|
require("core-js/modules/es.string.iterator.js");
|
|
@@ -35,6 +34,7 @@ require("core-js/modules/es.array.concat.js");
|
|
|
35
34
|
require("core-js/modules/es.array.includes.js");
|
|
36
35
|
require("core-js/modules/es.array.join.js");
|
|
37
36
|
require("core-js/modules/es.array.map.js");
|
|
37
|
+
require("core-js/modules/es.object.to-string.js");
|
|
38
38
|
require("core-js/modules/es.regexp.exec.js");
|
|
39
39
|
require("core-js/modules/es.string.ends-with.js");
|
|
40
40
|
require("core-js/modules/es.string.match.js");
|
|
@@ -318,12 +318,14 @@ export interface SocProcInsee {
|
|
|
318
318
|
}
|
|
319
319
|
export declare enum FamSocProEnum {
|
|
320
320
|
AgriculteursExploitants = "Agriculteurs exploitants",
|
|
321
|
-
|
|
321
|
+
ArtisansCommerçantsChefsDEntreprises = "Artisans, commer\u00E7ants, chefs d'entreprises",
|
|
322
|
+
ArtisansCommerçantsEtChefsDEntrepriseAncien = "Artisans, commer\u00E7ants et chefs d'entreprise",
|
|
322
323
|
AutresPersonnesSansActivitéProfessionnelle = "Autres personnes sans activit\u00E9 professionnelle",
|
|
323
324
|
CadresEtProfessionsIntellectuellesSupérieures = "Cadres et professions intellectuelles sup\u00E9rieures",
|
|
324
325
|
Employés = "Employ\u00E9s",
|
|
325
326
|
Ouvriers = "Ouvriers",
|
|
326
|
-
ProfessionsIntermédiaires = "Professions
|
|
327
|
+
ProfessionsIntermédiaires = "Professions interm\u00E9diaires",
|
|
328
|
+
ProfessionsIntermédiairesAncien = "Professions Interm\u00E9diaires",
|
|
327
329
|
Retraités = "Retrait\u00E9s",
|
|
328
330
|
SansProfessionDéclarée = "Sans profession d\u00E9clar\u00E9e"
|
|
329
331
|
}
|