@inseefr/lunatic 2.7.17 → 2.7.19

package/README.md

@@ -124,7 +124,8 @@ Lunatic uses webWorkers to take the load off the main execution frame (e.g. list
 
 Workers are normally installed when the library is installed (postinstall scripts). If this is not the case, you can always manually run the command `npx @inseefr/lunatic workers` at the root of your project to add Lunatic workers to your project.
 
-Lunatic workers are added to the `public/workers` folder of the current project when the library is installed.
+By default: Lunatic workers are added to the `public/workers` folder of the current project when the library is installed.
+If you want to install inside another folder, just run `npx @inseefr/lunatic workers my-custom-folder`. Workers will be available to the `my-custom-folder/workers` folder of the current project.
 
 If a new version of Lunatic offers new workers, they will be automatically updated.
 This ensures that you always have the right version of workers for the version of Lunatic you're using.

package/lib/src/utils/array.d.ts

@@ -22,3 +22,7 @@ export declare function firstValueItem<T = unknown>(items: T | T[]): T | undefin
  * - subArray([1, 2, 3]) // [[1], [1, 2], [1, 2, 3]]
  */
 export declare function subArrays<T = unknown>(items: T[] | T): T[][];
+/**
+ * Calculates the depth of an array
+ */
+export declare function depth(arr: unknown, base?: number): number;

package/lib/use-lunatic/commons/variables/behaviours/cleaning-behaviour.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.cleaningBehaviour = cleaningBehaviour;
+var _array = require("../../../../utils/array");
 /**
  * Cleaning behaviour for the store
  * When a variable changes, other variables can be reset
@@ -32,8 +33,12 @@ function cleaningBehaviour(store, cleaning) {
         if (skipCleaning) {
           continue;
         }
-        store.set(variableName, getValueAtIteration(initialValues[variableName], iteration), {
-          iteration: iteration
+
+        // Variable may be top level, so we need to deduce expected iteration
+        var variableDepth = (0, _array.depth)(initialValues[variableName]);
+        var variableIteration = variableDepth === 0 ? undefined : iteration === null || iteration === void 0 ? void 0 : iteration.slice(0, (0, _array.depth)(initialValues[variableName]));
+        store.set(variableName, getValueAtIteration(initialValues[variableName], variableIteration), {
+          iteration: variableIteration
         });
       } catch (e) {
         // If we have an error, skip this cleaning

package/lib/use-lunatic/commons/variables/lunatic-variables-store.spec.js

@@ -287,6 +287,8 @@ var _lunaticVariablesStore = require("./lunatic-variables-store");
         READY: {
           PRENOM: 'READY'
         }
+      }, {
+        PRENOM: [null]
       });
       variables.set('READY', false, {
         iteration: [1]
@@ -308,6 +310,21 @@ var _lunaticVariablesStore = require("./lunatic-variables-store");
       });
       (0, _vitest.expect)(variables.get('PRENOM')).toEqual(['John', null, 'Marc']);
     });
+    (0, _vitest.it)('should clean root variables even when in an iteration', function () {
+      variables.set('PRENOM', 'John');
+      variables.set('READY', [true, true, true]);
+      (0, _cleaningBehaviour.cleaningBehaviour)(variables, {
+        READY: {
+          PRENOM: 'READY'
+        }
+      }, {
+        PRENOM: null
+      });
+      variables.set('READY', false, {
+        iteration: [1]
+      });
+      (0, _vitest.expect)(variables.get('PRENOM')).toEqual(null);
+    });
   });
   (0, _vitest.describe)('missing', function () {
     (0, _vitest.beforeEach)(function () {

package/lib/utils/array.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.depth = depth;
 exports.firstValueItem = firstValueItem;
 exports.getAtIndex = getAtIndex;
 exports.resizeArray = resizeArray;
@@ -115,4 +116,15 @@ function subArrays(items) {
     arrays.push(items.slice(0, i));
   }
   return arrays;
+}
+
+/**
+ * Calculates the depth of an array
+ */
+function depth(arr) {
+  var base = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+  if (!Array.isArray(arr)) {
+    return base;
+  }
+  return depth(arr[0], base + 1);
 }

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

@@ -14,7 +14,7 @@ var WorkerEnum = exports.WorkerEnum = /*#__PURE__*/function (WorkerEnum) {
   return WorkerEnum;
 }({});
 var version = _package["default"].workersVersion;
-var DEFAULT_BASE_PATH = 'workers';
+var DEFAULT_BASE_PATH = "".concat(window.location.origin, "/workers");
 var WORKER_PATH = {
   APPEND: "lunatic-append-worker-".concat(version, ".js"),
   SEARCH: "lunatic-search-worker-".concat(version, ".js"),

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@inseefr/lunatic",
-	"version": "2.7.17",
+	"version": "2.7.19",
 	"workersVersion": "0.3.0",
 	"description": "Library of questionnaire components",
 	"repository": {

package/scripts/build/workers-paths.js

@@ -3,7 +3,15 @@ const path = require('path');
 
 const version = lunaticPackageJson.workersVersion;
 
-const currentPublicFolder = path.resolve(`${process.cwd()}/public/workers`);
+/**
+ * process.argv return an array, for example, for this command "node ./my-script.js hello"
+ * process.argv = ["node", "./my-script.js", "hello"], process.argv[2] = "hello" (or undefined if no argument)
+ */
+const getPublicFolder = () => process.argv[2] || 'public';
+
+const currentPublicFolder = path.resolve(
+	`${process.cwd()}/${getPublicFolder()}/workers`
+);
 const workersReleaseFolder = path.resolve(__dirname, '../../workers-release');
 
 const workersPath = {