Minor refactoring

Author: cdoublev

__tests__/definition.js

@@ -104,13 +104,13 @@ const c = keyword('c')
 const colon = token(':')
 const comma = token(',')
 const number = type('<number>')
+const plus = token('+')
 
 describe('symbols', () => {
     it("parses and serializes '+' (delimiter)", () => {
         const input = "'+'"
-        const parsed = token('+')
-        expect(parse("'+'")).toEqual(parsed)
-        expect(serialize(parsed)).toBe(input)
+        expect(parse("'+'")).toEqual(plus)
+        expect(serialize(plus)).toBe(input)
     })
     it('parses and serializes a (keyword)', () => {
         const input = 'a'
@@ -366,10 +366,17 @@ describe('multipliers', () => {
         expect(parse(input)).toEqual(parsed)
         expect(serialize(parsed)).toBe(input)
     })
-    it("parses and serializes ','?'", () => {
+    it("parses and serializes ,?", () => {
+        const input = ',?'
         const parsed = optional(comma)
+        expect(parse(input)).toEqual(parsed)
         expect(parse("','?")).toEqual(parsed)
-        expect(serialize(parsed)).toBe(',?')
+        expect(serialize(parsed)).toBe(input)
+    })
+    it("parses and serializes '+'?'", () => {
+        const parsed = optional(plus)
+        expect(parse("'+'?")).toEqual(parsed)
+        expect(serialize(parsed)).toBe("'+'?")
     })
     it('parses and serializes <number>?', () => {
         const input = '<number>?'
@@ -538,7 +545,7 @@ describe('context rules', () => {
         expect(parse("[['+' | '-'] <calc-product>]*", production)).toEqual(
             repeat(
                 sequence(
-                    alternation(token('+'), token('-')),
+                    alternation(plus, token('-')),
                     type('<calc-product>')),
                 0,
                 31))

lib/parse/definition.js

@@ -254,7 +254,7 @@ function consumeSymbol(chars, production) {
         case '/':
         case ':':
         case ';':
-            return { type: 'token', value: char }
+            return consumeMultiplier(chars, { type: 'token', value: char })
         default:
             return consumeIdentifier(chars, production)
     }

lib/parse/postprocess.js

@@ -1421,7 +1421,7 @@ function postParseSymbols(symbols, node) {
  * the CSS value definition syntax.
  */
 function postParseSyntax(syntax, node, parser) {
-    const definition = parseSyntax(syntax.value, parser, node.context)
+    const definition = parseSyntax(syntax.value, parser)
     return definition ? { ...syntax, definition } : error(node)
 }
 

lib/parse/tokenize.js

@@ -389,8 +389,7 @@ function consumeString(chars) {
  * @returns {object}
  * @see {@link https://drafts.csswg.org/css-syntax-3/#consume-url-token}
  */
-function consumeUrl(chars, identifier) {
-    const start = identifier.start
+function consumeUrl(chars, { start }) {
     let value = ''
     chars.consumeRunOf(isWhitespace)
     for (const char of chars) {
@@ -403,8 +402,7 @@ function consumeUrl(chars, identifier) {
                 return { end: chars.index + 1, start, types: ['<url-token>'], value }
             }
             if (chars.atEnd()) {
-                error({ message: 'Unclosed url' })
-                return { end: chars.index + 1, start, types: ['<url-token>'], value }
+                break
             }
             consumeBadUrl(chars)
             return { end: chars.index + 1, start, types: ['<bad-url-token>'], value: '' }