@inseefr/lunatic 2.7.14 → 2.7.15

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.firstItem)(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.firstItem)(result) : result));
     } catch (e) {
       return _objectSpread(_objectSpread({}, object), {}, _defineProperty({}, path, e instanceof Error ? e.toString() : e));
     }

package/lib/utils/array.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.firstItem = firstItem;
 exports.getAtIndex = getAtIndex;
 exports.resizeArray = resizeArray;
 exports.setAtIndex = setAtIndex;
@@ -81,4 +82,24 @@ 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;
   }, []);
+}
+function firstItem(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 undefined;
 }

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.15",
 	"workersVersion": "0.3.0",
 	"description": "Library of questionnaire components",
 	"repository": {