@inseefr/lunatic 2.7.10 → 2.7.11

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

@@ -7,6 +7,8 @@ var _source = _interopRequireDefault(require("../stories/overview/source.json"))
 var _source2 = _interopRequireDefault(require("../stories/questionnaires/logement/source.json"));
 var _source3 = _interopRequireDefault(require("../stories/questionnaires2023/simpsons/source.json"));
 var _source4 = _interopRequireDefault(require("../stories/component-set/source.json"));
+var _sourceLoop = _interopRequireDefault(require("../stories/behaviour/cleaning/source-loop.json"));
+var _sourceResizingCleaning = _interopRequireDefault(require("../stories/behaviour/resizing/source-resizing-cleaning.json"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -31,7 +33,7 @@ var dataFromObject = function dataFromObject(o) {
 };
 (0, _vitest.describe)('use-lunatic()', function () {
   var defaultParams = [_source3["default"], dataFromObject({}), {}];
-  (0, _vitest.it)('should initialize correcly', function () {
+  (0, _vitest.it)('should initialize correctly', function () {
     var _renderHook = (0, _reactHooks.renderHook)(function () {
         return _useLunatic["default"].apply(void 0, defaultParams);
       }),
@@ -168,12 +170,62 @@ var dataFromObject = function dataFromObject(o) {
       });
     });
   });
+  (0, _vitest.describe)('cleaning', function () {
+    (0, _vitest.it)('should handle cleaning in a loop', function () {
+      var _renderHook10 = (0, _reactHooks.renderHook)(function () {
+          return (0, _useLunatic["default"])(_sourceLoop["default"], undefined, {});
+        }),
+        result = _renderHook10.result;
+      (0, _reactHooks.act)(function () {
+        result.current.onChange({
+          name: 'PRENOM'
+        }, ['John', 'Doe', 'Marc']);
+        result.current.onChange({
+          name: 'AGE'
+        }, [18, 18, 18]);
+        // Go in the first iteration
+        result.current.goNextPage();
+        result.current.goNextPage();
+      });
+      var expectCollectedAgeToEqual = function expectCollectedAgeToEqual(expectation) {
+        (0, _vitest.expect)(result.current.getData(false).COLLECTED.AGE.COLLECTED).toEqual(expectation);
+      };
+      expectCollectedAgeToEqual([18, 18, 18]);
+      (0, _reactHooks.act)(function () {
+        result.current.onChange({
+          name: 'HIDE_AGE'
+        }, true, {
+          iteration: [0]
+        });
+      });
+      expectCollectedAgeToEqual([null, 18, 18]);
+    });
+  });
+  (0, _vitest.describe)('resizing', function () {
+    (0, _vitest.it)('should resize after cleaning', function () {
+      var spy = _vitest.vi.fn();
+      var _renderHook11 = (0, _reactHooks.renderHook)(function () {
+          return (0, _useLunatic["default"])(_sourceResizingCleaning["default"], undefined, {
+            onChange: spy
+          });
+        }),
+        result = _renderHook11.result;
+      result.current.onChange({
+        name: 'NB'
+      }, 3);
+      (0, _vitest.expect)(result.current.getData(true).COLLECTED.PRENOMS.COLLECTED).toEqual([null, null, null]);
+      result.current.onChange({
+        name: 'NB'
+      }, 2);
+      (0, _vitest.expect)(result.current.getData(true).COLLECTED.PRENOMS.COLLECTED).toEqual([null, null]);
+    });
+  });
   (0, _vitest.describe)('getComponents()', function () {
     (0, _vitest.describe)('componentSet', function () {
-      var _renderHook10 = (0, _reactHooks.renderHook)(function () {
+      var _renderHook12 = (0, _reactHooks.renderHook)(function () {
           return (0, _useLunatic["default"])(_source4["default"], undefined, {});
         }),
-        result = _renderHook10.result;
+        result = _renderHook12.result;
       var getComponents = function getComponents() {
         return result.current.getComponents();
       };
@@ -196,10 +248,10 @@ var dataFromObject = function dataFromObject(o) {
   (0, _vitest.describe)('getData()', function () {
     var hookRef;
     (0, _vitest.beforeEach)(function () {
-      var _renderHook11 = (0, _reactHooks.renderHook)(function () {
+      var _renderHook13 = (0, _reactHooks.renderHook)(function () {
           return (0, _useLunatic["default"])(_source3["default"], undefined, {});
         }),
-        result = _renderHook11.result;
+        result = _renderHook13.result;
       (0, _reactHooks.act)(function () {
         result.current.onChange({
           name: 'COMMENT'
@@ -245,12 +297,12 @@ var dataFromObject = function dataFromObject(o) {
   (0, _vitest.describe)('getChangedData()', function () {
     var hookRef;
     (0, _vitest.beforeEach)(function () {
-      var _renderHook12 = (0, _reactHooks.renderHook)(function () {
+      var _renderHook14 = (0, _reactHooks.renderHook)(function () {
           return (0, _useLunatic["default"])(_source3["default"], undefined, {
             trackChanges: true
           });
         }),
-        result = _renderHook12.result;
+        result = _renderHook14.result;
       hookRef = result;
     });
     (0, _vitest.it)('should return every value', function () {

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

@@ -90,9 +90,11 @@ function useSuggesters(_ref) {
 
   // Index the data
   (0, _react.useEffect)(function () {
-    var aborts = [];
+    var aborts = {
+      current: []
+    };
     if (typeof getReferentiel === 'function' && Array.isArray(suggesters) && auto) {
-      suggesters.forEach( /*#__PURE__*/function () {
+      var suggesterWorkers = suggesters.map( /*#__PURE__*/function () {
         var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(store) {
           var name, current, isClean, data, _createAppendTask, _createAppendTask2, append, abort, result;
           return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -132,7 +134,7 @@ function useSuggesters(_ref) {
               case 13:
                 data = _context.sent;
                 _createAppendTask = (0, _createAppendTask3.createAppendTask)(store, 1, nothing, workersBasePath), _createAppendTask2 = _slicedToArray(_createAppendTask, 2), append = _createAppendTask2[0], abort = _createAppendTask2[1];
-                aborts.push(abort);
+                aborts.current.push(abort);
                 _context.next = 18;
                 return append(data);
               case 18:
@@ -163,11 +165,13 @@ function useSuggesters(_ref) {
           return _ref3.apply(this, arguments);
         };
       }());
-      return function () {
-        aborts.forEach(function (abort) {
-          return abort();
+      var clearWorkers = function clearWorkers() {
+        return aborts.current.forEach(function (a) {
+          return a();
         });
       };
+      Promise.all(suggesterWorkers)["finally"](clearWorkers);
+      return clearWorkers;
     }
   }, [suggesters, auto, getReferentiel, status, workersBasePath]);
   return getSuggesterStatus;

package/lib/utils/store-tools/initStore.js

@@ -28,7 +28,7 @@ function _initStore() {
         case 3:
           db = _context.sent;
           if (!db) {
-            _context.next = 15;
+            _context.next = 16;
             break;
           }
           _context.next = 7;
@@ -43,10 +43,11 @@ function _initStore() {
           return (0, _insertEntity["default"])(db, _constantes["default"].STORE_INFO_NAME, storeInfo);
         case 13:
           c = _context.sent;
+          db.close();
           return _context.abrupt("return", a && b && c);
-        case 15:
-          return _context.abrupt("return", false);
         case 16:
+          return _context.abrupt("return", false);
+        case 17:
         case "end":
           return _context.stop();
       }

package/lib/utils/store-tools/open-or-create-store.js

@@ -9,14 +9,14 @@ var _getIdb = _interopRequireDefault(require("../idb-tools/get-idb"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 /* eslint-disable no-restricted-globals */
 
-var IDB_REF = (0, _getIdb["default"])();
 function openStorage(name) {
   var idbVersion = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
   return new Promise(function (resolve, reject) {
-    if (!IDB_REF) {
+    var idb = (0, _getIdb["default"])();
+    if (!idb) {
       reject('indexedDb not supported !');
     }
-    var request = IDB_REF.open(name, idbVersion);
+    var request = idb.open(name, idbVersion);
     var db;
     var doIt = true;
     request.onupgradeneeded = function (e) {

package/lib/utils/suggester-workers/searching/searching.js

@@ -83,14 +83,14 @@ function searching(_x3, _x4) {
 }
 function _searching() {
   _searching = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(search, _ref2) {
-    var name, _ref2$version, version, _ref2$meloto, meloto, db, info, queryParser, max, order, parser, transaction, store, index, tokens, documents;
+    var name, _ref2$version, version, _ref2$meloto, meloto, db, info, queryParser, max, order, parser, tokens, transaction, store, index, documents;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
           name = _ref2.name, _ref2$version = _ref2.version, version = _ref2$version === void 0 ? '1' : _ref2$version, _ref2$meloto = _ref2.meloto, meloto = _ref2$meloto === void 0 ? true : _ref2$meloto;
           _context2.prev = 1;
           if (!isValideSearch(search)) {
-            _context2.next = 21;
+            _context2.next = 23;
             break;
           }
           _context2.next = 5;
@@ -106,34 +106,44 @@ function _searching() {
           return (0, _resolveQueryParser["default"])(queryParser);
         case 12:
           parser = _context2.sent;
+          tokens = parser(search); // Do not start a transaction if we have nothing to search
+          if (!(tokens.length === 0)) {
+            _context2.next = 16;
+            break;
+          }
+          return _context2.abrupt("return", {
+            results: [],
+            search: search,
+            tokens: tokens
+          });
+        case 16:
           transaction = db.transaction(_storeTools.CONSTANTES.STORE_DATA_NAME, 'readonly');
           store = transaction.objectStore(_storeTools.CONSTANTES.STORE_DATA_NAME);
           index = store.index(_storeTools.CONSTANTES.STORE_INDEX_NAME);
-          tokens = parser(search);
-          _context2.next = 19;
+          _context2.next = 21;
           return searchTokens(tokens, index);
-        case 19:
+        case 21:
           documents = _context2.sent;
           return _context2.abrupt("return", {
             results: prepare((0, _order["default"])(order)(filterSize((0, _computeScore["default"])(documents, tokens, meloto), max), order)),
             search: search,
             tokens: tokens
           });
-        case 21:
+        case 23:
           return _context2.abrupt("return", {
             results: [],
             search: search
           });
-        case 24:
-          _context2.prev = 24;
+        case 26:
+          _context2.prev = 26;
           _context2.t0 = _context2["catch"](1);
           console.error(_context2.t0);
           throw _context2.t0;
-        case 28:
+        case 30:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[1, 24]]);
+    }, _callee2, null, [[1, 26]]);
   }));
   return _searching.apply(this, arguments);
 }

package/lib/utils/suggester-workers/searching/searching.worker.js

@@ -6,17 +6,21 @@ var _searching = _interopRequireDefault(require("./searching"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 /* eslint-disable no-restricted-globals */
 
+var LAST_SEARCH = undefined;
 self.onmessage = function (e) {
   var _e$data = e.data,
     search = _e$data.search,
     name = _e$data.name,
     version = _e$data.version,
     meloto = _e$data.meloto;
+  LAST_SEARCH = search;
   (0, _searching["default"])(search, {
     name: name,
     version: version,
     meloto: meloto
   }).then(function (result) {
-    self.postMessage(result);
+    if (search === LAST_SEARCH) {
+      self.postMessage(result);
+    }
   });
 };

package/lib/utils/vtl.js

@@ -79,11 +79,11 @@ function getExpressionType(expression) {
   return '';
 }
 function getExpressionAsString(expression) {
-  if (typeof expression === 'string') {
-    return expression;
+  if (typeof expression === 'string' || typeof expression === 'number') {
+    return expression.toString();
   }
-  if (expression && _typeof(expression) === 'object' && 'value' in expression && typeof expression.value === 'string') {
-    return expression.value;
+  if (expression && _typeof(expression) === 'object' && 'value' in expression && (typeof expression.value === 'string' || typeof expression.value === 'number')) {
+    return expression.value.toString();
   }
   return '';
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@inseefr/lunatic",
-	"version": "2.7.10",
+	"version": "2.7.11",
 	"workersVersion": "0.3.0",
 	"description": "Library of questionnaire components",
 	"repository": {
@@ -49,7 +49,7 @@
 		"check": "tsc",
 		"lint": "eslint ./src",
 		"lint:check": "eslint . --ext .ts,.tsx",
-		"_format": "prettier **/*.{ts,tsx,json,md}",
+		"_format": "prettier **/*.{ts,tsx,json}",
 		"format": "npm run _format -- --write",
 		"format:check": "npm run _format -- --list-different",
 		"test-coverage": "vitest run --coverage",
@@ -71,7 +71,7 @@
 	],
 	"dependencies": {
 		"@inseefr/trevas": "^0.1.20",
-		"@inseefr/vtl-2.0-antlr-tools": "^0.1.0-bundle",
+		"@inseefr/vtl-2.0-antlr-tools": "^0.1.0",
 		"antlr4": "4.11.0",
 		"classnames": "^2.3.1",
 		"date-fns": "^2.25.0",