@inseefr/lunatic 2.7.15 → 2.7.16

package/lib/src/use-lunatic/commons/variables/lunatic-variables-store.d.ts

@@ -76,6 +76,7 @@ declare class LunaticVariable {
      * Set the value and returns true if the variable is touched
      */
     setValue(value: unknown, iteration?: IterationLevel): boolean;
+    private updateTimestamps;
     private setValueForArray;
     private getSavedValue;
     private getDependencies;

package/lib/src/utils/array.d.ts

@@ -11,4 +11,14 @@ export declare function setAtIndex<T>(arr: T, index: number | number[], newValue
  */
 export declare function getAtIndex(arr: unknown, indexes: number[]): unknown;
 export declare function resizeArray<T = unknown>(array: unknown, newLength: number, defaultValue?: T): T[];
-export declare function firstItem<T = unknown>(items: T | T[]): T;
+/**
+ * Return the first non null/undefined value of an array
+ */
+export declare function firstValueItem<T = unknown>(items: T | T[]): T | undefined;
+/**
+ * Return a list of partial array
+ *
+ * Example :
+ * - subArray([1, 2, 3]) // [[1], [1, 2], [1, 2, 3]]
+ */
+export declare function subArrays<T = unknown>(items: T[] | T): T[][];

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

@@ -14,7 +14,7 @@ function executeConditionFilter(filter, execute, iteration) {
       iteration: iteration
     });
     // Todo : replace this with a casting system on execute
-    return Array.isArray(result) ? (0, _array.firstItem)(result) : result;
+    return Array.isArray(result) ? (0, _array.firstValueItem)(result) : result;
   }
   return undefined;
 }

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

@@ -42,7 +42,7 @@ function createCrawl(_ref) {
       var result = executeExpression(candidate, {
         iteration: linksIterations !== null && linksIterations !== void 0 ? linksIterations : iteration
       });
-      return _objectSpread(_objectSpread({}, object), {}, _defineProperty({}, path, Array.isArray(result) ? (0, _array.firstItem)(result) : result));
+      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,10 +3,11 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.firstItem = firstItem;
+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(); }
@@ -83,23 +84,35 @@ function resizeArray(array, newLength, defaultValue) {
     return index < array.length ? array[index] : value;
   }, []);
 }
-function firstItem(items) {
+
+/**
+ * Return the first non null/undefined value of an array
+ */
+function firstValueItem(items) {
   if (!Array.isArray(items)) {
     return items;
   }
-  var _iterator2 = _createForOfIteratorHelper(items),
-    _step2;
-  try {
-    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-      var item = _step2.value;
-      if (item !== undefined) {
-        return item;
-      }
-    }
-  } catch (err) {
-    _iterator2.e(err);
-  } finally {
-    _iterator2.f();
+  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 undefined;
+  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/package.json

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