Minor things

Author: cdoublev

lib/parse/arbitrary.js

@@ -3,11 +3,9 @@ const { isBlock, isComma, isDelimiter, isWhitespace } = require('../utils/value.
 const { getFunction, getRule, isProducedBy } = require('../utils/context.js')
 const { list, omitted } = require('../values/value.js')
 const Stream = require('./stream.js')
-const blocks = require('../values/blocks.js')
+const { closingTokens } = require('../values/blocks.js')
 const createError = require('../error.js')
 
-const closingTokens = Object.values(blocks.associatedTokens)
-
 /**
  * @param {object} node
  * @returns {SyntaxError}

lib/parse/definition.js

@@ -1,17 +1,15 @@
 
+const { associatedTokens, closingTokens } = require('../values/blocks.js')
 const { isDigit, isIdentifierCharacter, startsWithIdentifier } = require('./tokenize.js')
 const Stream = require('./stream.js')
 const arbitrary = require('./arbitrary.js')
-const blocks = require('../values/blocks.js')
 const { canonicalize } = require('../values/dimensions.js')
 const error = require('../error.js')
 const forgiving = require('../values/forgiving.js')
 const { isMultipliableWith } = require('../utils/definition.js')
 const nonTerminals = require('../values/definitions.js')
 const properties = require('../properties/definitions.js')
 
-const closingTokens = Object.values(blocks.associatedTokens)
-
 /**
  * @see {@link https://drafts.csswg.org/css-values-4/#calc-syntax}
  */
@@ -67,7 +65,7 @@ function consumeRangeBoundary(chars, infinity) {
  * @returns {object}
  */
 function consumeRange(chars, infinity = Infinity) {
-    const closingToken = blocks.associatedTokens[chars.current]
+    const closingToken = associatedTokens[chars.current]
     const bounds = []
     for (const char of chars) {
         switch (char) {
@@ -284,7 +282,7 @@ function consumeSymbolUnit(chars, production) {
         case '(':
         case '{': {
             const value = consumeDefinition(chars, production)
-            chars.consume(blocks.associatedTokens[char], Error)
+            chars.consume(associatedTokens[char], Error)
             return { associatedToken: char, type: 'block', value }
         }
         case '[': {

lib/parse/parser.js

@@ -1,4 +1,5 @@
 
+const { associatedTokens, closingTokens } = require('../values/blocks.js')
 const {
     isBlock,
     isCloseCurlyBrace,
@@ -14,7 +15,6 @@ const {
 } = require('../utils/value.js')
 const { type: contextType, getRoot, getRule, isContext } = require('../utils/context.js')
 const Stream = require('./stream.js')
-const blocks = require('../values/blocks.js')
 const compatibility = require('../compatibility.js')
 const error = require('../error.js')
 const expandShorthandDeclaration = require('./shorthand.js')
@@ -26,8 +26,6 @@ const root = require('../rules/definitions.js')
 const shorthands = require('../properties/shorthands.js')
 const substitutions = require('../values/substitutions.js')
 
-const closingTokens = Object.values(blocks.associatedTokens)
-
 const EXTRA_COMPONENT_VALUE_ERROR = {
     message: 'Cannot parse more than a single component value',
 }
@@ -405,7 +403,7 @@ function consumeFunction(tokens, { start, value: name }) {
  * It deviates from the specification by trimming whitespaces.
  */
 function consumeBlock(tokens, { start, value: associatedToken }) {
-    const closingToken = blocks.associatedTokens[associatedToken]
+    const closingToken = associatedTokens[associatedToken]
     const value = consumeComponentValueList(tokens, [closingToken])
     if (!tokens.consume(isDelimiter(closingToken))) {
         error({ message: 'Unclosed block' })
@@ -420,7 +418,7 @@ function consumeBlock(tokens, { start, value: associatedToken }) {
  */
 function consumeComponentValue(tokens) {
     const current = tokens.consume()
-    if (blocks.associatedTokens[current.value]) {
+    if (associatedTokens[current.value]) {
         return consumeBlock(tokens, current)
     }
     if (current.types[0] === '<function-token>') {

lib/serialize.js

@@ -7,8 +7,8 @@ const { hslToRgb, hwbToRgb } = require('./utils/color.js')
 const { isBlock, isCalculationOperator, isComma, isList, isNumeric, isOmitted } = require('./utils/value.js')
 const { isDigit, isIdentifierCharacter, isNonASCIIIdentifierCharacter } = require('./parse/tokenize.js')
 const { list, map, string } = require('./values/value.js')
+const { associatedTokens } = require('./values/blocks.js')
 const { auto } = require('./values/defaults.js')
-const blocks = require('./values/blocks.js')
 const { keywords: cssWideKeywords } = require('./values/substitutions.js')
 const display = require('./values/display.js')
 const logical = require('./properties/logical.js')
@@ -168,7 +168,7 @@ function serializeBlock({ associatedToken, value }) {
     if (value && associatedToken === '{') {
         value = ` ${value} `
     }
-    return `${associatedToken}${value}${blocks.associatedTokens[associatedToken]}`
+    return `${associatedToken}${value}${associatedTokens[associatedToken]}`
 }
 
 /**
@@ -705,7 +705,7 @@ function serializeDefinition(definition, parentPrecedence = 0) {
         if (associatedToken === '[') {
             return `'['${serializeDefinition(value)}']'`
         }
-        return `${associatedToken}${serializeDefinition(value)}${blocks.associatedTokens[associatedToken]}`
+        return `${associatedToken}${serializeDefinition(value)}${associatedTokens[associatedToken]}`
     }
     if (type === 'function') {
         if (name) {

lib/values/blocks.js

@@ -5,4 +5,8 @@ const associatedTokens = {
     '{': '}',
 }
 
-module.exports = { associatedTokens }
+module.exports = {
+    associatedTokens,
+    closingTokens: Object.values(associatedTokens),
+    openingTokens: Object.keys(associatedTokens),
+}