@master/eslint-plugin-css 2.0.0-rc.25 → 2.0.0-rc.26

package/dist/create-rule.d.ts

@@ -1,3 +1,3 @@
 import { ESLintUtils } from '@typescript-eslint/utils';
-declare const _default: <TOptions extends readonly unknown[], TMessageIds extends string>({ name, meta, ...rule }: Readonly<ESLintUtils.RuleWithMetaAndName<TOptions, TMessageIds>>) => ESLintUtils.RuleModule<TMessageIds, TOptions, ESLintUtils.RuleListener>;
+declare const _default: <Options extends readonly unknown[], MessageIds extends string>({ name, meta, ...rule }: Readonly<ESLintUtils.RuleWithMetaAndName<Options, MessageIds>>) => ESLintUtils.RuleModule<MessageIds, Options, ESLintUtils.RuleListener>;
 export default _default;

package/dist/functions/filter-collision-classes.cjs

@@ -0,0 +1,9 @@
+'use strict';
+
+var synckit = require('synckit');
+var filterCollisionClasses_worker = require('./filter-collision-classes.worker.cjs');
+var path = require('path');
+
+var filterCollisionClasses = process.env.NODE_ENV === 'test' ? filterCollisionClasses_worker : synckit.createSyncFn(path.join(__dirname, 'filter-collision-classes.worker.cjs'));
+
+module.exports = filterCollisionClasses;

package/dist/functions/filter-collision-classes.d.ts

@@ -0,0 +1,3 @@
+import runFilterCollisionClasses from './filter-collision-classes.worker';
+declare const _default: typeof runFilterCollisionClasses;
+export default _default;

package/dist/functions/filter-collision-classes.mjs

@@ -0,0 +1,11 @@
+import __url_for_shim from 'url';
+import __path_for_shim from 'path';
+const __filename = __url_for_shim.fileURLToPath(import.meta.url);
+const __dirname = __path_for_shim.dirname(__filename);
+import { createSyncFn } from 'synckit';
+import runFilterCollisionClasses from './filter-collision-classes.worker.mjs';
+import { join } from 'path';
+var filterCollisionClasses = process.env.NODE_ENV === 'test' ? runFilterCollisionClasses : createSyncFn(join(__dirname, 'filter-collision-classes.worker.cjs'));
+export {
+    filterCollisionClasses as default
+};

package/dist/functions/filter-collision-classes.worker.cjs

@@ -0,0 +1,35 @@
+'use strict';
+
+var synckit = require('synckit');
+var getCss = require('./get-css.cjs');
+var cssValidator = require('@master/css-validator');
+var css = require('@master/css');
+
+function runFilterCollisionClasses(classNames, config) {
+    const currentCSS = getCss(config);
+    const validRules = classNames.map((eachClassName)=>cssValidator.generateValidRules(eachClassName, {
+            css: currentCSS
+        })[0]).filter(Boolean);
+    const collisionClassesRecord = {};
+    for(let i = 0; i < classNames.length; i++){
+        const className = classNames[i];
+        const rule = validRules.find((eachValidRule)=>eachValidRule.className === className);
+        const collisionClasses = [];
+        if (rule) {
+            for(let j = 0; j < classNames.length; j++){
+                const compareClassName = classNames[j];
+                const compareRule = validRules.find((eachValidRule)=>eachValidRule.className === compareClassName);
+                if (i !== j && compareRule && css.areRulesDuplicated(rule, compareRule) && css.areRuleStatesEqual(rule, compareRule)) {
+                    collisionClasses.push(compareClassName);
+                }
+            }
+            if (collisionClasses.length > 0) {
+                collisionClassesRecord[className] = collisionClasses;
+            }
+        }
+    }
+    return collisionClassesRecord;
+}
+synckit.runAsWorker(runFilterCollisionClasses);
+
+module.exports = runFilterCollisionClasses;

package/dist/functions/filter-collision-classes.worker.d.ts

@@ -0,0 +1 @@
+export default function runFilterCollisionClasses(classNames: string[], config: string | object): Record<string, string[]>;

package/dist/functions/filter-collision-classes.worker.mjs

@@ -0,0 +1,33 @@
+import { runAsWorker } from 'synckit';
+import getCSS from './get-css.mjs';
+import { generateValidRules } from '@master/css-validator';
+import { areRulesDuplicated, areRuleStatesEqual } from '@master/css';
+
+function runFilterCollisionClasses(classNames, config) {
+    const currentCSS = getCSS(config);
+    const validRules = classNames.map((eachClassName)=>generateValidRules(eachClassName, {
+            css: currentCSS
+        })[0]).filter(Boolean);
+    const collisionClassesRecord = {};
+    for(let i = 0; i < classNames.length; i++){
+        const className = classNames[i];
+        const rule = validRules.find((eachValidRule)=>eachValidRule.className === className);
+        const collisionClasses = [];
+        if (rule) {
+            for(let j = 0; j < classNames.length; j++){
+                const compareClassName = classNames[j];
+                const compareRule = validRules.find((eachValidRule)=>eachValidRule.className === compareClassName);
+                if (i !== j && compareRule && areRulesDuplicated(rule, compareRule) && areRuleStatesEqual(rule, compareRule)) {
+                    collisionClasses.push(compareClassName);
+                }
+            }
+            if (collisionClasses.length > 0) {
+                collisionClassesRecord[className] = collisionClasses;
+            }
+        }
+    }
+    return collisionClassesRecord;
+}
+runAsWorker(runFilterCollisionClasses);
+
+export { runFilterCollisionClasses as default };

package/dist/rules/class-collision.cjs

@@ -1,12 +1,10 @@
 'use strict';
 
-var areDeclarationsEqual = require('../utils/are-declarations-equal.cjs');
-var areVendorPrefixSelectorsEqual = require('../utils/are-vendor-prefix-selectors-equal.cjs');
 var defineVisitors = require('../utils/define-visitors.cjs');
 var resolveContext = require('../utils/resolve-context.cjs');
 var findLoc = require('../utils/find-loc.cjs');
 var parseNodeRecursive = require('../utils/parse-node-recursive.cjs');
-var validRules = require('../functions/valid-rules.cjs');
+var filterCollisionClasses = require('../functions/filter-collision-classes.cjs');
 var createRule = require('../create-rule.cjs');
 
 var classCollision = createRule({
@@ -58,41 +56,28 @@ var classCollision = createRule({
                 const sourceCodeLines = sourceCode.lines;
                 const nodeStartLine = node.loc.start.line;
                 const nodeEndLine = node.loc.end.line;
-                const ruleOfClass = validRules(classNames, settings.config);
-                for(let i = 0; i < classNames.length; i++){
-                    const className = classNames[i];
-                    const rule = ruleOfClass[className];
-                    const conflicts = [];
-                    if (rule) {
-                        for(let j = 0; j < classNames.length; j++){
-                            const compareClassName = classNames[j];
-                            const compareRule = ruleOfClass[compareClassName];
-                            if (i !== j && compareRule && areDeclarationsEqual(rule.declarations, compareRule.declarations) && areVendorPrefixSelectorsEqual(rule.vendorPrefixSelectors, compareRule.vendorPrefixSelectors) && rule.stateToken === compareRule.stateToken) {
-                                conflicts.push(compareClassName);
-                            }
-                        }
+                const collisionClassesRecord = filterCollisionClasses(classNames, settings.config);
+                for(const className in collisionClassesRecord){
+                    const collisionClasses = collisionClassesRecord[className];
+                    const collisionClassNamesMsg = collisionClasses.map((x)=>`"${x}"`).join(' and ');
+                    let fixClassNames = originalClassNamesValue;
+                    for (const collisionClassName of collisionClasses){
+                        const regexSafe = collisionClassName.replace(/(\\|\.|\(|\)|\[|\]|\{|\}|\+|\*|\?|\^|\$|\||\/)/g, '\\$1');
+                        fixClassNames = fixClassNames.replace(new RegExp(`\\s+${regexSafe}|${regexSafe}\\s+`), '');
                     }
-                    if (conflicts.length > 0) {
-                        const conflictClassNamesMsg = conflicts.map((x)=>`"${x}"`).join(' and ');
-                        let fixClassNames = originalClassNamesValue;
-                        for (const conflictClassName of conflicts){
-                            const regexSafe = conflictClassName.replace(/(\\|\.|\(|\)|\[|\]|\{|\}|\+|\*|\?|\^|\$|\||\/)/g, '\\$1');
-                            fixClassNames = fixClassNames.replace(new RegExp(`\\s+${regexSafe}|${regexSafe}\\s+`), '');
+                    context.report({
+                        loc: findLoc(className, sourceCodeLines, nodeStartLine, nodeEndLine),
+                        messageId: 'collisionClass',
+                        data: {
+                            message: `"${className}" applies the same CSS declarations as ${collisionClassNamesMsg}.`
+                        },
+                        fix: function(fixer) {
+                            return fixer.replaceTextRange([
+                                start,
+                                end
+                            ], fixClassNames);
                         }
-                        context.report({
-                            loc: findLoc(className, sourceCodeLines, nodeStartLine, nodeEndLine),
-                            messageId: 'collisionClass',
-                            data: {
-                                message: `"${className}" applies the same CSS declarations as ${conflictClassNamesMsg}.`
-                            },
-                            fix: function(fixer) {
-                                return fixer.replaceTextRange([
-                                    start,
-                                    end
-                                ], fixClassNames);
-                            }
-                        });
-                    }
+                    });
                 }
             }, false, false, settings.ignoredKeys, context);
         };

package/dist/rules/class-collision.mjs

@@ -1,10 +1,8 @@
-import areDeclarationsEqual from '../utils/are-declarations-equal.mjs';
-import areVendorPrefixSelectorsEqual from '../utils/are-vendor-prefix-selectors-equal.mjs';
 import defineVisitors from '../utils/define-visitors.mjs';
 import resolveContext from '../utils/resolve-context.mjs';
 import findLoc from '../utils/find-loc.mjs';
 import { parseNodeRecursive } from '../utils/parse-node-recursive.mjs';
-import validRules from '../functions/valid-rules.mjs';
+import filterCollisionClasses from '../functions/filter-collision-classes.mjs';
 import createRule from '../create-rule.mjs';
 
 var classCollision = createRule({
@@ -56,41 +54,28 @@ var classCollision = createRule({
                 const sourceCodeLines = sourceCode.lines;
                 const nodeStartLine = node.loc.start.line;
                 const nodeEndLine = node.loc.end.line;
-                const ruleOfClass = validRules(classNames, settings.config);
-                for(let i = 0; i < classNames.length; i++){
-                    const className = classNames[i];
-                    const rule = ruleOfClass[className];
-                    const conflicts = [];
-                    if (rule) {
-                        for(let j = 0; j < classNames.length; j++){
-                            const compareClassName = classNames[j];
-                            const compareRule = ruleOfClass[compareClassName];
-                            if (i !== j && compareRule && areDeclarationsEqual(rule.declarations, compareRule.declarations) && areVendorPrefixSelectorsEqual(rule.vendorPrefixSelectors, compareRule.vendorPrefixSelectors) && rule.stateToken === compareRule.stateToken) {
-                                conflicts.push(compareClassName);
-                            }
-                        }
+                const collisionClassesRecord = filterCollisionClasses(classNames, settings.config);
+                for(const className in collisionClassesRecord){
+                    const collisionClasses = collisionClassesRecord[className];
+                    const collisionClassNamesMsg = collisionClasses.map((x)=>`"${x}"`).join(' and ');
+                    let fixClassNames = originalClassNamesValue;
+                    for (const collisionClassName of collisionClasses){
+                        const regexSafe = collisionClassName.replace(/(\\|\.|\(|\)|\[|\]|\{|\}|\+|\*|\?|\^|\$|\||\/)/g, '\\$1');
+                        fixClassNames = fixClassNames.replace(new RegExp(`\\s+${regexSafe}|${regexSafe}\\s+`), '');
                     }
-                    if (conflicts.length > 0) {
-                        const conflictClassNamesMsg = conflicts.map((x)=>`"${x}"`).join(' and ');
-                        let fixClassNames = originalClassNamesValue;
-                        for (const conflictClassName of conflicts){
-                            const regexSafe = conflictClassName.replace(/(\\|\.|\(|\)|\[|\]|\{|\}|\+|\*|\?|\^|\$|\||\/)/g, '\\$1');
-                            fixClassNames = fixClassNames.replace(new RegExp(`\\s+${regexSafe}|${regexSafe}\\s+`), '');
+                    context.report({
+                        loc: findLoc(className, sourceCodeLines, nodeStartLine, nodeEndLine),
+                        messageId: 'collisionClass',
+                        data: {
+                            message: `"${className}" applies the same CSS declarations as ${collisionClassNamesMsg}.`
+                        },
+                        fix: function(fixer) {
+                            return fixer.replaceTextRange([
+                                start,
+                                end
+                            ], fixClassNames);
                         }
-                        context.report({
-                            loc: findLoc(className, sourceCodeLines, nodeStartLine, nodeEndLine),
-                            messageId: 'collisionClass',
-                            data: {
-                                message: `"${className}" applies the same CSS declarations as ${conflictClassNamesMsg}.`
-                            },
-                            fix: function(fixer) {
-                                return fixer.replaceTextRange([
-                                    start,
-                                    end
-                                ], fixClassNames);
-                            }
-                        });
-                    }
+                    });
                 }
             }, false, false, settings.ignoredKeys, context);
         };

package/package.json

@@ -1 +1 @@
-{"name":"@master/eslint-plugin-css","type":"module","scripts":{"build":"techor build \"src/**/*.{js,ts}\"","dev":"pnpm build --watch","test":"jest","type-check":"tsc --noEmit","lint":"eslint src"},"keywords":["mastercss","eslint","eslintplugin"],"license":"MIT","description":"Master CSS ESLint Plugin","author":"Aoyue Design LLC.","funding":"https://css.master.co/docs/donate","homepage":"https://css.master.co","bugs":{"url":"https://github.com/master-co/css/issues"},"repository":{"type":"git","url":"https://github.com/master-co/css.git","directory":"packages/eslint-plugin"},"sideEffects":false,"main":"./dist/index.cjs","module":"./dist/index.mjs","jsnext:main":"./dist/index.mjs","esnext":"./dist/index.mjs","types":"./dist/index.d.ts","exports":{".":{"import":"./dist/index.mjs","require":"./dist/index.cjs","types":"./dist/index.d.ts"}},"files":["dist"],"publishConfig":{"access":"public","provenance":true},"dependencies":{"@master/css":"^2.0.0-rc.25","@master/css-validator":"^2.0.0-rc.25","@typescript-eslint/utils":"^7.0.2","explore-config":"^3.0.15","synckit":"^0.9.0","typescript-eslint":"^7.0.2"},"devDependencies":{"@angular-eslint/template-parser":"^16.3.1","@types/node":"^20.11.20","@typescript-eslint/rule-tester":"^7.0.2","eslint":"^8.57.0","eslint-plugin-markdown":"^3.0.1","eslint-plugin-mdx":"^2.3.4","svelte-eslint-parser":"^0.33.1","ts-node":"^10.9.2","vue-eslint-parser":"^9.4.2"},"version":"2.0.0-rc.25"}
+{"name":"@master/eslint-plugin-css","type":"module","scripts":{"build":"techor build \"src/**/*.{js,ts}\"","dev":"pnpm build --watch","test":"jest","type-check":"tsc --noEmit","lint":"eslint src"},"keywords":["mastercss","eslint","eslintplugin"],"license":"MIT","description":"Master CSS ESLint Plugin","author":"Aoyue Design LLC.","funding":"https://css.master.co/docs/donate","homepage":"https://css.master.co","bugs":{"url":"https://github.com/master-co/css/issues"},"repository":{"type":"git","url":"https://github.com/master-co/css.git","directory":"packages/eslint-plugin"},"sideEffects":false,"main":"./dist/index.cjs","module":"./dist/index.mjs","jsnext:main":"./dist/index.mjs","esnext":"./dist/index.mjs","types":"./dist/index.d.ts","exports":{".":{"import":"./dist/index.mjs","require":"./dist/index.cjs","types":"./dist/index.d.ts"}},"files":["dist"],"publishConfig":{"access":"public","provenance":true},"dependencies":{"@master/css":"^2.0.0-rc.26","@master/css-validator":"^2.0.0-rc.26","@typescript-eslint/utils":"^7.0.2","explore-config":"^3.0.15","synckit":"^0.9.0","typescript-eslint":"^7.0.2"},"devDependencies":{"@angular-eslint/template-parser":"^16.3.1","@types/node":"^20.11.20","@typescript-eslint/rule-tester":"^7.0.2","eslint":"^8.57.0","eslint-plugin-markdown":"^3.0.1","eslint-plugin-mdx":"^2.3.4","svelte-eslint-parser":"^0.33.1","ts-node":"^10.9.2","vue-eslint-parser":"^9.4.2"},"version":"2.0.0-rc.26"}

package/dist/functions/valid-rules.cjs

@@ -1,9 +0,0 @@
-'use strict';
-
-var synckit = require('synckit');
-var validRules_worker = require('./valid-rules.worker.cjs');
-var path = require('path');
-
-var validRules = process.env.NODE_ENV === 'test' ? validRules_worker : synckit.createSyncFn(path.join(__dirname, 'valid-rules.worker.cjs'));
-
-module.exports = validRules;

package/dist/functions/valid-rules.d.ts

@@ -1,3 +0,0 @@
-import runValidRules from './valid-rules.worker';
-declare const _default: typeof runValidRules;
-export default _default;

package/dist/functions/valid-rules.mjs

@@ -1,11 +0,0 @@
-import __url_for_shim from 'url';
-import __path_for_shim from 'path';
-const __filename = __url_for_shim.fileURLToPath(import.meta.url);
-const __dirname = __path_for_shim.dirname(__filename);
-import { createSyncFn } from 'synckit';
-import runValidRules from './valid-rules.worker.mjs';
-import { join } from 'path';
-var validRules = process.env.NODE_ENV === 'test' ? runValidRules : createSyncFn(join(__dirname, 'valid-rules.worker.cjs'));
-export {
-    validRules as default
-};

package/dist/functions/valid-rules.worker.cjs

@@ -1,24 +0,0 @@
-'use strict';
-
-var synckit = require('synckit');
-var getCss = require('./get-css.cjs');
-var cssValidator = require('@master/css-validator');
-
-function runValidRules(classNames, config) {
-    const currentCSS = getCss(config);
-    const ruleOfClass = {};
-    classNames.forEach((eachClassName)=>{
-        const validRule = cssValidator.generateValidRules(eachClassName, {
-            css: currentCSS
-        })[0];
-        if (validRule) ruleOfClass[eachClassName] = {
-            vendorPrefixSelectors: validRule?.vendorPrefixSelectors,
-            declarations: validRule?.declarations,
-            stateToken: validRule?.stateToken
-        };
-    });
-    return ruleOfClass;
-}
-synckit.runAsWorker(runValidRules);
-
-module.exports = runValidRules;

package/dist/functions/valid-rules.worker.d.ts

@@ -1,6 +0,0 @@
-import { Rule } from '@master/css';
-export default function runValidRules(classNames: string[], config: string | object): Record<string, {
-    declarations: Rule['declarations'];
-    stateToken: Rule['stateToken'];
-    vendorPrefixSelectors: Rule['vendorPrefixSelectors'];
-}>;

package/dist/functions/valid-rules.worker.mjs

@@ -1,22 +0,0 @@
-import { runAsWorker } from 'synckit';
-import getCSS from './get-css.mjs';
-import { generateValidRules } from '@master/css-validator';
-
-function runValidRules(classNames, config) {
-    const currentCSS = getCSS(config);
-    const ruleOfClass = {};
-    classNames.forEach((eachClassName)=>{
-        const validRule = generateValidRules(eachClassName, {
-            css: currentCSS
-        })[0];
-        if (validRule) ruleOfClass[eachClassName] = {
-            vendorPrefixSelectors: validRule?.vendorPrefixSelectors,
-            declarations: validRule?.declarations,
-            stateToken: validRule?.stateToken
-        };
-    });
-    return ruleOfClass;
-}
-runAsWorker(runValidRules);
-
-export { runValidRules as default };

package/dist/utils/are-declarations-equal.cjs

@@ -1,21 +0,0 @@
-'use strict';
-
-function areDeclarationsEqual(aDeclarations, bDeclarations) {
-    // 获取对象A和B的所有属性名
-    const aKeys = Object.keys(aDeclarations);
-    const bKeys = Object.keys(bDeclarations);
-    // 如果属性数量不相等，返回false
-    if (aKeys.length !== bKeys.length) {
-        return false;
-    }
-    // 检查对象A的属性是否都存在于对象B中
-    for (const key of aKeys){
-        if (!Object.prototype.hasOwnProperty.call(bDeclarations, key)) {
-            return false;
-        }
-    }
-    // 如果所有属性都匹配，返回true
-    return true;
-}
-
-module.exports = areDeclarationsEqual;

package/dist/utils/are-declarations-equal.d.ts

@@ -1 +0,0 @@
-export default function areDeclarationsEqual(aDeclarations: any, bDeclarations: any): boolean;

package/dist/utils/are-declarations-equal.mjs

@@ -1,19 +0,0 @@
-function areDeclarationsEqual(aDeclarations, bDeclarations) {
-    // 获取对象A和B的所有属性名
-    const aKeys = Object.keys(aDeclarations);
-    const bKeys = Object.keys(bDeclarations);
-    // 如果属性数量不相等，返回false
-    if (aKeys.length !== bKeys.length) {
-        return false;
-    }
-    // 检查对象A的属性是否都存在于对象B中
-    for (const key of aKeys){
-        if (!Object.prototype.hasOwnProperty.call(bDeclarations, key)) {
-            return false;
-        }
-    }
-    // 如果所有属性都匹配，返回true
-    return true;
-}
-
-export { areDeclarationsEqual as default };

package/dist/utils/are-vendor-prefix-selectors-equal.cjs

@@ -1,14 +0,0 @@
-'use strict';
-
-function areVendorPrefixSelectorsEqual(aVendorPrefixSelectors, bVendorPrefixSelectors) {
-    const aKeys = Object.keys(aVendorPrefixSelectors);
-    if (aKeys.length !== Object.keys(bVendorPrefixSelectors).length) return false;
-    return aKeys.every((eachAKey)=>{
-        if (!Object.prototype.hasOwnProperty.call(bVendorPrefixSelectors, eachAKey)) return false;
-        const aValues = aVendorPrefixSelectors[eachAKey];
-        const bValues = bVendorPrefixSelectors[eachAKey];
-        return aValues.length === bValues.length && aValues.every((eachAValue)=>bValues.includes(eachAValue));
-    });
-}
-
-module.exports = areVendorPrefixSelectorsEqual;

package/dist/utils/are-vendor-prefix-selectors-equal.d.ts

@@ -1 +0,0 @@
-export default function areVendorPrefixSelectorsEqual(aVendorPrefixSelectors: any, bVendorPrefixSelectors: any): boolean;

package/dist/utils/are-vendor-prefix-selectors-equal.mjs

@@ -1,12 +0,0 @@
-function areVendorPrefixSelectorsEqual(aVendorPrefixSelectors, bVendorPrefixSelectors) {
-    const aKeys = Object.keys(aVendorPrefixSelectors);
-    if (aKeys.length !== Object.keys(bVendorPrefixSelectors).length) return false;
-    return aKeys.every((eachAKey)=>{
-        if (!Object.prototype.hasOwnProperty.call(bVendorPrefixSelectors, eachAKey)) return false;
-        const aValues = aVendorPrefixSelectors[eachAKey];
-        const bValues = bVendorPrefixSelectors[eachAKey];
-        return aValues.length === bValues.length && aValues.every((eachAValue)=>bValues.includes(eachAValue));
-    });
-}
-
-export { areVendorPrefixSelectorsEqual as default };