Merge branch 'master-co:dev/beta' into dev/beta

master-co · Oct 25, 2023 · 18cf929 · 18cf929
2 parents 7d630f6 + d20a504
commit 18cf929
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/packages/eslint-plugin/lib/settings.js b/packages/eslint-plugin/lib/settings.js
@@ -1,5 +1,5 @@
 const settings = {
-    functions: ['classnames', 'clsx', 'ctl', 'cva', 'cv', 'classVariant', 'styled'],
+    functions: ['classnames', 'clsx', 'ctl', 'cva', 'cv', 'classVariant', 'styled(?:\\.\\w+)?'],
     ignoredKeys: ['compoundVariants', 'defaultVariants'],
     classMatching: '^class(Name)?$',
     config: 'master.css.*'

diff --git a/packages/eslint-plugin/lib/utils/define-visitors.js b/packages/eslint-plugin/lib/utils/define-visitors.js
@@ -1,9 +1,14 @@
 const astUtil = require('./ast')
 
-function defineVisitors({ context, options, settings, config }, visitNode) {
+function defineVisitors({ context, settings }, visitNode) {
+
+    const isFnNode = (node) => {
+        const calleeStr = astUtil.calleeToString(node.callee || node.tag)
+        return settings.functions.findIndex((eachFnPattern) => new RegExp('^' + eachFnPattern).test(calleeStr)) !== -1
+    }
+
     const CallExpression = function (node) {
-        const calleeStr = astUtil.calleeToString(node.callee)
-        if (settings.functions.findIndex((name) => calleeStr.startsWith(name)) === -1) {
+        if (!isFnNode(node)) {
             return
         }
         node.arguments.forEach((arg) => {
@@ -32,10 +37,7 @@ function defineVisitors({ context, options, settings, config }, visitNode) {
             visitNode(node)
         },
         TaggedTemplateExpression: function (node) {
-            if (
-                settings.functions.includes(node.tag.name) ||
-                settings.functions.includes(node.tag?.object?.name) && node.tag?.type === 'MemberExpression'
-            ) {
+            if (isFnNode(node)) {
                 visitNode(node, node.quasi)
                 return
             }