@inseefr/lunatic 2.0.3-v2 → 2.0.5-v2

package/lib/use-lunatic/commons/create-map-pages.js

@@ -4,33 +4,22 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-
 var _isPaginatedLoop = _interopRequireDefault(require("./is-paginated-loop"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
 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; }
-
 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) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 function isUnpaginated(questionnaire) {
   var maxPage = questionnaire.maxPage;
   return maxPage === undefined;
 }
+
 /**
  *
  * @param {*} component: object
@@ -38,15 +27,12 @@ function isUnpaginated(questionnaire) {
  * @param {*} map Map<page,{ components: Array<component>, isLoop: boolean, subPages: Array<page> }>
  * @returns
  */
-
-
 function mergeComponent(component, page, map) {
   if (!page) {
     return _objectSpread(_objectSpread({}, map), {}, {
       unpaged: [].concat(_toConsumableArray(map.unpaged), [component])
     });
   }
-
   if (page in map) {
     var current = map[page];
     var components = current.components;
@@ -54,20 +40,16 @@ function mergeComponent(component, page, map) {
       components: [].concat(_toConsumableArray(components), [component])
     })));
   }
-
   return _objectSpread(_objectSpread({}, map), {}, _defineProperty({}, page, {
     components: [component]
   }));
 }
-
 function mergeNestedComponents(components, map) {
   return components.reduce(function (current, component) {
     var page = component.page;
-
     if (page) {
       return mergeComponent(component, page, current);
     }
-
     return current;
   }, map);
 }
@@ -76,11 +58,8 @@ function mergeNestedComponents(components, map) {
  * @param {*} components
  * @returns
  */
-
-
 function createPages(questionnaire) {
   var components = questionnaire.components;
-
   if (isUnpaginated(questionnaire)) {
     return {
       1: {
@@ -91,18 +70,15 @@ function createPages(questionnaire) {
 
   var map = components.reduce(function (current, component) {
     var components = component.components,
-        page = component.page;
-
+      page = component.page;
     if ((0, _isPaginatedLoop["default"])(component)) {
       return mergeComponent(component, page, mergeNestedComponents(components, current));
     }
-
     return mergeComponent(component, page, current);
   }, {
     unpaged: []
   });
   return map;
 }
-
 var _default = createPages;
 exports["default"] = _default;

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

@@ -4,31 +4,24 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-
 var _getCompatibleVtlExpression = _interopRequireDefault(require("./get-compatible-vtl-expression"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
 function executeConditionFilter(filter, execute, iteration) {
   if (filter && typeof execute === 'function') {
     var logging = function logging() {
       for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
         args[_key] = arguments[_key];
       }
-
       console.warn(args);
       console.warn('executeConditionFilter:', filter);
     };
-
     var value = filter.value;
     return execute((0, _getCompatibleVtlExpression["default"])(value), {
       iteration: iteration,
       logging: logging
     });
   }
-
   return undefined;
 }
-
 var _default = executeConditionFilter;
 exports["default"] = _default;

package/lib/use-lunatic/commons/execute-expression/create-execute-expression.js

@@ -4,275 +4,231 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-
 var _executeExpression = _interopRequireDefault(require("./execute-expression"));
-
 var _getSafetyExpression = _interopRequireDefault(require("./get-safety-expression"));
-
 var _getExpressionsVariables = _interopRequireDefault(require("./get-expressions-variables"));
-
 var _createMemoizer3 = _interopRequireDefault(require("./create-memoizer"));
-
 var _createRefreshCalculated = _interopRequireDefault(require("./create-refresh-calculated"));
-
 var _vtl = _interopRequireDefault(require("../../../utils/vtl"));
-
 var _constants = require("../../../utils/constants");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": 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) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _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."); }
-
 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 = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
 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 validateExpression(expObject) {
   if (_typeof(expObject) === 'object') {
     var type = expObject.type;
-
     if (type === _constants.VTL || type === _constants.VTL_MD) {
       return expObject;
     }
   }
-
   if (typeof expObject === 'string') return {
     value: expObject,
     type: _constants.VTL
   };
   console.warn("Non-VTL compatible expression : ".concat(expObject));
 }
-
 function createBindings(variables) {
   return Object.entries(variables).reduce(function (bindings, _ref) {
     var _ref2 = _slicedToArray(_ref, 2),
-        name = _ref2[0],
-        value = _ref2[1].value;
-
+      name = _ref2[0],
+      value = _ref2[1].value;
     return _objectSpread(_objectSpread({}, bindings), {}, _defineProperty({}, name, value));
   }, {});
 }
+
 /**
  *
  * @param {*} variables
  * @returns
  */
-
-
 function createExecuteExpression(variables, features) {
   // on aimerait map d'expression, avec les bindings
   var bindings = createBindings(variables);
   var tokensMap = new Map();
   var collectedUpdated = new Map();
-
   var _createMemoizer = (0, _createMemoizer3["default"])(),
-      _createMemoizer2 = _slicedToArray(_createMemoizer, 2),
-      memoize = _createMemoizer2[0],
-      getMemoizedValue = _createMemoizer2[1];
-
+    _createMemoizer2 = _slicedToArray(_createMemoizer, 2),
+    memoize = _createMemoizer2[0],
+    getMemoizedValue = _createMemoizer2[1];
   var _createRefreshCalcula = (0, _createRefreshCalculated["default"])({
-    variables: variables,
-    execute: execute,
-    bindings: bindings
-  }),
-      _createRefreshCalcula2 = _slicedToArray(_createRefreshCalcula, 2),
-      refreshCalculated = _createRefreshCalcula2[0],
-      setToRefreshCalculated = _createRefreshCalcula2[1];
+      variables: variables,
+      execute: execute,
+      bindings: bindings
+    }),
+    _createRefreshCalcula2 = _slicedToArray(_createRefreshCalcula, 2),
+    refreshCalculated = _createRefreshCalcula2[0],
+    setToRefreshCalculated = _createRefreshCalcula2[1];
+
   /**
    *
    * @param {*} name
    */
-
-
   function pushToLazy(name) {
     var _variables$name$Calcu = variables[name].CalculatedLinked,
-        CalculatedLinked = _variables$name$Calcu === void 0 ? [] : _variables$name$Calcu;
+      CalculatedLinked = _variables$name$Calcu === void 0 ? [] : _variables$name$Calcu;
     CalculatedLinked.forEach(function (variable) {
       var name = variable.name;
       setToRefreshCalculated(name, variable);
     });
   }
+
   /**
    *
    * @param {*} name
    * @param {*} value
    */
-
-
   function updateBindings(name, value) {
     // update des bindings
     if (name in bindings) {
       bindings[name] = value;
       collectedUpdated.set(name, []);
     }
-
     pushToLazy(name);
   }
+
   /**
    *
    * @param {*} variables
    * @param {*} iteration
    */
-
-
   function setLoopBindings(variables, iteration) {
     Object.entries(bindings).forEach(function (_ref3) {
       var _ref4 = _slicedToArray(_ref3, 2),
-          k = _ref4[0],
-          v = _ref4[1];
-
+        k = _ref4[0],
+        v = _ref4[1];
       var _variables$k = variables[k],
-          type = _variables$k.type,
-          value = _variables$k.value;
-
+        type = _variables$k.type,
+        value = _variables$k.value;
       if (!Array.isArray(v) && type === _constants.COLLECTED && Array.isArray(value)) {
         bindings[k] = value[iteration];
         pushToLazy(k);
       }
     });
   }
+
   /**
    *
    * @param {*} variables
    */
-
-
   function resetLoopBindings(variables) {
     Object.entries(bindings).forEach(function (_ref5) {
       var _ref6 = _slicedToArray(_ref5, 2),
-          k = _ref6[0],
-          v = _ref6[1];
-
+        k = _ref6[0],
+        v = _ref6[1];
       var _variables$k2 = variables[k],
-          type = _variables$k2.type,
-          value = _variables$k2.value;
-
+        type = _variables$k2.type,
+        value = _variables$k2.value;
       if (type === _constants.COLLECTED && Array.isArray(value) && !Array.isArray(v)) {
         bindings[k] = value;
       }
     });
   }
-
   function getVariablesAndCach(expression) {
     if (tokensMap.has(expression)) {
       return tokensMap.get(expression);
     }
-
     var tokens = (0, _getExpressionsVariables["default"])(expression, variables);
     tokensMap.set(expression, tokens);
     return tokens;
   }
-  /**/
-
 
+  /**/
   function collecteVariables(dependencies) {
     if (Array.isArray(dependencies)) {
       return dependencies.reduce(function (map, name) {
         if (name in variables) {
           var data = variables[name];
           var variable = data.variable,
-              type = data.type;
-
+            type = data.type;
           if (!(name in map)) {
             if (type === 'CALCULATED') {
               var expression = variable.expression;
               var subDependencies = getVariablesAndCach(expression);
               return _objectSpread(_objectSpread({}, map), {}, _defineProperty({}, name, _objectSpread({}, variable)), collecteVariables(subDependencies));
             }
-
             return _objectSpread(_objectSpread({}, map), {}, _defineProperty({}, name, _objectSpread({}, variable)));
           }
         } else {
           throw new Error("Unknown variable ".concat(name));
         }
-
         return map;
       }, {});
     }
-
     return {};
   }
-
   function resolveUseContext(name, _ref7) {
     var iteration = _ref7.iteration,
-        linksIterations = _ref7.linksIterations;
+      linksIterations = _ref7.linksIterations;
     var value = bindings[name];
-
     if ([_constants.X_AXIS, _constants.Y_AXIS].includes(name) && linksIterations !== undefined) {
       pushToLazy(name);
-
       var _linksIterations = _slicedToArray(linksIterations, 2),
-          x = _linksIterations[0],
-          y = _linksIterations[1];
-
+        x = _linksIterations[0],
+        y = _linksIterations[1];
       if (Array.isArray(value) && x < value.length) {
         return value[name === _constants.X_AXIS ? x : y];
       }
-
       return null;
     }
-
     if (iteration !== undefined && Array.isArray(value)) {
       pushToLazy(name);
-
       if (iteration < value.length) {
         return value[iteration];
       }
-
       return null;
     }
-
+    if (linksIterations !== undefined) {
+      var _linksIterations2 = _slicedToArray(linksIterations, 2),
+        _x = _linksIterations2[0],
+        _y = _linksIterations2[1];
+      // console.log({ name, linksIterations, value });
+      if (Array.isArray(value) && _x < value.length) {
+        var sub = value[_x];
+        if (Array.isArray(sub) && _y < sub.length) {
+          return sub[_y];
+        }
+      }
+      return null;
+    }
     return (0, _vtl["default"])(value);
   }
-
   function fillVariablesValues(map, _ref8) {
     var iteration = _ref8.iteration,
-        linksIterations = _ref8.linksIterations;
+      linksIterations = _ref8.linksIterations;
     return Object.entries(map).reduce(function (sub, _ref9) {
       var _ref10 = _slicedToArray(_ref9, 2),
-          name = _ref10[0],
-          _ = _ref10[1];
-
+        name = _ref10[0],
+        _ = _ref10[1];
       return _objectSpread(_objectSpread({}, sub), {}, _defineProperty({}, name, resolveUseContext(name, {
         iteration: iteration,
         linksIterations: linksIterations
       })));
     }, {});
   }
+
   /**
    *
    * @param {*} vtlObject
    * @param {*} args
    * @returns
    */
-
-
   function execute(expObject) {
     var args = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-
     var _validateExpression = validateExpression((0, _getSafetyExpression["default"])(expObject)),
-        expression = _validateExpression.value,
-        type = _validateExpression.type;
-
+      expression = _validateExpression.value,
+      type = _validateExpression.type;
     var iteration = args.iteration,
-        linksIterations = args.linksIterations,
-        logging = args.logging;
+      linksIterations = args.linksIterations,
+      logging = args.logging;
     var bindingDependencies = getVariablesAndCach(expression);
-
     function loggingDefault(_, bindings, e) {
       if (process.env.NODE_ENV === 'development') {
         console.warn("VTL error :  ".concat(expression), _objectSpread({}, args), {
@@ -281,7 +237,6 @@ function createExecuteExpression(variables, features) {
         console.warn(e);
       }
     }
-
     var vtlBindings = refreshCalculated(fillVariablesValues(collecteVariables(bindingDependencies), {
       iteration: iteration,
       linksIterations: linksIterations
@@ -291,18 +246,14 @@ function createExecuteExpression(variables, features) {
       linksIterations: linksIterations
     });
     var memoized = getMemoizedValue(expression, vtlBindings);
-
     if (memoized === undefined) {
       var result = (0, _executeExpression["default"])(vtlBindings, expression, type, features, logging || loggingDefault);
       memoize(expression, vtlBindings, result);
       return result;
     }
-
     return memoized;
   }
-
   return [execute, updateBindings, setLoopBindings, resetLoopBindings];
 }
-
 var _default = createExecuteExpression;
 exports["default"] = _default;

package/lib/use-lunatic/commons/execute-expression/create-memoizer.js

@@ -4,75 +4,51 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-
 var _objectHash = _interopRequireDefault(require("object-hash"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": 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) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _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."); }
-
 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 = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
 function createMemoizer() {
   var expresionsMap = new Map();
-
   function refillBindings(bindings) {
     return Object.entries(bindings).reduce(function (map, _ref) {
       var _ref2 = _slicedToArray(_ref, 2),
-          key = _ref2[0],
-          value = _ref2[1];
-
+        key = _ref2[0],
+        value = _ref2[1];
       var dataPointsValue = value === null || value === void 0 ? void 0 : value.result;
-
       if (dataPointsValue) {
         return _objectSpread(_objectSpread({}, map), {}, _defineProperty({}, key, dataPointsValue));
       }
-
       return _objectSpread(_objectSpread({}, map), {}, _defineProperty({}, key, value));
     }, {});
   }
-
   function memoize(expression, bindings, value) {
     var refill = refillBindings(bindings);
     var hash = (0, _objectHash["default"])(refill);
     var map = expresionsMap.get(expression);
-
     if (!map) {
       map = new Map();
       expresionsMap.set(expression, map);
     }
-
     map.set(hash, value);
   }
-
   function getMemoizedValue(expression, bindings) {
     var map = expresionsMap.get(expression);
-
     if (map) {
       var refill = refillBindings(bindings);
       var hash = (0, _objectHash["default"])(refill);
       return map.get(hash);
     }
-
     return undefined;
   }
-
   return [memoize, getMemoizedValue];
 }
-
 var _default = createMemoizer;
 exports["default"] = _default;