@inseefr/lunatic 2.7.14 → 2.7.16

package/lib/stories/utils/referentiel.js

@@ -17,15 +17,15 @@ var getReferentiel = exports.getReferentiel = /*#__PURE__*/function () {
           _context.next = _context.t0 === 'libelle-pcs2020' ? 3 : _context.t0 === 'naf-rev2-stop' ? 4 : _context.t0 === 'naf-rev2' ? 4 : _context.t0 === 'cog-communes' ? 5 : 6;
           break;
         case 3:
-          return _context.abrupt("return", fetch('/libelles-pcs-2020.json').then(function (r) {
+          return _context.abrupt("return", fetch('./libelles-pcs-2020.json').then(function (r) {
             return r.json();
           }));
         case 4:
-          return _context.abrupt("return", fetch('/naf-rev2.json').then(function (r) {
+          return _context.abrupt("return", fetch('./naf-rev2.json').then(function (r) {
             return r.json();
           }));
         case 5:
-          return _context.abrupt("return", fetch('/communes-2019.json').then(function (r) {
+          return _context.abrupt("return", fetch('./communes-2019.json').then(function (r) {
             return r.json();
           }));
         case 6:

package/lib/use-lunatic/commons/execute-condition-filter.js

@@ -5,13 +5,16 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 var _getCompatibleVtlExpression = _interopRequireDefault(require("./get-compatible-vtl-expression"));
+var _array = require("../../utils/array");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function executeConditionFilter(filter, execute, iteration) {
   if (filter && typeof execute === 'function') {
     var value = filter.value;
-    return execute((0, _getCompatibleVtlExpression["default"])(value), {
+    var result = execute((0, _getCompatibleVtlExpression["default"])(value), {
       iteration: iteration
     });
+    // Todo : replace this with a casting system on execute
+    return Array.isArray(result) ? (0, _array.firstValueItem)(result) : result;
   }
   return undefined;
 }

package/lib/use-lunatic/commons/fill-components/fill-component-expressions.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 var _isObject = require("../../../utils/is-object");
+var _array = require("../../../utils/array");
 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 _toArray(arr) { return _arrayWithHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -38,9 +39,10 @@ function createCrawl(_ref) {
   function executeAndFillObject(object, path) {
     var candidate = object[path];
     try {
-      return _objectSpread(_objectSpread({}, object), {}, _defineProperty({}, path, executeExpression(candidate, {
+      var result = executeExpression(candidate, {
         iteration: linksIterations !== null && linksIterations !== void 0 ? linksIterations : iteration
-      })));
+      });
+      return _objectSpread(_objectSpread({}, object), {}, _defineProperty({}, path, Array.isArray(result) ? (0, _array.firstValueItem)(result) : result));
     } catch (e) {
       return _objectSpread(_objectSpread({}, object), {}, _defineProperty({}, path, e instanceof Error ? e.toString() : e));
     }

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

@@ -237,8 +237,7 @@ var LunaticVariable = /*#__PURE__*/function () {
     key: "getValue",
     value: function getValue(iteration) {
       var _this$dictionary,
-        _this = this,
-        _iteration;
+        _this = this;
       // The variable is not calculated
       if (!this.expression) {
         return this.getSavedValue(iteration);
@@ -265,7 +264,7 @@ var LunaticVariable = /*#__PURE__*/function () {
       if (Object.keys(bindings).length === 0) {
         iteration = undefined;
       }
-      if (!this.isOutdated(iteration)) {
+      if (this.shapeFrom && !this.isOutdated(iteration)) {
         return this.getSavedValue(iteration);
       }
       if ((0, _env.isTestEnv)()) {
@@ -277,8 +276,7 @@ var LunaticVariable = /*#__PURE__*/function () {
       } catch (e) {
         throw new Error("Cannot interpret expression \"".concat(this.expression, "\" with bindings ").concat(JSON.stringify(bindings), ", error : ").concat(e.toString()));
       }
-      this.calculatedAt.set((_iteration = iteration) === null || _iteration === void 0 ? void 0 : _iteration.join('.'), performance.now());
-      this.calculatedAt.set(undefined, performance.now());
+      this.updateTimestamps(iteration, 'calculatedAt');
       return this.getSavedValue(iteration);
     }
 
@@ -300,14 +298,27 @@ var LunaticVariable = /*#__PURE__*/function () {
         this.value = [];
       }
       this.value = !Array.isArray(iteration) ? value : (0, _array.setAtIndex)(this.value, iteration, value);
-      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());
+      this.updateTimestamps(iteration, 'updatedAt');
       return true;
     }
+  }, {
+    key: "updateTimestamps",
+    value: function updateTimestamps(iteration, key) {
+      // Update parent iteration level timestamp
+      var _iterator2 = _createForOfIteratorHelper((0, _array.subArrays)(iteration)),
+        _step2;
+      try {
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          var subIteration = _step2.value;
+          this[key].set(subIteration.join('.'), performance.now());
+        }
+      } catch (err) {
+        _iterator2.e(err);
+      } finally {
+        _iterator2.f();
+      }
+      this[key].set(undefined, performance.now());
+    }
   }, {
     key: "setValueForArray",
     value: function setValueForArray(value) {
@@ -334,20 +345,20 @@ var LunaticVariable = /*#__PURE__*/function () {
         return this.value;
       }
       var current = this.value;
-      var _iterator2 = _createForOfIteratorHelper(iteration),
-        _step2;
+      var _iterator3 = _createForOfIteratorHelper(iteration),
+        _step3;
       try {
-        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-          var index = _step2.value;
+        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+          var index = _step3.value;
           if (!Array.isArray(current)) {
             return current;
           }
           current = current[index];
         }
       } catch (err) {
-        _iterator2.e(err);
+        _iterator3.e(err);
       } finally {
-        _iterator2.f();
+        _iterator3.f();
       }
       return current;
     }

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

@@ -37,7 +37,8 @@ var _lunaticVariablesStore = require("./lunatic-variables-store");
     variables.set('FIRSTNAME', 'John');
     variables.set('LASTNAME', 'Doe');
     variables.setCalculated('FULLNAME', 'FIRSTNAME || " " || LASTNAME', {
-      dependencies: ['FIRSTNAME', 'LASTNAME']
+      dependencies: ['FIRSTNAME', 'LASTNAME'],
+      shapeFrom: 'FIRSTNAME'
     });
     (0, _vitest.expect)(variables.get('FULLNAME')).toEqual('John Doe');
     (0, _vitest.expect)(variables.interpretCount).toBe(1);
@@ -54,10 +55,12 @@ var _lunaticVariablesStore = require("./lunatic-variables-store");
     variables.set('LASTNAME', 'Doe');
     variables.set('AGE', '18');
     variables.setCalculated('FULLNAME', 'FIRSTNAME || " " || LASTNAME', {
-      dependencies: ['FIRSTNAME', 'LASTNAME']
+      dependencies: ['FIRSTNAME', 'LASTNAME'],
+      shapeFrom: 'FIRSTNAME'
     });
     variables.setCalculated('LABEL', 'FULLNAME || " is " || AGE', {
-      dependencies: ['FULLNAME', 'AGE']
+      dependencies: ['FULLNAME', 'AGE'],
+      shapeFrom: 'FULLNAME'
     });
     (0, _vitest.expect)(variables.get('LABEL')).toEqual('John Doe is 18');
     (0, _vitest.expect)(variables.interpretCount).toBe(2);
@@ -83,7 +86,7 @@ var _lunaticVariablesStore = require("./lunatic-variables-store");
     variables.set('LASTNAME', 'Doe');
     (0, _vitest.expect)(variables.run('FIRSTNAME || " " || LASTNAME')).toEqual('John Doe');
     (0, _vitest.expect)(variables.run('FIRSTNAME || " " || LASTNAME')).toEqual('John Doe');
-    (0, _vitest.expect)(variables.interpretCount).toBe(1);
+    (0, _vitest.expect)(variables.interpretCount).toBe(2);
     variables.set('FIRSTNAME', 'Jane');
     (0, _vitest.expect)(variables.run('FIRSTNAME || " " || LASTNAME')).toEqual('Jane Doe');
   });
@@ -220,7 +223,19 @@ var _lunaticVariablesStore = require("./lunatic-variables-store");
         iteration: [1]
       });
       (0, _vitest.expect)(variables.run('"hello"')).toEqual('hello');
-      (0, _vitest.expect)(variables.interpretCount).toBe(1);
+      (0, _vitest.expect)(variables.interpretCount).toBe(3);
+    });
+    (0, _vitest.it)('should handle deep refresh', function () {
+      variables.set('LIENS', [['17', null], [null, '17']]);
+      variables.setCalculated('IS_12', 'if ("12" in LIENS) then 1 else 0', {
+        dependencies: ['LIENS'],
+        shapeFrom: 'LIENS'
+      });
+      (0, _vitest.expect)(variables.get('IS_12', [0])).toBe(0);
+      variables.set('LIENS', '12', {
+        iteration: [0, 0]
+      });
+      (0, _vitest.expect)(variables.get('IS_12', [0])).toBe(1);
     });
   });
   (0, _vitest.describe)('resizing', function () {

package/lib/utils/array.js

@@ -3,9 +3,11 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.firstValueItem = firstValueItem;
 exports.getAtIndex = getAtIndex;
 exports.resizeArray = resizeArray;
 exports.setAtIndex = setAtIndex;
+exports.subArrays = subArrays;
 exports.times = times;
 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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
@@ -81,4 +83,36 @@ function resizeArray(array, newLength, defaultValue) {
   return new Array(newLength).fill(defaultValue !== null && defaultValue !== void 0 ? defaultValue : null).map(function (value, index) {
     return index < array.length ? array[index] : value;
   }, []);
+}
+
+/**
+ * Return the first non null/undefined value of an array
+ */
+function firstValueItem(items) {
+  if (!Array.isArray(items)) {
+    return items;
+  }
+  return items.find(function (v) {
+    return v !== undefined && v !== null;
+  });
+}
+
+/**
+ * Return a list of partial array
+ *
+ * Example :
+ * - subArray([1, 2, 3]) // [[1], [1, 2], [1, 2, 3]]
+ */
+function subArrays(items) {
+  if (!Array.isArray(items)) {
+    return [];
+  }
+  if (items.length === 1) {
+    return [items];
+  }
+  var arrays = [];
+  for (var i = 1; i <= items.length; i++) {
+    arrays.push(items.slice(0, i));
+  }
+  return arrays;
 }

package/lib/utils/array.spec.js

@@ -27,4 +27,9 @@ var _array = require("./array");
       (0, _vitest.expect)((0, _array.setAtIndex)([null], [1, 2], 10)).toEqual([null, [null, null, 10]]);
     });
   });
+  (0, _vitest.it)('firstValueItem', function () {
+    (0, _vitest.expect)((0, _array.firstValueItem)([0, 1, 2])).toBe(0);
+    (0, _vitest.expect)((0, _array.firstValueItem)([null, 1, 2])).toBe(1);
+    (0, _vitest.expect)((0, _array.firstValueItem)([null, undefined, false])).toBe(false);
+  });
 });

package/lib/utils/variables.js

@@ -8,29 +8,18 @@ exports.getInitialVariableValue = getInitialVariableValue;
  * Extract the initial value from the source.json and data.json
  */
 function getInitialVariableValue(variable) {
-  var _data$variable$variab;
+  var _data$variable$variab, _data$COLLECTED;
   var data = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   switch (variable.variableType) {
     case 'EXTERNAL':
     case 'CALCULATED':
       return (_data$variable$variab = data[variable.variableType]) === null || _data$variable$variab === void 0 ? void 0 : _data$variable$variab[variable.name];
     case 'COLLECTED':
-      var collectedData = data.COLLECTED;
-      var fromData;
-      if (collectedData && variable.name in collectedData) {
-        var _collectedData$variab = collectedData[variable.name],
-          COLLECTED = _collectedData$variab.COLLECTED,
-          FORCED = _collectedData$variab.FORCED;
-        fromData = COLLECTED !== null && COLLECTED !== void 0 ? COLLECTED : FORCED;
-      }
+      var fromData = (_data$COLLECTED = data.COLLECTED) === null || _data$COLLECTED === void 0 || (_data$COLLECTED = _data$COLLECTED[variable.name]) === null || _data$COLLECTED === void 0 ? void 0 : _data$COLLECTED.COLLECTED;
       if ('values' in variable && variable.values) {
-        var _ref, _fromData;
-        var _variable$values = variable.values,
-          _COLLECTED = _variable$values.COLLECTED,
-          _FORCED = _variable$values.FORCED;
-        return (_ref = (_fromData = fromData) !== null && _fromData !== void 0 ? _fromData : _FORCED) !== null && _ref !== void 0 ? _ref : _COLLECTED;
+        return fromData !== null && fromData !== void 0 ? fromData : variable.values.COLLECTED;
       }
-      return undefined;
+      return fromData;
     default:
       return null;
   }

package/lib/utils/variables.spec.js

@@ -0,0 +1,74 @@
+"use strict";
+
+var _vitest = require("vitest");
+var _variables = require("./variables");
+var data = {
+  EXTERNAL: {
+    ADRESSE: 'mon adresse'
+  },
+  CALCULATED: {
+    PRENOMSB: ['Paul', 'Pierre']
+  },
+  COLLECTED: {
+    NB_HAB: {
+      COLLECTED: 2
+    },
+    PRENOMS: {
+      COLLECTED: ['Paul', 'Pierre'],
+      EDITED: [],
+      INPUTED: [],
+      FORCED: [],
+      PREVIOUS: []
+    },
+    AGE: {}
+  }
+};
+var externalVariable = {
+  variableType: 'EXTERNAL',
+  name: 'ADRESSE'
+};
+var calculatedVariable = {
+  variableType: 'CALCULATED',
+  bindingDependencies: ['PRENOMS'],
+  expression: {
+    type: 'VTL',
+    value: 'PRENOMS'
+  },
+  name: 'PRENOMSB',
+  shapeFrom: 'PRENOMS'
+};
+var simpleCollectedVariable = {
+  variableType: 'COLLECTED',
+  name: 'NB_HAB'
+};
+var loopCollectedVariable = {
+  variableType: 'COLLECTED',
+  values: {
+    COLLECTED: []
+  },
+  name: 'PRENOMS'
+};
+var emptyCollectedVariable = {
+  variableType: 'COLLECTED',
+  name: 'AGE'
+};
+(0, _vitest.describe)('getInitialVariableValue', function () {
+  (0, _vitest.it)('should return external value', function () {
+    (0, _vitest.expect)((0, _variables.getInitialVariableValue)(externalVariable, data)).toEqual('mon adresse');
+  });
+  (0, _vitest.it)('should return calculated value', function () {
+    (0, _vitest.expect)((0, _variables.getInitialVariableValue)(calculatedVariable, data)).toEqual(['Paul', 'Pierre']);
+  });
+  (0, _vitest.it)('should return collected value out of a loop', function () {
+    (0, _vitest.expect)((0, _variables.getInitialVariableValue)(simpleCollectedVariable, data)).toEqual(2);
+  });
+  (0, _vitest.it)('should return array of collected values in a loop', function () {
+    (0, _vitest.expect)((0, _variables.getInitialVariableValue)(loopCollectedVariable, data)).toEqual(['Paul', 'Pierre']);
+  });
+  (0, _vitest.it)('should return undefined value out of a loop', function () {
+    (0, _vitest.expect)((0, _variables.getInitialVariableValue)(emptyCollectedVariable, data)).toEqual(undefined);
+  });
+  (0, _vitest.it)('should set empty undefined if no data', function () {
+    (0, _vitest.expect)((0, _variables.getInitialVariableValue)(simpleCollectedVariable)).toEqual(undefined);
+  });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@inseefr/lunatic",
-	"version": "2.7.14",
+	"version": "2.7.16",
 	"workersVersion": "0.3.0",
 	"description": "Library of questionnaire components",
 	"repository": {