@inseefr/lunatic 3.13.6-rc-fix-multimode.2 → 3.14.0-rc-delay-sequence-cleaning.0
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/Suggester/SuggesterType.d.ts +3 -1
- package/components/shared/Combobox/ComboboxType.d.ts +2 -0
- 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/Suggester/SuggesterType.d.ts +3 -1
- package/esm/components/shared/Combobox/ComboboxType.d.ts +2 -0
- 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/use-lunatic/reducer/reducerInitializer.js +1 -1
- package/esm/use-lunatic/reducer/reducerInitializer.js.map +1 -1
- package/esm/utils/search/SearchInterface.d.ts +9 -1
- package/esm/utils/search/melauto.d.ts +4 -1
- package/esm/utils/search/melauto.js +17 -17
- package/esm/utils/search/melauto.js.map +1 -1
- package/esm/utils/search/melauto.spec.js +9 -13
- package/esm/utils/search/melauto.spec.js.map +1 -1
- package/package.json +13 -1
- package/src/components/Duration/getDurationFromValue.ts +10 -6
- package/src/components/Suggester/SuggesterType.ts +3 -1
- package/src/components/shared/Combobox/ComboboxType.ts +2 -0
- package/src/stories/behaviour/cleaning/cleaning.stories.tsx +7 -0
- package/src/stories/behaviour/cleaning/source-sequence.json +444 -0
- package/src/stories/behaviour/search/search.stories.tsx +258 -0
- 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/use-lunatic/reducer/reducerInitializer.tsx +1 -1
- package/src/use-lunatic/use-lunatic.test.ts +6 -2
- package/src/utils/search/SearchInterface.ts +10 -1
- package/src/utils/search/melauto.spec.ts +10 -13
- package/src/utils/search/melauto.ts +20 -13
- 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/use-lunatic/reducer/reducerInitializer.js +1 -1
- package/use-lunatic/reducer/reducerInitializer.js.map +1 -1
- package/utils/search/SearchInterface.d.ts +9 -1
- package/utils/search/melauto.d.ts +4 -1
- package/utils/search/melauto.js +11 -14
- package/utils/search/melauto.js.map +1 -1
- package/utils/search/melauto.spec.js +9 -13
- package/utils/search/melauto.spec.js.map +1 -1
|
@@ -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
|
*/
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.computeIterations = computeIterations;
|
|
3
4
|
exports.compileControls = compileControls;
|
|
4
5
|
const fill_component_expressions_1 = require("./fill-components/fill-component-expressions");
|
|
5
6
|
const check_roundabout_control_1 = require("../reducer/controls/check-roundabout-control");
|
|
@@ -63,12 +64,17 @@ function checkControls(controls, executeExpression, pager) {
|
|
|
63
64
|
* Figure out the number of iterations of a component.
|
|
64
65
|
*/
|
|
65
66
|
function computeIterations(component, executeExpression) {
|
|
67
|
+
// iterations is present and it's already computed, return the actual value (case of InterpretedComponent)
|
|
68
|
+
if ('iterations' in component && typeof component.iterations === 'number')
|
|
69
|
+
return component.iterations;
|
|
70
|
+
// iteratons is present and it's an expression, compute it
|
|
66
71
|
if ('iterations' in component &&
|
|
67
72
|
component.iterations &&
|
|
68
73
|
typeof component.iterations === 'object' &&
|
|
69
74
|
'value' in component.iterations) {
|
|
70
75
|
return executeExpression(component.iterations);
|
|
71
76
|
}
|
|
77
|
+
// Fallback to variable collectes by this component, return it's length
|
|
72
78
|
if ('response' in component) {
|
|
73
79
|
const value = executeExpression({
|
|
74
80
|
type: 'VTL',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compile-controls.js","sourceRoot":"","sources":["../../src/use-lunatic/commons/compile-controls.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"compile-controls.js","sourceRoot":"","sources":["../../src/use-lunatic/commons/compile-controls.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,123 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const vitest_1 = require("vitest");
|
|
4
|
+
const compile_controls_1 = require("./compile-controls");
|
|
5
|
+
// Mock de la fonction executeExpression
|
|
6
|
+
const mockExecuteExpression = vitest_1.vi.fn();
|
|
7
|
+
(0, vitest_1.describe)('computeIterations', () => {
|
|
8
|
+
(0, vitest_1.beforeEach)(() => {
|
|
9
|
+
vitest_1.vi.resetAllMocks();
|
|
10
|
+
});
|
|
11
|
+
(0, vitest_1.it)('should return iterations directly if it is a number', () => {
|
|
12
|
+
const component = {
|
|
13
|
+
id: 'test',
|
|
14
|
+
componentType: 'Loop',
|
|
15
|
+
iterations: 5,
|
|
16
|
+
};
|
|
17
|
+
(0, vitest_1.expect)((0, compile_controls_1.computeIterations)(component, mockExecuteExpression)).toBe(5);
|
|
18
|
+
});
|
|
19
|
+
(0, vitest_1.it)('should execute VTL expression for iterations if it is an object', () => {
|
|
20
|
+
const component = {
|
|
21
|
+
id: 'test',
|
|
22
|
+
componentType: 'Loop',
|
|
23
|
+
iterations: { type: 'VTL', value: 'count(ARRAY)' },
|
|
24
|
+
};
|
|
25
|
+
mockExecuteExpression.mockReturnValue(3);
|
|
26
|
+
(0, vitest_1.expect)((0, compile_controls_1.computeIterations)(component, mockExecuteExpression)).toBe(3);
|
|
27
|
+
(0, vitest_1.expect)(mockExecuteExpression).toHaveBeenCalledWith({
|
|
28
|
+
type: 'VTL',
|
|
29
|
+
value: 'count(ARRAY)',
|
|
30
|
+
});
|
|
31
|
+
});
|
|
32
|
+
(0, vitest_1.it)('should return array length if component has a response with an array value', () => {
|
|
33
|
+
const component = {
|
|
34
|
+
id: 'test',
|
|
35
|
+
componentType: 'Question',
|
|
36
|
+
response: { name: 'ARRAY' },
|
|
37
|
+
};
|
|
38
|
+
mockExecuteExpression.mockReturnValue(['a', 'b', 'c', 'd']);
|
|
39
|
+
(0, vitest_1.expect)((0, compile_controls_1.computeIterations)(component, mockExecuteExpression)).toBe(4);
|
|
40
|
+
(0, vitest_1.expect)(mockExecuteExpression).toHaveBeenCalledWith({
|
|
41
|
+
type: 'VTL',
|
|
42
|
+
value: 'ARRAY',
|
|
43
|
+
});
|
|
44
|
+
});
|
|
45
|
+
(0, vitest_1.it)('should return 0 if response value is not an array', () => {
|
|
46
|
+
const component = {
|
|
47
|
+
id: 'test',
|
|
48
|
+
componentType: 'Question',
|
|
49
|
+
response: { name: 'VAR' },
|
|
50
|
+
};
|
|
51
|
+
mockExecuteExpression.mockReturnValue('not an array');
|
|
52
|
+
(0, vitest_1.expect)((0, compile_controls_1.computeIterations)(component, mockExecuteExpression)).toBe(0);
|
|
53
|
+
});
|
|
54
|
+
(0, vitest_1.it)('should return max iterations of children if component has components', () => {
|
|
55
|
+
const component = {
|
|
56
|
+
id: 'parent',
|
|
57
|
+
componentType: 'Loop',
|
|
58
|
+
components: [
|
|
59
|
+
{ id: 'child1', componentType: 'Question', iterations: 2 },
|
|
60
|
+
{ id: 'child2', componentType: 'Question', iterations: 5 },
|
|
61
|
+
],
|
|
62
|
+
};
|
|
63
|
+
(0, vitest_1.expect)((0, compile_controls_1.computeIterations)(component, mockExecuteExpression)).toBe(5);
|
|
64
|
+
});
|
|
65
|
+
(0, vitest_1.it)('should return 0 if no iterations, response, or components are present', () => {
|
|
66
|
+
const component = {
|
|
67
|
+
id: 'test',
|
|
68
|
+
componentType: 'Question',
|
|
69
|
+
};
|
|
70
|
+
(0, vitest_1.expect)((0, compile_controls_1.computeIterations)(component, mockExecuteExpression)).toBe(0);
|
|
71
|
+
});
|
|
72
|
+
(0, vitest_1.it)('should return 0 if iterations is null or undefined', () => {
|
|
73
|
+
const component1 = {
|
|
74
|
+
id: 'test1',
|
|
75
|
+
componentType: 'Loop',
|
|
76
|
+
iterations: null,
|
|
77
|
+
};
|
|
78
|
+
const component2 = {
|
|
79
|
+
id: 'test2',
|
|
80
|
+
componentType: 'Loop',
|
|
81
|
+
iterations: undefined,
|
|
82
|
+
};
|
|
83
|
+
(0, vitest_1.expect)((0, compile_controls_1.computeIterations)(component1, mockExecuteExpression)).toBe(0);
|
|
84
|
+
(0, vitest_1.expect)((0, compile_controls_1.computeIterations)(component2, mockExecuteExpression)).toBe(0);
|
|
85
|
+
});
|
|
86
|
+
(0, vitest_1.it)('should return 0 if all children have no iterations', () => {
|
|
87
|
+
const component = {
|
|
88
|
+
id: 'parent',
|
|
89
|
+
componentType: 'Loop',
|
|
90
|
+
components: [
|
|
91
|
+
{ id: 'child1', componentType: 'Question' },
|
|
92
|
+
{ id: 'child2', componentType: 'Question' },
|
|
93
|
+
],
|
|
94
|
+
};
|
|
95
|
+
(0, vitest_1.expect)((0, compile_controls_1.computeIterations)(component, mockExecuteExpression)).toBe(0);
|
|
96
|
+
});
|
|
97
|
+
(0, vitest_1.it)('should prioritize iterations over response if both are present', () => {
|
|
98
|
+
const component = {
|
|
99
|
+
id: 'test',
|
|
100
|
+
componentType: 'Loop',
|
|
101
|
+
iterations: 3,
|
|
102
|
+
response: { name: 'ARRAY' },
|
|
103
|
+
};
|
|
104
|
+
mockExecuteExpression.mockReturnValue(['a', 'b', 'c', 'd', 'e']);
|
|
105
|
+
(0, vitest_1.expect)((0, compile_controls_1.computeIterations)(component, mockExecuteExpression)).toBe(3);
|
|
106
|
+
(0, vitest_1.expect)(mockExecuteExpression).not.toHaveBeenCalled();
|
|
107
|
+
});
|
|
108
|
+
(0, vitest_1.it)('should prioritize iterations expression over response if both are present', () => {
|
|
109
|
+
const component = {
|
|
110
|
+
id: 'test',
|
|
111
|
+
componentType: 'Loop',
|
|
112
|
+
iterations: { type: 'VTL', value: 'count(ARRAY)' },
|
|
113
|
+
response: { name: 'ANOTHER_ARRAY' },
|
|
114
|
+
};
|
|
115
|
+
mockExecuteExpression.mockReturnValue(7);
|
|
116
|
+
(0, vitest_1.expect)((0, compile_controls_1.computeIterations)(component, mockExecuteExpression)).toBe(7);
|
|
117
|
+
(0, vitest_1.expect)(mockExecuteExpression).toHaveBeenCalledWith({
|
|
118
|
+
type: 'VTL',
|
|
119
|
+
value: 'count(ARRAY)',
|
|
120
|
+
});
|
|
121
|
+
});
|
|
122
|
+
});
|
|
123
|
+
//# 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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"}
|
|
@@ -35,7 +35,7 @@ const baseState = {
|
|
|
35
35
|
const onChange = { current: () => { } };
|
|
36
36
|
function reducerInitializer({ source, data, features = ['VTL'], initialPage = '1', lastReachedPage = undefined, withOverview = false, disableFilters = false, disableFiltersDescription = true, getReferentiel, onVariableChange = onChange, logger = console.error, }) {
|
|
37
37
|
const variables = lunatic_variables_store_1.LunaticVariablesStore.makeFromSource(source, data, {
|
|
38
|
-
autoCommit:
|
|
38
|
+
autoCommit: false,
|
|
39
39
|
changeHandler: onVariableChange,
|
|
40
40
|
disableCleaning: disableFilters,
|
|
41
41
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reducerInitializer.js","sourceRoot":"","sources":["../../src/use-lunatic/reducer/reducerInitializer.tsx"],"names":[],"mappings":";;AA0CA,gDAoHC;;AAxJD,0FAAqF;AACrF,wCAAwD;AACxD,yCAA2E;AAC3E,qDAAgD;AAChD,qEAAkE;AAClE,6DAAqE;AACrE,8DAA0D;AAC1D,+CAA8C;AAC9C,8EAA2E;AAI3E,MAAM,SAAS,GAAG;IACjB,IAAI,EAAE,CAAC;IACP,OAAO,EAAE,CAAC;IACV,OAAO,EAAE,SAAS;IAClB,UAAU,EAAE,SAAS;IACrB,SAAS,EAAE,SAAS;IACpB,gBAAgB,EAAE,SAAS;IAC3B,YAAY,EAAE,SAAS;CACvB,CAAC;AACF,MAAM,SAAS,GAAG;IACjB,SAAS,EAAE,IAAI,+CAAqB,EAAE;IACtC,KAAK,EAAE,SAAS;IAChB,aAAa,EAAE,SAAS;IACxB,KAAK,EAAE,EAAE;IACT,QAAQ,EAAE,KAAK;IACf,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;IACrB,QAAQ,EAAE,EAAE;IACZ,cAAc,EAAE,GAAG,EAAE,GAAE,CAAC;IACxB,iBAAiB,EAAE,GAAO,EAAE,CAAC,IAAS;IACtC,OAAO,EAAE,EAAE,cAAc,EAAE,KAAK,EAAE,yBAAyB,EAAE,IAAI,EAAE;CACrC,CAAC;AAEhC,MAAM,QAAQ,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,GAAE,CAAC,EAAE,CAAC;AAEvC,SAAgB,kBAAkB,CAAC,EAClC,MAAM,EACN,IAAI,EACJ,QAAQ,GAAG,CAAC,KAAK,CAAC,EAClB,WAAW,GAAG,GAAG,EACjB,eAAe,GAAG,SAAS,EAC3B,YAAY,GAAG,KAAK,EACpB,cAAc,GAAG,KAAK,EACtB,yBAAyB,GAAG,IAAI,EAChC,cAAc,EACd,gBAAgB,GAAG,QAAQ,EAC3B,MAAM,GAAG,OAAO,CAAC,KAAK,GAatB;IACA,MAAM,SAAS,GAAG,+CAAqB,CAAC,cAAc,CAAC,MAAM,EAAE,IAAI,EAAE;QACpE,UAAU,EAAE,
|
|
1
|
+
{"version":3,"file":"reducerInitializer.js","sourceRoot":"","sources":["../../src/use-lunatic/reducer/reducerInitializer.tsx"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,15 @@ export type SearchInfo = LunaticSuggester;
|
|
|
3
3
|
export type IndexEntry = {
|
|
4
4
|
id: string;
|
|
5
5
|
label: string;
|
|
6
|
-
|
|
6
|
+
/**
|
|
7
|
+
* Score computed by MiniSearch algo
|
|
8
|
+
*/
|
|
9
|
+
score: number;
|
|
10
|
+
/**
|
|
11
|
+
* Score compute by melauto algo
|
|
12
|
+
*/
|
|
13
|
+
melautoScore: number;
|
|
14
|
+
[k: string]: any;
|
|
7
15
|
};
|
|
8
16
|
export interface SearchInterface<T extends IndexEntry> {
|
|
9
17
|
isIndexed(): boolean;
|
|
@@ -7,10 +7,13 @@
|
|
|
7
7
|
* (e.g., "0111Z" will appear before "0115Z" when both match "011")
|
|
8
8
|
* Numeric awareness means "item2" will come before "item10" (not "item10" before "item2")
|
|
9
9
|
*/
|
|
10
|
+
export type WithMelautoScore<T> = T & {
|
|
11
|
+
melautoScore?: number;
|
|
12
|
+
};
|
|
10
13
|
export declare function applyMelauto<T extends {
|
|
11
14
|
id: string;
|
|
12
15
|
label?: string;
|
|
13
|
-
}>(query: string, data: T[]): T[];
|
|
16
|
+
}>(query: string, data: T[]): WithMelautoScore<T>[];
|
|
14
17
|
/**
|
|
15
18
|
* Melauto scoring algorithm
|
|
16
19
|
*
|
package/utils/search/melauto.js
CHANGED
|
@@ -2,23 +2,20 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.applyMelauto = applyMelauto;
|
|
4
4
|
exports.melautoScore = melautoScore;
|
|
5
|
-
/**
|
|
6
|
-
* Apply Melauto sorting algorithm on the data
|
|
7
|
-
*
|
|
8
|
-
* 1. Sort by melauto score
|
|
9
|
-
* 2. When scores are equal, sort alphabetically with numeric awareness
|
|
10
|
-
* This ensures consistent ordering for items with identical scores
|
|
11
|
-
* (e.g., "0111Z" will appear before "0115Z" when both match "011")
|
|
12
|
-
* Numeric awareness means "item2" will come before "item10" (not "item10" before "item2")
|
|
13
|
-
*/
|
|
14
5
|
function applyMelauto(query, data) {
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
6
|
+
// no query -> no sort
|
|
7
|
+
if (query === undefined || query === '')
|
|
8
|
+
return data;
|
|
9
|
+
return data
|
|
10
|
+
.map((item) => ({
|
|
11
|
+
...item,
|
|
12
|
+
melautoScore: melautoScore(item.label ?? item.id, query),
|
|
13
|
+
}))
|
|
14
|
+
.sort((a, b) => {
|
|
15
|
+
const diff = b.melautoScore - a.melautoScore;
|
|
19
16
|
if (diff !== 0)
|
|
20
17
|
return diff;
|
|
21
|
-
//
|
|
18
|
+
// if equal -> sort alphabetically with numeric awareness
|
|
22
19
|
const ta = (a.label ?? a.id).toString();
|
|
23
20
|
const tb = (b.label ?? b.id).toString();
|
|
24
21
|
return ta.localeCompare(tb, undefined, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"melauto.js","sourceRoot":"","sources":["../../src/utils/search/melauto.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"melauto.js","sourceRoot":"","sources":["../../src/utils/search/melauto.ts"],"names":[],"mappings":";;AAWA,oCAuBC;AAuBD,oCAYC;AA1DD,SAAgB,YAAY,CAC3B,KAAa,EACb,IAAS;IAET,sBAAsB;IACtB,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,EAAE;QAAE,OAAO,IAAI,CAAC;IACrD,OAAO,IAAI;SACT,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACf,GAAG,IAAI;QACP,YAAY,EAAE,YAAY,CAAC,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,EAAE,EAAE,KAAK,CAAC;KACxD,CAAC,CAAC;SACF,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QACd,MAAM,IAAI,GAAG,CAAC,CAAC,YAAY,GAAG,CAAC,CAAC,YAAY,CAAC;QAC7C,IAAI,IAAI,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;QAE5B,yDAAyD;QACzD,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC;QACxC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC;QACxC,OAAO,EAAE,CAAC,aAAa,CAAC,EAAE,EAAE,SAAS,EAAE;YACtC,OAAO,EAAE,IAAI;YACb,WAAW,EAAE,MAAM;SACnB,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;;GAGG;AACH,MAAM,SAAS,GAAG,CAAC,GAAW,EAAU,EAAE;IACzC,OAAO,GAAG;SACR,SAAS,CAAC,KAAK,CAAC;SAChB,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC;SAC/B,WAAW,EAAE;SACb,KAAK,CAAC,YAAY,CAAC;SACnB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;SAC3B,IAAI,CAAC,GAAG,CAAC,CAAC;AACb,CAAC,CAAC;AAEF;;;;;;GAMG;AACH,SAAgB,YAAY,CAAC,GAAW,EAAE,KAAa;IACtD,MAAM,UAAU,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC;IAClC,MAAM,UAAU,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC/C,OAAO,UAAU,CAAC,MAAM,CAAC,UAAU,KAAK,EAAE,KAAK,EAAE,CAAC;QACjD,MAAM,KAAK,GAAG,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACvC,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;YACf,OAAO,KAAK,CAAC;QACd,CAAC;QACD,MAAM,GAAG,GAAG,CAAC,UAAU,CAAC,MAAM,GAAG,KAAK,CAAC,GAAG,UAAU,CAAC,MAAM,CAAC;QAC5D,MAAM,MAAM,GAAG,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,UAAU,CAAC,MAAM,CAAC;QAC3D,OAAO,KAAK,GAAG,GAAG,GAAG,MAAM,CAAC;IAC7B,CAAC,EAAE,CAAC,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -21,12 +21,8 @@ const data = [
|
|
|
21
21
|
{ id: 'hello-w' },
|
|
22
22
|
];
|
|
23
23
|
const sortedData = (0, melauto_1.applyMelauto)('hello', noLabelData);
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
{ id: 'hello-w' },
|
|
27
|
-
{ id: 'a' },
|
|
28
|
-
];
|
|
29
|
-
(0, vitest_1.expect)(sortedData).toStrictEqual(expectedSortedData);
|
|
24
|
+
// check only order with the id
|
|
25
|
+
(0, vitest_1.expect)(sortedData.map((item) => item.id)).toEqual(['b', 'hello-w', 'a']);
|
|
30
26
|
});
|
|
31
27
|
});
|
|
32
28
|
(0, vitest_1.describe)('melautoScore', () => {
|
|
@@ -63,13 +59,13 @@ const data = [
|
|
|
63
59
|
{ id: '0112B', label: '0112B' },
|
|
64
60
|
];
|
|
65
61
|
const sortedData = (0, melauto_1.applyMelauto)('011', numericData);
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
62
|
+
// check only order with the id
|
|
63
|
+
(0, vitest_1.expect)(sortedData.map((item) => item.id)).toEqual([
|
|
64
|
+
'0111Z',
|
|
65
|
+
'0112B',
|
|
66
|
+
'0115Z',
|
|
67
|
+
'0120A',
|
|
68
|
+
]);
|
|
73
69
|
});
|
|
74
70
|
(0, vitest_1.it)('should apply alphanumeric sort with numeric awareness', () => {
|
|
75
71
|
const mixedData = [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"melauto.spec.js","sourceRoot":"","sources":["../../src/utils/search/melauto.spec.ts"],"names":[],"mappings":";;AAAA,mCAA8C;AAC9C,uCAAuD;AAEvD,4CAA4C;AAC5C,MAAM,IAAI,GAAG;IACZ,EAAE,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,aAAa,EAAE;IACjC,EAAE,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,kBAAkB,EAAE;IACtC,EAAE,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,gBAAgB,EAAE;IACpC,EAAE,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,kBAAkB,EAAE;CACtC,CAAC;AAEF,IAAA,iBAAQ,EAAC,cAAc,EAAE,GAAG,EAAE;IAC7B,IAAA,WAAE,EAAC,wDAAwD,EAAE,GAAG,EAAE;QACjE,MAAM,UAAU,GAAG,IAAA,sBAAY,EAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QAC1C,IAAA,eAAM,EAAC,UAAU,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC,CAAC,CAAC;IAEH,IAAA,WAAE,EAAC,uDAAuD,EAAE,GAAG,EAAE;QAChE,MAAM,WAAW,GAAG;YACnB,EAAE,EAAE,EAAE,GAAG,EAAE;YACX,EAAE,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE;YAC3B,EAAE,EAAE,EAAE,SAAS,EAAE;SACjB,CAAC;QACF,MAAM,UAAU,GAAG,IAAA,sBAAY,EAAC,OAAO,EAAE,WAAW,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"melauto.spec.js","sourceRoot":"","sources":["../../src/utils/search/melauto.spec.ts"],"names":[],"mappings":"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"}
|