@inseefr/lunatic 2.6.2 → 2.6.3-rc.1

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

@@ -10,14 +10,15 @@ var actions = _interopRequireWildcard(require("./actions"));
 var _commons = require("./commons");
 var _i18n = _interopRequireDefault(require("../i18n"));
 var _constants = require("../utils/constants");
-var _getData = require("./commons/get-data");
 var _initialState = _interopRequireDefault(require("./initial-state"));
 var _lunaticContext = require("./lunatic-context");
-var _compileControls = _interopRequireDefault(require("./commons/compile-controls"));
+var _compileControls = require("./commons/compile-controls");
 var _getOverview = require("./commons/getOverview");
 var _useLoopVariables = require("./hooks/use-loop-variables");
 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");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -76,7 +77,9 @@ function useLunatic(source) {
     _ref$dontKnowButton = _ref.dontKnowButton,
     dontKnowButton = _ref$dontKnowButton === void 0 ? DEFAULT_DONT_KNOW : _ref$dontKnowButton,
     _ref$refusedButton = _ref.refusedButton,
-    refusedButton = _ref$refusedButton === void 0 ? DEFAULT_REFUSED : _ref$refusedButton;
+    refusedButton = _ref$refusedButton === void 0 ? DEFAULT_REFUSED : _ref$refusedButton,
+    _ref$trackChanges = _ref.trackChanges,
+    trackChanges = _ref$trackChanges === void 0 ? false : _ref$trackChanges;
   var _useReducer = (0, _react.useReducer)(_reducer["default"], _initialState["default"]),
     _useReducer2 = _slicedToArray(_useReducer, 2),
     state = _useReducer2[0],
@@ -109,7 +112,7 @@ function useLunatic(source) {
     suggesters: suggesters
   });
   var compileControls = (0, _react.useCallback)(function () {
-    return (0, _compileControls["default"])({
+    return (0, _compileControls.compileControls)({
       pager: pager,
       pages: pages,
       isInLoop: isInLoop,
@@ -146,18 +149,17 @@ function useLunatic(source) {
     return components;
   }, [components]);
   var handleChange = (0, _react.useCallback)(function (response, value, args) {
-    dispatch(actions.handleChange(typeof response === 'string' ? {
-      name: response
-    } : response, value, args));
+    dispatch(actions.handleChange(typeof response === 'string' ? response : response.name, value, args === null || args === void 0 ? void 0 : args.iteration));
     onChange(response, value, args);
   }, [dispatch, onChange]);
-  var getData = function getData(withRefreshedCalculated) {
-    var variables = state.variables;
-    return (0, _getData.getQuestionnaireData)({
-      variables: variables,
-      withRefreshedCalculated: withRefreshedCalculated
-    });
+  var getData = function getData(withRefreshedCalculated, variableNames) {
+    return (0, _getQuestionnaireData.getQuestionnaireData)(state.variables, source.variables, withRefreshedCalculated, variableNames);
   };
+  var _useTrackChanges = (0, _useTrackChanges2.useTrackChanges)(trackChanges, state.variables, function (variableNames) {
+      return getData(false, variableNames);
+    }),
+    resetChangedData = _useTrackChanges.resetChangedData,
+    getChangedData = _useTrackChanges.getChangedData;
   var buildedOverview = (0, _react.useMemo)(function () {
     return (0, _getOverview.overviewWithChildren)(overview);
   }, [overview]);
@@ -204,7 +206,9 @@ function useLunatic(source) {
     Provider: Provider,
     onChange: handleChange,
     overview: buildedOverview,
-    loopVariables: (0, _useLoopVariables.useLoopVariables)(pager, state.pages)
+    loopVariables: (0, _useLoopVariables.useLoopVariables)(pager, state.pages),
+    getChangedData: getChangedData,
+    resetChangedData: resetChangedData
   };
 }
 var _default = useLunatic;

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

@@ -5,7 +5,7 @@ var _vitest = require("vitest");
 var _useLunatic = _interopRequireDefault(require("./use-lunatic"));
 var _source = _interopRequireDefault(require("../stories/overview/source.json"));
 var _source2 = _interopRequireDefault(require("../stories/questionnaires/logement/source.json"));
-var _source3 = _interopRequireDefault(require("../stories/questionnaires/simpsons/source.json"));
+var _source3 = _interopRequireDefault(require("../stories/questionnaires2023/simpsons/source.json"));
 var _source4 = _interopRequireDefault(require("../stories/component-set/source.json"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 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); }
@@ -38,7 +38,7 @@ var dataFromObject = function dataFromObject(o) {
       result = _renderHook.result;
     (0, _vitest.expect)(result.current.pager.page).toBe('1');
     (0, _vitest.expect)(result.current.pager.lastReachedPage).toBe('1');
-    (0, _vitest.expect)(result.current.pager.maxPage).toBe('39');
+    (0, _vitest.expect)(result.current.pager.maxPage).toBe('41');
   });
   (0, _vitest.it)('should go to the next page correcly', function () {
     var _renderHook2 = (0, _reactHooks.renderHook)(function () {
@@ -193,4 +193,133 @@ var dataFromObject = function dataFromObject(o) {
       });
     });
   });
+  (0, _vitest.describe)('getData()', function () {
+    var hookRef;
+    (0, _vitest.beforeEach)(function () {
+      var _renderHook11 = (0, _reactHooks.renderHook)(function () {
+          return (0, _useLunatic["default"])(_source3["default"], undefined, {});
+        }),
+        result = _renderHook11.result;
+      (0, _reactHooks.act)(function () {
+        result.current.onChange({
+          name: 'COMMENT'
+        }, 'Mon commentaire');
+        result.current.onChange({
+          name: 'READY'
+        }, true);
+      });
+      hookRef = result;
+    });
+    (0, _vitest.it)('should return every value', function () {
+      var data = hookRef.current.getData(false);
+      (0, _vitest.expect)(data).toMatchObject({
+        COLLECTED: {
+          COMMENT: {
+            COLLECTED: 'Mon commentaire'
+          },
+          READY: {
+            COLLECTED: true
+          }
+        }
+      });
+      (0, _vitest.expect)(Object.keys(data.COLLECTED)).toHaveLength(109);
+      (0, _vitest.expect)(Object.keys(data.CALCULATED)).toHaveLength(0);
+    });
+    (0, _vitest.it)('should return calculated values', function () {
+      var data = hookRef.current.getData(true);
+      (0, _vitest.expect)(Object.keys(data.COLLECTED)).toHaveLength(109);
+      (0, _vitest.expect)(Object.keys(data.CALCULATED)).toHaveLength(33);
+    });
+    (0, _vitest.it)('should only return requested variables', function () {
+      var data = hookRef.current.getData(false, ['COMMENT']);
+      (0, _vitest.expect)(data).toMatchObject({
+        COLLECTED: {
+          COMMENT: {
+            COLLECTED: 'Mon commentaire'
+          }
+        }
+      });
+      (0, _vitest.expect)(Object.keys(data.COLLECTED)).toHaveLength(1);
+    });
+  });
+  (0, _vitest.describe)('getChangedData()', function () {
+    var hookRef;
+    (0, _vitest.beforeEach)(function () {
+      var _renderHook12 = (0, _reactHooks.renderHook)(function () {
+          return (0, _useLunatic["default"])(_source3["default"], undefined, {
+            trackChanges: true
+          });
+        }),
+        result = _renderHook12.result;
+      hookRef = result;
+    });
+    (0, _vitest.it)('should return every value', function () {
+      var data = hookRef.current.getChangedData();
+      (0, _vitest.expect)(data.COLLECTED).toEqual({});
+    });
+    (0, _vitest.it)('should return changes since the last update', function () {
+      (0, _reactHooks.act)(function () {
+        hookRef.current.onChange({
+          name: 'COMMENT'
+        }, 'Mon commentaire');
+        hookRef.current.onChange({
+          name: 'READY'
+        }, true);
+      });
+      (0, _vitest.expect)(hookRef.current.getChangedData()).toMatchObject({
+        COLLECTED: {
+          COMMENT: {
+            COLLECTED: 'Mon commentaire'
+          },
+          READY: {
+            COLLECTED: true
+          }
+        }
+      });
+    });
+    (0, _vitest.it)('should reset changes with true parameter', function () {
+      (0, _reactHooks.act)(function () {
+        hookRef.current.onChange({
+          name: 'COMMENT'
+        }, 'Mon commentaire');
+        hookRef.current.onChange({
+          name: 'READY'
+        }, true);
+      });
+      var data = hookRef.current.getChangedData(true);
+      (0, _vitest.expect)(data).toMatchObject({
+        COLLECTED: {
+          COMMENT: {
+            COLLECTED: 'Mon commentaire'
+          },
+          READY: {
+            COLLECTED: true
+          }
+        }
+      });
+      (0, _vitest.expect)(hookRef.current.getChangedData().COLLECTED).toEqual({});
+    });
+    (0, _vitest.it)('should reset changes with resetChanges()', function () {
+      (0, _reactHooks.act)(function () {
+        hookRef.current.onChange({
+          name: 'COMMENT'
+        }, 'Mon commentaire');
+        hookRef.current.onChange({
+          name: 'READY'
+        }, true);
+      });
+      hookRef.current.resetChangedData();
+      (0, _vitest.expect)(hookRef.current.getChangedData().COLLECTED).toEqual({});
+      (0, _reactHooks.act)(function () {
+        hookRef.current.onChange({
+          name: 'READY'
+        }, false);
+      });
+      (0, _vitest.expect)(hookRef.current.getChangedData().COLLECTED).toMatchObject({
+        READY: {
+          COLLECTED: false
+        }
+      });
+    });
+  });
 });

package/lib/utils/array.js

@@ -3,14 +3,20 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.getAtIndex = getAtIndex;
+exports.resizeArray = resizeArray;
 exports.setAtIndex = setAtIndex;
 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(); }
 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 _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."); }
+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 _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 /**
  * Call a callback x times
  */
@@ -24,10 +30,55 @@ function times(n, cb) {
  * Update an item in an array without mutating the array
  */
 function setAtIndex(arr, index, newValue) {
-  if (index < 0) {
-    throw new Error("Cannot update value in an array, index out of bounds ".concat(index, "/").concat(arr.length));
+  if (!Array.isArray(index)) {
+    return setAtIndex(arr, [index], newValue);
   }
-  var newArray = _toConsumableArray(arr);
-  newArray[index] = newValue;
+  var _index = _toArray(index),
+    currentIndex = _index[0],
+    restIndex = _index.slice(1);
+  var newArray = Array.isArray(arr) ? _toConsumableArray(arr) : [arr];
+  if (newArray.length < currentIndex + 1) {
+    newArray = resizeArray(newArray, currentIndex + 1, null);
+  }
+  newArray[currentIndex] = restIndex.length === 0 ? newValue : setAtIndex(newArray[currentIndex], restIndex, newValue);
   return newArray;
+}
+
+/**
+ * Get a value inside an array
+ */
+function getAtIndex(arr, indexes) {
+  var current = arr;
+  if (!Array.isArray(current)) {
+    return undefined;
+  }
+  var _iterator = _createForOfIteratorHelper(indexes),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var index = _step.value;
+      if (index < 0 || index >= current.length) {
+        return undefined; // Index out of bounds, return undefined
+      }
+
+      current = current[index];
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  return current;
+}
+function resizeArray(array, newLength, defaultValue) {
+  // The value is not an array, create an empty array
+  if (!Array.isArray(array)) {
+    return new Array(newLength).fill(defaultValue !== null && defaultValue !== void 0 ? defaultValue : null);
+  }
+  if (array.length === newLength) {
+    return array;
+  }
+  return new Array(newLength).fill(defaultValue !== null && defaultValue !== void 0 ? defaultValue : null).map(function (value, index) {
+    return index < array.length ? array[index] : value;
+  }, []);
 }

package/lib/utils/array.spec.js

@@ -0,0 +1,30 @@
+"use strict";
+
+var _vitest = require("vitest");
+var _array = require("./array");
+(0, _vitest.describe)('array', function () {
+  (0, _vitest.describe)('resizeArray()', function () {
+    (0, _vitest.it)('should append new value', function () {
+      (0, _vitest.expect)((0, _array.resizeArray)([1, 2], 3, 3)).toEqual([1, 2, 3]);
+      (0, _vitest.expect)((0, _array.resizeArray)([1, 2], 4, 3)).toEqual([1, 2, 3, 3]);
+    });
+    (0, _vitest.it)('should remove value', function () {
+      (0, _vitest.expect)((0, _array.resizeArray)([1, 2, 3], 1)).toEqual([1]);
+    });
+  });
+  (0, _vitest.describe)('setAtIndex', function () {
+    (0, _vitest.it)('should work with simple index', function () {
+      (0, _vitest.expect)((0, _array.setAtIndex)([1, 2, 3], 1, 3)).toEqual([1, 3, 3]);
+    });
+    (0, _vitest.it)('should work with non array value', function () {
+      (0, _vitest.expect)((0, _array.setAtIndex)(null, 1, 3)).toEqual([null, 3]);
+      (0, _vitest.expect)((0, _array.setAtIndex)(4, 1, 3)).toEqual([4, 3]);
+    });
+    (0, _vitest.it)('should work with deep index', function () {
+      (0, _vitest.expect)((0, _array.setAtIndex)([[1, 2, 3], [1, 2, 3], [1, 2, 3]], [1, 2], 10)).toEqual([[1, 2, 3], [1, 2, 10], [1, 2, 3]]);
+    });
+    (0, _vitest.it)('should work with deep and non array value', function () {
+      (0, _vitest.expect)((0, _array.setAtIndex)([null], [1, 2], 10)).toEqual([null, [null, null, 10]]);
+    });
+  });
+});

package/lib/utils/env.js

@@ -0,0 +1,10 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isTestEnv = isTestEnv;
+function isTestEnv() {
+  var meta = import.meta;
+  return meta && meta !== null && meta !== void 0 && meta.env ? import.meta.env.MODE === 'test' : false;
+}

package/lib/utils/get-component-value.js

@@ -4,13 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getComponentValue = getComponentValue;
-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); }
+var _component = require("../use-lunatic/commons/component");
 /**
  * Extract the value associated with a component
  * If the component expect multiple values (it has a responses property) then extract a map of values
  */
 function getComponentValue(component, valueMap, rowIndex) {
-  if (hasResponse(component)) {
+  if ((0, _component.hasResponse)(component)) {
     var value = valueMap[component.response.name];
     if (Array.isArray(value)) {
       return value[rowIndex !== null && rowIndex !== void 0 ? rowIndex : 0];
@@ -19,7 +19,7 @@ function getComponentValue(component, valueMap, rowIndex) {
   }
 
   // For checkbox group we need to send the map of values
-  if (hasResponses(component)) {
+  if ((0, _component.hasResponses)(component)) {
     var _component$responses$, _component$responses;
     return Object.fromEntries((_component$responses$ = (_component$responses = component.responses) === null || _component$responses === void 0 ? void 0 : _component$responses.map(function (_ref) {
       var response = _ref.response;
@@ -31,10 +31,4 @@ function getComponentValue(component, valueMap, rowIndex) {
     })) !== null && _component$responses$ !== void 0 ? _component$responses$ : []);
   }
   return undefined;
-}
-function hasResponse(component) {
-  return !!component && _typeof(component) === 'object' && 'response' in component && 'name' in component.response;
-}
-function hasResponses(component) {
-  return !!component && _typeof(component) === 'object' && 'responses' in component;
 }

package/lib/utils/number.js

@@ -5,10 +5,15 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.between = between;
 exports.forceInt = forceInt;
+exports.isNumber = isNumber;
 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 forceInt(n) {
   if (typeof n === 'string') {
-    return parseInt(n, 10);
+    var casted = parseInt(n, 10);
+    if (Number.isNaN(casted)) {
+      throw new Error("Cannot cast ".concat(n, " to int"));
+    }
+    return casted;
   }
   if (typeof n === 'number') {
     return n;
@@ -27,4 +32,11 @@ function between(n, min, max) {
     return max;
   }
   return n;
+}
+
+/**
+ * Check if the value is a number
+ */
+function isNumber(n) {
+  return typeof n === 'number' && Number.isFinite(n);
 }

package/lib/utils/variables.js

@@ -0,0 +1,37 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getInitialVariableValue = getInitialVariableValue;
+/**
+ * Extract the initial value from the source.json and data.json
+ */
+function getInitialVariableValue(variable) {
+  var _data$variable$variab;
+  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;
+      }
+      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 undefined;
+    default:
+      return null;
+  }
+}

package/lib/utils/vtl.js

@@ -0,0 +1,100 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getExpressionAsString = getExpressionAsString;
+exports.getExpressionType = getExpressionType;
+exports.getVTLCompatibleValue = getVTLCompatibleValue;
+exports.interpretVTL = interpretVTL;
+exports.parseVTLVariables = parseVTLVariables;
+var _object = require("./object");
+var _trevas = require("@inseefr/trevas");
+var _antlr = _interopRequireDefault(require("antlr4"));
+var _vtl = require("@inseefr/vtl-2.0-antlr-tools");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+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); }
+/**
+ * Simplified version of interpret (that converts binding and value)
+ */
+function interpretVTL(expression, bindings) {
+  var result = (0, _trevas.interpret)(expression, (0, _object.objectMap)(bindings, function (k, v) {
+    return [k, getVTLCompatibleValue(v)];
+  }));
+  if (isDataSet(result)) {
+    return extractDataSetResult(result);
+  }
+  return result;
+}
+
+/**
+ * Extract variables used in a VTL expression
+ */
+function parseVTLVariables(expression) {
+  try {
+    var chars = new _antlr["default"].InputStream(expression);
+    var lexer = new _vtl.VtlLexer(chars);
+    var dependencySet = lexer.getAllTokens().reduce(function (acc, _ref) {
+      var start = _ref.start,
+        stop = _ref.stop,
+        type = _ref.type;
+      if (type === 234) {
+        acc.add(expression.substring(start, stop + 1));
+      }
+      return acc;
+    }, new Set());
+    dependencySet["delete"](expression); // Prevent dependency loop
+    return Array.from(dependencySet);
+  } catch (e) {
+    return [];
+  }
+}
+
+/**
+ * Transform a value to make it compatible with VTL (for bindings)
+ */
+function getVTLCompatibleValue(value) {
+  if (value === undefined) {
+    return null;
+  }
+  if (Array.isArray(value)) {
+    return {
+      dataStructure: {
+        result: {}
+      },
+      dataPoints: {
+        result: value
+      }
+    };
+  }
+  return value;
+}
+function getExpressionType(expression) {
+  if (typeof expression === 'string') {
+    return 'VTL';
+  }
+  if (expression && _typeof(expression) === 'object' && 'type' in expression && typeof expression.type === 'string') {
+    return expression.type;
+  }
+  return '';
+}
+function getExpressionAsString(expression) {
+  if (typeof expression === 'string') {
+    return expression;
+  }
+  if (expression && _typeof(expression) === 'object' && 'value' in expression && typeof expression.value === 'string') {
+    return expression.value;
+  }
+  return '';
+}
+function isDataSet(result) {
+  return _typeof(result) === 'object' && result !== null && 'dataPoints' in result && result.dataPoints !== null && _typeof(result.dataPoints) === 'object' && 'result' in result.dataPoints;
+}
+function extractDataSetResult(dataSet) {
+  var dataPoints = dataSet.dataPoints;
+  if (dataPoints) {
+    var result = dataPoints.result;
+    return result;
+  }
+  return undefined;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@inseefr/lunatic",
-	"version": "2.6.2",
+	"version": "2.6.3-rc.1",
 	"workersVersion": "0.2.5-experimental",
 	"description": "Library of questionnaire components",
 	"repository": {

package/lib/components/loop/utils/get-initial-nb-rows.js

@@ -1,17 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getInitialNbRows = getInitialNbRows;
-/**
- * Find the length of the variable (the biggest value sent to the loop)
- */
-function getInitialNbRows(value) {
-  return Object.values(value).reduce(function (length, variable) {
-    if (Array.isArray(variable)) {
-      return Math.max(length, variable.length);
-    }
-    return length;
-  }, 1);
-}

package/lib/components/pairwise-links/index.js

@@ -1,13 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "default", {
-  enumerable: true,
-  get: function get() {
-    return _pairwiseLinks["default"];
-  }
-});
-var _pairwiseLinks = _interopRequireDefault(require("./pairwise-links"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }