@inseefr/lunatic 2.7.12 → 2.7.13

package/lib/components/loop/block-for-loop.js

@@ -73,7 +73,11 @@ var BlockForLoop = exports.BlockForLoop = (0, _commons.createCustomizableLunatic
     return null;
   }
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_declarations.DeclarationsBeforeText, {
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_commons.Label, {
+      htmlFor: id,
+      id: "label-".concat(id),
+      children: label
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_declarations.DeclarationsBeforeText, {
       declarations: declarations,
       id: id
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_declarations.DeclarationsAfterText, {
@@ -96,7 +100,7 @@ var BlockForLoop = exports.BlockForLoop = (0, _commons.createCustomizableLunatic
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_loopButton.LoopButton, {
         onClick: addRow,
         disabled: nbRows === max,
-        children: label || _i18n["default"].DEFAULT_BUTTON_ADD
+        children: _i18n["default"].DEFAULT_BUTTON_ADD
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_loopButton.LoopButton, {
         onClick: removeRow,
         disabled: nbRows === 1,

package/lib/components/loop/roster-for-loop/__snapshots__/roster-for-loop.spec.tsx.snap

@@ -2,6 +2,13 @@
 
 exports[`RosterForLoop > renders the right number of columns 1`] = `
 <div>
+  <label
+    class="lunatic-label"
+    for="table"
+    id="label-table"
+  >
+    Ceci est un test
+  </label>
   <table
     class="lunatic-table"
     id="table-table"
@@ -77,7 +84,7 @@ exports[`RosterForLoop > renders the right number of columns 1`] = `
   <input
     class="button-lunatic"
     type="button"
-    value="Ceci est un test"
+    value="Add row"
   />
   <input
     class="button-lunatic"

package/lib/components/loop/roster-for-loop/roster-for-loop.js

@@ -18,7 +18,7 @@ var _lunaticComponents = require("../../lunatic-components");
 var _constant = require("../constant");
 var _errors = require("../../commons/components/errors/errors");
 var _jsxRuntime = require("react/jsx-runtime");
-var _excluded = ["value", "lines", "handleChange", "declarations", "label", "headers", "iterations", "id", "getComponents"];
+var _excluded = ["value", "lines", "handleChange", "declarations", "header", "iterations", "id", "getComponents", "label"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 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; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -44,11 +44,11 @@ var RosterForLoop = exports.RosterForLoop = (0, _commons.createCustomizableLunat
     lines = props.lines,
     handleChange = props.handleChange,
     declarations = props.declarations,
-    label = props.label,
-    headers = props.headers,
+    header = props.header,
     iterations = props.iterations,
     id = props.id,
     getComponents = props.getComponents,
+    label = props.label,
     otherProps = _objectWithoutProperties(props, _excluded);
   var min = (lines === null || lines === void 0 ? void 0 : lines.min) || DEFAULT_MIN_ROWS;
   var max = (lines === null || lines === void 0 ? void 0 : lines.max) || DEFAULT_MAX_ROWS;
@@ -85,7 +85,11 @@ var RosterForLoop = exports.RosterForLoop = (0, _commons.createCustomizableLunat
   }
   var cols = 0;
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_declarations.DeclarationsBeforeText, {
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_commons.Label, {
+      htmlFor: id,
+      id: "label-".concat(id),
+      children: label
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_declarations.DeclarationsBeforeText, {
       declarations: declarations,
       id: id
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_declarations.DeclarationsAfterText, {
@@ -94,7 +98,7 @@ var RosterForLoop = exports.RosterForLoop = (0, _commons.createCustomizableLunat
     }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_htmlTable.Table, {
       id: id,
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_tableHeader.TableHeader, {
-        header: headers,
+        header: header,
         id: id
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_htmlTable.Tbody, {
         id: id,
@@ -146,7 +150,7 @@ var RosterForLoop = exports.RosterForLoop = (0, _commons.createCustomizableLunat
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_loopButton.LoopButton, {
         onClick: addRow,
         disabled: nbRows === max,
-        children: label || _i18n["default"].DEFAULT_BUTTON_ADD
+        children: _i18n["default"].DEFAULT_BUTTON_ADD
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_loopButton.LoopButton, {
         onClick: removeRow,
         disabled: nbRows === min,

package/lib/src/components/loop/block-for-loop.d.ts

@@ -15,7 +15,7 @@ export declare const BlockForLoop: import("react").ComponentType<import("../type
         deps?: string[] | undefined;
     } | undefined) => T;
     value: Record<string, unknown[]>;
-    headers?: {
+    header?: {
         label: import("react").ReactNode;
     }[] | undefined;
     paginatedLoop?: boolean | undefined;

package/lib/src/components/loop/roster-for-loop/roster-for-loop.d.ts

@@ -16,7 +16,7 @@ export declare const RosterForLoop: import("react").ComponentType<import("../../
         deps?: string[] | undefined;
     } | undefined) => T;
     value: Record<string, unknown[]>;
-    headers?: {
+    header?: {
         label: import("react").ReactNode;
     }[] | undefined;
     paginatedLoop?: boolean | undefined;

package/lib/src/components/type.d.ts

@@ -98,7 +98,7 @@ type ComponentPropsByType = {
         getComponents: (n: number) => FilledLunaticComponentProps[];
         executeExpression: LunaticState['executeExpression'];
         value: Record<string, unknown[]>;
-        headers?: Array<{
+        header?: Array<{
             label: ReactNode;
         }>;
         paginatedLoop?: boolean;
@@ -112,7 +112,7 @@ type ComponentPropsByType = {
         getComponents: (n: number) => FilledLunaticComponentProps[];
         executeExpression: LunaticState['executeExpression'];
         value: Record<string, unknown[]>;
-        headers?: Array<{
+        header?: Array<{
             label: ReactNode;
         }>;
         paginatedLoop?: boolean;

package/lib/src/use-lunatic/use-lunatic.d.ts

@@ -72,7 +72,7 @@ declare function useLunatic(source: LunaticSource, data: LunaticData | undefined
                     deps?: string[] | undefined;
                 } | undefined) => T;
                 value: Record<string, unknown[]>;
-                headers?: {
+                header?: {
                     label: import("react").ReactNode;
                 }[] | undefined;
                 paginatedLoop?: boolean | undefined;
@@ -90,7 +90,7 @@ declare function useLunatic(source: LunaticSource, data: LunaticData | undefined
                     deps?: string[] | undefined;
                 } | undefined) => T;
                 value: Record<string, unknown[]>;
-                headers?: {
+                header?: {
                     label: import("react").ReactNode;
                 }[] | undefined;
                 paginatedLoop?: boolean | undefined;
@@ -320,7 +320,7 @@ declare function useLunatic(source: LunaticSource, data: LunaticData | undefined
                     deps?: string[] | undefined;
                 } | undefined) => T;
                 value: Record<string, unknown[]>;
-                headers?: {
+                header?: {
                     label: import("react").ReactNode;
                 }[] | undefined;
                 paginatedLoop?: boolean | undefined;
@@ -338,7 +338,7 @@ declare function useLunatic(source: LunaticSource, data: LunaticData | undefined
                     deps?: string[] | undefined;
                 } | undefined) => T;
                 value: Record<string, unknown[]>;
-                headers?: {
+                header?: {
                     label: import("react").ReactNode;
                 }[] | undefined;
                 paginatedLoop?: boolean | undefined;

package/lib/stories/loop/source-with-header.json

@@ -14,7 +14,7 @@
 		{
 			"id": "loop-prenom",
 			"componentType": "RosterForLoop",
-			"headers": [
+			"header": [
 				{ "headerCell": true, "label": "Prénom" },
 				{ "headerCell": true, "label": "Age" }
 			],

package/lib/stories/utils/referentiel.js

@@ -21,15 +21,15 @@ var getReferentiel = exports.getReferentiel = /*#__PURE__*/function () {
             return r.json();
           }));
         case 4:
-          return _context.abrupt("return", fetch('https://inseefr.github.io/Lunatic/storybook/naf-rev2.json').then(function (r) {
+          return _context.abrupt("return", fetch('/naf-rev2.json').then(function (r) {
             return r.json();
           }));
         case 5:
-          return _context.abrupt("return", fetch('https://inseefr.github.io/Lunatic/storybook/communes-2019.json').then(function (r) {
+          return _context.abrupt("return", fetch('/communes-2019.json').then(function (r) {
             return r.json();
           }));
         case 6:
-          throw new Error("Unkonw r\xE9f\xE9rentiel ".concat(name));
+          throw new Error("Unknown r\xE9f\xE9rentiel ".concat(name));
         case 7:
         case "end":
           return _context.stop();

package/lib/use-lunatic/commons/fill-components/fill-component-expressions.js

@@ -24,7 +24,7 @@ var VTL_ATTRIBUTES = ['label', 'options.label', 'responses.label', 'hierarchy.la
 // Disable controls compilation
 // 'controls.control',
 // 'controls.errorMessage',
-'controls.iterations', 'lines.min', 'lines.max', 'xAxisIterations', 'yAxisIterations', 'conditionFilter', 'headers.label', 'header.label', 'disabled', 'readOnly'];
+'controls.iterations', 'lines.min', 'lines.max', 'xAxisIterations', 'yAxisIterations', 'conditionFilter', 'header.label', 'disabled', 'readOnly'];
 
 // Utility type to replace all expression from an object into a translated version
 

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

@@ -387,8 +387,13 @@ var LunaticVariable = /*#__PURE__*/function () {
       var _this4 = this,
         _this$calculatedAt$ge;
       var dependenciesUpdatedAt = Math.max.apply(Math, [0].concat(_toConsumableArray(this.getDependencies().map(function (dep) {
-        var _this4$dictionary$get, _this4$dictionary;
-        return (_this4$dictionary$get = (_this4$dictionary = _this4.dictionary) === null || _this4$dictionary === void 0 || (_this4$dictionary = _this4$dictionary.get(dep)) === null || _this4$dictionary === void 0 ? void 0 : _this4$dictionary.updatedAt.get(iteration === null || iteration === void 0 ? void 0 : iteration.join('.'))) !== null && _this4$dictionary$get !== void 0 ? _this4$dictionary$get : 0;
+        var _ref2, _this4$dictionary$get, _this4$dictionary, _this4$dictionary2;
+        return (// Check when a value at the same iteration was calculated
+          (_ref2 = (_this4$dictionary$get = (_this4$dictionary = _this4.dictionary) === null || _this4$dictionary === void 0 || (_this4$dictionary = _this4$dictionary.get(dep)) === null || _this4$dictionary === void 0 ? void 0 : _this4$dictionary.updatedAt.get(iteration === null || iteration === void 0 ? void 0 : iteration.join('.'))) !== null && _this4$dictionary$get !== void 0 ? _this4$dictionary$get : // For aggregated value (max / min) look the global updatedAt time
+          (_this4$dictionary2 = _this4.dictionary) === null || _this4$dictionary2 === void 0 || (_this4$dictionary2 = _this4$dictionary2.get(dep)) === null || _this4$dictionary2 === void 0 ? void 0 : _this4$dictionary2.updatedAt.get(undefined)) !== null && _ref2 !== void 0 ? _ref2 :
+          // Otherwise this is a static value that never changes
+          0
+        );
       }))));
       return dependenciesUpdatedAt > ((_this$calculatedAt$ge = this.calculatedAt.get(iteration === null || iteration === void 0 ? void 0 : iteration.join('.'))) !== null && _this$calculatedAt$ge !== void 0 ? _this$calculatedAt$ge : -1);
     }

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

@@ -199,6 +199,19 @@ var _lunaticVariablesStore = require("./lunatic-variables-store");
       });
       (0, _vitest.expect)(variables.get('FULLNAME')).toEqual(['John 1', 'Jane 2']);
     });
+    (0, _vitest.it)('should handle aggregate functions', function () {
+      variables.set('AGE', [1, 2, 3]);
+      variables.setCalculated('MAXAGE', 'max(AGE)');
+      variables.setCalculated('AGE_AND_MAX', 'AGE + MAXAGE', {
+        shapeFrom: 'AGE'
+      });
+      (0, _vitest.expect)(variables.get('AGE_AND_MAX', [0])).toEqual(4);
+      variables.set('AGE', 12, {
+        iteration: [1]
+      });
+      (0, _vitest.expect)(variables.get('AGE', [1])).toEqual(12);
+      (0, _vitest.expect)(variables.get('AGE_AND_MAX', [0])).toEqual(13);
+    });
   });
   (0, _vitest.describe)('resizing', function () {
     (0, _vitest.it)('should resize variables', function () {

package/package.json

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