stylelint-gamut 1.1.5 → 1.2.1

package/README.md

@@ -4,7 +4,7 @@
 
 **stylelint-gamut** is a [Stylelint] plugin that helps you to work with different color spaces. 
 
-Right now it's working with **node version ≥ 16.0.0**.
+Right now it's working with **node version ≥ 16.0.0** and **Stylelint version ≥ 14.0.0**.
 
 # Installation
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "stylelint-gamut",
-  "version": "1.1.5",
+  "version": "1.2.1",
   "description": "Stylelint plugin for working with different color spaces",
   "main": "src/index.js",
   "scripts": {
@@ -33,7 +33,7 @@
   },
   "homepage": "https://github.com/fpetrakov/stylelint-gamut#readme",
   "peerDependencies": {
-    "stylelint": ">=14.10.0"
+    "stylelint": "^14.0.0"
   },
   "devDependencies": {
     "eslint": "^8.22.0",

package/src/index.js

@@ -1,10 +1,8 @@
 'use strict'
 
-const valueParser = require('postcss-value-parser')
 const stylelint = require('stylelint')
 const Color = require('colorjs.io').default
 const isStandardSyntaxProperty = require('./utils/isStandardSyntaxProperty')
-const isCustomProperty = require('./utils/isCustomProperty')
 const isAtRule = require('./utils/isAtRule')
 const declarationValueIndex = require('./utils/declarationValueIndex')
 
@@ -29,45 +27,51 @@ const ruleFunction = (primary) => {
       return
     }
 
+    const customProperties = {}
+
     root.walkDecls((decl) => {
       if (!isStandardSyntaxProperty(decl.prop)) return
 
-      if (isCustomProperty(decl.prop)) return
-
-      if (decl.value.includes('lch(') || decl.value.includes('lab(')) {
-        const colors = decl.value.match(/(oklch|oklab|lab|lch)\([^)]+\)/g)
-        if (colors) {
-          for (const color of colors) {
-            checkColor(color)
-          }
+      const values = decl.value.match(/(oklch|oklab|lab|lch|var)\([^)]+\)/g)
+      if (values) {
+        for (const value of values) {
+          check(value)
         }
       }
 
-      function checkColor (color) {
-        const parsedValue = valueParser(color)
+      function check (value) {
+        let customPropValue
+        if (value.startsWith('var(--')) {
+          const varName = value.slice(4, -1)
 
-        parsedValue.walk((node, _index, nodes) => {
-          if (node.type !== 'function') return
+          if (customProperties[varName] && !customProperties[varName].inQuery) {
+            customPropValue = customProperties[varName].value
+          } else {
+            return
+          }
+        }
+
+        const isInSrgbGamut = new Color(customPropValue || value).inGamut('srgb')
 
-          const isInSrgbGamut = new Color(valueParser.stringify(nodes)).inGamut(
-            'srgb'
-          )
+        if (isInSrgbGamut) return
 
-          if (isInSrgbGamut) return
+        if (isInColorGamutP3MediaQuery(decl)) return
 
-          if (isInColorGamutP3MediaQuery(decl)) return
+        if (decl.prop && decl.prop.startsWith('--')) {
+          customProperties[decl.prop] = { value: decl.value.trim(), inQuery: false }
+          return
+        }
 
-          const index = declarationValueIndex(decl) + node.sourceIndex
-          const endIndex = index + decl.value.length
+        const index = declarationValueIndex(decl)
+        const endIndex = index + decl.value.length
 
-          stylelint.utils.report({
-            message: messages.rejected(color),
-            node: decl,
-            index,
-            endIndex,
-            result,
-            ruleName
-          })
+        stylelint.utils.report({
+          message: messages.rejected(value),
+          node: decl,
+          index,
+          endIndex,
+          result,
+          ruleName
         })
       }
     })

package/src/utils/isCustomProperty.js

@@ -1,10 +0,0 @@
-'use strict'
-
-/**
- * Check whether a property is a custom one
- * @param {string} property
- * @returns {boolean}
- */
-module.exports = function isCustomProperty (property) {
-  return property.startsWith('--')
-}