Skip to content

Commit 789253e

Browse files
JLHwungmathiasbynens
authored andcommitted
Infer mapping declaration value types from parsed data
Assisted-By: GPT-6 Issue: #110
1 parent eec7af7 commit 789253e

2 files changed

Lines changed: 23 additions & 9 deletions

File tree

‎scripts/utils.mjs‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,10 @@ const writeFiles = (options) => {
278278
symbolsFileContent = `export default ${jsesc(codePointsAsArray.map((cp) => String.fromCodePoint(cp)))};\n`;
279279
}
280280
} else {
281+
const valueTypes = new Set();
282+
for (const to of codePoints.values()) {
283+
valueTypes.add(Array.isArray(to) ? 'number[]' : 'number');
284+
}
281285
if (codePoints.size < 10) {
282286
const symbols = new Map();
283287
for (let [from, to] of codePoints) {
@@ -299,15 +303,7 @@ const writeFiles = (options) => {
299303
// rather than shipped as a second copy of the same data.
300304
symbolsFileContent = `import codePoints from './code-points.mjs';\nimport mappingToSymbols from '../../mapping-to-symbols.mjs';\n\nexport default mappingToSymbols(codePoints);\n`;
301305
}
302-
if (
303-
(type === 'Case_Folding' && item === 'F') ||
304-
type === 'Special_Casing' ||
305-
type === 'Decomposition_Mapping'
306-
) {
307-
codePointsType = 'Map<number, number[]>';
308-
} else {
309-
codePointsType = 'Map<number, number>';
310-
}
306+
codePointsType = `Map<number, ${[...valueTypes].sort().join(' | ') || 'number'}>`;
311307
symbolsType = 'Map<string, string>';
312308
}
313309
writeFileIfChanged(

‎tests/parsers.mjs‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
import { test } from 'node:test';
2+
import fs from 'node:fs';
3+
import parseCaseFolding from '../scripts/parse-case-folding.mjs';
4+
import utils from '../scripts/utils.mjs';
25
import parseDecompositionMapping from '../scripts/parse-decomposition-mapping.mjs';
36
import parseIndicConjunctBreak from '../scripts/parse-indic-conjunct-break.mjs';
47
import parseJoiningType from '../scripts/parse-joining-type.mjs';
@@ -22,6 +25,21 @@ test('Hangul has pairwise canonical decomposition mappings', async (t) => {
2225
t.assert.equal(await parseDecompositionMapping('1.1.5'), undefined);
2326
});
2427

28+
test('Case folding declarations describe scalar and expansion values', async (t) => {
29+
const map = await parseCaseFolding('3.0.1');
30+
t.assert.equal(map.E.get(0xb5), 0x3bc);
31+
t.assert.deepEqual(map.E.get(0xdf), [0x73, 0x73]);
32+
utils.writeFiles({ version: 'parser-types-test', type: 'Case_Folding', map });
33+
const declaration = fs.readFileSync(
34+
new URL(
35+
'../output/unicode-parser-types-test/Case_Folding/E/code-points.d.mts',
36+
import.meta.url,
37+
),
38+
'utf8',
39+
);
40+
t.assert.match(declaration, /Map<number, number \| number\[\]>/);
41+
});
42+
2543
test('ArabicShaping fallback derives implicit joining types', async (t) => {
2644
for (const version of ['3.2.0', '4.0.0', '4.0.1']) {
2745
const map = await parseJoiningType(version);

0 commit comments

Comments
 (0)