@inseefr/lunatic 3.13.5-rc.4 → 3.13.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/components/Duration/getDurationFromValue.d.ts +2 -2
- package/components/Duration/getDurationFromValue.js +7 -6
- package/components/Duration/getDurationFromValue.js.map +1 -1
- package/components/shared/MDLabel/MDLabel.js +2 -1
- package/components/shared/MDLabel/MDLabel.js.map +1 -1
- package/esm/components/Duration/getDurationFromValue.d.ts +2 -2
- package/esm/components/Duration/getDurationFromValue.js +7 -6
- package/esm/components/Duration/getDurationFromValue.js.map +1 -1
- package/esm/components/shared/MDLabel/MDLabel.js +2 -1
- package/esm/components/shared/MDLabel/MDLabel.js.map +1 -1
- package/esm/hooks/useMultimode.js +21 -10
- package/esm/hooks/useMultimode.js.map +1 -1
- package/esm/use-lunatic/commons/compile-controls.d.ts +5 -0
- package/esm/use-lunatic/commons/compile-controls.js +6 -1
- package/esm/use-lunatic/commons/compile-controls.js.map +1 -1
- package/esm/use-lunatic/commons/compile-controls.spec.d.ts +1 -0
- package/esm/use-lunatic/commons/compile-controls.spec.js +121 -0
- package/esm/use-lunatic/commons/compile-controls.spec.js.map +1 -0
- package/esm/utils/getArticulationState.js +12 -6
- package/esm/utils/getArticulationState.js.map +1 -1
- package/hooks/useMultimode.js +20 -8
- package/hooks/useMultimode.js.map +1 -1
- package/package.json +12 -2
- package/src/components/Duration/getDurationFromValue.ts +10 -6
- package/src/components/shared/MDLabel/MDLabel.tsx +2 -2
- package/src/hooks/useMultimode.ts +27 -13
- package/src/stories/questionnaires/SRCV/data.json +116 -0
- package/src/stories/questionnaires/SRCV/source.json +69256 -0
- package/src/stories/questionnaires/SRCV/srcv.stories.tsx +23 -0
- package/src/use-lunatic/commons/compile-controls.spec.ts +136 -0
- package/src/use-lunatic/commons/compile-controls.ts +7 -1
- package/src/utils/getArticulationState.ts +16 -8
- package/tsconfig.build.tsbuildinfo +1 -1
- package/use-lunatic/commons/compile-controls.d.ts +5 -0
- package/use-lunatic/commons/compile-controls.js +6 -0
- package/use-lunatic/commons/compile-controls.js.map +1 -1
- package/use-lunatic/commons/compile-controls.spec.d.ts +1 -0
- package/use-lunatic/commons/compile-controls.spec.js +123 -0
- package/use-lunatic/commons/compile-controls.spec.js.map +1 -0
- package/utils/getArticulationState.js +12 -6
- package/utils/getArticulationState.js.map +1 -1
|
@@ -4,6 +4,6 @@ import { type DurationValue } from './durationUtils';
|
|
|
4
4
|
* Convert a string into a duration
|
|
5
5
|
*
|
|
6
6
|
* ## Example
|
|
7
|
-
* - "P12Y5M" => {
|
|
7
|
+
* - "P12Y5M" => {years: 12, months: 5}
|
|
8
8
|
*/
|
|
9
|
-
export declare const getDurationFromValue: (value: string | null, format: DurationFormat) => DurationValue;
|
|
9
|
+
export declare const getDurationFromValue: (value: string | null | undefined, format: DurationFormat) => DurationValue;
|
|
@@ -1,18 +1,19 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getDurationFromValue = void 0;
|
|
4
|
+
const isNullOrUndefined = (value) => value === null || value === undefined;
|
|
4
5
|
/**
|
|
5
6
|
* Convert a string into a duration
|
|
6
7
|
*
|
|
7
8
|
* ## Example
|
|
8
|
-
* - "P12Y5M" => {
|
|
9
|
+
* - "P12Y5M" => {years: 12, months: 5}
|
|
9
10
|
*/
|
|
10
11
|
const getDurationFromValue = (value, format) => {
|
|
11
|
-
// Handle nulls value
|
|
12
|
-
if (value
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
12
|
+
// Handle nulls or undefined value
|
|
13
|
+
if (isNullOrUndefined(value)) {
|
|
14
|
+
if (format === 'PTnHnM') {
|
|
15
|
+
return { hours: null, minutes: null };
|
|
16
|
+
}
|
|
16
17
|
return { years: null, months: null };
|
|
17
18
|
}
|
|
18
19
|
const match = matchFromFormat(value, format);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getDurationFromValue.js","sourceRoot":"","sources":["../../src/components/Duration/getDurationFromValue.ts"],"names":[],"mappings":";;;AAGA;;;;;GAKG;AACI,MAAM,oBAAoB,GAAG,CACnC,
|
|
1
|
+
{"version":3,"file":"getDurationFromValue.js","sourceRoot":"","sources":["../../src/components/Duration/getDurationFromValue.ts"],"names":[],"mappings":";;;AAGA,MAAM,iBAAiB,GAAG,CAAC,KAAU,EAA6B,EAAE,CACnE,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,CAAC;AAEvC;;;;;GAKG;AACI,MAAM,oBAAoB,GAAG,CACnC,KAAgC,EAChC,MAAsB,EACN,EAAE;IAClB,kCAAkC;IAClC,IAAI,iBAAiB,CAAC,KAAK,CAAC,EAAE,CAAC;QAC9B,IAAI,MAAM,KAAK,QAAQ,EAAE,CAAC;YACzB,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;QACvC,CAAC;QACD,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IACtC,CAAC;IAED,MAAM,KAAK,GAAG,eAAe,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAC7C,IAAI,MAAM,KAAK,QAAQ,EAAE,CAAC;QACzB,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;IAC/C,CAAC;IACD,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;AAC9C,CAAC,CAAC;AAjBW,QAAA,oBAAoB,wBAiB/B;AAEF;;;;;GAKG;AACH,MAAM,eAAe,GAAG,CAAC,KAAa,EAAE,MAAsB,EAAY,EAAE;IAC3E,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,CAAC,GAAG,CAAA,OAAO,CAAC,CAAC,CAAC;IACpE,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAChC,IAAI,CAAC,KAAK,EAAE,CAAC;QACZ,MAAM,IAAI,KAAK,CACd,2BAA2B,KAAK,gCAAgC,MAAM,GAAG,CACzE,CAAC;IACH,CAAC;IACD,MAAM,CAAC,EAAE,GAAG,OAAO,CAAC,GAAG,KAAK,CAAC;IAC7B,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;AACnD,CAAC,CAAC"}
|
|
@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.MDLabel = MDLabel;
|
|
7
7
|
const jsx_runtime_1 = require("react/jsx-runtime");
|
|
8
|
+
const react_1 = require("react");
|
|
8
9
|
const react_markdown_1 = __importDefault(require("react-markdown"));
|
|
9
10
|
const MarkdownLink_1 = require("./MarkdownLink");
|
|
10
11
|
const remark_breaks_1 = __importDefault(require("remark-breaks"));
|
|
@@ -12,7 +13,7 @@ const remark_emoji_1 = __importDefault(require("remark-emoji"));
|
|
|
12
13
|
function MDLabel({ expression, MarkdownLinkOverride }) {
|
|
13
14
|
const hasParagraphs = /\n\n/.test(expression);
|
|
14
15
|
const components = {
|
|
15
|
-
p: hasParagraphs ? 'p' :
|
|
16
|
+
p: hasParagraphs ? 'p' : react_1.Fragment,
|
|
16
17
|
br: 'br',
|
|
17
18
|
a: (props) => ((0, jsx_runtime_1.jsx)(MarkdownA, { ...props, MarkdownLinkComponent: MarkdownLinkOverride ?? MarkdownLink_1.MarkdownLink })),
|
|
18
19
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MDLabel.js","sourceRoot":"","sources":["../../../src/components/shared/MDLabel/MDLabel.tsx"],"names":[],"mappings":";;;;;AAWA,0BAoBC;;
|
|
1
|
+
{"version":3,"file":"MDLabel.js","sourceRoot":"","sources":["../../../src/components/shared/MDLabel/MDLabel.tsx"],"names":[],"mappings":";;;;;AAWA,0BAoBC;;AA/BD,iCAAyD;AACzD,oEAA2D;AAC3D,iDAA8C;AAC9C,kEAAyC;AACzC,gEAAiC;AAOjC,SAAgB,OAAO,CAAC,EAAE,UAAU,EAAE,oBAAoB,EAAS;IAClE,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC9C,MAAM,UAAU,GAAG;QAClB,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,gBAAQ;QACjC,EAAE,EAAE,IAAI;QACR,CAAC,EAAE,CAAC,KAAqB,EAAE,EAAE,CAAC,CAC7B,uBAAC,SAAS,OACL,KAAK,EACT,qBAAqB,EAAE,oBAAoB,IAAI,2BAAY,GAC1D,CACF;KACsB,CAAC;IACzB,OAAO,CACN,uBAAC,wBAAQ,IACR,UAAU,EAAE,UAAU,EACtB,aAAa,EAAE,CAAC,CAAC,sBAAK,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,EAAE,uBAAY,CAAC,YAE3D,UAAU,GACD,CACX,CAAC;AACH,CAAC;AAQD,MAAM,SAAS,GAAG,CAAC,EAClB,KAAK,EACL,IAAI,EACJ,QAAQ,EACR,qBAAqB,GAKpB,EAAE,EAAE;IACL,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,uBAAC,OAAO,IAAC,UAAU,EAAE,KAAK,GAAI,CAAC,CAAC,CAAC,IAAI,CAAC;IAC9D,OAAO,CACN,uBAAC,qBAAqB,IAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,YACjD,QAAQ,GACc,CACxB,CAAC;AACH,CAAC,CAAC"}
|
|
@@ -4,6 +4,6 @@ import { type DurationValue } from './durationUtils';
|
|
|
4
4
|
* Convert a string into a duration
|
|
5
5
|
*
|
|
6
6
|
* ## Example
|
|
7
|
-
* - "P12Y5M" => {
|
|
7
|
+
* - "P12Y5M" => {years: 12, months: 5}
|
|
8
8
|
*/
|
|
9
|
-
export declare const getDurationFromValue: (value: string | null, format: DurationFormat) => DurationValue;
|
|
9
|
+
export declare const getDurationFromValue: (value: string | null | undefined, format: DurationFormat) => DurationValue;
|
|
@@ -1,15 +1,16 @@
|
|
|
1
|
+
const isNullOrUndefined = (value) => value === null || value === undefined;
|
|
1
2
|
/**
|
|
2
3
|
* Convert a string into a duration
|
|
3
4
|
*
|
|
4
5
|
* ## Example
|
|
5
|
-
* - "P12Y5M" => {
|
|
6
|
+
* - "P12Y5M" => {years: 12, months: 5}
|
|
6
7
|
*/
|
|
7
8
|
export const getDurationFromValue = (value, format) => {
|
|
8
|
-
// Handle nulls value
|
|
9
|
-
if (value
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
9
|
+
// Handle nulls or undefined value
|
|
10
|
+
if (isNullOrUndefined(value)) {
|
|
11
|
+
if (format === 'PTnHnM') {
|
|
12
|
+
return { hours: null, minutes: null };
|
|
13
|
+
}
|
|
13
14
|
return { years: null, months: null };
|
|
14
15
|
}
|
|
15
16
|
const match = matchFromFormat(value, format);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getDurationFromValue.js","sourceRoot":"","sources":["../../../src/components/Duration/getDurationFromValue.ts"],"names":[],"mappings":"AAGA;;;;;GAKG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CACnC,
|
|
1
|
+
{"version":3,"file":"getDurationFromValue.js","sourceRoot":"","sources":["../../../src/components/Duration/getDurationFromValue.ts"],"names":[],"mappings":"AAGA,MAAM,iBAAiB,GAAG,CAAC,KAAU,EAA6B,EAAE,CACnE,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,CAAC;AAEvC;;;;;GAKG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CACnC,KAAgC,EAChC,MAAsB,EACN,EAAE;IAClB,kCAAkC;IAClC,IAAI,iBAAiB,CAAC,KAAK,CAAC,EAAE,CAAC;QAC9B,IAAI,MAAM,KAAK,QAAQ,EAAE,CAAC;YACzB,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;QACvC,CAAC;QACD,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IACtC,CAAC;IAED,MAAM,KAAK,GAAG,eAAe,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAC7C,IAAI,MAAM,KAAK,QAAQ,EAAE,CAAC;QACzB,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;IAC/C,CAAC;IACD,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;AAC9C,CAAC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,eAAe,GAAG,CAAC,KAAa,EAAE,MAAsB,EAAY,EAAE;IAC3E,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,CAAC,GAAG,CAAA,OAAO,CAAC,CAAC,CAAC;IACpE,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAChC,IAAI,CAAC,KAAK,EAAE,CAAC;QACZ,MAAM,IAAI,KAAK,CACd,2BAA2B,KAAK,gCAAgC,MAAM,GAAG,CACzE,CAAC;IACH,CAAC;IACD,MAAM,CAAC,EAAE,GAAG,OAAO,CAAC,GAAG,KAAK,CAAC;IAC7B,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;AACnD,CAAC,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
2
|
+
import { Fragment } from 'react';
|
|
2
3
|
import Markdown from 'react-markdown';
|
|
3
4
|
import { MarkdownLink } from './MarkdownLink';
|
|
4
5
|
import remarkBreaks from 'remark-breaks';
|
|
@@ -6,7 +7,7 @@ import emoji from 'remark-emoji';
|
|
|
6
7
|
export function MDLabel({ expression, MarkdownLinkOverride }) {
|
|
7
8
|
const hasParagraphs = /\n\n/.test(expression);
|
|
8
9
|
const components = {
|
|
9
|
-
p: hasParagraphs ? 'p' :
|
|
10
|
+
p: hasParagraphs ? 'p' : Fragment,
|
|
10
11
|
br: 'br',
|
|
11
12
|
a: (props) => (_jsx(MarkdownA, { ...props, MarkdownLinkComponent: MarkdownLinkOverride !== null && MarkdownLinkOverride !== void 0 ? MarkdownLinkOverride : MarkdownLink })),
|
|
12
13
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MDLabel.js","sourceRoot":"","sources":["../../../../src/components/shared/MDLabel/MDLabel.tsx"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"MDLabel.js","sourceRoot":"","sources":["../../../../src/components/shared/MDLabel/MDLabel.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAA0B,MAAM,OAAO,CAAC;AACzD,OAAO,QAA6B,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,YAAY,MAAM,eAAe,CAAC;AACzC,OAAO,KAAK,MAAM,cAAc,CAAC;AAOjC,MAAM,UAAU,OAAO,CAAC,EAAE,UAAU,EAAE,oBAAoB,EAAS;IAClE,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC9C,MAAM,UAAU,GAAG;QAClB,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ;QACjC,EAAE,EAAE,IAAI;QACR,CAAC,EAAE,CAAC,KAAqB,EAAE,EAAE,CAAC,CAC7B,KAAC,SAAS,OACL,KAAK,EACT,qBAAqB,EAAE,oBAAoB,aAApB,oBAAoB,cAApB,oBAAoB,GAAI,YAAY,GAC1D,CACF;KACsB,CAAC;IACzB,OAAO,CACN,KAAC,QAAQ,IACR,UAAU,EAAE,UAAU,EACtB,aAAa,EAAE,CAAC,CAAC,KAAK,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,EAAE,YAAY,CAAC,YAE3D,UAAU,GACD,CACX,CAAC;AACH,CAAC;AAQD,MAAM,SAAS,GAAG,CAAC,EAClB,KAAK,EACL,IAAI,EACJ,QAAQ,EACR,qBAAqB,GAKpB,EAAE,EAAE;IACL,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,KAAC,OAAO,IAAC,UAAU,EAAE,KAAK,GAAI,CAAC,CAAC,CAAC,IAAI,CAAC;IAC9D,OAAO,CACN,KAAC,qBAAqB,IAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,YACjD,QAAQ,GACc,CACxB,CAAC;AACH,CAAC,CAAC"}
|
|
@@ -45,26 +45,37 @@ import { forceInt } from '../utils/number';
|
|
|
45
45
|
*/
|
|
46
46
|
export function useMultimode(source, store) {
|
|
47
47
|
const getMultimode = useCallback(() => {
|
|
48
|
-
var _a;
|
|
48
|
+
var _a, _b, _c, _d, _e, _f;
|
|
49
49
|
if (!source.multimode) {
|
|
50
50
|
return {};
|
|
51
51
|
}
|
|
52
|
-
|
|
52
|
+
// Initialize rules to empty objects if they do not exist
|
|
53
|
+
const questionnaireRules = ((_a = source.multimode.questionnaire) === null || _a === void 0 ? void 0 : _a.rules) || {};
|
|
54
|
+
const leafRules = ((_b = source.multimode.leaf) === null || _b === void 0 ? void 0 : _b.rules) || {};
|
|
55
|
+
// If neither has rules, return an empty object
|
|
56
|
+
if (Object.keys(questionnaireRules).length === 0 && Object.keys(leafRules).length === 0) {
|
|
57
|
+
return {};
|
|
58
|
+
}
|
|
59
|
+
// Get unique rule keys
|
|
53
60
|
const keys = new Set([
|
|
54
|
-
...Object.keys(
|
|
55
|
-
...Object.keys(
|
|
61
|
+
...Object.keys(questionnaireRules),
|
|
62
|
+
...Object.keys(leafRules),
|
|
56
63
|
]);
|
|
57
|
-
|
|
64
|
+
// Handle the case where leaf.source exists to retrieve iterations
|
|
65
|
+
let iterations = 0;
|
|
66
|
+
if ((_c = source.multimode.leaf) === null || _c === void 0 ? void 0 : _c.source) {
|
|
67
|
+
const roundabout = findComponentById(source.components, source.multimode.leaf.source);
|
|
68
|
+
iterations = forceInt((_f = store.run((_e = (_d = roundabout === null || roundabout === void 0 ? void 0 : roundabout.iterations) === null || _d === void 0 ? void 0 : _d.value) !== null && _e !== void 0 ? _e : '')) !== null && _f !== void 0 ? _f : 0);
|
|
69
|
+
}
|
|
58
70
|
return Object.fromEntries(Array.from(keys).map((key) => {
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
const questionnaireExpression = (_a = source.multimode) === null || _a === void 0 ? void 0 : _a.questionnaire.rules[key];
|
|
71
|
+
// Check the rule at the questionnaire level
|
|
72
|
+
const questionnaireExpression = questionnaireRules[key];
|
|
62
73
|
if (questionnaireExpression &&
|
|
63
74
|
store.run(questionnaireExpression.value)) {
|
|
64
75
|
return [key, true];
|
|
65
76
|
}
|
|
66
|
-
|
|
67
|
-
|
|
77
|
+
// Check the rule at the leaf level
|
|
78
|
+
const leafExpression = leafRules[key];
|
|
68
79
|
if (!leafExpression) {
|
|
69
80
|
return [key, false];
|
|
70
81
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useMultimode.js","sourceRoot":"","sources":["../../src/hooks/useMultimode.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AACpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAE3C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyCG;AACH,MAAM,UAAU,YAAY,CAC3B,MAAqB,EACrB,KAA4B;IAE5B,MAAM,YAAY,GAAG,WAAW,CAAC,GAAG,EAAE;;QACrC,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;YACvB,OAAO,EAAE,CAAC;QACX,CAAC;QAED,MAAM,
|
|
1
|
+
{"version":3,"file":"useMultimode.js","sourceRoot":"","sources":["../../src/hooks/useMultimode.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,10 @@
|
|
|
1
1
|
import type { LunaticError, LunaticReducerState } from '../type';
|
|
2
|
+
import { type ComponentDefinition, type InterpretedComponent } from './component';
|
|
2
3
|
export type StateForControls = Pick<LunaticReducerState, 'pager' | 'pages' | 'isInLoop' | 'executeExpression'>;
|
|
4
|
+
/**
|
|
5
|
+
* Figure out the number of iterations of a component.
|
|
6
|
+
*/
|
|
7
|
+
export declare function computeIterations(component: InterpretedComponent | ComponentDefinition, executeExpression: LunaticReducerState['executeExpression']): number;
|
|
3
8
|
/**
|
|
4
9
|
* Check controls for currently visible components and output errors.
|
|
5
10
|
*/
|
|
@@ -61,13 +61,18 @@ function checkControls(controls, executeExpression, pager) {
|
|
|
61
61
|
/**
|
|
62
62
|
* Figure out the number of iterations of a component.
|
|
63
63
|
*/
|
|
64
|
-
function computeIterations(component, executeExpression) {
|
|
64
|
+
export function computeIterations(component, executeExpression) {
|
|
65
|
+
// iterations is present and it's already computed, return the actual value (case of InterpretedComponent)
|
|
66
|
+
if ('iterations' in component && typeof component.iterations === 'number')
|
|
67
|
+
return component.iterations;
|
|
68
|
+
// iteratons is present and it's an expression, compute it
|
|
65
69
|
if ('iterations' in component &&
|
|
66
70
|
component.iterations &&
|
|
67
71
|
typeof component.iterations === 'object' &&
|
|
68
72
|
'value' in component.iterations) {
|
|
69
73
|
return executeExpression(component.iterations);
|
|
70
74
|
}
|
|
75
|
+
// Fallback to variable collectes by this component, return it's length
|
|
71
76
|
if ('response' in component) {
|
|
72
77
|
const value = executeExpression({
|
|
73
78
|
type: 'VTL',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compile-controls.js","sourceRoot":"","sources":["../../../src/use-lunatic/commons/compile-controls.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"compile-controls.js","sourceRoot":"","sources":["../../../src/use-lunatic/commons/compile-controls.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,wBAAwB,EAAE,MAAM,8CAA8C,CAAC;AACxF,OAAO,EAAE,sBAAsB,EAAE,MAAM,8CAA8C,CAAC;AACtF,OAAO,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAC1E,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAGN,eAAe,EACf,mBAAmB,EACnB,qBAAqB,GAGrB,MAAM,aAAa,CAAC;AAOrB;;;GAGG;AACH,SAAS,eAAe,CACvB,KAAuB,EACvB,UAA0D,EAC1D,aAA8C;IAE9C,IAAI,MAAM,GAAG,aAAa,aAAb,aAAa,cAAb,aAAa,GAAK,EAAqC,CAAC;IAErE,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACpC,0CAA0C;QAC1C,IAAI,UAAU,IAAI,SAAS,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC;YAClE,MAAM,eAAe,GAAG,aAAa,CACpC,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC,EAClD,KAAK,CAAC,iBAAiB,EACvB,KAAK,CAAC,KAAK,CACX,CAAC;YACF,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAChC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,GAAG,eAAe,CAAC;YACxC,CAAC;QACF,CAAC;QAED,kEAAkE;QAClE,IAAI,qBAAqB,CAAC,SAAS,CAAC;YACnC,MAAM,GAAG,eAAe,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QAEpD,+CAA+C;QAC/C,IAAI,eAAe,CAAC,SAAS,CAAC;YAC7B,MAAM,GAAG,SAAS,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QAE9C,mCAAmC;QACnC,IAAI,mBAAmB,CAAC,SAAS,CAAC;YACjC,MAAM,GAAG,eAAe,CAAC,KAAK,EAAE,SAAS,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IAChE,CAAC;IAED,OAAO,MAAM,CAAC;AACf,CAAC;AAED,SAAS,eAAe,CACvB,KAAuB,EACvB,SAAyC,EACzC,MAAsC;;IAEtC,MAAM,WAAW,GAAG,MAAA,SAAS,CAAC,QAAQ,0CAAE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC;IACxE,IAAI,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,MAAM,EAAE,CAAC;QACzB,MAAM,GAAG,oBAAoB,CAC5B,KAAK,EACL,EAAE,GAAG,SAAS,EAAE,QAAQ,EAAE,WAAW,EAAE,EACvC,MAAM,CACN,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC;AACf,CAAC;AAED,SAAS,SAAS,CACjB,KAAuB,EACvB,SAAmC,EACnC,MAAsC;;IAEtC,MAAM,WAAW,GAAG,MAAA,SAAS,CAAC,QAAQ,0CAAE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC;IACxE,IAAI,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,MAAM,EAAE,CAAC;QACzB,MAAM,GAAG,oBAAoB,CAC5B,KAAK,EACL,EAAE,GAAG,SAAS,EAAE,QAAQ,EAAE,WAAW,EAAE,EACvC,MAAM,CACN,CAAC;IACH,CAAC;IACD,KAAK,MAAM,KAAK,IAAI,SAAS,CAAC,UAAU,EAAE,CAAC;QAC1C,MAAM,GAAG,oBAAoB,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;IACrD,CAAC;IACD,OAAO,MAAM,CAAC;AACf,CAAC;AAED,SAAS,aAAa,CACrB,QAA0B,EAC1B,iBAA2D,EAC3D,KAAmC;IAEnC,OAAO,QAAQ;SACb,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;QAChB,IAAI,OAAO,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;YACnC,OAAO,sBAAsB,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC;QAC3D,CAAC;QACD,OAAO,gBAAgB,CAAC,OAAO,EAAE,iBAAiB,EAAE,KAAK,CAAC,CAAC;IAC5D,CAAC,CAAC;SACD,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC;AAC1C,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,iBAAiB,CAChC,SAAqD,EACrD,iBAA2D;IAE3D,0GAA0G;IAC1G,IAAI,YAAY,IAAI,SAAS,IAAI,OAAO,SAAS,CAAC,UAAU,KAAK,QAAQ;QACxE,OAAO,SAAS,CAAC,UAAU,CAAC;IAC7B,0DAA0D;IAC1D,IACC,YAAY,IAAI,SAAS;QACzB,SAAS,CAAC,UAAU;QACpB,OAAO,SAAS,CAAC,UAAU,KAAK,QAAQ;QACxC,OAAO,IAAI,SAAS,CAAC,UAAU,EAC9B,CAAC;QACF,OAAO,iBAAiB,CAAS,SAAS,CAAC,UAAU,CAAC,CAAC;IACxD,CAAC;IAED,uEAAuE;IACvE,IAAI,UAAU,IAAI,SAAS,EAAE,CAAC;QAC7B,MAAM,KAAK,GAAG,iBAAiB,CAAC;YAC/B,IAAI,EAAE,KAAK;YACX,KAAK,EAAE,SAAS,CAAC,QAAQ,CAAC,IAAI;SAC9B,CAAC,CAAC;QACH,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YAC1B,OAAO,KAAK,CAAC,MAAM,CAAC;QACrB,CAAC;IACF,CAAC;IACD,+CAA+C;IAC/C,IAAI,YAAY,IAAI,SAAS,EAAE,CAAC;QAC/B,OAAO,IAAI,CAAC,GAAG,CACd,GAAG,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACjC,iBAAiB,CAAC,CAAC,EAAE,iBAAiB,CAAC,CACvC,CACD,CAAC;IACH,CAAC;IACD,OAAO,CAAC,CAAC;AACV,CAAC;AAED;;;GAGG;AACH,SAAS,oBAAoB,CAC5B,KAAuB,EACvB,SAGiC,EACjC,MAAsC;;IAEtC,mCAAmC;IACnC,IAAI,SAAS,CAAC,aAAa,KAAK,UAAU,EAAE,CAAC;QAC5C,KAAK,MAAM,KAAK,IAAI,SAAS,CAAC,UAAU,EAAE,CAAC;YAC1C,MAAM,GAAG,oBAAoB,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;QACrD,CAAC;QACD,OAAO,MAAM,CAAC;IACf,CAAC;IAED,yCAAyC;IACzC,IAAI,UAAU,IAAI,SAAS,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC;QACnE,OAAO,MAAM,CAAC;IACf,CAAC;IAED,qCAAqC;IACrC,MAAM,UAAU,GAAG,iBAAiB,CAAC,SAAS,EAAE,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACzE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,EAAE,CAAC,EAAE,EAAE,CAAC;QACrC,6DAA6D;QAC7D,MAAM,cAAc,GAAG;YACtB,GAAG,KAAK,CAAC,KAAK;YACd,SAAS,EAAE,CAAC;YACZ,YAAY,EAAE,UAAU;SACxB,CAAC;QACF,yCAAyC;QACzC,IAAI,CAAC,CAAC,UAAU,IAAI,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;YACvD,SAAS;QACV,CAAC;QAED,2EAA2E;QAC3E,IAAI,qBAAqB,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACjE,MAAM,mBAAmB,GAAG,KAAK,CAAC,iBAAiB,CAClD,EAAE,KAAK,EAAE,MAAA,SAAS,CAAC,IAAI,CAAC,QAAQ,0CAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,EACtD,cAAc,CACd,CAAC;YAEF,IAAI,mBAAmB,EAAE,CAAC;gBACzB,SAAS;YACV,CAAC;QACF,CAAC;QAED,uDAAuD;QACvD;QACC,+FAA+F;QAC/F,CAAC,iBAAiB,IAAI,SAAS;YAC9B,SAAS,CAAC,eAAe;YACzB,OAAO,SAAS,CAAC,eAAe,IAAI,QAAQ;YAC5C,OAAO,IAAI,SAAS,CAAC,eAAe;YACpC,CAAC,KAAK,CAAC,iBAAiB,CACvB,EAAE,KAAK,EAAE,SAAS,CAAC,eAAe,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,EACvD,cAAc,CACd,CAAC;YACH,gFAAgF;YAChF,SAAS,CAAC,eAAe,KAAK,KAAK,EAClC,CAAC;YACF,SAAS;QACV,CAAC;QACD,MAAM,eAAe,GAAG,aAAa,CACpC,SAAS,CAAC,QAAQ,EAClB,KAAK,CAAC,iBAAiB,EACvB,cAAc,CACd,CAAC;QACF,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAChC,MAAM,CAAC,GAAG,SAAS,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC,GAAG,eAAe,CAAC;QAClD,CAAC;IACF,CAAC;IAED,OAAO,MAAM,CAAC;AACf,CAAC;AAED;;GAEG;AACH,SAAS,gBAAgB,CAAC,MAAuC;IAChE,IAAI,CAAC,MAAM,EAAE,CAAC;QACb,OAAO,KAAK,CAAC;IACd,CAAC;IACD,mDAAmD;IACnD,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC;SACzC,IAAI,EAAE;SACN,IAAI,CACJ,CAAC,KAAK,EAAE,EAAE,CACT,KAAK,CAAC,WAAW,CAAC,UAAU,CAAC,OAAO,CAAC;QACrC,KAAK,CAAC,aAAa,KAAK,QAAQ,CACjC,CAAC;IACH,OAAO,aAAa,KAAK,SAAS,CAAC;AACpC,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,eAAe,CAAC,KAAuB;IACtD,MAAM,UAAU,GAAG,sBAAsB,CAAC,KAAK,CAAC,CAAC;IACjD,MAAM,iBAAiB,GAAG,UAAU;SAClC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,wBAAwB,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;SAC9D,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE;;QACrB,IAAI,iBAAiB,IAAI,SAAS,EAAE,CAAC;YACpC,OAAO,MAAA,SAAS,CAAC,eAAe,mCAAI,IAAI,CAAC;QAC1C,CAAC;QACD,OAAO,IAAI,CAAC;IACb,CAAC,CAAC,CAAC;IACJ,MAAM,MAAM,GAAG,eAAe,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC;IACzD,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;IAC1E,OAAO;QACN,aAAa;QACb,UAAU,EAAE,gBAAgB,CAAC,aAAa,CAAC;KAC3C,CAAC;AACH,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,121 @@
|
|
|
1
|
+
import { describe, it, expect, vi, beforeEach } from 'vitest';
|
|
2
|
+
import { computeIterations } from './compile-controls';
|
|
3
|
+
// Mock de la fonction executeExpression
|
|
4
|
+
const mockExecuteExpression = vi.fn();
|
|
5
|
+
describe('computeIterations', () => {
|
|
6
|
+
beforeEach(() => {
|
|
7
|
+
vi.resetAllMocks();
|
|
8
|
+
});
|
|
9
|
+
it('should return iterations directly if it is a number', () => {
|
|
10
|
+
const component = {
|
|
11
|
+
id: 'test',
|
|
12
|
+
componentType: 'Loop',
|
|
13
|
+
iterations: 5,
|
|
14
|
+
};
|
|
15
|
+
expect(computeIterations(component, mockExecuteExpression)).toBe(5);
|
|
16
|
+
});
|
|
17
|
+
it('should execute VTL expression for iterations if it is an object', () => {
|
|
18
|
+
const component = {
|
|
19
|
+
id: 'test',
|
|
20
|
+
componentType: 'Loop',
|
|
21
|
+
iterations: { type: 'VTL', value: 'count(ARRAY)' },
|
|
22
|
+
};
|
|
23
|
+
mockExecuteExpression.mockReturnValue(3);
|
|
24
|
+
expect(computeIterations(component, mockExecuteExpression)).toBe(3);
|
|
25
|
+
expect(mockExecuteExpression).toHaveBeenCalledWith({
|
|
26
|
+
type: 'VTL',
|
|
27
|
+
value: 'count(ARRAY)',
|
|
28
|
+
});
|
|
29
|
+
});
|
|
30
|
+
it('should return array length if component has a response with an array value', () => {
|
|
31
|
+
const component = {
|
|
32
|
+
id: 'test',
|
|
33
|
+
componentType: 'Question',
|
|
34
|
+
response: { name: 'ARRAY' },
|
|
35
|
+
};
|
|
36
|
+
mockExecuteExpression.mockReturnValue(['a', 'b', 'c', 'd']);
|
|
37
|
+
expect(computeIterations(component, mockExecuteExpression)).toBe(4);
|
|
38
|
+
expect(mockExecuteExpression).toHaveBeenCalledWith({
|
|
39
|
+
type: 'VTL',
|
|
40
|
+
value: 'ARRAY',
|
|
41
|
+
});
|
|
42
|
+
});
|
|
43
|
+
it('should return 0 if response value is not an array', () => {
|
|
44
|
+
const component = {
|
|
45
|
+
id: 'test',
|
|
46
|
+
componentType: 'Question',
|
|
47
|
+
response: { name: 'VAR' },
|
|
48
|
+
};
|
|
49
|
+
mockExecuteExpression.mockReturnValue('not an array');
|
|
50
|
+
expect(computeIterations(component, mockExecuteExpression)).toBe(0);
|
|
51
|
+
});
|
|
52
|
+
it('should return max iterations of children if component has components', () => {
|
|
53
|
+
const component = {
|
|
54
|
+
id: 'parent',
|
|
55
|
+
componentType: 'Loop',
|
|
56
|
+
components: [
|
|
57
|
+
{ id: 'child1', componentType: 'Question', iterations: 2 },
|
|
58
|
+
{ id: 'child2', componentType: 'Question', iterations: 5 },
|
|
59
|
+
],
|
|
60
|
+
};
|
|
61
|
+
expect(computeIterations(component, mockExecuteExpression)).toBe(5);
|
|
62
|
+
});
|
|
63
|
+
it('should return 0 if no iterations, response, or components are present', () => {
|
|
64
|
+
const component = {
|
|
65
|
+
id: 'test',
|
|
66
|
+
componentType: 'Question',
|
|
67
|
+
};
|
|
68
|
+
expect(computeIterations(component, mockExecuteExpression)).toBe(0);
|
|
69
|
+
});
|
|
70
|
+
it('should return 0 if iterations is null or undefined', () => {
|
|
71
|
+
const component1 = {
|
|
72
|
+
id: 'test1',
|
|
73
|
+
componentType: 'Loop',
|
|
74
|
+
iterations: null,
|
|
75
|
+
};
|
|
76
|
+
const component2 = {
|
|
77
|
+
id: 'test2',
|
|
78
|
+
componentType: 'Loop',
|
|
79
|
+
iterations: undefined,
|
|
80
|
+
};
|
|
81
|
+
expect(computeIterations(component1, mockExecuteExpression)).toBe(0);
|
|
82
|
+
expect(computeIterations(component2, mockExecuteExpression)).toBe(0);
|
|
83
|
+
});
|
|
84
|
+
it('should return 0 if all children have no iterations', () => {
|
|
85
|
+
const component = {
|
|
86
|
+
id: 'parent',
|
|
87
|
+
componentType: 'Loop',
|
|
88
|
+
components: [
|
|
89
|
+
{ id: 'child1', componentType: 'Question' },
|
|
90
|
+
{ id: 'child2', componentType: 'Question' },
|
|
91
|
+
],
|
|
92
|
+
};
|
|
93
|
+
expect(computeIterations(component, mockExecuteExpression)).toBe(0);
|
|
94
|
+
});
|
|
95
|
+
it('should prioritize iterations over response if both are present', () => {
|
|
96
|
+
const component = {
|
|
97
|
+
id: 'test',
|
|
98
|
+
componentType: 'Loop',
|
|
99
|
+
iterations: 3,
|
|
100
|
+
response: { name: 'ARRAY' },
|
|
101
|
+
};
|
|
102
|
+
mockExecuteExpression.mockReturnValue(['a', 'b', 'c', 'd', 'e']);
|
|
103
|
+
expect(computeIterations(component, mockExecuteExpression)).toBe(3);
|
|
104
|
+
expect(mockExecuteExpression).not.toHaveBeenCalled();
|
|
105
|
+
});
|
|
106
|
+
it('should prioritize iterations expression over response if both are present', () => {
|
|
107
|
+
const component = {
|
|
108
|
+
id: 'test',
|
|
109
|
+
componentType: 'Loop',
|
|
110
|
+
iterations: { type: 'VTL', value: 'count(ARRAY)' },
|
|
111
|
+
response: { name: 'ANOTHER_ARRAY' },
|
|
112
|
+
};
|
|
113
|
+
mockExecuteExpression.mockReturnValue(7);
|
|
114
|
+
expect(computeIterations(component, mockExecuteExpression)).toBe(7);
|
|
115
|
+
expect(mockExecuteExpression).toHaveBeenCalledWith({
|
|
116
|
+
type: 'VTL',
|
|
117
|
+
value: 'count(ARRAY)',
|
|
118
|
+
});
|
|
119
|
+
});
|
|
120
|
+
});
|
|
121
|
+
//# sourceMappingURL=compile-controls.spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"compile-controls.spec.js","sourceRoot":"","sources":["../../../src/use-lunatic/commons/compile-controls.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import { reducerInitializer } from '../use-lunatic/reducer/reducerInitializer';
|
|
|
2
2
|
import { times } from './array';
|
|
3
3
|
import { forceInt } from './number';
|
|
4
4
|
import { isRoundaboutComponent } from '../use-lunatic/commons/component';
|
|
5
|
+
import { castNumber } from './cast';
|
|
5
6
|
export var ArticulationState;
|
|
6
7
|
(function (ArticulationState) {
|
|
7
8
|
ArticulationState[ArticulationState["COMPLETED"] = 1] = "COMPLETED";
|
|
@@ -41,18 +42,23 @@ export var ArticulationState;
|
|
|
41
42
|
*/
|
|
42
43
|
export function getArticulationState(source, data) {
|
|
43
44
|
var _a;
|
|
45
|
+
if (!source.articulation) {
|
|
46
|
+
return {
|
|
47
|
+
items: [],
|
|
48
|
+
};
|
|
49
|
+
}
|
|
44
50
|
const roundabout = findComponentById(source.components, source.articulation.source);
|
|
45
|
-
const { variables } = reducerInitializer({ source, data });
|
|
46
|
-
const iterations = forceInt(variables.run((_a = roundabout === null || roundabout === void 0 ? void 0 : roundabout.iterations.value) !== null && _a !== void 0 ? _a : '0'));
|
|
47
|
-
const rows = times(iterations, (k) => source.articulation.items.map((item) => ({
|
|
48
|
-
label: item.label,
|
|
49
|
-
value: variables.run(item.value, { iteration: [k] }),
|
|
50
|
-
})));
|
|
51
51
|
if (!roundabout) {
|
|
52
52
|
return {
|
|
53
53
|
items: [],
|
|
54
54
|
};
|
|
55
55
|
}
|
|
56
|
+
const { variables } = reducerInitializer({ source, data });
|
|
57
|
+
const iterations = castNumber(variables.run((_a = roundabout.iterations.value) !== null && _a !== void 0 ? _a : '0'));
|
|
58
|
+
const rows = times(iterations, (k) => source.articulation.items.map((item) => ({
|
|
59
|
+
label: item.label,
|
|
60
|
+
value: variables.run(item.value, { iteration: [k] }),
|
|
61
|
+
})));
|
|
56
62
|
return {
|
|
57
63
|
items: rows.map((row, k) => {
|
|
58
64
|
var _a;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getArticulationState.js","sourceRoot":"","sources":["../../src/utils/getArticulationState.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,kBAAkB,EAAE,MAAM,2CAA2C,CAAC;AAE/E,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AACpC,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"getArticulationState.js","sourceRoot":"","sources":["../../src/utils/getArticulationState.ts"],"names":[],"mappings":"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"}
|
package/hooks/useMultimode.js
CHANGED
|
@@ -51,21 +51,33 @@ function useMultimode(source, store) {
|
|
|
51
51
|
if (!source.multimode) {
|
|
52
52
|
return {};
|
|
53
53
|
}
|
|
54
|
-
|
|
54
|
+
// Initialize rules to empty objects if they do not exist
|
|
55
|
+
const questionnaireRules = source.multimode.questionnaire?.rules || {};
|
|
56
|
+
const leafRules = source.multimode.leaf?.rules || {};
|
|
57
|
+
// If neither has rules, return an empty object
|
|
58
|
+
if (Object.keys(questionnaireRules).length === 0 && Object.keys(leafRules).length === 0) {
|
|
59
|
+
return {};
|
|
60
|
+
}
|
|
61
|
+
// Get unique rule keys
|
|
55
62
|
const keys = new Set([
|
|
56
|
-
...Object.keys(
|
|
57
|
-
...Object.keys(
|
|
63
|
+
...Object.keys(questionnaireRules),
|
|
64
|
+
...Object.keys(leafRules),
|
|
58
65
|
]);
|
|
59
|
-
|
|
66
|
+
// Handle the case where leaf.source exists to retrieve iterations
|
|
67
|
+
let iterations = 0;
|
|
68
|
+
if (source.multimode.leaf?.source) {
|
|
69
|
+
const roundabout = (0, getArticulationState_1.findComponentById)(source.components, source.multimode.leaf.source);
|
|
70
|
+
iterations = (0, number_1.forceInt)(store.run(roundabout?.iterations?.value ?? '') ?? 0);
|
|
71
|
+
}
|
|
60
72
|
return Object.fromEntries(Array.from(keys).map((key) => {
|
|
61
|
-
// Check the
|
|
62
|
-
const questionnaireExpression =
|
|
73
|
+
// Check the rule at the questionnaire level
|
|
74
|
+
const questionnaireExpression = questionnaireRules[key];
|
|
63
75
|
if (questionnaireExpression &&
|
|
64
76
|
store.run(questionnaireExpression.value)) {
|
|
65
77
|
return [key, true];
|
|
66
78
|
}
|
|
67
|
-
|
|
68
|
-
|
|
79
|
+
// Check the rule at the leaf level
|
|
80
|
+
const leafExpression = leafRules[key];
|
|
69
81
|
if (!leafExpression) {
|
|
70
82
|
return [key, false];
|
|
71
83
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useMultimode.js","sourceRoot":"","sources":["../src/hooks/useMultimode.ts"],"names":[],"mappings":";;AAgDA,
|
|
1
|
+
{"version":3,"file":"useMultimode.js","sourceRoot":"","sources":["../src/hooks/useMultimode.ts"],"names":[],"mappings":";;AAgDA,oCAmEC;AAjHD,iCAAoC;AACpC,wEAAkE;AAClE,4CAA2C;AAE3C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyCG;AACH,SAAgB,YAAY,CAC3B,MAAqB,EACrB,KAA4B;IAE5B,MAAM,YAAY,GAAG,IAAA,mBAAW,EAAC,GAAG,EAAE;QACrC,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;YACvB,OAAO,EAAE,CAAC;QACX,CAAC;QAED,yDAAyD;QACzD,MAAM,kBAAkB,GAAG,MAAM,CAAC,SAAS,CAAC,aAAa,EAAE,KAAK,IAAI,EAAE,CAAC;QACvE,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC;QAErD,+CAA+C;QAC/C,IAAI,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,MAAM,KAAK,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzF,OAAO,EAAE,CAAC;QACX,CAAC;QAED,uBAAuB;QACvB,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC;YACpB,GAAG,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC;YAClC,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC;SACzB,CAAC,CAAC;QAEH,kEAAkE;QAClE,IAAI,UAAU,GAAG,CAAC,CAAC;QACnB,IAAI,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC;YACnC,MAAM,UAAU,GAAG,IAAA,wCAAiB,EACnC,MAAM,CAAC,UAAU,EACjB,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAC5B,CAAC;YACF,UAAU,GAAG,IAAA,iBAAQ,EACpB,KAAK,CAAC,GAAG,CAAC,UAAU,EAAE,UAAU,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC,CACnD,CAAC;QACH,CAAC;QAED,OAAO,MAAM,CAAC,WAAW,CACxB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YAC5B,4CAA4C;YAC5C,MAAM,uBAAuB,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC;YACxD,IACC,uBAAuB;gBACvB,KAAK,CAAC,GAAG,CAAC,uBAAuB,CAAC,KAAK,CAAC,EACvC,CAAC;gBACF,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;YACpB,CAAC;YAED,mCAAmC;YACnC,MAAM,cAAc,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC;YACtC,IAAI,CAAC,cAAc,EAAE,CAAC;gBACrB,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;YACrB,CAAC;YAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrC,IAAI,KAAK,CAAC,GAAG,CAAC,cAAc,CAAC,KAAK,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;oBACzD,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;gBACpB,CAAC;YACF,CAAC;YAED,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QACrB,CAAC,CAAC,CACF,CAAC;IACH,CAAC,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC;IAEpB,OAAO;QACN,YAAY;KACZ,CAAC;AACH,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@inseefr/lunatic",
|
|
3
|
-
"version": "3.13.5
|
|
3
|
+
"version": "3.13.5",
|
|
4
4
|
"description": "Library of questionnaire components",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -314,6 +314,9 @@
|
|
|
314
314
|
"src/stories/paste.stories.tsx",
|
|
315
315
|
"src/stories/question/question.stories.tsx",
|
|
316
316
|
"src/stories/question/source.json",
|
|
317
|
+
"src/stories/questionnaires/SRCV/data.json",
|
|
318
|
+
"src/stories/questionnaires/SRCV/source.json",
|
|
319
|
+
"src/stories/questionnaires/SRCV/srcv.stories.tsx",
|
|
317
320
|
"src/stories/questionnaires/logement/data.json",
|
|
318
321
|
"src/stories/questionnaires/logement/logement.stories.tsx",
|
|
319
322
|
"src/stories/questionnaires/logement/source-sequence.json",
|
|
@@ -370,6 +373,7 @@
|
|
|
370
373
|
"src/type.utils.ts",
|
|
371
374
|
"src/use-lunatic/__snapshots__/use-lunatic.test.ts.snap",
|
|
372
375
|
"src/use-lunatic/actions.ts",
|
|
376
|
+
"src/use-lunatic/commons/compile-controls.spec.ts",
|
|
373
377
|
"src/use-lunatic/commons/compile-controls.ts",
|
|
374
378
|
"src/use-lunatic/commons/component.ts",
|
|
375
379
|
"src/use-lunatic/commons/execute-condition-filter.ts",
|
|
@@ -1405,6 +1409,9 @@
|
|
|
1405
1409
|
"esm/use-lunatic/commons/compile-controls.d.ts",
|
|
1406
1410
|
"esm/use-lunatic/commons/compile-controls.js",
|
|
1407
1411
|
"esm/use-lunatic/commons/compile-controls.js.map",
|
|
1412
|
+
"esm/use-lunatic/commons/compile-controls.spec.d.ts",
|
|
1413
|
+
"esm/use-lunatic/commons/compile-controls.spec.js",
|
|
1414
|
+
"esm/use-lunatic/commons/compile-controls.spec.js.map",
|
|
1408
1415
|
"esm/use-lunatic/commons/component.d.ts",
|
|
1409
1416
|
"esm/use-lunatic/commons/component.js",
|
|
1410
1417
|
"esm/use-lunatic/commons/component.js.map",
|
|
@@ -1750,6 +1757,9 @@
|
|
|
1750
1757
|
"use-lunatic/commons/compile-controls.d.ts",
|
|
1751
1758
|
"use-lunatic/commons/compile-controls.js",
|
|
1752
1759
|
"use-lunatic/commons/compile-controls.js.map",
|
|
1760
|
+
"use-lunatic/commons/compile-controls.spec.d.ts",
|
|
1761
|
+
"use-lunatic/commons/compile-controls.spec.js",
|
|
1762
|
+
"use-lunatic/commons/compile-controls.spec.js.map",
|
|
1753
1763
|
"use-lunatic/commons/component.d.ts",
|
|
1754
1764
|
"use-lunatic/commons/component.js",
|
|
1755
1765
|
"use-lunatic/commons/component.js.map",
|
|
@@ -2112,4 +2122,4 @@
|
|
|
2112
2122
|
"node": "20.16.0",
|
|
2113
2123
|
"pnpm": "9.15.0"
|
|
2114
2124
|
}
|
|
2115
|
-
}
|
|
2125
|
+
}
|
|
@@ -1,20 +1,24 @@
|
|
|
1
1
|
import { DurationFormat } from '../type';
|
|
2
2
|
import { type DurationValue } from './durationUtils';
|
|
3
3
|
|
|
4
|
+
const isNullOrUndefined = (value: any): value is null | undefined =>
|
|
5
|
+
value === null || value === undefined;
|
|
6
|
+
|
|
4
7
|
/**
|
|
5
8
|
* Convert a string into a duration
|
|
6
9
|
*
|
|
7
10
|
* ## Example
|
|
8
|
-
* - "P12Y5M" => {
|
|
11
|
+
* - "P12Y5M" => {years: 12, months: 5}
|
|
9
12
|
*/
|
|
10
13
|
export const getDurationFromValue = (
|
|
11
|
-
value: string | null,
|
|
14
|
+
value: string | null | undefined,
|
|
12
15
|
format: DurationFormat
|
|
13
16
|
): DurationValue => {
|
|
14
|
-
// Handle nulls value
|
|
15
|
-
if (value
|
|
16
|
-
|
|
17
|
-
|
|
17
|
+
// Handle nulls or undefined value
|
|
18
|
+
if (isNullOrUndefined(value)) {
|
|
19
|
+
if (format === 'PTnHnM') {
|
|
20
|
+
return { hours: null, minutes: null };
|
|
21
|
+
}
|
|
18
22
|
return { years: null, months: null };
|
|
19
23
|
}
|
|
20
24
|
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { type PropsWithChildren } from 'react';
|
|
1
|
+
import { Fragment, type PropsWithChildren } from 'react';
|
|
2
2
|
import Markdown, { type Components } from 'react-markdown';
|
|
3
3
|
import { MarkdownLink } from './MarkdownLink';
|
|
4
4
|
import remarkBreaks from 'remark-breaks';
|
|
@@ -12,7 +12,7 @@ type Props = {
|
|
|
12
12
|
export function MDLabel({ expression, MarkdownLinkOverride }: Props) {
|
|
13
13
|
const hasParagraphs = /\n\n/.test(expression);
|
|
14
14
|
const components = {
|
|
15
|
-
p: hasParagraphs ? 'p' :
|
|
15
|
+
p: hasParagraphs ? 'p' : Fragment,
|
|
16
16
|
br: 'br',
|
|
17
17
|
a: (props: MarkdownAProps) => (
|
|
18
18
|
<MarkdownA
|