@master/eslint-plugin-css 2.0.0-rc.28 → 2.0.0-rc.29

package/dist/index.d.ts

@@ -42,9 +42,11 @@ declare const _default: {
         };
     };
     settings: {
-        calleeMatching: string;
-        classMatching: string;
+        classAttributes: string[];
+        classFunctions: string[];
+        classDeclarations: string[];
         ignoredKeys: string[];
+        /** @type {import('typescript-eslint').Config} */
         config: string;
     };
     meta: {

package/dist/rules/class-collision.cjs

@@ -6,6 +6,7 @@ var findLoc = require('../utils/find-loc.cjs');
 var parseNodeRecursive = require('../utils/parse-node-recursive.cjs');
 var filterCollisionClasses = require('../functions/filter-collision-classes.cjs');
 var createRule = require('../create-rule.cjs');
+var settingsSchema = require('../settings-schema.cjs');
 
 var classCollision = createRule({
     name: 'class-collision-detection',
@@ -20,31 +21,7 @@ var classCollision = createRule({
         },
         fixable: 'code',
         schema: [
-            {
-                type: 'object',
-                properties: {
-                    calleeMatching: {
-                        type: 'string'
-                    },
-                    classMatching: {
-                        type: 'string'
-                    },
-                    ignoredKeys: {
-                        type: 'array',
-                        items: {
-                            type: 'string',
-                            minLength: 0
-                        },
-                        uniqueItems: true
-                    },
-                    config: {
-                        type: [
-                            'string',
-                            'object'
-                        ]
-                    }
-                }
-            }
+            settingsSchema
         ]
     },
     defaultOptions: [],
@@ -83,8 +60,7 @@ var classCollision = createRule({
         };
         return defineVisitors({
             context,
-            settings,
-            options
+            settings
         }, visitNode);
     }
 });

package/dist/rules/class-collision.mjs

@@ -4,6 +4,7 @@ import findLoc from '../utils/find-loc.mjs';
 import { parseNodeRecursive } from '../utils/parse-node-recursive.mjs';
 import filterCollisionClasses from '../functions/filter-collision-classes.mjs';
 import createRule from '../create-rule.mjs';
+import settingsSchema from '../settings-schema.mjs';
 
 var classCollision = createRule({
     name: 'class-collision-detection',
@@ -18,31 +19,7 @@ var classCollision = createRule({
         },
         fixable: 'code',
         schema: [
-            {
-                type: 'object',
-                properties: {
-                    calleeMatching: {
-                        type: 'string'
-                    },
-                    classMatching: {
-                        type: 'string'
-                    },
-                    ignoredKeys: {
-                        type: 'array',
-                        items: {
-                            type: 'string',
-                            minLength: 0
-                        },
-                        uniqueItems: true
-                    },
-                    config: {
-                        type: [
-                            'string',
-                            'object'
-                        ]
-                    }
-                }
-            }
+            settingsSchema
         ]
     },
     defaultOptions: [],
@@ -81,8 +58,7 @@ var classCollision = createRule({
         };
         return defineVisitors({
             context,
-            settings,
-            options
+            settings
         }, visitNode);
     }
 });

package/dist/rules/class-order.cjs

@@ -11,6 +11,7 @@ var extractClassnamesFromValue = require('../utils/extract-classnames-from-value
 var findLoc = require('../utils/find-loc.cjs');
 var reorderValidClasses = require('../functions/reorder-valid-classes.cjs');
 var createRule = require('../create-rule.cjs');
+var settingsSchema = require('../settings-schema.cjs');
 
 var classOrder = createRule({
     name: 'consistent-class-order',
@@ -25,31 +26,7 @@ var classOrder = createRule({
             invalidClassOrder: 'No consistent class order followed.'
         },
         schema: [
-            {
-                type: 'object',
-                properties: {
-                    calleeMatching: {
-                        type: 'string'
-                    },
-                    classMatching: {
-                        type: 'string'
-                    },
-                    ignoredKeys: {
-                        type: 'array',
-                        items: {
-                            type: 'string',
-                            minLength: 0
-                        },
-                        uniqueItems: true
-                    },
-                    config: {
-                        type: [
-                            'string',
-                            'object'
-                        ]
-                    }
-                }
-            }
+            settingsSchema
         ]
     },
     defaultOptions: [],
@@ -189,8 +166,7 @@ var classOrder = createRule({
         };
         return defineVisitors({
             context,
-            settings,
-            options
+            settings
         }, visitNode);
     }
 });

package/dist/rules/class-order.mjs

@@ -9,6 +9,7 @@ import extractClassnamesFromValue from '../utils/extract-classnames-from-value.m
 import findLoc from '../utils/find-loc.mjs';
 import reorderValidClasses from '../functions/reorder-valid-classes.mjs';
 import createRule from '../create-rule.mjs';
+import settingsSchema from '../settings-schema.mjs';
 
 var classOrder = createRule({
     name: 'consistent-class-order',
@@ -23,31 +24,7 @@ var classOrder = createRule({
             invalidClassOrder: 'No consistent class order followed.'
         },
         schema: [
-            {
-                type: 'object',
-                properties: {
-                    calleeMatching: {
-                        type: 'string'
-                    },
-                    classMatching: {
-                        type: 'string'
-                    },
-                    ignoredKeys: {
-                        type: 'array',
-                        items: {
-                            type: 'string',
-                            minLength: 0
-                        },
-                        uniqueItems: true
-                    },
-                    config: {
-                        type: [
-                            'string',
-                            'object'
-                        ]
-                    }
-                }
-            }
+            settingsSchema
         ]
     },
     defaultOptions: [],
@@ -187,8 +164,7 @@ var classOrder = createRule({
         };
         return defineVisitors({
             context,
-            settings,
-            options
+            settings
         }, visitNode);
     }
 });

package/dist/rules/class-validation.cjs

@@ -6,6 +6,7 @@ var findLoc = require('../utils/find-loc.cjs');
 var parseNodeRecursive = require('../utils/parse-node-recursive.cjs');
 var validate = require('../functions/validate.cjs');
 var createRule = require('../create-rule.cjs');
+var settingsSchema = require('../settings-schema.cjs');
 
 var classValidation = createRule({
     name: 'syntax-error-checks',
@@ -21,31 +22,7 @@ var classValidation = createRule({
         },
         fixable: null,
         schema: [
-            {
-                type: 'object',
-                properties: {
-                    calleeMatching: {
-                        type: 'string'
-                    },
-                    classMatching: {
-                        type: 'string'
-                    },
-                    ignoredKeys: {
-                        type: 'array',
-                        items: {
-                            type: 'string',
-                            minLength: 0
-                        },
-                        uniqueItems: true
-                    },
-                    config: {
-                        type: [
-                            'string',
-                            'object'
-                        ]
-                    }
-                }
-            }
+            settingsSchema
         ]
     },
     defaultOptions: [],
@@ -85,8 +62,7 @@ var classValidation = createRule({
         };
         return defineVisitors({
             context,
-            settings,
-            options
+            settings
         }, visitNode);
     }
 });

package/dist/rules/class-validation.mjs

@@ -4,6 +4,7 @@ import findLoc from '../utils/find-loc.mjs';
 import { parseNodeRecursive } from '../utils/parse-node-recursive.mjs';
 import validate from '../functions/validate.mjs';
 import createRule from '../create-rule.mjs';
+import settingsSchema from '../settings-schema.mjs';
 
 var classValidation = createRule({
     name: 'syntax-error-checks',
@@ -19,31 +20,7 @@ var classValidation = createRule({
         },
         fixable: null,
         schema: [
-            {
-                type: 'object',
-                properties: {
-                    calleeMatching: {
-                        type: 'string'
-                    },
-                    classMatching: {
-                        type: 'string'
-                    },
-                    ignoredKeys: {
-                        type: 'array',
-                        items: {
-                            type: 'string',
-                            minLength: 0
-                        },
-                        uniqueItems: true
-                    },
-                    config: {
-                        type: [
-                            'string',
-                            'object'
-                        ]
-                    }
-                }
-            }
+            settingsSchema
         ]
     },
     defaultOptions: [],
@@ -83,8 +60,7 @@ var classValidation = createRule({
         };
         return defineVisitors({
             context,
-            settings,
-            options
+            settings
         }, visitNode);
     }
 });

package/dist/settings-schema.cjs

@@ -0,0 +1,35 @@
+'use strict';
+
+const settingsSchema = {
+    type: 'object',
+    properties: {
+        classAttributes: {
+            type: 'array',
+            items: {
+                type: 'string'
+            }
+        },
+        classFunctions: {
+            type: 'array',
+            items: {
+                type: 'string'
+            }
+        },
+        ignoredKeys: {
+            type: 'array',
+            items: {
+                type: 'string',
+                minLength: 0
+            },
+            uniqueItems: true
+        },
+        config: {
+            type: [
+                'string',
+                'object'
+            ]
+        }
+    }
+};
+
+module.exports = settingsSchema;

package/dist/settings-schema.d.ts

@@ -0,0 +1,3 @@
+import type { JSONSchema4 } from '@typescript-eslint/utils/json-schema';
+declare const settingsSchema: JSONSchema4;
+export default settingsSchema;

package/dist/settings-schema.mjs

@@ -0,0 +1,33 @@
+const settingsSchema = {
+    type: 'object',
+    properties: {
+        classAttributes: {
+            type: 'array',
+            items: {
+                type: 'string'
+            }
+        },
+        classFunctions: {
+            type: 'array',
+            items: {
+                type: 'string'
+            }
+        },
+        ignoredKeys: {
+            type: 'array',
+            items: {
+                type: 'string',
+                minLength: 0
+            },
+            uniqueItems: true
+        },
+        config: {
+            type: [
+                'string',
+                'object'
+            ]
+        }
+    }
+};
+
+export { settingsSchema as default };

package/dist/settings.cjs

@@ -1,8 +1,11 @@
 'use strict';
 
+var css = require('@master/css');
+
 const settings = {
-    calleeMatching: '^(classnames|clsx|ctl|cva|cv|classVariant|styled(?:\\.\\w+)?)',
-    classMatching: '^class(Name)?$',
+    classAttributes: css.CLASS_ATTRIBUTES,
+    classFunctions: css.CLASS_FUNCTIONS,
+    classDeclarations: css.CLASS_DECLARATIONS,
     ignoredKeys: [
         'compoundVariants',
         'defaultVariants'

package/dist/settings.d.ts

@@ -1,13 +1,15 @@
 declare const settings: {
-    calleeMatching: string;
-    classMatching: string;
+    classAttributes: string[];
+    classFunctions: string[];
+    classDeclarations: string[];
     ignoredKeys: string[];
     config: string;
 };
 export default settings;
 export interface Settings {
-    calleeMatching: string;
-    classMatching: string;
+    classAttributes?: string[];
+    classFunctions?: string[];
+    classDeclarations?: string[];
     ignoredKeys: string[];
     config: string | object;
 }

package/dist/settings.mjs

@@ -1,6 +1,9 @@
+import { CLASS_ATTRIBUTES, CLASS_FUNCTIONS, CLASS_DECLARATIONS } from '@master/css';
+
 const settings = {
-    calleeMatching: '^(classnames|clsx|ctl|cva|cv|classVariant|styled(?:\\.\\w+)?)',
-    classMatching: '^class(Name)?$',
+    classAttributes: CLASS_ATTRIBUTES,
+    classFunctions: CLASS_FUNCTIONS,
+    classDeclarations: CLASS_DECLARATIONS,
     ignoredKeys: [
         'compoundVariants',
         'defaultVariants'

package/dist/utils/define-visitors.cjs

@@ -1,6 +1,9 @@
 'use strict';
 
-function defineVisitors({ context, settings, options }, visitNode) {
+function defineVisitors({ context, settings }, visitNode) {
+    const classAttributeRegex = new RegExp(`^(?:${settings.classAttributes.join('|')})$`);
+    const classFunctionsRegex = new RegExp(`^(?:${settings.classFunctions.join('|')})`);
+    const classDeclarationsRegex = new RegExp(`^(?:${settings.classDeclarations.join('|')})$`);
     const isFnNode = (node)=>{
         let calleeName = '';
         const calleeNode = node.callee || node.tag;
@@ -10,7 +13,7 @@ function defineVisitors({ context, settings, options }, visitNode) {
         if (calleeNode.type === 'MemberExpression') {
             calleeName = `${calleeNode.object.name}.${calleeNode.property.name}`;
         }
-        return new RegExp(settings.calleeMatching).test(calleeName);
+        return classFunctionsRegex.test(calleeName);
     };
     const CallExpression = function(node) {
         if (!isFnNode(node)) {
@@ -20,11 +23,10 @@ function defineVisitors({ context, settings, options }, visitNode) {
             visitNode(node, arg);
         });
     };
-    const classMatchingRegex = new RegExp(settings.classMatching);
     const scriptVisitor = {
         CallExpression,
         JSXAttribute: function(node) {
-            if (!node.name || !classMatchingRegex.test(node.name.name)) return;
+            if (!node.name || !classAttributeRegex.test(node.name.name)) return;
             if (node.value && node.value.type === 'Literal') {
                 visitNode(node);
             } else if (node.value && node.value.type === 'JSXExpressionContainer') {
@@ -32,13 +34,13 @@ function defineVisitors({ context, settings, options }, visitNode) {
             }
         },
         SvelteAttribute: function(node) {
-            if (!node.key?.name || !classMatchingRegex.test(node.key.name)) return;
+            if (!node.key?.name || !classAttributeRegex.test(node.key.name)) return;
             for (const eachValue of node.value){
                 visitNode(node, eachValue);
             }
         },
         TextAttribute: function(node) {
-            if (!node.name || !classMatchingRegex.test(node.name)) return;
+            if (!node.name || !classAttributeRegex.test(node.name)) return;
             visitNode(node);
         },
         TaggedTemplateExpression: function(node) {
@@ -46,6 +48,21 @@ function defineVisitors({ context, settings, options }, visitNode) {
                 visitNode(node, node.quasi);
                 return;
             }
+        },
+        VariableDeclaration: function(node) {
+            node.declarations.forEach((decl)=>{
+                console.log(decl);
+                if (decl.id.type === 'Identifier' && classDeclarationsRegex.test(decl.id.name)) {
+                    visitNode(node, decl.init);
+                }
+            });
+        },
+        ObjectExpression: function(node) {
+            node.properties.forEach((prop)=>{
+                if (prop.type === 'Property' && prop.key.type === 'Identifier' && classDeclarationsRegex.test(prop.key.name)) {
+                    visitNode(node, prop.value);
+                }
+            });
         }
     };
     const templateBodyVisitor = {

package/dist/utils/define-visitors.d.ts

@@ -1,8 +1,7 @@
 import { TSESTree } from '@typescript-eslint/utils';
 import type { RuleContext, RuleListener } from '@typescript-eslint/utils/ts-eslint';
 import { Settings } from '../settings';
-export default function defineVisitors({ context, settings, options }: {
+export default function defineVisitors({ context, settings }: {
     context: RuleContext<any, any[]>;
     settings: Settings;
-    options: any;
 }, visitNode: (node: TSESTree.Node, args?: any) => void): RuleListener;

package/dist/utils/define-visitors.mjs

@@ -1,4 +1,7 @@
-function defineVisitors({ context, settings, options }, visitNode) {
+function defineVisitors({ context, settings }, visitNode) {
+    const classAttributeRegex = new RegExp(`^(?:${settings.classAttributes.join('|')})$`);
+    const classFunctionsRegex = new RegExp(`^(?:${settings.classFunctions.join('|')})`);
+    const classDeclarationsRegex = new RegExp(`^(?:${settings.classDeclarations.join('|')})$`);
     const isFnNode = (node)=>{
         let calleeName = '';
         const calleeNode = node.callee || node.tag;
@@ -8,7 +11,7 @@ function defineVisitors({ context, settings, options }, visitNode) {
         if (calleeNode.type === 'MemberExpression') {
             calleeName = `${calleeNode.object.name}.${calleeNode.property.name}`;
         }
-        return new RegExp(settings.calleeMatching).test(calleeName);
+        return classFunctionsRegex.test(calleeName);
     };
     const CallExpression = function(node) {
         if (!isFnNode(node)) {
@@ -18,11 +21,10 @@ function defineVisitors({ context, settings, options }, visitNode) {
             visitNode(node, arg);
         });
     };
-    const classMatchingRegex = new RegExp(settings.classMatching);
     const scriptVisitor = {
         CallExpression,
         JSXAttribute: function(node) {
-            if (!node.name || !classMatchingRegex.test(node.name.name)) return;
+            if (!node.name || !classAttributeRegex.test(node.name.name)) return;
             if (node.value && node.value.type === 'Literal') {
                 visitNode(node);
             } else if (node.value && node.value.type === 'JSXExpressionContainer') {
@@ -30,13 +32,13 @@ function defineVisitors({ context, settings, options }, visitNode) {
             }
         },
         SvelteAttribute: function(node) {
-            if (!node.key?.name || !classMatchingRegex.test(node.key.name)) return;
+            if (!node.key?.name || !classAttributeRegex.test(node.key.name)) return;
             for (const eachValue of node.value){
                 visitNode(node, eachValue);
             }
         },
         TextAttribute: function(node) {
-            if (!node.name || !classMatchingRegex.test(node.name)) return;
+            if (!node.name || !classAttributeRegex.test(node.name)) return;
             visitNode(node);
         },
         TaggedTemplateExpression: function(node) {
@@ -44,6 +46,21 @@ function defineVisitors({ context, settings, options }, visitNode) {
                 visitNode(node, node.quasi);
                 return;
             }
+        },
+        VariableDeclaration: function(node) {
+            node.declarations.forEach((decl)=>{
+                console.log(decl);
+                if (decl.id.type === 'Identifier' && classDeclarationsRegex.test(decl.id.name)) {
+                    visitNode(node, decl.init);
+                }
+            });
+        },
+        ObjectExpression: function(node) {
+            node.properties.forEach((prop)=>{
+                if (prop.type === 'Property' && prop.key.type === 'Identifier' && classDeclarationsRegex.test(prop.key.name)) {
+                    visitNode(node, prop.value);
+                }
+            });
         }
     };
     const templateBodyVisitor = {

package/dist/utils/resolve-context.d.ts

@@ -1,8 +1,9 @@
 import type { RuleContext } from '@typescript-eslint/utils/ts-eslint';
 export default function resolveContext(context: RuleContext<any, any[]>): {
     settings: {
-        calleeMatching: string;
-        classMatching: string;
+        classAttributes: string[];
+        classFunctions: string[];
+        classDeclarations: string[];
         ignoredKeys: string[];
         config: string;
     };

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.28","@master/css-explore-config":"^2.0.0-rc.28","@master/css-validator":"^2.0.0-rc.28","@typescript-eslint/utils":"^7.7.0","synckit":"^0.9.0","typescript-eslint":"^7.7.0"},"devDependencies":{"@angular-eslint/template-parser":"^17.3.0","@master/css-explore-config":"^2.0.0-rc.28","@master/css-shared":"^2.0.0-rc.28","@types/node":"^20.12.7","@typescript-eslint/rule-tester":"^7.7.0","eslint":"^8.57.0","eslint-plugin-markdown":"^4.0.1","eslint-plugin-mdx":"^3.1.5","svelte-eslint-parser":"^0.34.1","ts-node":"^10.9.2","vue-eslint-parser":"^9.4.2"},"version":"2.0.0-rc.28"}
+{"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.29","@master/css-explore-config":"^2.0.0-rc.29","@master/css-validator":"^2.0.0-rc.29","@typescript-eslint/utils":"^7.7.0","synckit":"^0.9.0","typescript-eslint":"^7.7.0"},"devDependencies":{"@angular-eslint/template-parser":"^17.3.0","@master/css-explore-config":"^2.0.0-rc.29","@master/css-shared":"^2.0.0-rc.29","@types/node":"^20.12.7","@typescript-eslint/rule-tester":"^7.7.0","eslint":"^8.57.0","eslint-plugin-markdown":"^4.0.1","eslint-plugin-mdx":"^3.1.5","svelte-eslint-parser":"^0.34.1","ts-node":"^10.9.2","vue-eslint-parser":"^9.4.2"},"version":"2.0.0-rc.29"}