@inseefr/lunatic 2.6.2 → 2.6.3-rc.1

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

@@ -1,10 +1,8 @@
 import { type FunctionComponent } from 'react';
-import type { LunaticState } from './type';
+import type { LunaticData, LunaticState } from './type';
 import type { LunaticSource } from './type-source';
 import type { LunaticComponentType } from '../components/type';
-declare function useLunatic(source: LunaticSource, data: Partial<Record<"EXTERNAL" | "CALCULATED", Record<string, unknown>> & {
-    COLLECTED: Record<string, import("./type").LunaticCollectedValue>;
-}> | undefined, { features, preferences, savingType, onChange, management, shortcut, initialPage, lastReachedPage, autoSuggesterLoading, activeControls, getReferentiel, custom, withOverview, missing, missingStrategy, missingShortcut, dontKnowButton, refusedButton, }: {
+declare function useLunatic(source: LunaticSource, data: LunaticData | undefined, { features, preferences, savingType, onChange, management, shortcut, initialPage, lastReachedPage, autoSuggesterLoading, activeControls, getReferentiel, custom, withOverview, missing, missingStrategy, missingShortcut, dontKnowButton, refusedButton, trackChanges, }: {
     features?: LunaticState['features'];
     preferences?: LunaticState['preferences'];
     savingType?: LunaticState['savingType'];
@@ -26,6 +24,7 @@ declare function useLunatic(source: LunaticSource, data: Partial<Record<"EXTERNA
     };
     dontKnowButton?: string;
     refusedButton?: string;
+    trackChanges?: boolean;
 }): {
     getComponents: ({ only, except, }?: {
         only?: (keyof {
@@ -64,13 +63,12 @@ declare function useLunatic(source: LunaticSource, data: Partial<Record<"EXTERNA
                     min: number;
                     max: number;
                 };
-                iterations?: number | undefined;
+                iterations: number;
                 getComponents: (n: number) => import("./commons/fill-components/fill-components").FilledLunaticComponentProps[];
                 executeExpression: <T extends unknown = unknown>(expression: unknown, args?: {
-                    iteration?: number | undefined;
-                    linksIterations?: number[] | undefined;
-                    logging?: import("./commons/execute-expression/create-execute-expression").ExpressionLogger | undefined;
+                    iteration?: number | number[] | undefined;
                     bindingDependencies?: string[] | undefined;
+                    deps?: string[] | undefined;
                 } | undefined) => T;
                 value: Record<string, unknown[]>;
                 headers?: {
@@ -83,13 +81,12 @@ declare function useLunatic(source: LunaticSource, data: Partial<Record<"EXTERNA
                     min: number;
                     max: number;
                 };
-                iterations?: number | undefined;
+                iterations: number;
                 getComponents: (n: number) => import("./commons/fill-components/fill-components").FilledLunaticComponentProps[];
                 executeExpression: <T extends unknown = unknown>(expression: unknown, args?: {
-                    iteration?: number | undefined;
-                    linksIterations?: number[] | undefined;
-                    logging?: import("./commons/execute-expression/create-execute-expression").ExpressionLogger | undefined;
+                    iteration?: number | number[] | undefined;
                     bindingDependencies?: string[] | undefined;
+                    deps?: string[] | undefined;
                 } | undefined) => T;
                 value: Record<string, unknown[]>;
                 headers?: {
@@ -104,14 +101,11 @@ declare function useLunatic(source: LunaticSource, data: Partial<Record<"EXTERNA
                     rowspan?: number | undefined;
                     colspan?: number | undefined;
                 }[];
-                body: {
-                    label: import("./type").LunaticExpression;
-                }[][];
+                body: import("./commons/fill-components/fill-components").FilledLunaticComponentProps[][];
                 executeExpression: <T extends unknown = unknown>(expression: unknown, args?: {
-                    iteration?: number | undefined;
-                    linksIterations?: number[] | undefined;
-                    logging?: import("./commons/execute-expression/create-execute-expression").ExpressionLogger | undefined;
+                    iteration?: number | number[] | undefined;
                     bindingDependencies?: string[] | undefined;
+                    deps?: string[] | undefined;
                 } | undefined) => T;
                 iteration: number | undefined;
             };
@@ -220,15 +214,15 @@ declare function useLunatic(source: LunaticSource, data: Partial<Record<"EXTERNA
                 components: import("./type").LunaticComponentDefinition[];
                 features?: ["VTL"] | ["VTL", "MD"] | undefined;
                 executeExpression: <T extends unknown = unknown>(expression: unknown, args?: {
-                    iteration?: number | undefined;
-                    linksIterations?: number[] | undefined;
-                    logging?: import("./commons/execute-expression/create-execute-expression").ExpressionLogger | undefined;
+                    iteration?: number | number[] | undefined;
                     bindingDependencies?: string[] | undefined;
+                    deps?: string[] | undefined;
                 } | undefined) => T;
                 xAxisIterations: number;
                 yAxisIterations: number;
                 symLinks: Record<string, Record<string, string>>;
                 value: Record<string, unknown[]>;
+                getComponents: (x: number, y: number) => import("./commons/fill-components/fill-components").FilledLunaticComponentProps[];
             };
             Suggester: import("../components/type").LunaticBaseProps<string | null> & {
                 storeName: string;
@@ -312,13 +306,12 @@ declare function useLunatic(source: LunaticSource, data: Partial<Record<"EXTERNA
                     min: number;
                     max: number;
                 };
-                iterations?: number | undefined;
+                iterations: number;
                 getComponents: (n: number) => import("./commons/fill-components/fill-components").FilledLunaticComponentProps[];
                 executeExpression: <T extends unknown = unknown>(expression: unknown, args?: {
-                    iteration?: number | undefined;
-                    linksIterations?: number[] | undefined;
-                    logging?: import("./commons/execute-expression/create-execute-expression").ExpressionLogger | undefined;
+                    iteration?: number | number[] | undefined;
                     bindingDependencies?: string[] | undefined;
+                    deps?: string[] | undefined;
                 } | undefined) => T;
                 value: Record<string, unknown[]>;
                 headers?: {
@@ -331,13 +324,12 @@ declare function useLunatic(source: LunaticSource, data: Partial<Record<"EXTERNA
                     min: number;
                     max: number;
                 };
-                iterations?: number | undefined;
+                iterations: number;
                 getComponents: (n: number) => import("./commons/fill-components/fill-components").FilledLunaticComponentProps[];
                 executeExpression: <T extends unknown = unknown>(expression: unknown, args?: {
-                    iteration?: number | undefined;
-                    linksIterations?: number[] | undefined;
-                    logging?: import("./commons/execute-expression/create-execute-expression").ExpressionLogger | undefined;
+                    iteration?: number | number[] | undefined;
                     bindingDependencies?: string[] | undefined;
+                    deps?: string[] | undefined;
                 } | undefined) => T;
                 value: Record<string, unknown[]>;
                 headers?: {
@@ -352,14 +344,11 @@ declare function useLunatic(source: LunaticSource, data: Partial<Record<"EXTERNA
                     rowspan?: number | undefined;
                     colspan?: number | undefined;
                 }[];
-                body: {
-                    label: import("./type").LunaticExpression;
-                }[][];
+                body: import("./commons/fill-components/fill-components").FilledLunaticComponentProps[][];
                 executeExpression: <T extends unknown = unknown>(expression: unknown, args?: {
-                    iteration?: number | undefined;
-                    linksIterations?: number[] | undefined;
-                    logging?: import("./commons/execute-expression/create-execute-expression").ExpressionLogger | undefined;
+                    iteration?: number | number[] | undefined;
                     bindingDependencies?: string[] | undefined;
+                    deps?: string[] | undefined;
                 } | undefined) => T;
                 iteration: number | undefined;
             };
@@ -468,15 +457,15 @@ declare function useLunatic(source: LunaticSource, data: Partial<Record<"EXTERNA
                 components: import("./type").LunaticComponentDefinition[];
                 features?: ["VTL"] | ["VTL", "MD"] | undefined;
                 executeExpression: <T extends unknown = unknown>(expression: unknown, args?: {
-                    iteration?: number | undefined;
-                    linksIterations?: number[] | undefined;
-                    logging?: import("./commons/execute-expression/create-execute-expression").ExpressionLogger | undefined;
+                    iteration?: number | number[] | undefined;
                     bindingDependencies?: string[] | undefined;
+                    deps?: string[] | undefined;
                 } | undefined) => T;
                 xAxisIterations: number;
                 yAxisIterations: number;
                 symLinks: Record<string, Record<string, string>>;
                 value: Record<string, unknown[]>;
+                getComponents: (x: number, y: number) => import("./commons/fill-components/fill-components").FilledLunaticComponentProps[];
             };
             Suggester: import("../components/type").LunaticBaseProps<string | null> & {
                 storeName: string;
@@ -552,29 +541,15 @@ declare function useLunatic(source: LunaticSource, data: Partial<Record<"EXTERNA
         linksIterations?: number[] | undefined;
     };
     waiting: boolean;
-    getData: (withRefreshedCalculated: boolean) => {
-        CALCULATED: {};
-        EXTERNAL: ({
-            variableType: "EXTERNAL";
-            name: string;
-            value: unknown;
-        } & {
-            variableType: "EXTERNAL";
-        })[];
-        COLLECTED: ({
-            variableType: "COLLECTED";
-            name: string;
-            values: import("./type-source").ValuesType<unknown> | import("./type-source").ValuesTypeArray<unknown>;
-        } & {
-            variableType: "COLLECTED";
-        })[];
-    };
+    getData: (withRefreshedCalculated: boolean, variableNames?: string[]) => LunaticData;
     Provider: FunctionComponent<{
         children?: import("react").ReactNode;
     }>;
     onChange: (response: {
         name: string;
-    }, value: any, args?: Record<string, unknown> | undefined) => void;
+    }, value: any, args?: {
+        iteration?: number[] | undefined;
+    } | undefined) => void;
     overview: {
         lunaticId: string;
         page: string;
@@ -585,5 +560,7 @@ declare function useLunatic(source: LunaticSource, data: Partial<Record<"EXTERNA
         children: import("./commons/getOverview").OverviewItem[];
     }[];
     loopVariables: string[];
+    getChangedData: (reset?: boolean) => LunaticData;
+    resetChangedData: () => void;
 };
 export default useLunatic;

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

@@ -5,4 +5,9 @@ export declare function times<T>(n: number, cb: (k: number) => T): T[];
 /**
  * Update an item in an array without mutating the array
  */
-export declare function setAtIndex<T>(arr: T[], index: number, newValue: T): T[];
+export declare function setAtIndex<T>(arr: T, index: number | number[], newValue: unknown): T;
+/**
+ * Get a value inside an array
+ */
+export declare function getAtIndex(arr: unknown, indexes: number[]): unknown;
+export declare function resizeArray<T = unknown>(array: unknown, newLength: number, defaultValue?: T): T[];

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

@@ -0,0 +1 @@
+export declare function isTestEnv(): boolean;

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

@@ -3,3 +3,7 @@ export declare function forceInt(n: unknown): number;
  * Limit a number between 2 values
  */
 export declare function between(n: number, min: number, max: number): number;
+/**
+ * Check if the value is a number
+ */
+export declare function isNumber(n: unknown): n is number;

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

@@ -0,0 +1,5 @@
+import type { LunaticData, LunaticVariable } from '../use-lunatic/type';
+/**
+ * Extract the initial value from the source.json and data.json
+ */
+export declare function getInitialVariableValue(variable: LunaticVariable, data?: LunaticData): unknown;

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

@@ -0,0 +1,14 @@
+/**
+ * Simplified version of interpret (that converts binding and value)
+ */
+export declare function interpretVTL<T>(expression: string, bindings: Record<string, unknown>): T;
+/**
+ * Extract variables used in a VTL expression
+ */
+export declare function parseVTLVariables(expression: string): string[];
+/**
+ * Transform a value to make it compatible with VTL (for bindings)
+ */
+export declare function getVTLCompatibleValue(value: unknown): {} | null;
+export declare function getExpressionType(expression: unknown): string;
+export declare function getExpressionAsString(expression: unknown): string;

package/lib/use-lunatic/actions.js

@@ -36,13 +36,13 @@ var goToPage = actionCreator(ActionKind.GO_TO_PAGE);
 exports.goToPage = goToPage;
 var onInit = actionCreator(ActionKind.ON_INIT);
 exports.onInit = onInit;
-var handleChange = function handleChange(response, value, args) {
+var handleChange = function handleChange(name, value, iteration) {
   return {
     type: ActionKind.HANDLE_CHANGE,
     payload: {
-      response: response,
+      name: name,
       value: value,
-      args: args
+      iteration: iteration
     }
   };
 };

package/lib/use-lunatic/commons/compile-controls.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = void 0;
+exports.compileControls = compileControls;
 var _commons = require("../reducer/commons");
 var _resolveComponentControls = require("../reducer/resolve-component-controls");
 var _replaceComponentSequence = require("../replace-component-sequence");
@@ -53,7 +53,7 @@ function isCriticalErrors(errors) {
   }
   return false;
 }
-function computeErrors(state) {
+function compileControls(state) {
   var components = (0, _replaceComponentSequence.replaceComponentSequence)((0, _getComponentsFromState["default"])(state));
   var componentFiltered = components.map(function (component) {
     return (0, _fillComponentExpressions["default"])(component, state);
@@ -68,6 +68,4 @@ function computeErrors(state) {
     currentErrors: currentErrors,
     isCritical: isCritical
   };
-}
-var _default = computeErrors;
-exports["default"] = _default;
+}

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

@@ -0,0 +1,22 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.hasBody = hasBody;
+exports.hasComponentType = hasComponentType;
+exports.hasResponse = hasResponse;
+exports.hasResponses = hasResponses;
+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 hasResponse(component) {
+  return !!component && _typeof(component) === 'object' && 'response' in component && 'name' in component.response;
+}
+function hasResponses(component) {
+  return !!component && _typeof(component) === 'object' && 'responses' in component;
+}
+function hasBody(component) {
+  return !!component && _typeof(component) === 'object' && 'body' in component && Array.isArray(component.body);
+}
+function hasComponentType(component) {
+  return !!component && _typeof(component) === 'object' && 'componentType' in component && typeof component.componentType === 'string';
+}

package/lib/use-lunatic/commons/execute-condition-filter.js

@@ -9,16 +9,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
 function executeConditionFilter(filter, execute, iteration) {
   if (filter && typeof execute === 'function') {
     var value = filter.value;
-    var logging = function logging() {
-      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-        args[_key] = arguments[_key];
-      }
-      console.warn(args);
-      console.warn('executeConditionFilter:', filter);
-    };
     return execute((0, _getCompatibleVtlExpression["default"])(value), {
-      iteration: iteration,
-      logging: logging
+      iteration: iteration
     });
   }
   return undefined;

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', 'iterations', 'xAxisIterations', 'yAxisIterations', 'conditionFilter', 'headers.label', 'header.label', 'disabled', 'readOnly'];
+'controls.iterations', 'lines.min', 'lines.max', 'xAxisIterations', 'yAxisIterations', 'conditionFilter', 'headers.label', 'header.label', 'disabled', 'readOnly'];
 
 // Utility type to replace all expression from an object into a translated version
 
@@ -39,8 +39,7 @@ function createCrawl(_ref) {
     var candidate = object[path];
     try {
       return _objectSpread(_objectSpread({}, object), {}, _defineProperty({}, path, executeExpression(candidate, {
-        iteration: iteration,
-        linksIterations: linksIterations
+        iteration: linksIterations !== null && linksIterations !== void 0 ? linksIterations : iteration
       })));
     } catch (e) {
       return _objectSpread(_objectSpread({}, object), {}, _defineProperty({}, path, e instanceof Error ? e.toString() : e));

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

@@ -3,9 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = void 0;
-var _getComponentValue = _interopRequireDefault(require("../get-component-value"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+exports.fillComponentValue = fillComponentValue;
+var _component = require("../component");
+var _number = require("../../../utils/number");
 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; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -13,10 +13,24 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 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 fillComponentValue(component, state) {
-  var value = (0, _getComponentValue["default"])(component, state);
   return _objectSpread(_objectSpread({}, component), {}, {
-    value: value
+    value: getValueForComponent(component, state)
   });
 }
-var _default = fillComponentValue;
-exports["default"] = _default;
+function getValueForComponent(component, state) {
+  var iteration = (0, _number.isNumber)(state.pager.iteration) ? [state.pager.iteration] : undefined;
+  if (state.pager.linksIterations) {
+    iteration = state.pager.linksIterations;
+  }
+  if ((0, _component.hasResponses)(component)) {
+    var _component$responses$, _component$responses;
+    return Object.entries((_component$responses$ = (_component$responses = component.responses) === null || _component$responses === void 0 ? void 0 : _component$responses.map(function (_ref) {
+      var response = _ref.response;
+      return [response.name, state.variables.get(response.name, iteration)];
+    })) !== null && _component$responses$ !== void 0 ? _component$responses$ : []);
+  }
+  if ((0, _component.hasResponse)(component)) {
+    return state.variables.get(component.response.name, iteration);
+  }
+  return null;
+}

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

@@ -3,14 +3,15 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = void 0;
+exports.fillComponent = exports["default"] = void 0;
 var _fillComponentExpressions = _interopRequireDefault(require("./fill-component-expressions"));
-var _fillComponentValue = _interopRequireDefault(require("./fill-component-value"));
+var _fillComponentValue = require("./fill-component-value");
 var _fillFromState = _interopRequireDefault(require("./fill-from-state"));
 var _fillManagement = _interopRequireDefault(require("./fill-management"));
 var _fillMissingResponse = _interopRequireDefault(require("./fill-missing-response"));
 var _fillPagination = _interopRequireDefault(require("./fill-pagination"));
 var _fillSpecificExpression = _interopRequireDefault(require("./fill-specific-expression"));
+var _fillIterations = require("./fill-iterations");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 /**
  * Compose multiple methods together to create a new method
@@ -35,11 +36,12 @@ function compose() {
  *
  * Force typing for this function since it's doo dynamic
  */
-var fillComponent = compose(_fillFromState["default"], _fillComponentExpressions["default"], _fillPagination["default"], _fillComponentValue["default"], _fillMissingResponse["default"], _fillManagement["default"], _fillSpecificExpression["default"]);
+var fillComponent = compose(_fillFromState["default"], _fillComponentExpressions["default"], _fillPagination["default"], _fillComponentValue.fillComponentValue, _fillMissingResponse["default"], _fillManagement["default"], _fillIterations.fillIterations, _fillSpecificExpression["default"]);
 
 /**
  * Fill components with values coming from the state, and interpret VTL expression
  */
+exports.fillComponent = fillComponent;
 function fillComponents(components, state) {
   return components.map(function (component) {
     return fillComponent(component, state);

package/lib/use-lunatic/commons/{execute-expression/get-safety-expression.js → fill-components/fill-iterations.js}

@@ -3,33 +3,43 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = void 0;
-var _constants = require("../../../utils/constants");
+exports.fillIterations = fillIterations;
+var _component = require("../component");
+var _number = require("../../../utils/number");
+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; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 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 _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); }
 /**
- * Convert an unknown variable into a valid VTL expression object
+ * Fill the number of iterations for loop components without "iterations" expression
  */
-function getSafetyExpression(expression) {
-  if (typeof expression === 'string') {
-    return {
-      value: expression,
-      type: _constants.VTL
-    };
-  }
-  // TODO: fix into model and supress this block
-  if (expression && _typeof(expression) === 'object' && 'value' in expression && !('type' in expression)) {
-    return _objectSpread(_objectSpread({}, expression), {}, {
-      type: _constants.VTL
+function fillIterations(component, state) {
+  if ('iterations' in component && component.iterations) {
+    return _objectSpread(_objectSpread({}, component), {}, {
+      iterations: (0, _number.forceInt)(state.executeExpression(component.iterations, {
+        iteration: state.pager.iteration
+      }))
     });
   }
+  if (component.componentType !== 'RosterForLoop' && component.componentType !== 'Loop') {
+    return component;
+  }
 
-  // TODO: ensure we really have an expression here or throw an error
-  return expression;
-}
-var _default = getSafetyExpression;
-exports["default"] = _default;
+  // Iterations expression is not present on the component definition
+  // infer it from the value of child components
+  var iterations = component.components.reduce(function (acc, component) {
+    if (!(0, _component.hasResponse)(component)) {
+      return acc;
+    }
+    var value = state.variables.get(component.response.name, (0, _number.isNumber)(state.pager.iteration) ? [state.pager.iteration] : undefined);
+    if (Array.isArray(value) && value.length > acc) {
+      return value.length;
+    }
+    return acc;
+  }, 0);
+  return _objectSpread(_objectSpread({}, component), {}, {
+    iterations: iterations
+  });
+}

package/lib/use-lunatic/commons/fill-components/fill-missing-response.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
+var _number = require("../../../utils/number");
 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; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -19,19 +20,11 @@ function fillMissingResponse(component, state) {
     return component;
   }
   var missingResponse = component.missingResponse;
-  var variables = state.variables,
-    pager = state.pager;
-  var name = missingResponse.name;
-  if (name in variables) {
-    var value = variables[name].value;
-    var missingValue = pager.iteration === undefined ? value : value[pager.iteration];
-    return _objectSpread(_objectSpread({}, component), {}, {
-      missingResponse: _objectSpread(_objectSpread({}, missingResponse), {}, {
-        value: missingValue
-      })
-    });
-  }
-  return component;
+  return _objectSpread(_objectSpread({}, component), {}, {
+    missingResponse: _objectSpread(_objectSpread({}, missingResponse), {}, {
+      value: state.variables.get(missingResponse.name, (0, _number.isNumber)(state.pager.iteration) ? [state.pager.iteration] : undefined)
+    })
+  });
 }
 var _default = fillMissingResponse;
 exports["default"] = _default;

package/lib/use-lunatic/commons/fill-components/fill-specific-expression.js

@@ -5,9 +5,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-var _fillComponents = _interopRequireDefault(require("./fill-components"));
-var _array = require("../../../utils/array");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+var _fillComponents = _interopRequireWildcard(require("./fill-components"));
+var _component = require("../component");
+var _vtl = require("../../../utils/vtl");
+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; }
 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; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 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; }
@@ -59,8 +61,9 @@ function fillChildComponentsWithIteration(component, state) {
     getComponents: function getComponents(iteration) {
       return (0, _fillComponents["default"])(component.components, _objectSpread(_objectSpread({}, state), {}, {
         handleChange: function handleChange(response, value) {
-          var _component$value$resp, _component$value;
-          state.handleChange(response, (0, _array.setAtIndex)((_component$value$resp = (_component$value = component.value) === null || _component$value === void 0 ? void 0 : _component$value[response.name]) !== null && _component$value$resp !== void 0 ? _component$value$resp : [], iteration, value));
+          state.handleChange(response, value, {
+            iteration: [iteration]
+          });
         },
         pager: _objectSpread(_objectSpread({}, state.pager), {}, {
           iteration: iteration,
@@ -71,6 +74,52 @@ function fillChildComponentsWithIteration(component, state) {
   });
 }
 
+/**
+ * For pairwise, inject a method to retrieve component at a specific iteration combination
+ */
+function fillPairwise(component, state) {
+  return _objectSpread(_objectSpread({}, component), {}, {
+    getComponents: function getComponents(x, y) {
+      if (x === y) {
+        return [];
+      }
+      return (0, _fillComponents["default"])(component.components, _objectSpread(_objectSpread({}, state), {}, {
+        handleChange: function handleChange(response, value) {
+          state.handleChange(response, value, {
+            iteration: [x, y]
+          });
+          // Update linked value
+          if (response.name in component.symLinks && value in component.symLinks[response.name]) {
+            state.handleChange(response, component.symLinks[response.name][value], {
+              iteration: [y, x]
+            });
+          }
+        },
+        pager: _objectSpread(_objectSpread({}, state.pager), {}, {
+          linksIterations: [x, y],
+          subPage: 0 // Fake a subpage to simulate an iteration
+        })
+      }));
+    }
+  });
+}
+
+/**
+ * For pairwise, inject a method to retrieve component at a specific iteration combination
+ */
+function fillTable(component, state) {
+  return _objectSpread(_objectSpread({}, component), {}, {
+    body: component.body.map(function (row) {
+      return row.map(function (component) {
+        if ((0, _component.hasComponentType)(component)) {
+          return (0, _fillComponents.fillComponent)(component, state);
+        }
+        return state.executeExpression((0, _vtl.getVTLCompatibleValue)(component.label));
+      });
+    })
+  });
+}
+
 /**
  * Fill component specific props (RoundAbout for instance)
  */
@@ -83,6 +132,10 @@ function fillSpecificExpressions(component, state) {
     case 'Loop':
     case 'RosterForLoop':
       return fillChildComponentsWithIteration(component, state);
+    case 'PairwiseLinks':
+      return fillPairwise(component, state);
+    case 'Table':
+      return fillTable(component, state);
     default:
       return component;
   }

package/lib/use-lunatic/commons/get-compatible-vtl-expression.js

@@ -8,6 +8,7 @@ var _constants = require("../../utils/constants");
 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); }
 /**
  * Ensure that an expression is compatible with VTL (convert if necessary)
+ * @deprecated use getExpressionAsString() instead
  */
 function getCompatibleVTLExpression(expression) {
   if (typeof expression === 'string') {