@inseefr/lunatic 2.4.2-beta → 2.4.3-beta

package/lib/use-lunatic/reducer/{validate-controls/validation-utils.js → resolve-component-controls/resolve-component-control.js}

@@ -4,6 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.resolveComponentControls = resolveComponentControls;
+var _resolveRoundaboutControl = require("./resolve-roundabout-control");
+var _typeSource = require("../../type-source");
+var _resolveSimpleControl = require("./resolve-simple-control");
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -11,40 +14,13 @@ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symb
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function resolveControl(state, control) {
-  var _state$pager;
-  var executeExpression = state.executeExpression;
-  var _ref = (_state$pager = state.pager) !== null && _state$pager !== void 0 ? _state$pager : {},
-    iteration = _ref.iteration,
-    linksIterations = _ref.linksIterations;
-  var criticality = control.criticality,
-    errorMessage = control.errorMessage,
-    id = control.id,
-    typeOfControl = control.typeOfControl;
-  var _control$control = control.control,
-    _control$control2 = _control$control === void 0 ? {} : _control$control,
-    _control$control2$val = _control$control2.value,
-    value = _control$control2$val === void 0 ? 'true' : _control$control2$val;
-  try {
-    var result = executeExpression(value, {
-      iteration: iteration,
-      linksIterations: linksIterations
-    });
-    if (!result) {
-      var label = executeExpression(errorMessage, {
-        iteration: iteration,
-        linksIterations: linksIterations
-      });
-      return {
-        criticality: criticality,
-        errorMessage: label,
-        id: id,
-        typeOfControl: typeOfControl
-      };
-    }
-    return undefined;
-  } catch (e) {
-    console.warn("Error on validating control ".concat(value));
-    return undefined;
+  var type = control.type;
+  switch (type) {
+    case _typeSource.ControlTypeEnum.roundabout:
+      return (0, _resolveRoundaboutControl.resolveRoundaboutControl)(state, control);
+    case _typeSource.ControlTypeEnum.simple:
+    default:
+      return (0, _resolveSimpleControl.resolveSimpleControl)(state, control);
   }
 }
 

package/lib/use-lunatic/reducer/resolve-component-controls/resolve-roundabout-control.js

@@ -0,0 +1,54 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.resolveRoundaboutControl = resolveRoundaboutControl;
+/**
+ * Pour le Roundabout, le controle doit être validé pour chaque itération
+ * composants l'unité enquêtée.
+ * Itération prend pour valeur le rang de l'unité stat au sein de l'unité enquêté.
+ * Le rondpoint ne peut pas être placé dans une boucle car l'itération est effacée.
+ * TODO intégrer cela dans le cadre de boucle de bloucle.
+ */
+function resolveRoundaboutControl(state, control) {
+  var _control$control$valu, _control$control;
+  var executeExpression = state.executeExpression;
+  var criticality = control.criticality,
+    errorMessage = control.errorMessage,
+    id = control.id,
+    typeOfControl = control.typeOfControl,
+    iterations = control.iterations;
+  var value = (_control$control$valu = control === null || control === void 0 ? void 0 : (_control$control = control.control) === null || _control$control === void 0 ? void 0 : _control$control.value) !== null && _control$control$valu !== void 0 ? _control$control$valu : 'true';
+  if (!iterations || iterations <= 0) {
+    return undefined;
+  }
+  var errors = Array.from({
+    length: iterations
+  }, function (_, k) {
+    return k;
+  })
+  /**
+   * Currently, the controls are lifted when the condition is false.
+   * An evolution is planned on the questionnaire generation side (Eno) to come back to a more coherent logic (i.e. lift the control when the condition is true)
+   *
+   * After this change, we have to change the next line to `.filter((iteration) => executeExpression(value, { iteration }))`
+   */.filter(function (iteration) {
+    return !executeExpression(value, {
+      iteration: iteration
+    });
+  }).map(function (iteration) {
+    return executeExpression(errorMessage, {
+      iteration: iteration
+    });
+  });
+  if (errors.length) {
+    return {
+      criticality: criticality,
+      errorMessage: errors,
+      id: id,
+      typeOfControl: typeOfControl
+    };
+  }
+  return undefined;
+}

package/lib/use-lunatic/reducer/resolve-component-controls/resolve-simple-control.js

@@ -0,0 +1,44 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.resolveSimpleControl = resolveSimpleControl;
+function resolveSimpleControl(state, control) {
+  var _state$pager, _control$control$valu, _control$control;
+  var executeExpression = state.executeExpression;
+  var _ref = (_state$pager = state.pager) !== null && _state$pager !== void 0 ? _state$pager : {},
+    iteration = _ref.iteration,
+    linksIterations = _ref.linksIterations;
+  var criticality = control.criticality,
+    errorMessage = control.errorMessage,
+    id = control.id,
+    typeOfControl = control.typeOfControl;
+  var value = (_control$control$valu = control === null || control === void 0 ? void 0 : (_control$control = control.control) === null || _control$control === void 0 ? void 0 : _control$control.value) !== null && _control$control$valu !== void 0 ? _control$control$valu : 'true';
+  var result = executeExpression(value, {
+    iteration: iteration,
+    linksIterations: linksIterations
+  });
+  try {
+    /**
+     * Currently, the controls are lifted when the condition is false.
+     * An evolution is planned on the questionnaire generation side (Eno) to come back to a more coherent logic (i.e. lift the control when the condition is true)
+     *
+     * After this change, we have to change the next line to `if (!result) return undefined;`
+     */
+    if (result) return undefined;
+    var label = executeExpression(errorMessage, {
+      iteration: iteration,
+      linksIterations: linksIterations
+    });
+    return {
+      criticality: criticality,
+      errorMessage: label,
+      id: id,
+      typeOfControl: typeOfControl
+    };
+  } catch (e) {
+    console.warn("Error on validating control ".concat(value));
+    return undefined;
+  }
+}

package/lib/use-lunatic/replace-component-sequence.js

@@ -0,0 +1,28 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.replaceComponentSequence = replaceComponentSequence;
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+/**
+ * Pour le ComponentSet : les composants du fieldset n'existe pas dans pages.
+ * Ils échappent donc aux controls. On les substitue ici au ComponentSet.
+ * On ne peut pas les ajouter directement dans pages (en spécifiant un page), car ils s'afficheraient 2 fois : dans le fieldset et en dessus, comme
+ * des composant à part entière.
+ * D'autres composant pourraient un jour figurer ici.
+ */
+function replaceComponentSequence(components) {
+  return components.reduce(function (acc, component) {
+    var componentType = component.componentType;
+    if (componentType === 'ComponentSet') {
+      return [].concat(_toConsumableArray(acc), _toConsumableArray(component.components));
+    }
+    return [].concat(_toConsumableArray(acc), [component]);
+  }, []);
+}

package/lib/use-lunatic/type-source.js

@@ -3,22 +3,28 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.TypeOfControl = exports.Criticality = void 0;
+exports.TypeOfControl = exports.Criticality = exports.ControlTypeEnum = void 0;
 /**
  * Types used for source data (lunatic models and data.json)
  *
  * These types should not be used outside of use-lunatic
  */
-var Criticality;
-exports.Criticality = Criticality;
-(function (Criticality) {
+var Criticality = /*#__PURE__*/function (Criticality) {
   Criticality["INFO"] = "INFO";
   Criticality["WARN"] = "WARN";
   Criticality["ERROR"] = "ERROR";
-})(Criticality || (exports.Criticality = Criticality = {}));
-var TypeOfControl;
-exports.TypeOfControl = TypeOfControl;
-(function (TypeOfControl) {
+  return Criticality;
+}({});
+exports.Criticality = Criticality;
+var TypeOfControl = /*#__PURE__*/function (TypeOfControl) {
   TypeOfControl["FORMAT"] = "FORMAT";
   TypeOfControl["CONSISTENCY"] = "CONSISTENCY";
-})(TypeOfControl || (exports.TypeOfControl = TypeOfControl = {}));
+  return TypeOfControl;
+}({});
+exports.TypeOfControl = TypeOfControl;
+var ControlTypeEnum = /*#__PURE__*/function (ControlTypeEnum) {
+  ControlTypeEnum["roundabout"] = "roundabout";
+  ControlTypeEnum["simple"] = "simple";
+  return ControlTypeEnum;
+}({});
+exports.ControlTypeEnum = ControlTypeEnum;

package/lib/use-lunatic/use-lunatic.js

@@ -26,7 +26,7 @@ function _nonIterableRest() { throw new TypeError("Invalid attempt to destructur
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i["return"] && (_r = _i["return"](), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; } // @ts-ignore
 var empty = {}; // Keep the same empty object (to avoid problem with useEffect dependencies)
 var emptyFn = function emptyFn() {};
 var DEFAULT_DATA = empty;

package/lib/use-lunatic/use-suggesters.js

@@ -23,16 +23,16 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i["return"] && (_r = _i["return"](), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-var SuggesterStatus;
-exports.SuggesterStatus = SuggesterStatus;
-(function (SuggesterStatus) {
+var SuggesterStatus = /*#__PURE__*/function (SuggesterStatus) {
   SuggesterStatus[SuggesterStatus["unused"] = 0] = "unused";
   SuggesterStatus[SuggesterStatus["idle"] = 1] = "idle";
   SuggesterStatus[SuggesterStatus["pending"] = 2] = "pending";
   SuggesterStatus[SuggesterStatus["success"] = 3] = "success";
   SuggesterStatus[SuggesterStatus["unknown"] = 4] = "unknown";
   SuggesterStatus[SuggesterStatus["error"] = 5] = "error";
-})(SuggesterStatus || (exports.SuggesterStatus = SuggesterStatus = {}));
+  return SuggesterStatus;
+}({});
+exports.SuggesterStatus = SuggesterStatus;
 function nothing() {}
 
 // with side effect !
@@ -153,6 +153,6 @@ function useSuggesters(_ref) {
         });
       };
     }
-  }, [suggesters, getReferentiel, status]);
+  }, [suggesters, auto, getReferentiel, status]);
   return getSuggesterStatus;
 }

package/lib/utils/function.js

@@ -0,0 +1,11 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.voidFunction = void 0;
+/**
+ * Global void function to use as default parameters
+ */
+var voidFunction = function voidFunction() {};
+exports.voidFunction = voidFunction;

package/lib/utils/idb-tools/create-db-opener.js

@@ -7,10 +7,10 @@ exports["default"] = void 0;
 var _getIdb = _interopRequireDefault(require("./get-idb"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 var IDB_REF = (0, _getIdb["default"])();
-function onSuccessDefault(e, resolve) {
-  resolve(e.result);
+function onSuccessDefault(e, resolve, reject) {
+  resolve(e.target.result);
 }
-function onUpgradeNeededDefault() {
+function onUpgradeNeededDefault(e, resolve, reject) {
   throw new Error('Upgrade needed hook required!');
 }
 function onErrorDefault(e, _, reject) {
@@ -32,10 +32,14 @@ function createDbOpener() {
       }
       var request = IDB_REF.open(name, version);
       request.onupgradeneeded = function (e) {
-        onUpgradeNeeded(e, resolve, reject);
+        if (isOpenDBRequestEvent(e)) {
+          onUpgradeNeeded(e, resolve, reject);
+        }
       };
       request.onsuccess = function (e) {
-        onSuccess(e, resolve, reject);
+        if (isOpenDBRequestEvent(e)) {
+          onSuccess(e, resolve, reject);
+        }
       };
       request.onerror = function (e) {
         onError(e, resolve, reject);
@@ -43,5 +47,8 @@ function createDbOpener() {
     });
   };
 }
+function isOpenDBRequestEvent(e) {
+  return e.target instanceof IDBOpenDBRequest;
+}
 var _default = createDbOpener;
 exports["default"] = _default;

package/lib/utils/idb-tools/idb-bulk-insert.js

@@ -31,8 +31,6 @@ var BULK_INSERT_MESSAGES = {
     type: 'bulk-insert/error'
   }
 };
-
-/* */
 exports.BULK_INSERT_MESSAGES = BULK_INSERT_MESSAGES;
 var pushTask = function pushTask(store, transaction) {
   return function () {
@@ -53,8 +51,6 @@ var pushTask = function pushTask(store, transaction) {
     }
   };
 };
-
-/* */
 function split(entities) {
   var limit = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : BULK_LIMIT;
   return entities.reduce(function (_ref3, n, i) {
@@ -64,8 +60,6 @@ function split(entities) {
     return (i + 1) % limit === 0 ? [[n], f].concat(_toConsumableArray(r)) : [[n].concat(_toConsumableArray(f))].concat(_toConsumableArray(r));
   }, [[]]);
 }
-
-/* */
 var bulkPush = function bulkPush(db, name, hook, resolve, reject, max) {
   return function (lot) {
     var i = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;

package/lib/utils/idb-tools/idb-types.js

@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/lib/utils/idb-tools/open-db.js

@@ -9,7 +9,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
 /* eslint-disable no-restricted-globals */
 
 function onUpgradeNeeded(e, _, reject) {
-  e.target.transaction.abort();
+  var _e$target$transaction;
+  (_e$target$transaction = e.target.transaction) === null || _e$target$transaction === void 0 ? void 0 : _e$target$transaction.abort();
   reject({
     message: 'base seems to need an upgrade!'
   });

package/lib/utils/idb-tools/open-or-create-db.js

@@ -25,9 +25,11 @@ function onUpgradeNeeded(e, resolve, reject) {
       multiEntry: true
     });
     var txn = e.target.transaction;
-    txn.oncomplete = function () {
-      resolve(db);
-    };
+    if (txn) {
+      txn.oncomplete = function () {
+        resolve(db);
+      };
+    }
   } catch (e) {
     reject(e);
   }

package/lib/utils/store-tools/auto-load.js

@@ -19,7 +19,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i["return"] && (_r = _i["return"](), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; } // @ts-ignore
 var workerPath = process.env.LUNATIC_LOADER_WORKER_PATH || process.env.REACT_APP_LUNATIC_LOADER_WORKER_PATH || 'workers/lunatic-loader-worker-0.1.0.js';
 var loadSuggesters = function loadSuggesters(suggesterFetcher) {
   return /*#__PURE__*/function () {
@@ -27,7 +27,7 @@ var loadSuggesters = function loadSuggesters(suggesterFetcher) {
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
-            Object.entries(suggesters).forEach( /*#__PURE__*/function () {
+            Object.entries(suggesters).map( /*#__PURE__*/function () {
               var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref2) {
                 var _ref4, name, attrs, version, db;
                 return _regeneratorRuntime().wrap(function _callee$(_context) {

package/lib/utils/store-tools/use-store-index.js

@@ -18,7 +18,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i["return"] && (_r = _i["return"](), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function useStoreIndex(storeInfo, idbVersion) {
-  var _useState = (0, _react.useState)(undefined),
+  var _useState = (0, _react.useState)(),
     _useState2 = _slicedToArray(_useState, 2),
     db = _useState2[0],
     setDb = _useState2[1];

package/lib/utils/suggester-workers/append-to-index/append.js

@@ -12,7 +12,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator["return"] && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, "catch": function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; } // @ts-ignore
+// @ts-ignore
 function append(_x, _x2, _x3) {
   return _append.apply(this, arguments);
 }
@@ -28,7 +29,7 @@ function _append() {
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          log = _args.length > 3 && _args[3] !== undefined ? _args[3] : function () {
+          log = _args.length > 3 && _args[3] !== undefined ? _args[3] : function (v) {
             return null;
           };
           _context.prev = 1;

package/lib/utils/suggester-workers/append-to-index/create-append-task.js

@@ -22,7 +22,8 @@ function createAppendTask(info, version) {
   var log = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : consoleLogging;
   var name = info.name,
     fields = info.fields,
-    stopWords = info.stopWords;
+    stopWords = info.stopWords,
+    meloto = info.meloto;
   var worker = (0, _createWorkerTs.createWorker)(workerPath);
   var start = false;
   var stop = false;
@@ -49,7 +50,8 @@ function createAppendTask(info, version) {
           version: version,
           fields: fields,
           stopWords: stopWords,
-          entities: entities
+          entities: entities,
+          meloto: meloto
         });
       }
     });

package/lib/utils/suggester-workers/commons-tokenizer/get-stemmer.spec.js

@@ -0,0 +1,11 @@
+"use strict";
+
+var _vitest = require("vitest");
+var _getStemmer = _interopRequireDefault(require("./get-stemmer"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+(0, _vitest.describe)('common-tokenizer', function () {
+  (0, _vitest.it)('getStemmer', function () {
+    var stemmer = (0, _getStemmer["default"])();
+    (0, _vitest.expect)(stemmer('bâtiment')).toEqual('bât');
+  });
+});

package/lib/utils/suggester-workers/commons-tokenizer/prepare-string-indexation.spec.js

@@ -0,0 +1,10 @@
+"use strict";
+
+var _vitest = require("vitest");
+var _prepareStringIndexation = _interopRequireDefault(require("./prepare-string-indexation"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+(0, _vitest.describe)('String indexation', function () {
+  (0, _vitest.it)('bâtiment', function () {
+    (0, _vitest.expect)((0, _prepareStringIndexation["default"])('bâtiment')).toEqual('batiment');
+  });
+});

package/lib/utils/suggester-workers/searching/compute-score.js

@@ -4,25 +4,20 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
+var _melotoOrder = require("./meloto-order");
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-function sort(withScore, max) {
+function sort(withScore) {
   return withScore.sort(function (a, b) {
-    if (a.score > b.score) {
-      return -1;
-    }
-    if (a.score < b.score) {
-      return 1;
-    }
-    return 0;
-  }).slice(0, max);
+    return b.score - a.score;
+  });
 }
-function computeScore(documents) {
-  var max = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 30;
+function computeScore(documents, tokens) {
+  var meloto = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
   var withScore = documents.map(function (doc) {
     var tokensSearch = doc.tokensSearch;
     var score = Object.keys(tokensSearch).length;
@@ -30,7 +25,7 @@ function computeScore(documents) {
       score: score
     });
   });
-  return sort(withScore, max);
+  return (0, _melotoOrder.melotoOrder)(sort(withScore), tokens, meloto);
 }
 var _default = computeScore;
 exports["default"] = _default;

package/lib/utils/suggester-workers/searching/meloto-order.js

@@ -0,0 +1,53 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.melotoOrder = melotoOrder;
+exports.value = value;
+var _prepareStringIndexation = _interopRequireDefault(require("../commons-tokenizer/prepare-string-indexation"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+function value(entity) {
+  var tokens = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+  var suggestion = entity.suggestion;
+  var label = suggestion.label;
+  var prepared = (0, _prepareStringIndexation["default"])(label);
+  if (label && label.length) {
+    return tokens.reduce(function (score, token, i) {
+      var index = prepared.search(token);
+      if (index >= 0) {
+        var how = label.length - index;
+        how /= label.length;
+        var weight = tokens.length - i;
+        weight /= tokens.length;
+        return score + how * weight;
+      }
+      return score;
+    }, 0);
+  }
+  return 0;
+}
+
+/**
+ * Applique une fonction de score supplémentaire pour approcher au mieux
+ * la classification obtenue avec l'outil Meloto, developpé par un prestataire
+ * pour le compte de l'Insee.
+ * Le nouveau classement favorise l'ordre d'apparation des token de recherche
+ * dans la chaine label des entités indéxées. Si la recherche contient électricien,
+ * la suggestion avec un label électricien sera mieux classée que celle avec chef électricien.
+ * S'il y a plusieur tokens de recherche, un poid dégréssif leur est appliqué lors du tri.
+ *
+ * @param {*} entities
+ * @param {*} tokens
+ * @param {*} active
+ * @returns
+ */
+function melotoOrder(entities, tokens) {
+  var active = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+  if (active) {
+    return entities.sort(function (a, b) {
+      return value(b, tokens) - value(a, tokens);
+    });
+  }
+  return entities;
+}