diff --git a/src/core/selector-type.js b/src/core/selector-type.js index fef24e5..a8a30a1 100644 --- a/src/core/selector-type.js +++ b/src/core/selector-type.js @@ -29,7 +29,8 @@ const Regex = { None : '', Invalid : '', Universal : /\*/, - Type : /^[A-Za-z]/, + TypeCategory : /^[A-Za-z]+/, + Type : /^[A-Za-z]+$/, TypeClass : /^[A-Za-z]+\.[A-Za-z]+$/, TypeId : /^[A-Za-z]+\#[A-Za-z]+$/, Class : /^\.[A-Za-z]+$/, @@ -48,16 +49,15 @@ const Regex = { * @return {SelectorType} type */ export default function getType(selector) { - console.log(selector, /^.[A-Za-z]+$/.test(selector)); - if (selector === '*') { return SelectorType.Universal; } - if (Regex.Type.test(selector)) { + if (Regex.TypeCategory.test(selector)) { return Regex.TypeClass.test(selector) ? SelectorType.TypeClass : Regex.TypeId.test(selector) ? SelectorType.TypeId : - SelectorType.Type; + Regex.Type.test(selector) ? SelectorType.Type : + SelectorType.Invalid; } return Regex.Class.test(selector) ? SelectorType.Class : diff --git a/test/get-type.js b/test/get-type.js index 5416678..c72b4a8 100644 --- a/test/get-type.js +++ b/test/get-type.js @@ -4,6 +4,10 @@ import getType, { SelectorType } from '../src/core/selector-type'; describe('getType(selector)', function() { describe('Selectors', () => { + it('Invalid selector (E E)', () => { + expect(getType('e e')).to.equal(SelectorType.Invalid); + }); + it('Type selector (E)', () => { expect(getType('div')).to.equal(SelectorType.Type); });