Skip to content

Commit 6d7a116

Browse files
mdevilsmdevils
committed
feat: latest should include all latest modules
1 parent cd56683 commit 6d7a116

File tree

3 files changed

+52
-48
lines changed

3 files changed

+52
-48
lines changed

‎src/parser.ts

+9-9
Original file line numberDiff line numberDiff line change
@@ -91,22 +91,22 @@ export function createParser(
9191
syntaxDefinition = extendSyntaxDefinition(cssSyntaxDefinitions[syntaxDefinition.baseSyntax], syntaxDefinition);
9292
}
9393

94-
// Apply additional modules if specified from options
95-
if (modules && modules.length > 0) {
96-
for (const module of modules) {
94+
// Apply modules from syntax definition
95+
if (syntaxDefinition.modules && syntaxDefinition.modules.length > 0) {
96+
for (const module of syntaxDefinition.modules) {
9797
const moduleSyntax = cssModules[module];
9898
if (moduleSyntax) {
99-
syntaxDefinition = extendSyntaxDefinition(syntaxDefinition, moduleSyntax);
99+
syntaxDefinition = extendSyntaxDefinition(moduleSyntax, syntaxDefinition);
100100
}
101101
}
102102
}
103-
104-
// Apply modules from syntax definition
105-
if (syntaxDefinition.modules && syntaxDefinition.modules.length > 0) {
106-
for (const module of syntaxDefinition.modules) {
103+
104+
// Apply additional modules if specified from options
105+
if (modules && modules.length > 0) {
106+
for (const module of modules) {
107107
const moduleSyntax = cssModules[module];
108108
if (moduleSyntax) {
109-
syntaxDefinition = extendSyntaxDefinition(syntaxDefinition, moduleSyntax);
109+
syntaxDefinition = extendSyntaxDefinition(moduleSyntax, syntaxDefinition);
110110
}
111111
}
112112
}

‎src/syntax-definitions.ts

+33-30
Original file line numberDiff line numberDiff line change
@@ -405,38 +405,9 @@ const selectors4SyntaxDefinition = extendSyntaxDefinition(selectors3SyntaxDefini
405405
NoArgument: ['marker'],
406406
Selector: ['part']
407407
}
408-
},
409-
// Include all the latest modules
410-
modules: [
411-
'css-position-4',
412-
'css-scoping-1',
413-
'css-pseudo-4',
414-
'css-shadow-parts-1'
415-
]
416-
});
417-
418-
const progressiveSyntaxDefinition = extendSyntaxDefinition(selectors4SyntaxDefinition, {
419-
pseudoElements: {
420-
unknown: 'accept'
421-
},
422-
pseudoClasses: {
423-
unknown: 'accept'
424-
},
425-
attributes: {
426-
unknownCaseSensitivityModifiers: 'accept'
427408
}
428409
});
429410

430-
export const cssSyntaxDefinitions: Record<CssLevel, SyntaxDefinition> = {
431-
css1: css1SyntaxDefinition,
432-
css2: css2SyntaxDefinition,
433-
css3: selectors3SyntaxDefinition,
434-
'selectors-3': selectors3SyntaxDefinition,
435-
'selectors-4': selectors4SyntaxDefinition,
436-
latest: selectors4SyntaxDefinition,
437-
progressive: progressiveSyntaxDefinition
438-
};
439-
440411
/**
441412
* CSS Modules with their syntax definitions.
442413
* These can be used to extend the parser with specific CSS modules.
@@ -447,20 +418,23 @@ export const cssSyntaxDefinitions: Record<CssLevel, SyntaxDefinition> = {
447418
*/
448419
export const cssModules = {
449420
'css-position-1': {
421+
latest: false,
450422
pseudoClasses: {
451423
definitions: {
452424
NoArgument: ['static', 'relative', 'absolute']
453425
}
454426
}
455427
},
456428
'css-position-2': {
429+
latest: false,
457430
pseudoClasses: {
458431
definitions: {
459432
NoArgument: ['static', 'relative', 'absolute', 'fixed']
460433
}
461434
}
462435
},
463436
'css-position-3': {
437+
latest: false,
464438
pseudoClasses: {
465439
definitions: {
466440
NoArgument: ['sticky', 'fixed', 'absolute', 'relative', 'static']
@@ -519,11 +493,40 @@ export const cssModules = {
519493
}
520494
}
521495
}
522-
} satisfies Record<string, SyntaxDefinition & {latest?: true}>;
496+
} satisfies Record<string, SyntaxDefinition & {latest?: boolean}>;
523497

524498
/**
525499
* CSS Module name.
526500
* @example 'css-position-3'
527501
* @example 'css-scoping-1'
528502
*/
529503
export type CssModule = keyof typeof cssModules;
504+
505+
const latestSyntaxDefinition = {
506+
...selectors4SyntaxDefinition,
507+
modules: (Object.entries(cssModules) as [CssModule, SyntaxDefinition & {latest?: boolean}][])
508+
.filter(([, {latest}]) => latest)
509+
.map(([name]) => name)
510+
};
511+
512+
const progressiveSyntaxDefinition = extendSyntaxDefinition(latestSyntaxDefinition, {
513+
pseudoElements: {
514+
unknown: 'accept'
515+
},
516+
pseudoClasses: {
517+
unknown: 'accept'
518+
},
519+
attributes: {
520+
unknownCaseSensitivityModifiers: 'accept'
521+
}
522+
});
523+
524+
export const cssSyntaxDefinitions: Record<CssLevel, SyntaxDefinition> = {
525+
css1: css1SyntaxDefinition,
526+
css2: css2SyntaxDefinition,
527+
css3: selectors3SyntaxDefinition,
528+
'selectors-3': selectors3SyntaxDefinition,
529+
'selectors-4': selectors4SyntaxDefinition,
530+
latest: latestSyntaxDefinition,
531+
progressive: progressiveSyntaxDefinition
532+
};

‎test/modules.test.ts

+10-9
Original file line numberDiff line numberDiff line change
@@ -600,11 +600,12 @@ describe('CSS Modules', () => {
600600
);
601601
});
602602
});
603-
603+
604604
describe('Syntax definition with modules', () => {
605605
it('should support modules defined in syntax definition', () => {
606606
const parse = createParser({
607607
syntax: {
608+
baseSyntax: 'selectors-3',
608609
pseudoClasses: {
609610
unknown: 'reject'
610611
},
@@ -614,7 +615,7 @@ describe('CSS Modules', () => {
614615
modules: ['css-position-4', 'css-shadow-parts-1']
615616
}
616617
});
617-
618+
618619
// Should parse position-4 pseudo-classes
619620
expect(parse(':initial')).toEqual(
620621
ast.selector({
@@ -625,7 +626,7 @@ describe('CSS Modules', () => {
625626
]
626627
})
627628
);
628-
629+
629630
// Should parse shadow-parts-1 pseudo-elements
630631
expect(parse('::part(button)')).toEqual(
631632
ast.selector({
@@ -647,16 +648,16 @@ describe('CSS Modules', () => {
647648
]
648649
})
649650
);
650-
651+
651652
// Should reject pseudo-classes not in the modules
652653
expect(() => parse(':focus-visible')).toThrow('Unknown pseudo-class: "focus-visible".');
653654
});
654-
655+
655656
it('should support latest syntax with all latest modules', () => {
656657
const parse = createParser({
657658
syntax: 'latest'
658659
});
659-
660+
660661
// Should parse position-4 pseudo-classes
661662
expect(parse(':initial')).toEqual(
662663
ast.selector({
@@ -667,7 +668,7 @@ describe('CSS Modules', () => {
667668
]
668669
})
669670
);
670-
671+
671672
// Should parse shadow-parts-1 pseudo-elements
672673
expect(parse('::part(button)')).toEqual(
673674
ast.selector({
@@ -689,7 +690,7 @@ describe('CSS Modules', () => {
689690
]
690691
})
691692
);
692-
693+
693694
// Should parse pseudo-4 pseudo-elements
694695
expect(parse('::marker')).toEqual(
695696
ast.selector({
@@ -700,7 +701,7 @@ describe('CSS Modules', () => {
700701
]
701702
})
702703
);
703-
704+
704705
// Should parse scoping-1 pseudo-classes
705706
expect(parse(':host')).toEqual(
706707
ast.selector({

0 commit comments

Comments
 (0)