Skip to content

Commit d222dfd

Browse files
mdevilsmdevils
committed
fix: identifier parsing for ids, classes, pseudo-classes and pseudo-elements
1 parent de9a3ed commit d222dfd

File tree

3 files changed

+45
-18
lines changed

3 files changed

+45
-18
lines changed

‎src/parser.ts

+31-13
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,10 @@ export function createParser(
264264
return result;
265265
}
266266

267-
function parseIdentifier(): string {
267+
function parseIdentifier(): string | null {
268+
if (!isIdentStart(chr)) {
269+
return null;
270+
}
268271
let result = '';
269272
while (pos < l) {
270273
if (isIdent(chr)) {
@@ -334,23 +337,28 @@ export function createParser(
334337
if (is('|')) {
335338
assert(namespaceEnabled, 'Namespaces are not enabled.');
336339
next();
340+
const name = parseIdentifier();
341+
assert(name, 'Expected attribute name.');
337342
attr = {
338343
type: 'Attribute',
339-
name: parseIdentifier(),
344+
name: name,
340345
namespace: {type: 'NoNamespace'}
341346
};
342347
} else if (is('*')) {
343348
assert(namespaceEnabled, 'Namespaces are not enabled.');
344349
assert(namespaceWildcardEnabled, 'Wildcard namespace is not enabled.');
345350
next();
346351
pass('|');
352+
const name = parseIdentifier();
353+
assert(name, 'Expected attribute name.');
347354
attr = {
348355
type: 'Attribute',
349-
name: parseIdentifier(),
356+
name,
350357
namespace: {type: 'WildcardNamespace'}
351358
};
352359
} else {
353360
const identifier = parseIdentifier();
361+
assert(identifier, 'Expected attribute name.');
354362
attr = {
355363
type: 'Attribute',
356364
name: identifier
@@ -360,9 +368,11 @@ export function createParser(
360368
next();
361369
if (isIdentStart(chr)) {
362370
assert(namespaceEnabled, 'Namespaces are not enabled.');
371+
const name = parseIdentifier();
372+
assert(name, 'Expected attribute name.');
363373
attr = {
364374
type: 'Attribute',
365-
name: parseIdentifier(),
375+
name,
366376
namespace: {type: 'NamespaceName', name: identifier}
367377
};
368378
} else {
@@ -389,25 +399,28 @@ export function createParser(
389399
};
390400
} else if (substitutesEnabled && is('$')) {
391401
next();
402+
const name = parseIdentifier();
403+
assert(name, 'Expected substitute name.');
392404
attr.value = {
393405
type: 'Substitution',
394-
name: parseIdentifier()
406+
name
395407
};
396-
assert(attr.value.name, 'Expected substitute name.');
397408
} else {
409+
const value = parseIdentifier();
410+
assert(value, 'Expected attribute value.');
398411
attr.value = {
399412
type: 'String',
400-
value: parseIdentifier()
413+
value
401414
};
402-
assert(attr.value.value, 'Expected attribute value.');
403415
}
404416
skipWhitespace();
405417
if (isEof() && !strict) {
406418
return attr;
407419
}
408420
if (!is(']')) {
409-
attr.caseSensitivityModifier = parseIdentifier();
410-
assert(attr.caseSensitivityModifier, 'Expected end of attribute selector.');
421+
const caseSensitivityModifier = parseIdentifier();
422+
assert(caseSensitivityModifier, 'Expected end of attribute selector.');
423+
attr.caseSensitivityModifier = caseSensitivityModifier;
411424
assert(
412425
attributesCaseSensitivityModifiersEnabled,
413426
'Attribute case sensitivity modifiers are not enabled.'
@@ -505,11 +518,12 @@ export function createParser(
505518
skipWhitespace();
506519
if (substitutesEnabled && is('$')) {
507520
next();
521+
const name = parseIdentifier();
522+
assert(name, 'Expected substitute name.');
508523
argument = {
509524
type: 'Substitution',
510-
name: parseIdentifier()
525+
name
511526
};
512-
assert(argument.name, 'Expected substitute name.');
513527
} else if (signature.type === 'String') {
514528
argument = {
515529
type: 'String',
@@ -560,9 +574,11 @@ export function createParser(
560574
return {type: 'WildcardTag'};
561575
} else if (isIdentStart(chr)) {
562576
assert(tagNameEnabled, 'Tag names are not enabled.');
577+
const name = parseIdentifier();
578+
assert(name, 'Expected tag name.');
563579
return {
564580
type: 'TagName',
565-
name: parseIdentifier()
581+
name
566582
};
567583
} else {
568584
return fail('Expected tag name.');
@@ -595,6 +611,7 @@ export function createParser(
595611
return tagName;
596612
} else if (isIdentStart(chr)) {
597613
const identifier = parseIdentifier();
614+
assert(identifier, 'Expected tag name.');
598615
if (!is('|')) {
599616
assert(tagNameEnabled, 'Tag names are not enabled.');
600617
return {
@@ -677,6 +694,7 @@ export function createParser(
677694

678695
assert(isDoubleColon || pseudoName, 'Expected pseudo-class name.');
679696
assert(!isDoubleColon || pseudoName, 'Expected pseudo-element name.');
697+
assert(pseudoName, 'Expected pseudo-class name.');
680698
assert(
681699
!isDoubleColon ||
682700
pseudoElementsAcceptUnknown ||

‎test/parser.test.ts

+13-4
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,7 @@ describe('parse()', () => {
275275
});
276276
it('should fail on empty class name', () => {
277277
expect(() => parse('.')).toThrow('Expected class name.');
278+
expect(() => parse('.1')).toThrow('Expected class name.');
278279
});
279280
it('should fail if not enabled', () => {
280281
expect(() => createParser({syntax: {}})('.class')).toThrow('Class names are not enabled.');
@@ -387,6 +388,7 @@ describe('parse()', () => {
387388
});
388389
it('should fail on empty ID name', () => {
389390
expect(() => parse('#')).toThrow('Expected ID name.');
391+
expect(() => parse('#1')).toThrow('Expected ID name.');
390392
});
391393
it('should fail if not enabled', () => {
392394
expect(() => createParser({syntax: {}})('#id')).toThrow('IDs are not enabled.');
@@ -548,7 +550,12 @@ describe('parse()', () => {
548550
);
549551
});
550552
it('should fail if attribute name is empty', () => {
551-
expect(() => parse('[=1]')).toThrow('Expected attribute name.');
553+
expect(() => parse('[=a1]')).toThrow('Expected attribute name.');
554+
expect(() => parse('[1=a1]')).toThrow('Expected attribute name.');
555+
});
556+
it('should fail if attribute value is empty', () => {
557+
expect(() => parse('[a=]')).toThrow('Expected attribute value.');
558+
expect(() => parse('[a=1]')).toThrow('Expected attribute value.');
552559
});
553560
it('should fail if substitutions are not enabled', () => {
554561
expect(() => parse('[attr=$value]')).toThrow('Expected attribute value.');
@@ -834,7 +841,7 @@ describe('parse()', () => {
834841
operators: ['=']
835842
}
836843
}
837-
})('[attr=1 i]')
844+
})('[attr=a1 i]')
838845
).toThrow('Attribute case sensitivity modifiers are not enabled.');
839846
});
840847
it('should fail if case sensitivity modifiers is specified without a comparison operator', () => {
@@ -857,7 +864,7 @@ describe('parse()', () => {
857864
unknownCaseSensitivityModifiers: 'accept'
858865
}
859866
}
860-
})('[attr=1 i]')
867+
})('[attr=a1 i]')
861868
).toEqual(
862869
ast.selector({
863870
rules: [
@@ -866,7 +873,7 @@ describe('parse()', () => {
866873
ast.attribute({
867874
name: 'attr',
868875
operator: '=',
869-
value: ast.string({value: '1'}),
876+
value: ast.string({value: 'a1'}),
870877
caseSensitivityModifier: 'i'
871878
})
872879
]
@@ -1205,6 +1212,7 @@ describe('parse()', () => {
12051212
});
12061213
it('should fail if name is empty', () => {
12071214
expect(() => parse(':')).toThrow('Expected pseudo-class name.');
1215+
expect(() => parse(':1')).toThrow('Expected pseudo-class name.');
12081216
});
12091217
it('should fail if argument was not specified', () => {
12101218
expect(() => parse(':lang')).toThrow('Argument is required for pseudo-class "lang".');
@@ -1388,6 +1396,7 @@ describe('parse()', () => {
13881396
});
13891397
it('should fail on empty pseudo-element name', () => {
13901398
expect(() => parse('::')).toThrow('Expected pseudo-element name.');
1399+
expect(() => parse('::1')).toThrow('Expected pseudo-element name.');
13911400
});
13921401
it('should fail on unknown pseudo elements', () => {
13931402
expect(() => createParser({syntax: {pseudoElements: {}}})('::before')).toThrow(

‎test/render.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ const testCases = {
8383
'.\\20wow': '.\\20 wow',
8484
'tag\\n\\\\name\\.\\[': 'tagn\\\\name\\.\\[',
8585
'.cls\\n\\\\name\\.\\[': '.clsn\\\\name\\.\\[',
86-
'[attr\\n\\\\name\\.\\[=1]': '[attrn\\\\name\\.\\[="1"]',
86+
'[attr\\n\\\\name\\.\\[=a1]': '[attrn\\\\name\\.\\[="a1"]',
8787
':pseudo\\n\\\\name\\.\\[\\((123)': ':pseudon\\\\name\\.\\[\\((\\31 23)',
8888
'[attr="val\nval"]': '[attr="val\\nval"]',
8989
'[attr="val\\"val"]': '[attr="val\\"val"]',

0 commit comments

Comments
 (0)