@inseefr/lunatic 2.4.10 → 2.5.0-fast-forward

package/lib/use-lunatic/reducer/reduce-go-to-page.js

@@ -5,8 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 var _actions = require("../actions");
-var _commons = require("./commons");
+var _pageTag = require("../commons/page-tag");
 var _reduceGoNextPage = _interopRequireDefault(require("./reduce-go-next-page"));
+var _page = require("../commons/page");
 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); }
 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; }
@@ -14,66 +15,61 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-function validateChange(state) {
-  var updatedState = _objectSpread({}, state);
-  if ((0, _commons.isOnEmptyPage)(updatedState)) {
-    return (0, _reduceGoNextPage["default"])(updatedState, {
+function reduceGoToPage(state, action) {
+  // The page contains non digit, extract information from it
+  if (action.payload.page.match(/\D/)) {
+    var pager = (0, _pageTag.getPagerFromPageTag)(action.payload.page);
+    if (pager) {
+      action.payload.iteration = pager.iteration;
+      action.payload.subPage = pager.subPage;
+      action.payload.page = pager.page;
+    }
+  }
+
+  // The page is still not a number, cancel the action
+  if (action.payload.page.match(/\D/)) {
+    console.error("Cannot reach page \"".concat(action.payload.page, "\", not a number"));
+    return state;
+  }
+  var newPager = _objectSpread(_objectSpread({}, state.pager), {}, {
+    page: action.payload.page,
+    subPage: action.payload.subPage,
+    iteration: action.payload.iteration,
+    nbIterations: undefined,
+    nbSubPages: undefined
+  });
+
+  // The page is not reachable
+  var pageId = (0, _page.getPageId)(newPager);
+  if (!(pageId in state.pages)) {
+    console.error("Page \"".concat(pageId, "\" does not exists in this questionnaire"));
+    return state;
+  }
+
+  // Find the number of subPages and iteration
+  var parentPage = state.pages[action.payload.page];
+  if (action.payload.subPage !== undefined) {
+    var _parentPage$subPages;
+    newPager.nbSubPages = (_parentPage$subPages = parentPage.subPages) === null || _parentPage$subPages === void 0 ? void 0 : _parentPage$subPages.length;
+    newPager.nbIterations = state.executeExpression(parentPage.iterations);
+  }
+
+  // Prevent an out of bound iteration
+  if (newPager.iteration !== undefined && newPager.nbIterations !== undefined && newPager.iteration >= newPager.nbIterations) {
+    newPager.iteration = newPager.nbIterations - 1;
+  }
+
+  // Move forward if the page is empty
+  if ((0, _page.isPageEmpty)(state)) {
+    return (0, _reduceGoNextPage["default"])(state, {
       type: _actions.ActionKind.GO_NEXT_PAGE,
       payload: {}
     });
   }
-  return updatedState;
-}
-function resolveSubPage(state, action) {
-  var pager = state.pager,
-    pages = state.pages;
-  var _action$payload = action.payload,
-    page = _action$payload.page,
-    iteration = _action$payload.iteration,
-    nbIterations = _action$payload.nbIterations,
-    _action$payload$subPa = _action$payload.subPage,
-    subPage = _action$payload$subPa === void 0 ? 0 : _action$payload$subPa,
-    roundabout = _action$payload.roundabout;
-  var _ref = pages[page] || {
-      subPages: []
-    },
-    subPages = _ref.subPages;
-  var nbSubPages = subPages === null || subPages === void 0 ? void 0 : subPages.length;
   return _objectSpread(_objectSpread({}, state), {}, {
-    isInLoop: true,
-    pager: _objectSpread(_objectSpread({}, pager), {}, {
-      page: page,
-      iteration: iteration,
-      nbIterations: nbIterations,
-      nbSubPages: nbSubPages,
-      subPage: subPage,
-      roundabout: roundabout
-    })
-  });
-}
-function reduceGoToPage(state, action) {
-  var isInLoop = state.isInLoop,
-    pager = state.pager;
-  var _action$payload2 = action.payload,
-    newPage = _action$payload2.page,
-    iteration = _action$payload2.iteration;
-  if (iteration !== undefined) {
-    return resolveSubPage(state, action);
-  }
-  if (!isInLoop) return _objectSpread(_objectSpread({}, state), {}, {
-    pager: _objectSpread(_objectSpread({}, pager), {}, {
-      subPage: undefined,
-      nbSubPages: undefined,
-      iteration: undefined,
-      nbIterations: undefined,
-      page: newPage
-    })
+    isInLoop: newPager.nbIterations !== undefined,
+    pager: newPager
   });
-  // TODO: fix when redirect to loop component
-  // How to calculate nbSubPages & nbIterations?
-  // How to calculate lazy variables we need?
-  // Handle setLoopBindings with the good iteration
-  return validateChange(state);
 }
 var _default = reduceGoToPage;
 exports["default"] = _default;

package/lib/use-lunatic/reducer/reduce-on-init.js

@@ -5,8 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 var _commons = require("../commons");
-var _pageTag = require("../commons/page-tag");
 var _compose = _interopRequireDefault(require("../commons/compose"));
+var _pageTag = require("../commons/page-tag");
 var _overviewOnInit = require("./overview/overview-on-init");
 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); }
@@ -28,21 +28,21 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 /**
  * Extract value from colllected data
  */
-function getInitalValueFromCollected(variable) {
-  var data = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+function getInitalValueFromCollected(variable, data) {
   var name = variable.name;
   var fromData;
-  if (name in data) {
+  if (data && name in data) {
     var _data$name = data[name],
       COLLECTED = _data$name.COLLECTED,
       FORCED = _data$name.FORCED;
     fromData = COLLECTED || FORCED;
   }
   if ('values' in variable && variable.values) {
+    var _fromData;
     var _variable$values = variable.values,
       _COLLECTED = _variable$values.COLLECTED,
       _FORCED = _variable$values.FORCED;
-    return fromData || _FORCED || _COLLECTED;
+    return (_fromData = fromData) !== null && _fromData !== void 0 ? _fromData : _FORCED || _COLLECTED;
   }
   return undefined;
 }
@@ -53,10 +53,7 @@ function getInitalValueFromCollected(variable) {
 function getInitialValueFromExternal(variable) {
   var data = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var name = variable.name;
-  if (name in data) {
-    return data[name];
-  }
-  return undefined;
+  return data === null || data === void 0 ? void 0 : data[name];
 }
 
 /**
@@ -174,6 +171,7 @@ function reduceOnInit(state, action) {
   var source = payload.source,
     data = payload.data,
     initialPage = payload.initialPage,
+    lastReachedPage = payload.lastReachedPage,
     features = payload.features,
     handleChange = payload.handleChange,
     preferences = payload.preferences,
@@ -205,7 +203,7 @@ function reduceOnInit(state, action) {
       nbSubPages: undefined,
       iteration: undefined,
       nbIterations: undefined,
-      lastReachedPage: initialPage
+      lastReachedPage: lastReachedPage
     };
     var _isFirstLastPage = (0, _commons.isFirstLastPage)(pager),
       isFirstPage = _isFirstLastPage.isFirstPage,

package/lib/use-lunatic/reducer/resolve-component-controls/resolve-roundabout-control.js

@@ -19,7 +19,7 @@ function resolveRoundaboutControl(state, control) {
     id = control.id,
     typeOfControl = control.typeOfControl,
     iterations = control.iterations;
-  var value = (_control$control$valu = control === null || control === void 0 ? void 0 : (_control$control = control.control) === null || _control$control === void 0 ? void 0 : _control$control.value) !== null && _control$control$valu !== void 0 ? _control$control$valu : 'true';
+  var value = (_control$control$valu = control === null || control === void 0 || (_control$control = control.control) === null || _control$control === void 0 ? void 0 : _control$control.value) !== null && _control$control$valu !== void 0 ? _control$control$valu : 'true';
   if (!iterations || iterations <= 0) {
     return undefined;
   }

package/lib/use-lunatic/reducer/resolve-component-controls/resolve-simple-control.js

@@ -14,7 +14,7 @@ function resolveSimpleControl(state, control) {
     errorMessage = control.errorMessage,
     id = control.id,
     typeOfControl = control.typeOfControl;
-  var value = (_control$control$valu = control === null || control === void 0 ? void 0 : (_control$control = control.control) === null || _control$control === void 0 ? void 0 : _control$control.value) !== null && _control$control$valu !== void 0 ? _control$control$valu : 'true';
+  var value = (_control$control$valu = control === null || control === void 0 || (_control$control = control.control) === null || _control$control === void 0 ? void 0 : _control$control.value) !== null && _control$control$valu !== void 0 ? _control$control$valu : 'true';
   var result = executeExpression(value, {
     iteration: iteration,
     linksIterations: linksIterations

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

@@ -6,8 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.TypeOfControl = exports.Criticality = exports.ControlTypeEnum = void 0;
 /**
  * Types used for source data (lunatic models and data.json)
- *
- * These types should not be used outside of use-lunatic
  */
 var Criticality = /*#__PURE__*/function (Criticality) {
   Criticality["INFO"] = "INFO";

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

@@ -56,6 +56,8 @@ function useLunatic(source) {
     shortcut = _ref$shortcut === void 0 ? false : _ref$shortcut,
     _ref$initialPage = _ref.initialPage,
     initialPage = _ref$initialPage === void 0 ? '1' : _ref$initialPage,
+    _ref$lastReachedPage = _ref.lastReachedPage,
+    lastReachedPage = _ref$lastReachedPage === void 0 ? '1' : _ref$lastReachedPage,
     _ref$autoSuggesterLoa = _ref.autoSuggesterLoading,
     autoSuggesterLoading = _ref$autoSuggesterLoa === void 0 ? false : _ref$autoSuggesterLoa,
     _ref$activeControls = _ref.activeControls,
@@ -121,12 +123,26 @@ function useLunatic(source) {
     var payload = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     dispatch(actions.goNextPage(payload));
   }, [dispatch]);
-  var goToPage = (0, _react.useCallback)(function () {
-    var payload = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  var goToPage = (0, _react.useCallback)(function (payload) {
     dispatch(actions.goToPage(payload));
   }, [dispatch]);
   var getComponents = (0, _react.useCallback)(function () {
-    // validate variables ?
+    var _ref2 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+      only = _ref2.only,
+      except = _ref2.except;
+    if (only && except) {
+      throw new Error('"only" and "except" cannot be used together in getComponents()');
+    }
+    if (only) {
+      return components.filter(function (c) {
+        return only.includes(c.componentType);
+      });
+    }
+    if (except) {
+      return components.filter(function (c) {
+        return !except.includes(c.componentType);
+      });
+    }
     return components;
   }, [components]);
   var handleChange = (0, _react.useCallback)(function (response, value, args) {
@@ -147,11 +163,13 @@ function useLunatic(source) {
   var _isFirstLastPage = (0, _commons.isFirstLastPage)(pager),
     isFirstPage = _isFirstLastPage.isFirstPage,
     isLastPage = _isFirstLastPage.isLastPage;
+  console.log('State overview', state.overview);
   (0, _react.useEffect)(function () {
     dispatch(actions.onInit({
       source: source,
       data: data,
       initialPage: initialPage,
+      lastReachedPage: lastReachedPage,
       features: features,
       preferences: preferences,
       savingType: savingType,
@@ -162,7 +180,7 @@ function useLunatic(source) {
       goToPage: goToPage,
       withOverview: withOverview
     }));
-  }, [source, data, initialPage, features, preferences, savingType, management, shortcut, handleChange, activeControls, withOverview, goToPage]);
+  }, [source, data, initialPage, features, preferences, savingType, management, shortcut, handleChange, activeControls, withOverview, goToPage, lastReachedPage]);
   (0, _react.useEffect)(function () {
     dispatch(actions.updateState({
       getSuggesterStatus: getSuggesterStatus

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

@@ -1,11 +1,11 @@
 "use strict";
 
-var _vitest = require("vitest");
 var _reactHooks = require("@testing-library/react-hooks");
+var _vitest = require("vitest");
 var _useLunatic = _interopRequireDefault(require("./use-lunatic"));
-var _source = _interopRequireDefault(require("../stories/questionnaires/simpsons/source.json"));
+var _source = _interopRequireDefault(require("../stories/overview/source.json"));
 var _source2 = _interopRequireDefault(require("../stories/questionnaires/logement/source.json"));
-var _source3 = _interopRequireDefault(require("../stories/overview/source.json"));
+var _source3 = _interopRequireDefault(require("../stories/questionnaires/simpsons/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); }
 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; }
@@ -29,7 +29,7 @@ var dataFromObject = function dataFromObject(o) {
   };
 };
 (0, _vitest.describe)('use-lunatic()', function () {
-  var defaultParams = [_source["default"], dataFromObject({}), {}];
+  var defaultParams = [_source3["default"], dataFromObject({}), {}];
   (0, _vitest.it)('should initialize correcly', function () {
     var _renderHook = (0, _reactHooks.renderHook)(function () {
         return _useLunatic["default"].apply(void 0, defaultParams);
@@ -53,7 +53,7 @@ var dataFromObject = function dataFromObject(o) {
     (0, _vitest.expect)(result.current.pager.lastReachedPage).toBe('2');
   });
   (0, _vitest.it)('should jump to a specific page', function () {
-    var params = [_source["default"], dataFromObject({
+    var params = [_source3["default"], dataFromObject({
       COMMENT: 'Hello world',
       READY: true,
       NAME_CHAR: ['a', 'b']
@@ -142,7 +142,7 @@ var dataFromObject = function dataFromObject(o) {
     });
     (0, _vitest.it)('should be empty when no hierarchy', function () {
       var _renderHook8 = (0, _reactHooks.renderHook)(function () {
-          return (0, _useLunatic["default"])(_source3["default"], undefined, lunaticConfiguration);
+          return (0, _useLunatic["default"])(_source["default"], undefined, lunaticConfiguration);
         }),
         result = _renderHook8.result;
       (0, _vitest.expect)(result.current.overview).toHaveLength(0);
@@ -152,7 +152,9 @@ var dataFromObject = function dataFromObject(o) {
         var _renderHook9 = (0, _reactHooks.renderHook)(function () {
             return (0, _useLunatic["default"])(_source2["default"], advancedQestionnaireData, _objectSpread(_objectSpread({}, lunaticConfiguration), {}, {
               // hack on initialPage : useLunatic SHOULD find lastReachedPage from COLLECTED data
-              initialPage: '16'
+              initialPage: '1',
+              // use lastReachedPage saved by orchestrator
+              lastReachedPage: '16'
             }));
           }),
           result = _renderHook9.result;

package/lib/utils/store-tools/auto-load.js

@@ -10,6 +10,7 @@ var _updateStoreInfo = _interopRequireDefault(require("./create/update-store-inf
 var _clearStoreData = _interopRequireDefault(require("./clear-store-data"));
 var _clearStoreInfo = _interopRequireDefault(require("./clear-store-info"));
 var _createWorker = require("../suggester-workers/create-worker");
+var _workerPath = require("./worker-path");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator["return"] && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, "catch": function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
@@ -20,7 +21,6 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; } // @ts-ignore
-var workerPath = process.env.LUNATIC_LOADER_WORKER_PATH || process.env.REACT_APP_LUNATIC_LOADER_WORKER_PATH || 'workers/lunatic-loader-worker-0.1.0.js';
 var loadSuggesters = function loadSuggesters(suggesterFetcher) {
   return /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(suggesters) {
@@ -123,7 +123,7 @@ function task(_ref8, version) {
   var log = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : function () {
     return null;
   };
-  var worker = (0, _createWorker.createWorker)(workerPath);
+  var worker = (0, _createWorker.createWorker)((0, _workerPath.getWorkerPath)());
   var start = false;
   var stop = false;
   function launch(entities) {

package/lib/utils/store-tools/worker-path.js

@@ -0,0 +1,13 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getWorkerPath = getWorkerPath;
+function getWorkerPath() {
+  var _ref, _process$env$LUNATIC_;
+  if ('LUNATIC_WORKER_PATH' in window) {
+    return window.LUNATIC_WORKER_PATH;
+  }
+  return (_ref = (_process$env$LUNATIC_ = process.env.LUNATIC_LOADER_WORKER_PATH) !== null && _process$env$LUNATIC_ !== void 0 ? _process$env$LUNATIC_ : process.env.REACT_APP_LUNATIC_LOADER_WORKER_PATH) !== null && _ref !== void 0 ? _ref : 'workers/lunatic-loader-worker-0.1.0.js';
+}

package/lib/utils/suggester-workers/append-to-index/create-append-task.js

@@ -5,8 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.createAppendTask = createAppendTask;
 var _createWorkerTs = require("../create-worker-ts");
+var _workerPath = require("../../store-tools/worker-path");
 var _logger = require("../../logger");
-var workerPath = process.env.LUNATIC_LOADER_WORKER_PATH || process.env.REACT_APP_LUNATIC_LOADER_WORKER_PATH || 'workers/lunatic-loader-worker-0.1.0.js';
 function consoleLogging() {
   for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
     args[_key] = arguments[_key];
@@ -25,7 +25,7 @@ function createAppendTask(info, version) {
     fields = info.fields,
     stopWords = info.stopWords,
     meloto = info.meloto;
-  var worker = (0, _createWorkerTs.createWorker)(workerPath);
+  var worker = (0, _createWorkerTs.createWorker)((0, _workerPath.getWorkerPath)());
   var start = false;
   var stop = false;
   function launch(entities) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@inseefr/lunatic",
-	"version": "2.4.10",
+	"version": "2.5.0-fast-forward",
 	"workersVersion": "0.2.5-experimental",
 	"description": "Library of questionnaire components",
 	"repository": {
@@ -24,7 +24,6 @@
 	],
 	"license": "MIT",
 	"main": "lib/index.js",
-	"types": "lib/src/index.d.ts",
 	"files": [
 		"lib"
 	],
@@ -53,7 +52,7 @@
 		"library"
 	],
 	"dependencies": {
-		"@inseefr/trevas": "^0.1.17",
+		"@inseefr/trevas": "^0.1.19",
 		"@inseefr/vtl-2.0-antlr-tools": "^0.1.0-bundle",
 		"antlr4": "4.11.0",
 		"classnames": "^2.3.1",
@@ -146,7 +145,7 @@
 		"sass-loader": "^13.2.0",
 		"source-map-explorer": "^2.4.2",
 		"ts-loader": "^9.4.2",
-		"typescript": "^5.0.4",
+		"typescript": "^5.1.6",
 		"vite": "^4.0.0",
 		"vitest": "^0.27.2",
 		"wait-on": "^7.0.1",

package/lib/components/button/__snapshots__/lunatic-button.spec.jsx.snap

@@ -1,80 +0,0 @@
-// Vitest Snapshot v1
-
-exports[`Button > renders without crashing 1`] = `
-{
-  "asFragment": [Function],
-  "baseElement": <body>
-    <div>
-      <button
-        class="button-lunatic"
-        type="button"
-      >
-        <span>
-          Click me!
-        </span>
-      </button>
-    </div>
-  </body>,
-  "container": <div>
-    <button
-      class="button-lunatic"
-      type="button"
-    >
-      <span>
-        Click me!
-      </span>
-    </button>
-  </div>,
-  "debug": [Function],
-  "findAllByAltText": [Function],
-  "findAllByDisplayValue": [Function],
-  "findAllByLabelText": [Function],
-  "findAllByPlaceholderText": [Function],
-  "findAllByRole": [Function],
-  "findAllByTestId": [Function],
-  "findAllByText": [Function],
-  "findAllByTitle": [Function],
-  "findByAltText": [Function],
-  "findByDisplayValue": [Function],
-  "findByLabelText": [Function],
-  "findByPlaceholderText": [Function],
-  "findByRole": [Function],
-  "findByTestId": [Function],
-  "findByText": [Function],
-  "findByTitle": [Function],
-  "getAllByAltText": [Function],
-  "getAllByDisplayValue": [Function],
-  "getAllByLabelText": [Function],
-  "getAllByPlaceholderText": [Function],
-  "getAllByRole": [Function],
-  "getAllByTestId": [Function],
-  "getAllByText": [Function],
-  "getAllByTitle": [Function],
-  "getByAltText": [Function],
-  "getByDisplayValue": [Function],
-  "getByLabelText": [Function],
-  "getByPlaceholderText": [Function],
-  "getByRole": [Function],
-  "getByTestId": [Function],
-  "getByText": [Function],
-  "getByTitle": [Function],
-  "queryAllByAltText": [Function],
-  "queryAllByDisplayValue": [Function],
-  "queryAllByLabelText": [Function],
-  "queryAllByPlaceholderText": [Function],
-  "queryAllByRole": [Function],
-  "queryAllByTestId": [Function],
-  "queryAllByText": [Function],
-  "queryAllByTitle": [Function],
-  "queryByAltText": [Function],
-  "queryByDisplayValue": [Function],
-  "queryByLabelText": [Function],
-  "queryByPlaceholderText": [Function],
-  "queryByRole": [Function],
-  "queryByTestId": [Function],
-  "queryByText": [Function],
-  "queryByTitle": [Function],
-  "rerender": [Function],
-  "unmount": [Function],
-}
-`;

package/lib/components/commons/components/combo-box/selection/__snapshots__/selection.spec.jsx.snap

@@ -1,81 +0,0 @@
-// Vitest Snapshot v1
-
-exports[`Selection component > should render correctly when it is disabled 1`] = `
-<div
-  aria-autocomplete="list"
-  aria-controls="todo"
-  aria-haspopup="listbox"
-  aria-owns="idUndefined"
-  class="lunatic-combo-box-selection"
-  id="idUndefined"
-  role="combobox"
->
-  <div
-    class="lunatic-combo-box-selected disabled"
-  >
-    <div>
-      No selection
-    </div>
-  </div>
-</div>
-`;
-
-exports[`Selection component > should render correctly when it is editable 1`] = `
-<div
-  aria-autocomplete="list"
-  aria-controls="todo"
-  aria-haspopup="listbox"
-  aria-owns="idUndefined"
-  class="lunatic-combo-box-selection"
-  id="idUndefined"
-  role="combobox"
->
-  <div
-    class="lunatic-combo-box-selected"
-  >
-    <div>
-      No selection
-    </div>
-  </div>
-</div>
-`;
-
-exports[`Selection component > should render correctly when it is expanded 1`] = `
-<div
-  aria-autocomplete="list"
-  aria-controls="todo"
-  aria-haspopup="listbox"
-  aria-owns="idUndefined"
-  class="lunatic-combo-box-selection"
-  id="idUndefined"
-  role="combobox"
->
-  <div
-    class="lunatic-combo-box-selected"
-  >
-    <div>
-      No selection
-    </div>
-  </div>
-</div>
-`;
-
-exports[`Selection component > should render correctly with default props 1`] = `
-<div
-  aria-autocomplete="list"
-  aria-controls="todo"
-  aria-haspopup="listbox"
-  aria-owns="idUndefined"
-  class="lunatic-combo-box-selection"
-  id="idUndefined"
-  role="combobox"
->
-  <div
-    class="lunatic-combo-box-selected"
-  >
-    <div>
-      No selection
-    </div>
-  </div>
-</div>
-`;

package/lib/src/use-lunatic/reducer/commons/is-empty-on-empty-page.d.ts

@@ -1,3 +0,0 @@
-import { LunaticState } from '../../type';
-declare function isOnEmptyPage(state: LunaticState): boolean;
-export default isOnEmptyPage;

package/lib/src/use-lunatic/reducer/reduce-roundabout.d.ts

@@ -1,2 +0,0 @@
-import type { LunaticState } from '../type';
-export declare function reduceToRoundabout(state: LunaticState): LunaticState;