@inseefr/lunatic 3.7.6-rc.0 → 3.7.6-rc.alphanumeric-sorting
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/esm/utils/search/melauto.d.ts +5 -0
- package/esm/utils/search/melauto.js +18 -3
- package/esm/utils/search/melauto.js.map +1 -1
- package/esm/utils/search/melauto.spec.js +16 -10
- package/esm/utils/search/melauto.spec.js.map +1 -1
- package/package.json +1 -1
- package/src/utils/search/melauto.spec.ts +17 -11
- package/src/utils/search/melauto.ts +18 -6
- package/tsconfig.build.tsbuildinfo +1 -1
- package/utils/search/melauto.d.ts +5 -0
- package/utils/search/melauto.js +19 -2
- package/utils/search/melauto.js.map +1 -1
- package/utils/search/melauto.spec.js +16 -10
- package/utils/search/melauto.spec.js.map +1 -1
|
@@ -1,5 +1,10 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Apply Melauto sorting algorithm on the data
|
|
3
|
+
*
|
|
4
|
+
* 1. Sort by melauto score
|
|
5
|
+
* 2. When scores are equal, sort alphabetically with numeric awareness
|
|
6
|
+
* This ensures consistent ordering for numeric queries
|
|
7
|
+
* (e.g., "0111Z" will appear before "0115Z" when both match "011")
|
|
3
8
|
*/
|
|
4
9
|
export declare function applyMelauto<T extends {
|
|
5
10
|
id: string;
|
|
@@ -1,11 +1,26 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Apply Melauto sorting algorithm on the data
|
|
3
|
+
*
|
|
4
|
+
* 1. Sort by melauto score
|
|
5
|
+
* 2. When scores are equal, sort alphabetically with numeric awareness
|
|
6
|
+
* This ensures consistent ordering for numeric queries
|
|
7
|
+
* (e.g., "0111Z" will appear before "0115Z" when both match "011")
|
|
3
8
|
*/
|
|
4
9
|
export function applyMelauto(query, data) {
|
|
5
10
|
return data.sort((a, b) => {
|
|
6
|
-
var _a, _b;
|
|
7
|
-
|
|
8
|
-
|
|
11
|
+
var _a, _b, _c, _d;
|
|
12
|
+
const sa = melautoScore((_a = a.label) !== null && _a !== void 0 ? _a : a.id, query);
|
|
13
|
+
const sb = melautoScore((_b = b.label) !== null && _b !== void 0 ? _b : b.id, query);
|
|
14
|
+
const diff = sb - sa;
|
|
15
|
+
if (diff !== 0)
|
|
16
|
+
return diff;
|
|
17
|
+
// This ensures stable sorting when multiple items have the same score
|
|
18
|
+
const ta = ((_c = a.label) !== null && _c !== void 0 ? _c : a.id).toString();
|
|
19
|
+
const tb = ((_d = b.label) !== null && _d !== void 0 ? _d : b.id).toString();
|
|
20
|
+
return ta.localeCompare(tb, undefined, {
|
|
21
|
+
numeric: true,
|
|
22
|
+
sensitivity: 'base',
|
|
23
|
+
});
|
|
9
24
|
});
|
|
10
25
|
}
|
|
11
26
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"melauto.js","sourceRoot":"","sources":["../../../src/utils/search/melauto.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"melauto.js","sourceRoot":"","sources":["../../../src/utils/search/melauto.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,MAAM,UAAU,YAAY,CAC3B,KAAa,EACb,IAAS;IAET,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;;QACzB,MAAM,EAAE,GAAG,YAAY,CAAC,MAAA,CAAC,CAAC,KAAK,mCAAI,CAAC,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;QAChD,MAAM,EAAE,GAAG,YAAY,CAAC,MAAA,CAAC,CAAC,KAAK,mCAAI,CAAC,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;QAChD,MAAM,IAAI,GAAG,EAAE,GAAG,EAAE,CAAC;QACrB,IAAI,IAAI,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;QAC5B,sEAAsE;QACtE,MAAM,EAAE,GAAG,CAAC,MAAA,CAAC,CAAC,KAAK,mCAAI,CAAC,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC;QACxC,MAAM,EAAE,GAAG,CAAC,MAAA,CAAC,CAAC,KAAK,mCAAI,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;AACJ,CAAC;AACD;;;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,MAAM,UAAU,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"}
|
|
@@ -8,16 +8,6 @@ const data = [
|
|
|
8
8
|
{ id: '4', label: 'Greetings planet' },
|
|
9
9
|
];
|
|
10
10
|
describe('applyMelauto', () => {
|
|
11
|
-
it('should sort data by relevance to the query', () => {
|
|
12
|
-
const sortedData = applyMelauto('hello', data);
|
|
13
|
-
const expectedSortedData = [
|
|
14
|
-
{ id: '1', label: 'Hello world' },
|
|
15
|
-
{ id: '3', label: 'Hello everyone' },
|
|
16
|
-
{ id: '2', label: 'Bonjour le monde' },
|
|
17
|
-
{ id: '4', label: 'Greetings planet' },
|
|
18
|
-
];
|
|
19
|
-
expect(sortedData).toStrictEqual(expectedSortedData);
|
|
20
|
-
});
|
|
21
11
|
it('should return data in original order if query is empty', () => {
|
|
22
12
|
const sortedData = applyMelauto('', data);
|
|
23
13
|
expect(sortedData).toEqual(data);
|
|
@@ -63,5 +53,21 @@ describe('melautoScore', () => {
|
|
|
63
53
|
const score2 = melautoScore('Hello world', 'héllo-wOrld');
|
|
64
54
|
expect(score1).toBeCloseTo(score2, 2);
|
|
65
55
|
});
|
|
56
|
+
it('should sort alphabetically with numeric awareness when scores are equal', () => {
|
|
57
|
+
const numericData = [
|
|
58
|
+
{ id: '0115Z', label: '0115Z' },
|
|
59
|
+
{ id: '0111Z', label: '0111Z' },
|
|
60
|
+
{ id: '0120A', label: '0120A' },
|
|
61
|
+
{ id: '0112B', label: '0112B' },
|
|
62
|
+
];
|
|
63
|
+
const sortedData = applyMelauto('011', numericData);
|
|
64
|
+
const expectedSortedData = [
|
|
65
|
+
{ id: '0111Z', label: '0111Z' },
|
|
66
|
+
{ id: '0112B', label: '0112B' },
|
|
67
|
+
{ id: '0115Z', label: '0115Z' },
|
|
68
|
+
{ id: '0120A', label: '0120A' },
|
|
69
|
+
];
|
|
70
|
+
expect(sortedData).toStrictEqual(expectedSortedData);
|
|
71
|
+
});
|
|
66
72
|
});
|
|
67
73
|
//# sourceMappingURL=melauto.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"melauto.spec.js","sourceRoot":"","sources":["../../../src/utils/search/melauto.spec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;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,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC7B,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"melauto.spec.js","sourceRoot":"","sources":["../../../src/utils/search/melauto.spec.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -10,17 +10,6 @@ const data = [
|
|
|
10
10
|
];
|
|
11
11
|
|
|
12
12
|
describe('applyMelauto', () => {
|
|
13
|
-
it('should sort data by relevance to the query', () => {
|
|
14
|
-
const sortedData = applyMelauto('hello', data);
|
|
15
|
-
const expectedSortedData = [
|
|
16
|
-
{ id: '1', label: 'Hello world' },
|
|
17
|
-
{ id: '3', label: 'Hello everyone' },
|
|
18
|
-
{ id: '2', label: 'Bonjour le monde' },
|
|
19
|
-
{ id: '4', label: 'Greetings planet' },
|
|
20
|
-
];
|
|
21
|
-
expect(sortedData).toStrictEqual(expectedSortedData);
|
|
22
|
-
});
|
|
23
|
-
|
|
24
13
|
it('should return data in original order if query is empty', () => {
|
|
25
14
|
const sortedData = applyMelauto('', data);
|
|
26
15
|
expect(sortedData).toEqual(data);
|
|
@@ -72,4 +61,21 @@ describe('melautoScore', () => {
|
|
|
72
61
|
const score2 = melautoScore('Hello world', 'héllo-wOrld');
|
|
73
62
|
expect(score1).toBeCloseTo(score2, 2);
|
|
74
63
|
});
|
|
64
|
+
|
|
65
|
+
it('should sort alphabetically with numeric awareness when scores are equal', () => {
|
|
66
|
+
const numericData = [
|
|
67
|
+
{ id: '0115Z', label: '0115Z' },
|
|
68
|
+
{ id: '0111Z', label: '0111Z' },
|
|
69
|
+
{ id: '0120A', label: '0120A' },
|
|
70
|
+
{ id: '0112B', label: '0112B' },
|
|
71
|
+
];
|
|
72
|
+
const sortedData = applyMelauto('011', numericData);
|
|
73
|
+
const expectedSortedData = [
|
|
74
|
+
{ id: '0111Z', label: '0111Z' },
|
|
75
|
+
{ id: '0112B', label: '0112B' },
|
|
76
|
+
{ id: '0115Z', label: '0115Z' },
|
|
77
|
+
{ id: '0120A', label: '0120A' },
|
|
78
|
+
];
|
|
79
|
+
expect(sortedData).toStrictEqual(expectedSortedData);
|
|
80
|
+
});
|
|
75
81
|
});
|
|
@@ -1,17 +1,29 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Apply Melauto sorting algorithm on the data
|
|
3
|
+
*
|
|
4
|
+
* 1. Sort by melauto score
|
|
5
|
+
* 2. When scores are equal, sort alphabetically with numeric awareness
|
|
6
|
+
* This ensures consistent ordering for numeric queries
|
|
7
|
+
* (e.g., "0111Z" will appear before "0115Z" when both match "011")
|
|
3
8
|
*/
|
|
4
9
|
export function applyMelauto<T extends { id: string; label?: string }>(
|
|
5
10
|
query: string,
|
|
6
11
|
data: T[]
|
|
7
12
|
): T[] {
|
|
8
|
-
return data.sort(
|
|
9
|
-
(a,
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
+
return data.sort((a, b) => {
|
|
14
|
+
const sa = melautoScore(a.label ?? a.id, query);
|
|
15
|
+
const sb = melautoScore(b.label ?? b.id, query);
|
|
16
|
+
const diff = sb - sa;
|
|
17
|
+
if (diff !== 0) return diff;
|
|
18
|
+
// This ensures stable sorting when multiple items have the same score
|
|
19
|
+
const ta = (a.label ?? a.id).toString();
|
|
20
|
+
const tb = (b.label ?? b.id).toString();
|
|
21
|
+
return ta.localeCompare(tb, undefined, {
|
|
22
|
+
numeric: true,
|
|
23
|
+
sensitivity: 'base',
|
|
24
|
+
});
|
|
25
|
+
});
|
|
13
26
|
}
|
|
14
|
-
|
|
15
27
|
/**
|
|
16
28
|
* Normalize a string to remove accent and other unicode character
|
|
17
29
|
* "Héllo (wörld)" becomes "Hello world"
|