@inseefr/lunatic 2.7.4 → 2.7.6

package/lib/use-lunatic/commons/variables/lunatic-variables-store.js

@@ -259,27 +259,45 @@ var LunaticVariable = /*#__PURE__*/function () {
   }, {
     key: "setValue",
     value: function setValue(value, iteration) {
-      var _this = this;
       if (value === this.getSavedValue(iteration)) {
         return false;
       }
       // Decompose arrays, to only update items that changed
       if (Array.isArray(value) && !Array.isArray(iteration)) {
-        return !!value.map(function (v, k) {
-          return _this.setValue(v, [k]);
-        }).find(function (v) {
-          return v;
-        });
+        return this.setValueForArray(value);
       }
       // We want to save a value at a specific iteration, but the value is not an array yet
       if (iteration !== undefined && !Array.isArray(this.value)) {
         this.value = [];
       }
       this.value = !Array.isArray(iteration) ? value : (0, _array.setAtIndex)(this.value, iteration, value);
-      this.updatedAt.set(iteration === null || iteration === void 0 ? void 0 : iteration.join('.'), performance.now());
+      if (value === undefined) {
+        this.updatedAt["delete"](iteration === null || iteration === void 0 ? void 0 : iteration.join('.'));
+      } else {
+        this.updatedAt.set(iteration === null || iteration === void 0 ? void 0 : iteration.join('.'), performance.now());
+      }
       this.updatedAt.set(undefined, performance.now());
       return true;
     }
+  }, {
+    key: "setValueForArray",
+    value: function setValueForArray(value) {
+      var _this = this;
+      var savedValue = this.getSavedValue();
+      var oldSize = Array.isArray(savedValue) ? savedValue.length : -1;
+      var newSize = value.length;
+      // Update every item of the array and look if we changed one item
+      var oneValueChanged = (0, _array.times)(Math.max(oldSize, newSize), function (k) {
+        return _this.setValue(value[k], [k]);
+      }).find(function (v) {
+        return v;
+      }) !== undefined;
+      // New array is smaller, shorten the array
+      if (oldSize > newSize && Array.isArray(this.value)) {
+        this.value = this.value.slice(0, newSize);
+      }
+      return oneValueChanged;
+    }
   }, {
     key: "getSavedValue",
     value: function getSavedValue(iteration) {

package/lib/use-lunatic/commons/variables/lunatic-variables-store.spec.js

@@ -14,6 +14,12 @@ var _missingBehaviour = require("./behaviours/missing-behaviour");
     variables.set('FIRSTNAME', 'John');
     (0, _vitest.expect)(variables.get('FIRSTNAME')).toEqual('John');
   });
+  (0, _vitest.it)('should handle array correctly', function () {
+    variables.set('AGE', [10, 20, 30]);
+    (0, _vitest.expect)(variables.get('AGE')).toEqual([10, 20, 30]);
+    variables.set('AGE', [10, 20]);
+    (0, _vitest.expect)(variables.get('AGE')).toEqual([10, 20]);
+  });
   (0, _vitest.it)('should create a store from an object', function () {
     var store = _lunaticVariablesStore.LunaticVariablesStore.makeFromObject({
       name: 'John',
@@ -86,6 +92,39 @@ var _missingBehaviour = require("./behaviours/missing-behaviour");
       return variables.run('Hello world');
     }).toThrowError();
   });
+  (0, _vitest.describe)('event listener', function () {
+    (0, _vitest.it)('should trigger onChange', function () {
+      variables.set('FIRSTNAME', 'John');
+      var spy = _vitest.vi.fn();
+      variables.on('change', function (e) {
+        return spy(e.detail.name, e.detail.value);
+      });
+      variables.set('FIRSTNAME', 'Jane');
+      (0, _vitest.expect)(spy).toHaveBeenCalledWith('FIRSTNAME', 'Jane');
+    });
+    (0, _vitest.it)('should trigger onChange on array', function () {
+      variables.set('AGE', [18, 23, 24]);
+      var spy = _vitest.vi.fn();
+      variables.on('change', function (e) {
+        return spy(e.detail.name, e.detail.value);
+      });
+      variables.set('AGE', [18, 23]);
+      (0, _vitest.expect)(spy).toHaveBeenCalledWith('AGE', [18, 23]);
+      variables.set('AGE', [18, 25]);
+      (0, _vitest.expect)(spy).toHaveBeenCalledWith('AGE', [18, 25]);
+    });
+    (0, _vitest.it)('should not trigger onChange when value does not change', function () {
+      variables.set('FIRSTNAME', 'John');
+      variables.set('AGE', [18, 20]);
+      var spy = _vitest.vi.fn();
+      variables.on('change', function (e) {
+        return spy(e.detail.name, e.detail.value);
+      });
+      variables.set('FIRSTNAME', 'John');
+      variables.set('AGE', [18, 20]);
+      (0, _vitest.expect)(spy).not.toHaveBeenCalled();
+    });
+  });
   (0, _vitest.describe)('with iteration', function () {
     (0, _vitest.it)('should handle arrays', function () {
       variables.set('FIRSTNAME', ['John', 'Jane']);

package/lib/use-lunatic/hooks/use-page-has-response.js

@@ -0,0 +1,104 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.usePageHasResponse = usePageHasResponse;
+var _react = require("react");
+var _isObject = require("../../utils/is-object");
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+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 _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 _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
+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; }
+/**
+ * Check if a page has one response (value is filled for at least one field)
+ */
+function usePageHasResponse(components, executeExpression) {
+  return (0, _react.useCallback)(function () {
+    if (!Array.isArray(components)) {
+      return false;
+    }
+    var _iterator = _createForOfIteratorHelper(components),
+      _step;
+    try {
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var component = _step.value;
+        // Some components are considered as "filled" by default
+        if (['PairwiseLinks', 'Roundabout'].includes(component.componentType)) {
+          return true;
+        }
+        // For Table, we have to extract components from its body and apply isSubComponentsEmpty function
+        if (component.componentType === 'Table') {
+          // Body is array for array (row), each "cell" could be an Label or Component, so we filter array.
+          var childrenComponent = component.body.reduce(function (_, row) {
+            var componentsInRow = row.filter(function (cell) {
+              return (0, _isObject.isObject)(cell) && 'componentType' in cell;
+            });
+            return [].concat(_toConsumableArray(_), _toConsumableArray(componentsInRow));
+          }, []);
+          return !isSubComponentsEmpty(childrenComponent, executeExpression);
+        }
+
+        // We found a value in one of the root component
+        if ('value' in component && !isEmpty(component.value)) {
+          return true;
+        }
+        // For rosterForLoop we need to inspect child components
+        if ('components' in component && Array.isArray(component.components) && !isSubComponentsEmpty(component.components, executeExpression)) {
+          return true;
+        }
+      }
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
+    }
+    return false;
+  }, [components, executeExpression]);
+}
+
+/**
+ * Check if a value is empty
+ * - null ou undefined ou ''
+ * - for arrays, every item must be empty
+ * - for objects, every value must be empty
+ */
+function isEmpty(value) {
+  // Array is empty if all items are empty
+  if (Array.isArray(value)) {
+    // We find one value that is not empty
+    return value.find(function (v) {
+      return !isEmpty(v);
+    }) === undefined;
+  }
+  // For object inspect each values
+  if (_typeof(value) === 'object' && value !== null) {
+    return isEmpty(Object.values(value));
+  }
+  return !value;
+}
+
+/**
+ * For complex component we need to inspect child components, interpret the response value
+ */
+function isSubComponentsEmpty(components, executeExpression) {
+  var _iterator2 = _createForOfIteratorHelper(components),
+    _step2;
+  try {
+    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+      var component = _step2.value;
+      if ('response' in component && !isEmpty(executeExpression(component.response.name))) {
+        return false;
+      }
+    }
+  } catch (err) {
+    _iterator2.e(err);
+  } finally {
+    _iterator2.f();
+  }
+  return true;
+}

package/lib/use-lunatic/reducer/{resolve-component-controls/resolve-simple-control.js → controls/check-base-control.js}

@@ -3,13 +3,11 @@
 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;
+exports.checkBaseControl = checkBaseControl;
+function checkBaseControl(control, executeExpression, pager) {
+  var _control$control$valu, _control$control;
+  var iteration = pager.iteration,
+    linksIterations = pager.linksIterations;
   var criticality = control.criticality,
     errorMessage = control.errorMessage,
     id = control.id,

package/lib/use-lunatic/reducer/{resolve-component-controls/resolve-roundabout-control.js → controls/check-roundabout-control.js}

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.resolveRoundaboutControl = resolveRoundaboutControl;
+exports.checkRoundaboutControl = checkRoundaboutControl;
 /**
  * Pour le Roundabout, le controle doit être validé pour chaque itération
  * composants l'unité enquêtée.
@@ -11,9 +11,8 @@ exports.resolveRoundaboutControl = resolveRoundaboutControl;
  * 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) {
+function checkRoundaboutControl(control, executeExpression) {
   var _control$control$valu, _control$control;
-  var executeExpression = state.executeExpression;
   var criticality = control.criticality,
     errorMessage = control.errorMessage,
     id = control.id,

package/lib/use-lunatic/reducer/overview/overview-on-init.js

@@ -25,10 +25,12 @@ var isSequence = function isSequence(sourceComponent) {
   return sourceComponent.components.length > 0 && 'hierarchy' in sourceComponent.components[0];
 };
 var isSequenceSamePage = function isSequenceSamePage(sourceComponent, page) {
-  return sourceComponent.components[0].hierarchy.sequence.page === page;
+  var _sourceComponent$comp;
+  return ((_sourceComponent$comp = sourceComponent.components[0].hierarchy) === null || _sourceComponent$comp === void 0 ? void 0 : _sourceComponent$comp.sequence.page) === page;
 };
 var isSubsequenceSamePage = function isSubsequenceSamePage(sourceComponent, page) {
-  return sourceComponent.components[0].hierarchy.subSequence !== undefined && sourceComponent.components[0].hierarchy.subSequence.page === page;
+  var _sourceComponent$comp2, _sourceComponent$comp3;
+  return ((_sourceComponent$comp2 = sourceComponent.components[0].hierarchy) === null || _sourceComponent$comp2 === void 0 ? void 0 : _sourceComponent$comp2.subSequence) !== undefined && ((_sourceComponent$comp3 = sourceComponent.components[0].hierarchy) === null || _sourceComponent$comp3 === void 0 ? void 0 : _sourceComponent$comp3.subSequence.page) === page;
 };
 var isPageReached = function isPageReached(page, lastReachedPage) {
   return parseInt(page, 10) <= parseInt(lastReachedPage, 10);
@@ -64,7 +66,7 @@ function getOverview(state) {
       var component = _step.value;
       var hierarchy = component.hierarchy,
         conditionFilter = component.conditionFilter;
-      if (hierarchy.subSequence) {
+      if (hierarchy && hierarchy.subSequence) {
         var _executeExpression, _pager$lastReachedPag;
         overviewEntries.subSequences.push(_objectSpread(_objectSpread({}, hierarchy.subSequence), {}, {
           type: 'subSequence',
@@ -75,7 +77,7 @@ function getOverview(state) {
           evaluatedLabel: executeExpression(hierarchy.subSequence.label),
           children: []
         }));
-      } else {
+      } else if (hierarchy) {
         var _pager$lastReachedPag2, _executeExpression2;
         overviewEntries.sequences.push(_objectSpread(_objectSpread({}, hierarchy.sequence), {}, {
           type: 'sequence',

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

@@ -20,6 +20,7 @@ var TypeOfControl = exports.TypeOfControl = /*#__PURE__*/function (TypeOfControl
 }({});
 var ControlTypeEnum = exports.ControlTypeEnum = /*#__PURE__*/function (ControlTypeEnum) {
   ControlTypeEnum["roundabout"] = "roundabout";
+  ControlTypeEnum["row"] = "ROW";
   ControlTypeEnum["simple"] = "simple";
   return ControlTypeEnum;
 }({});

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

@@ -19,6 +19,7 @@ var _reducer = _interopRequireDefault(require("./reducer"));
 var _useSuggesters = require("./use-suggesters");
 var _getQuestionnaireData = require("./commons/variables/get-questionnaire-data");
 var _useTrackChanges2 = require("../hooks/use-track-changes");
+var _usePageHasResponse = require("./hooks/use-page-has-response");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
@@ -212,7 +213,8 @@ function useLunatic(source) {
     overview: buildedOverview,
     loopVariables: (0, _useLoopVariables.useLoopVariables)(pager, state.pages),
     getChangedData: getChangedData,
-    resetChangedData: resetChangedData
+    resetChangedData: resetChangedData,
+    hasPageResponse: (0, _usePageHasResponse.usePageHasResponse)(components, executeExpression)
   };
 }
 var _default = exports["default"] = useLunatic;

package/lib/utils/env.js

@@ -7,7 +7,7 @@ exports.isTestEnv = isTestEnv;
 function isTestEnv() {
   try {
     // using vitest, process.env is defined
-    return /test/.test("".concat(process.env.npm_lifecycle_event));
+    return "".concat(process.env.VITEST) === 'true';
   } catch (e) {
     // process.env is not defined
     // so we are not running as test so we can return false

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

@@ -8,16 +8,17 @@ 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 _suggestion$label;
   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) {
+  var used = (_suggestion$label = suggestion.label) !== null && _suggestion$label !== void 0 ? _suggestion$label : suggestion.id;
+  var prepared = (0, _prepareStringIndexation["default"])(used);
+  if (used && used.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 how = used.length - index;
+        how /= used.length;
         var weight = tokens.length - i;
         weight /= tokens.length;
         return score + how * weight;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@inseefr/lunatic",
-	"version": "2.7.4",
+	"version": "2.7.6",
 	"workersVersion": "0.3.0",
 	"description": "Library of questionnaire components",
 	"repository": {
@@ -83,7 +83,7 @@
 		"react-keyboard-event-handler": "^1.5.4",
 		"react-markdown": "^8.0.3",
 		"react-number-format": "^5.1.3",
-		"react-tooltip": "^4.2.15",
+		"react-tooltip": "^5.23.0",
 		"remove-accents": "^0.4.2",
 		"sass": "^1.58.3",
 		"snowball": "^0.3.1",