@inseefr/lunatic 2.4.1 → 2.4.2

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/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/append-to-index/dist/create-append-task.js

@@ -22,7 +22,8 @@ function createAppendTask(info, version, log) {
   }
   var name = info.name,
     fields = info.fields,
-    stopWords = info.stopWords;
+    stopWords = info.stopWords,
+    meloto = info.meloto;
   var worker = create_worker_ts_1.createWorker(workerPath);
   var start = false;
   var stop = false;
@@ -51,7 +52,8 @@ function createAppendTask(info, version, log) {
           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;
+}

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

@@ -0,0 +1,67 @@
+"use strict";
+
+var _vitest = require("vitest");
+var _melotoOrder = require("./meloto-order");
+(0, _vitest.describe)('meloto', function () {
+  (0, _vitest.it)('value', function () {
+    var score = (0, _melotoOrder.value)({
+      suggestion: {
+        label: 'otat'
+      }
+    }, ['tat']);
+    var expected = (4 - 1) / 4;
+    (0, _vitest.expect)(score).toEqual(expected);
+  });
+  (0, _vitest.it)('value2', function () {
+    var score = (0, _melotoOrder.value)({
+      suggestion: {
+        label: 'otatxu'
+      }
+    }, ['tat', 'xu']);
+    var expected = (6 - 1) / 6 + (6 - 4) / 6 * 0.5;
+    (0, _vitest.expect)(score).toEqual(expected);
+  });
+  (0, _vitest.it)('sort', function () {
+    var entities = [{
+      suggestion: {
+        label: 'after culture',
+        id: 1
+      },
+      score: 1
+    }, {
+      suggestion: {
+        label: 'culture before',
+        id: 2
+      },
+      score: 1
+    }];
+    (0, _melotoOrder.melotoOrder)(entities, ['culture']);
+    (0, _vitest.expect)(entities[0].suggestion.id).toEqual(2);
+    (0, _vitest.expect)(entities[1].suggestion.id).toEqual(1);
+  });
+  (0, _vitest.it)('sort2', function () {
+    var entities = [{
+      suggestion: {
+        label: 'after after culture',
+        id: 1
+      },
+      score: 1
+    }, {
+      suggestion: {
+        label: 'after culture before',
+        id: 2
+      },
+      score: 1
+    }, {
+      suggestion: {
+        label: 'culture before before',
+        id: 3
+      },
+      score: 1
+    }];
+    (0, _melotoOrder.melotoOrder)(entities, ['cultu']);
+    (0, _vitest.expect)(entities[0].suggestion.id).toEqual(3);
+    (0, _vitest.expect)(entities[1].suggestion.id).toEqual(2);
+    (0, _vitest.expect)(entities[2].suggestion.id).toEqual(1);
+  });
+});

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

@@ -83,11 +83,11 @@ function searching(_x3, _x4) {
 }
 function _searching() {
   _searching = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(search, _ref2) {
-    var name, _ref2$version, version, db, info, queryParser, max, order, parser, transaction, store, index, tokens, documents;
+    var name, _ref2$version, version, _ref2$meloto, meloto, db, info, queryParser, max, order, parser, transaction, store, index, tokens, documents;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          name = _ref2.name, _ref2$version = _ref2.version, version = _ref2$version === void 0 ? '1' : _ref2$version;
+          name = _ref2.name, _ref2$version = _ref2.version, version = _ref2$version === void 0 ? '1' : _ref2$version, _ref2$meloto = _ref2.meloto, meloto = _ref2$meloto === void 0 ? true : _ref2$meloto;
           _context2.prev = 1;
           if (!isValideSearch(search)) {
             _context2.next = 21;
@@ -115,7 +115,7 @@ function _searching() {
         case 19:
           documents = _context2.sent;
           return _context2.abrupt("return", {
-            results: prepare((0, _order["default"])(order)(filterSize((0, _computeScore["default"])(documents), max), order)),
+            results: prepare((0, _order["default"])(order)(filterSize((0, _computeScore["default"])(documents, tokens, meloto), max), order)),
             search: search,
             tokens: tokens
           });

package/lib/utils/suggester-workers/searching/searching.worker.js

@@ -10,10 +10,12 @@ self.onmessage = function (e) {
   var _e$data = e.data,
     search = _e$data.search,
     name = _e$data.name,
-    version = _e$data.version;
+    version = _e$data.version,
+    meloto = _e$data.meloto;
   (0, _searching["default"])(search, {
     name: name,
-    version: version
+    version: version,
+    meloto: meloto
   }).then(function (result) {
     self.postMessage(result);
   });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@inseefr/lunatic",
-	"version": "2.4.1",
+	"version": "2.4.2",
 	"workersVersion": "0.2.5-experimental",
 	"description": "Library of questionnaire components",
 	"repository": {