Skip to content

Commit b11c316

Browse files
tbela99tbela99
committed
nesting selector cannot match pseudo element #67 
1 parent 127085a commit b11c316

File tree

17 files changed

+263
-50
lines changed

17 files changed

+263
-50
lines changed

‎dist/index-umd-web.js‎

Lines changed: 33 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@
107107
EnumToken[EnumToken["MediaFeatureAndTokenType"] = 89] = "MediaFeatureAndTokenType";
108108
EnumToken[EnumToken["MediaFeatureOrTokenType"] = 90] = "MediaFeatureOrTokenType";
109109
EnumToken[EnumToken["PseudoPageTokenType"] = 91] = "PseudoPageTokenType";
110+
EnumToken[EnumToken["PseudoElementTokenType"] = 92] = "PseudoElementTokenType";
110111
/* aliases */
111112
EnumToken[EnumToken["Time"] = 25] = "Time";
112113
EnumToken[EnumToken["Iden"] = 7] = "Iden";
@@ -3881,8 +3882,9 @@
38813882
return '';
38823883
}
38833884
case exports.EnumToken.PseudoClassTokenType:
3885+
case exports.EnumToken.PseudoElementTokenType:
38843886
// https://www.w3.org/TR/selectors-4/#single-colon-pseudos
3885-
if (token.typ == exports.EnumToken.PseudoClassTokenType && ['::before', '::after', '::first-line', '::first-letter'].includes(token.val)) {
3887+
if (token.typ == exports.EnumToken.PseudoElementTokenType && ['::before', '::after', '::first-line', '::first-letter'].includes(token.val)) {
38863888
return token.val.slice(1);
38873889
}
38883890
case exports.EnumToken.UrlTokenTokenType:
@@ -12009,8 +12011,8 @@
1200912011
tokens.shift();
1201012012
consumeWhitespace(tokens);
1201112013
}
12012-
while (tokens.length > 0 && tokens[0].typ == exports.EnumToken.PseudoClassTokenType) {
12013-
const isPseudoElement = tokens[0].val.startsWith('::');
12014+
while (tokens.length > 0 && (tokens[0].typ == exports.EnumToken.PseudoElementTokenType || tokens[0].typ == exports.EnumToken.PseudoClassTokenType)) {
12015+
const isPseudoElement = tokens[0].typ == exports.EnumToken.PseudoElementTokenType;
1201412016
if (
1201512017
// https://developer.mozilla.org/en-US/docs/Web/CSS/WebKit_Extensions#pseudo-elements
1201612018
!(isPseudoElement && tokens[0].val.startsWith('::-webkit-')) &&
@@ -16315,11 +16317,11 @@
1631516317
const node = {
1631616318
typ: exports.EnumToken.AtRuleNodeType,
1631716319
nam: renderToken(atRule, { removeComments: true }),
16318-
tokens: t,
16320+
// tokens: t,
1631916321
val: raw.join('')
1632016322
};
1632116323
Object.defineProperties(node, {
16322-
tokens: { ...definedPropertySettings, enumerable: true, value: tokens.slice() },
16324+
tokens: { ...definedPropertySettings, enumerable: false, value: tokens.slice() },
1632316325
raw: { ...definedPropertySettings, value: raw }
1632416326
});
1632516327
if (delim.typ == exports.EnumToken.BlockStartTokenType) {
@@ -16444,7 +16446,7 @@
1644416446
};
1644516447
Object.defineProperty(node, 'tokens', {
1644616448
...definedPropertySettings,
16447-
enumerable: true,
16449+
enumerable: false,
1644816450
value: tokens.slice()
1644916451
});
1645016452
let raw = [...uniq.values()];
@@ -16917,10 +16919,16 @@
1691716919
val: val.slice(0, -1),
1691816920
chi: []
1691916921
}
16920-
: {
16921-
typ: exports.EnumToken.PseudoClassTokenType,
16922+
: (
16923+
// https://www.w3.org/TR/selectors-4/#single-colon-pseudos
16924+
val.startsWith('::') || [':before', ':after', ':first-line', ':first-letter'].includes(val) ? {
16925+
typ: exports.EnumToken.PseudoElementTokenType,
1692216926
val
16923-
};
16927+
} :
16928+
{
16929+
typ: exports.EnumToken.PseudoClassTokenType,
16930+
val
16931+
});
1692416932
}
1692516933
if (isAtKeyword(val)) {
1692616934
return {
@@ -17614,7 +17622,14 @@
1761417622
rule.sel = splitRule(ast.sel).reduce((a, b) => a.concat([b.join('') + r]), []).join(',');
1761517623
}
1761617624
else {
17617-
selRule.forEach(arr => combinators.includes(arr[0].charAt(0)) ? arr.unshift(ast.sel) : arr.unshift(ast.sel, ' '));
17625+
// selRule = splitRule(selRule.reduce((acc, curr) => acc + (acc.length > 0 ? ',' : '') + curr.join(''), ''));
17626+
const arSelf = splitRule(ast.sel).filter(r => r.every(t => t != ':before' && t != ':after' && !t.startsWith('::'))).reduce((acc, curr) => acc.concat([curr.join('')]), []).join(',');
17627+
if (arSelf.length == 0) {
17628+
ast.chi.splice(i--, 1);
17629+
continue;
17630+
}
17631+
//
17632+
selRule.forEach(arr => combinators.includes(arr[0].charAt(0)) ? arr.unshift(arSelf) : arr.unshift(arSelf, ' '));
1761817633
rule.sel = selRule.reduce((acc, curr) => {
1761917634
acc.push(curr.join(''));
1762017635
return acc;
@@ -17625,8 +17640,14 @@
1762517640
let childSelectorCompound = [];
1762617641
let withCompound = [];
1762717642
let withoutCompound = [];
17628-
const rules = splitRule(ast.sel);
17643+
// pseudo elements cannot be used with '&'
17644+
// https://www.w3.org/TR/css-nesting-1/#example-7145ff1e
17645+
const rules = splitRule(ast.sel).filter(r => r.every(t => t != ':before' && t != ':after' && !t.startsWith('::')));
1762917646
const parentSelector = !node.sel.includes('&');
17647+
if (rules.length == 0) {
17648+
ast.chi.splice(i--, 1);
17649+
continue;
17650+
}
1763017651
for (const sel of (rule.raw ?? splitRule(rule.sel))) {
1763117652
const s = sel.join('');
1763217653
if (s.includes('&') || parentSelector) {
@@ -19323,7 +19344,7 @@
1932319344
return s.join('');
1932419345
}).join(',');
1932519346
// @ts-ignore
19326-
let sel = wrap ? node.optimized.optimized[0] + `:is(${rule})` : rule;
19347+
let sel = wrap ? node.optimized.optimized.join('') + `:is(${rule})` : rule;
1932719348
if (rule.includes('&')) {
1932819349
// @ts-ignore
1932919350
rule = replaceCompound(rule, node.optimized.optimized[0]);

‎dist/index.cjs‎

Lines changed: 33 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ exports.EnumToken = void 0;
106106
EnumToken[EnumToken["MediaFeatureAndTokenType"] = 89] = "MediaFeatureAndTokenType";
107107
EnumToken[EnumToken["MediaFeatureOrTokenType"] = 90] = "MediaFeatureOrTokenType";
108108
EnumToken[EnumToken["PseudoPageTokenType"] = 91] = "PseudoPageTokenType";
109+
EnumToken[EnumToken["PseudoElementTokenType"] = 92] = "PseudoElementTokenType";
109110
/* aliases */
110111
EnumToken[EnumToken["Time"] = 25] = "Time";
111112
EnumToken[EnumToken["Iden"] = 7] = "Iden";
@@ -3880,8 +3881,9 @@ function renderToken(token, options = {}, cache = Object.create(null), reducer,
38803881
return '';
38813882
}
38823883
case exports.EnumToken.PseudoClassTokenType:
3884+
case exports.EnumToken.PseudoElementTokenType:
38833885
// https://www.w3.org/TR/selectors-4/#single-colon-pseudos
3884-
if (token.typ == exports.EnumToken.PseudoClassTokenType && ['::before', '::after', '::first-line', '::first-letter'].includes(token.val)) {
3886+
if (token.typ == exports.EnumToken.PseudoElementTokenType && ['::before', '::after', '::first-line', '::first-letter'].includes(token.val)) {
38853887
return token.val.slice(1);
38863888
}
38873889
case exports.EnumToken.UrlTokenTokenType:
@@ -12008,8 +12010,8 @@ function validateCompoundSelector(tokens, root, options) {
1200812010
tokens.shift();
1200912011
consumeWhitespace(tokens);
1201012012
}
12011-
while (tokens.length > 0 && tokens[0].typ == exports.EnumToken.PseudoClassTokenType) {
12012-
const isPseudoElement = tokens[0].val.startsWith('::');
12013+
while (tokens.length > 0 && (tokens[0].typ == exports.EnumToken.PseudoElementTokenType || tokens[0].typ == exports.EnumToken.PseudoClassTokenType)) {
12014+
const isPseudoElement = tokens[0].typ == exports.EnumToken.PseudoElementTokenType;
1201312015
if (
1201412016
// https://developer.mozilla.org/en-US/docs/Web/CSS/WebKit_Extensions#pseudo-elements
1201512017
!(isPseudoElement && tokens[0].val.startsWith('::-webkit-')) &&
@@ -16314,11 +16316,11 @@ async function parseNode(results, context, stats, options, errors, src, map, raw
1631416316
const node = {
1631516317
typ: exports.EnumToken.AtRuleNodeType,
1631616318
nam: renderToken(atRule, { removeComments: true }),
16317-
tokens: t,
16319+
// tokens: t,
1631816320
val: raw.join('')
1631916321
};
1632016322
Object.defineProperties(node, {
16321-
tokens: { ...definedPropertySettings, enumerable: true, value: tokens.slice() },
16323+
tokens: { ...definedPropertySettings, enumerable: false, value: tokens.slice() },
1632216324
raw: { ...definedPropertySettings, value: raw }
1632316325
});
1632416326
if (delim.typ == exports.EnumToken.BlockStartTokenType) {
@@ -16443,7 +16445,7 @@ async function parseNode(results, context, stats, options, errors, src, map, raw
1644316445
};
1644416446
Object.defineProperty(node, 'tokens', {
1644516447
...definedPropertySettings,
16446-
enumerable: true,
16448+
enumerable: false,
1644716449
value: tokens.slice()
1644816450
});
1644916451
let raw = [...uniq.values()];
@@ -16916,10 +16918,16 @@ function getTokenType(val, hint) {
1691616918
val: val.slice(0, -1),
1691716919
chi: []
1691816920
}
16919-
: {
16920-
typ: exports.EnumToken.PseudoClassTokenType,
16921+
: (
16922+
// https://www.w3.org/TR/selectors-4/#single-colon-pseudos
16923+
val.startsWith('::') || [':before', ':after', ':first-line', ':first-letter'].includes(val) ? {
16924+
typ: exports.EnumToken.PseudoElementTokenType,
1692116925
val
16922-
};
16926+
} :
16927+
{
16928+
typ: exports.EnumToken.PseudoClassTokenType,
16929+
val
16930+
});
1692316931
}
1692416932
if (isAtKeyword(val)) {
1692516933
return {
@@ -17613,7 +17621,14 @@ function expandRule(node) {
1761317621
rule.sel = splitRule(ast.sel).reduce((a, b) => a.concat([b.join('') + r]), []).join(',');
1761417622
}
1761517623
else {
17616-
selRule.forEach(arr => combinators.includes(arr[0].charAt(0)) ? arr.unshift(ast.sel) : arr.unshift(ast.sel, ' '));
17624+
// selRule = splitRule(selRule.reduce((acc, curr) => acc + (acc.length > 0 ? ',' : '') + curr.join(''), ''));
17625+
const arSelf = splitRule(ast.sel).filter(r => r.every(t => t != ':before' && t != ':after' && !t.startsWith('::'))).reduce((acc, curr) => acc.concat([curr.join('')]), []).join(',');
17626+
if (arSelf.length == 0) {
17627+
ast.chi.splice(i--, 1);
17628+
continue;
17629+
}
17630+
//
17631+
selRule.forEach(arr => combinators.includes(arr[0].charAt(0)) ? arr.unshift(arSelf) : arr.unshift(arSelf, ' '));
1761717632
rule.sel = selRule.reduce((acc, curr) => {
1761817633
acc.push(curr.join(''));
1761917634
return acc;
@@ -17624,8 +17639,14 @@ function expandRule(node) {
1762417639
let childSelectorCompound = [];
1762517640
let withCompound = [];
1762617641
let withoutCompound = [];
17627-
const rules = splitRule(ast.sel);
17642+
// pseudo elements cannot be used with '&'
17643+
// https://www.w3.org/TR/css-nesting-1/#example-7145ff1e
17644+
const rules = splitRule(ast.sel).filter(r => r.every(t => t != ':before' && t != ':after' && !t.startsWith('::')));
1762817645
const parentSelector = !node.sel.includes('&');
17646+
if (rules.length == 0) {
17647+
ast.chi.splice(i--, 1);
17648+
continue;
17649+
}
1762917650
for (const sel of (rule.raw ?? splitRule(rule.sel))) {
1763017651
const s = sel.join('');
1763117652
if (s.includes('&') || parentSelector) {
@@ -19322,7 +19343,7 @@ function minify(ast, options = {}, recursive = false, errors, nestingContent, co
1932219343
return s.join('');
1932319344
}).join(',');
1932419345
// @ts-ignore
19325-
let sel = wrap ? node.optimized.optimized[0] + `:is(${rule})` : rule;
19346+
let sel = wrap ? node.optimized.optimized.join('') + `:is(${rule})` : rule;
1932619347
if (rule.includes('&')) {
1932719348
// @ts-ignore
1932819349
rule = replaceCompound(rule, node.optimized.optimized[0]);

‎dist/index.d.ts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ declare enum EnumToken {
9191
MediaFeatureAndTokenType = 89,
9292
MediaFeatureOrTokenType = 90,
9393
PseudoPageTokenType = 91,
94+
PseudoElementTokenType = 92,
9495
Time = 25,
9596
Iden = 7,
9697
EOF = 48,
@@ -517,6 +518,12 @@ export declare interface PseudoClassToken extends BaseToken {
517518
val: string;
518519
}
519520

521+
export declare interface PseudoElementToken extends BaseToken {
522+
523+
typ: EnumToken.PseudoElementTokenType;
524+
val: string;
525+
}
526+
520527
export declare interface PseudoPageToken extends BaseToken {
521528

522529
typ: EnumToken.PseudoPageTokenType;
@@ -812,6 +819,7 @@ export declare type Token =
812819
ListToken
813820
| PseudoClassToken
814821
| PseudoPageToken
822+
| PseudoElementToken
815823
| PseudoClassFunctionToken
816824
| DelimToken
817825
| BinaryExpressionToken

‎dist/lib/ast/expand.js‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,14 @@ function expandRule(node) {
6969
rule.sel = splitRule(ast.sel).reduce((a, b) => a.concat([b.join('') + r]), []).join(',');
7070
}
7171
else {
72-
selRule.forEach(arr => combinators.includes(arr[0].charAt(0)) ? arr.unshift(ast.sel) : arr.unshift(ast.sel, ' '));
72+
// selRule = splitRule(selRule.reduce((acc, curr) => acc + (acc.length > 0 ? ',' : '') + curr.join(''), ''));
73+
const arSelf = splitRule(ast.sel).filter(r => r.every(t => t != ':before' && t != ':after' && !t.startsWith('::'))).reduce((acc, curr) => acc.concat([curr.join('')]), []).join(',');
74+
if (arSelf.length == 0) {
75+
ast.chi.splice(i--, 1);
76+
continue;
77+
}
78+
//
79+
selRule.forEach(arr => combinators.includes(arr[0].charAt(0)) ? arr.unshift(arSelf) : arr.unshift(arSelf, ' '));
7380
rule.sel = selRule.reduce((acc, curr) => {
7481
acc.push(curr.join(''));
7582
return acc;
@@ -80,8 +87,14 @@ function expandRule(node) {
8087
let childSelectorCompound = [];
8188
let withCompound = [];
8289
let withoutCompound = [];
83-
const rules = splitRule(ast.sel);
90+
// pseudo elements cannot be used with '&'
91+
// https://www.w3.org/TR/css-nesting-1/#example-7145ff1e
92+
const rules = splitRule(ast.sel).filter(r => r.every(t => t != ':before' && t != ':after' && !t.startsWith('::')));
8493
const parentSelector = !node.sel.includes('&');
94+
if (rules.length == 0) {
95+
ast.chi.splice(i--, 1);
96+
continue;
97+
}
8598
for (const sel of (rule.raw ?? splitRule(rule.sel))) {
8699
const s = sel.join('');
87100
if (s.includes('&') || parentSelector) {

‎dist/lib/ast/minify.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ function minify(ast, options = {}, recursive = false, errors, nestingContent, co
227227
return s.join('');
228228
}).join(',');
229229
// @ts-ignore
230-
let sel = wrap ? node.optimized.optimized[0] + `:is(${rule})` : rule;
230+
let sel = wrap ? node.optimized.optimized.join('') + `:is(${rule})` : rule;
231231
if (rule.includes('&')) {
232232
// @ts-ignore
233233
rule = replaceCompound(rule, node.optimized.optimized[0]);

‎dist/lib/ast/types.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ var EnumToken;
101101
EnumToken[EnumToken["MediaFeatureAndTokenType"] = 89] = "MediaFeatureAndTokenType";
102102
EnumToken[EnumToken["MediaFeatureOrTokenType"] = 90] = "MediaFeatureOrTokenType";
103103
EnumToken[EnumToken["PseudoPageTokenType"] = 91] = "PseudoPageTokenType";
104+
EnumToken[EnumToken["PseudoElementTokenType"] = 92] = "PseudoElementTokenType";
104105
/* aliases */
105106
EnumToken[EnumToken["Time"] = 25] = "Time";
106107
EnumToken[EnumToken["Iden"] = 7] = "Iden";

‎dist/lib/parser/parse.js‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -451,11 +451,11 @@ async function parseNode(results, context, stats, options, errors, src, map, raw
451451
const node = {
452452
typ: EnumToken.AtRuleNodeType,
453453
nam: renderToken(atRule, { removeComments: true }),
454-
tokens: t,
454+
// tokens: t,
455455
val: raw.join('')
456456
};
457457
Object.defineProperties(node, {
458-
tokens: { ...definedPropertySettings, enumerable: true, value: tokens.slice() },
458+
tokens: { ...definedPropertySettings, enumerable: false, value: tokens.slice() },
459459
raw: { ...definedPropertySettings, value: raw }
460460
});
461461
if (delim.typ == EnumToken.BlockStartTokenType) {
@@ -580,7 +580,7 @@ async function parseNode(results, context, stats, options, errors, src, map, raw
580580
};
581581
Object.defineProperty(node, 'tokens', {
582582
...definedPropertySettings,
583-
enumerable: true,
583+
enumerable: false,
584584
value: tokens.slice()
585585
});
586586
let raw = [...uniq.values()];
@@ -1053,10 +1053,16 @@ function getTokenType(val, hint) {
10531053
val: val.slice(0, -1),
10541054
chi: []
10551055
}
1056-
: {
1057-
typ: EnumToken.PseudoClassTokenType,
1056+
: (
1057+
// https://www.w3.org/TR/selectors-4/#single-colon-pseudos
1058+
val.startsWith('::') || [':before', ':after', ':first-line', ':first-letter'].includes(val) ? {
1059+
typ: EnumToken.PseudoElementTokenType,
10581060
val
1059-
};
1061+
} :
1062+
{
1063+
typ: EnumToken.PseudoClassTokenType,
1064+
val
1065+
});
10601066
}
10611067
if (isAtKeyword(val)) {
10621068
return {

‎dist/lib/renderer/render.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -589,8 +589,9 @@ function renderToken(token, options = {}, cache = Object.create(null), reducer,
589589
return '';
590590
}
591591
case EnumToken.PseudoClassTokenType:
592+
case EnumToken.PseudoElementTokenType:
592593
// https://www.w3.org/TR/selectors-4/#single-colon-pseudos
593-
if (token.typ == EnumToken.PseudoClassTokenType && ['::before', '::after', '::first-line', '::first-letter'].includes(token.val)) {
594+
if (token.typ == EnumToken.PseudoElementTokenType && ['::before', '::after', '::first-line', '::first-letter'].includes(token.val)) {
594595
return token.val.slice(1);
595596
}
596597
case EnumToken.UrlTokenTokenType:

‎dist/lib/validation/syntaxes/compound-selector.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ function validateCompoundSelector(tokens, root, options) {
8080
tokens.shift();
8181
consumeWhitespace(tokens);
8282
}
83-
while (tokens.length > 0 && tokens[0].typ == EnumToken.PseudoClassTokenType) {
84-
const isPseudoElement = tokens[0].val.startsWith('::');
83+
while (tokens.length > 0 && (tokens[0].typ == EnumToken.PseudoElementTokenType || tokens[0].typ == EnumToken.PseudoClassTokenType)) {
84+
const isPseudoElement = tokens[0].typ == EnumToken.PseudoElementTokenType;
8585
if (
8686
// https://developer.mozilla.org/en-US/docs/Web/CSS/WebKit_Extensions#pseudo-elements
8787
!(isPseudoElement && tokens[0].val.startsWith('::-webkit-')) &&

0 commit comments

Comments
 (0)