@inseefr/lunatic 0.4.0-v2 → 0.4.1-v2

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

@@ -19,6 +19,10 @@ var _constants = require("../utils/constants");
 
 var _autoLoad = require("../utils/store-tools/auto-load");
 
+var _constants2 = require("../constants");
+
+var _calculatedVariables = require("./commons/calculated-variables");
+
 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; }
@@ -78,7 +82,9 @@ function useLunatic(source) {
       suggestersConfiguration = _ref.suggesters,
       suggesterFetcher = _ref.suggesterFetcher,
       _ref$modalForControls = _ref.modalForControls,
-      modalForControls = _ref$modalForControls === void 0 ? false : _ref$modalForControls;
+      modalForControls = _ref$modalForControls === void 0 ? false : _ref$modalForControls,
+      _ref$filterDescriptio = _ref.filterDescription,
+      filterDescription = _ref$filterDescriptio === void 0 ? false : _ref$filterDescriptio;
 
   var _useReducer = (0, _react.useReducer)(_reducer["default"], _initialState["default"]),
       _useReducer2 = _slicedToArray(_useReducer, 2),
@@ -153,15 +159,23 @@ function useLunatic(source) {
     onChange(response, value, args);
   }, [dispatch, onChange]);
 
-  var getState = function getState() {
+  var getState = function getState(withRefreshedCalculated) {
     var variables = state.variables;
-    return Object.entries(variables).reduce(function (acc, _ref3) {
+    var builtVariables = Object.entries(variables).reduce(function (acc, _ref3) {
       var _ref4 = _slicedToArray(_ref3, 2),
           k = _ref4[0],
-          value = _ref4[1].value;
+          _ref4$ = _ref4[1],
+          value = _ref4$.value,
+          type = _ref4$.type;
 
-      return _objectSpread(_objectSpread({}, acc), {}, _defineProperty({}, k, value));
+      if (type !== _constants2.CALCULATED || !withRefreshedCalculated) return _objectSpread(_objectSpread({}, acc), {}, _defineProperty({}, k, value));
+      return acc;
     }, {});
+    if (!withRefreshedCalculated) return builtVariables;
+    return (0, _calculatedVariables.interpretAllCalculatedVariables)({
+      variables: variables,
+      builtVariables: builtVariables
+    });
   };
 
   var pageTag = (0, _commons.getPageTag)(pager);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@inseefr/lunatic",
-	"version": "0.4.0-v2",
+	"version": "0.4.1-v2",
 	"workersVersion": "0.2.4-experimental",
 	"description": "Library of questionnaire components",
 	"repository": {