@pandacss/eslint-plugin 0.1.6 → 0.1.8

package/dist/index.js

@@ -7957,7 +7957,7 @@ init_cjs_shims();
 
 // package.json
 var name = "@pandacss/eslint-plugin";
-var version = "0.1.6";
+var version = "0.1.8";
 
 // src/configs/all.ts
 init_cjs_shims();
@@ -7979,7 +7979,14 @@ var createRule = import_utils.ESLintUtils.RuleCreator(
 );
 var isBase = process.env.NODE_ENV !== "test" || importMetaUrl.endsWith("dist/index.js");
 var distDir = (0, import_node_url.fileURLToPath)(new URL(isBase ? "./" : "../../dist", importMetaUrl));
-var syncAction = (0, import_synckit.createSyncFn)((0, import_node_path.join)(distDir, "utils/worker.mjs"));
+var _syncAction = (0, import_synckit.createSyncFn)((0, import_node_path.join)(distDir, "utils/worker.mjs"));
+var syncAction = (...args) => {
+  try {
+    return _syncAction(...args);
+  } catch (error) {
+    return;
+  }
+};
 
 // src/utils/helpers.ts
 init_cjs_shims();
@@ -8057,11 +8064,7 @@ var _getImports = (context) => {
 };
 var getImports = (context) => {
   const imports = _getImports(context);
-  try {
-    return imports.filter((imp) => syncAction("matchImports", getSyncOpts(context), imp));
-  } catch (error) {
-    return [];
-  }
+  return imports.filter((imp) => syncAction("matchImports", getSyncOpts(context), imp));
 };
 var isValidStyledProp = (node, context) => {
   if (typeof node === "string")
@@ -8120,7 +8123,7 @@ var isPandaProp = (node, context) => {
     return;
   return true;
 };
-var isStyledNode = (node, context, calleeName) => {
+var isStyledProperty = (node, context, calleeName) => {
   if (!isIdentifier(node.key) && !isLiteral(node.key) && !isTemplateLiteral(node.key))
     return;
   if (isIdentifier(node.key) && !isValidProperty(node.key.name, context, calleeName))
@@ -8131,13 +8134,6 @@ var isStyledNode = (node, context, calleeName) => {
     return;
   return true;
 };
-var isStyledProperty = (node, context, calleeName) => {
-  const ancestor = node.parent.parent;
-  const isValidFuncAncestor = isCallExpression(ancestor) && isIdentifier(ancestor.callee) && isPandaIsh(ancestor.callee.name, context);
-  if (isValidFuncAncestor)
-    return isStyledNode(node, context, calleeName);
-  return isStyledNode(ancestor, context, calleeName) && isStyledNode(node, context, calleeName);
-};
 var isInPandaFunction = (node, context) => {
   const callAncestor = getAncestor(isCallExpression, node);
   if (!callAncestor)
@@ -8758,23 +8754,50 @@ var rule8 = createRule({
       Property(node) {
         if (!isObjectExpression(node.value) || isIdentifier(node.key))
           return;
-        if (!isInPandaFunction(node, context) && !isInJSXProp(node, context))
+        const caller = isInPandaFunction(node, context);
+        if (!caller && !isInJSXProp(node, context))
           return;
         if (isStyledProperty(node, context))
           return;
-        const invalidLiteral = isLiteral(node.key) && typeof node.key.value === "string" && !node.key.value.includes("&");
-        const invalidTemplateLiteral = isTemplateLiteral(node.key) && !node.key.quasis[0].value.raw.includes("&");
-        if (invalidLiteral || invalidTemplateLiteral) {
-          context.report({
-            node: node.key,
-            messageId: "nesting"
-          });
-        }
+        const invalidNesting = isInvalidNesting(node, context, caller);
+        if (!invalidNesting)
+          return;
+        context.report({
+          node: node.key,
+          messageId: "nesting"
+        });
       }
     };
   }
 });
 var no_invalid_nesting_default = rule8;
+function isInvalidNesting(node, context, caller) {
+  const recipe = getImports(context).find((imp) => ["cva", "sva"].includes(imp.name) && imp.alias === caller);
+  if (!recipe)
+    return checkNode(node);
+  let currentNode = node;
+  let length = 0;
+  let styleObjectParent = null;
+  while (currentNode) {
+    if (currentNode.key && ["base", "variants"].includes(currentNode.key.name)) {
+      styleObjectParent = currentNode.key.name;
+    }
+    currentNode = currentNode.parent;
+    if (!styleObjectParent)
+      length++;
+  }
+  const requiredLength = caller === "cva" ? 2 : 4;
+  const extraLength = styleObjectParent === "base" ? 0 : 4;
+  if (length >= requiredLength + extraLength) {
+    return checkNode(node);
+  }
+  return false;
+}
+function checkNode(node) {
+  const invalidLiteral = isLiteral(node.key) && typeof node.key.value === "string" && !node.key.value.includes("&");
+  const invalidTemplateLiteral = isTemplateLiteral(node.key) && !node.key.quasis[0].value.raw.includes("&");
+  return invalidLiteral || invalidTemplateLiteral;
+}
 
 // src/rules/no-invalid-token-paths.ts
 init_cjs_shims();
@@ -8810,6 +8833,8 @@ var rule9 = createRule({
     const sendReport = (node, _value) => {
       const value = _value ?? node.value?.toString();
       const tokens = getInvalidTokens(value, context);
+      if (!tokens)
+        return;
       if (tokens.length > 0) {
         tokens.forEach((token) => {
           context.report({
@@ -8851,6 +8876,8 @@ var rule9 = createRule({
         const quasis = node.quasi.quasis[0];
         const styles = quasis.value.raw;
         const tokens = getInvalidTokens(styles, context);
+        if (!tokens)
+          return;
         tokens.forEach((token, i, arr) => {
           if (arr.indexOf(token) < i)
             return;

package/dist/index.mjs

@@ -10,7 +10,7 @@ var name, version;
 var init_package = __esm({
   "package.json"() {
     name = "@pandacss/eslint-plugin";
-    version = "0.1.6";
+    version = "0.1.8";
   }
 });
 
@@ -19,7 +19,7 @@ import { ESLintUtils } from "@typescript-eslint/utils";
 import { createSyncFn } from "synckit";
 import { join } from "node:path";
 import { fileURLToPath } from "node:url";
-var createRule, isBase, distDir, syncAction;
+var createRule, isBase, distDir, _syncAction, syncAction;
 var init_utils = __esm({
   "src/utils/index.ts"() {
     "use strict";
@@ -29,7 +29,14 @@ var init_utils = __esm({
     );
     isBase = process.env.NODE_ENV !== "test" || import.meta.url.endsWith("dist/index.js");
     distDir = fileURLToPath(new URL(isBase ? "./" : "../../dist", import.meta.url));
-    syncAction = createSyncFn(join(distDir, "utils/worker.mjs"));
+    _syncAction = createSyncFn(join(distDir, "utils/worker.mjs"));
+    syncAction = (...args) => {
+      try {
+        return _syncAction(...args);
+      } catch (error) {
+        return;
+      }
+    };
   }
 });
 
@@ -7975,7 +7982,7 @@ var init_nodes = __esm({
 });
 
 // src/utils/helpers.ts
-var import_scope_manager, getAncestor, getSyncOpts, getImportSpecifiers, hasPkgImport, isPandaConfigFunction, _getImports, getImports, isValidStyledProp, isPandaIsh, findDeclaration, isLocalStyledFactory, isValidFile, isValidProperty, isPandaImport, isPandaProp, isStyledNode, isStyledProperty, isInPandaFunction, isInJSXProp, isPandaAttribute, resolveLonghand, resolveShorthands, isColorAttribute, isColorToken, extractTokens, getInvalidTokens, getTokenImport, getTaggedTemplateCaller;
+var import_scope_manager, getAncestor, getSyncOpts, getImportSpecifiers, hasPkgImport, isPandaConfigFunction, _getImports, getImports, isValidStyledProp, isPandaIsh, findDeclaration, isLocalStyledFactory, isValidFile, isValidProperty, isPandaImport, isPandaProp, isStyledProperty, isInPandaFunction, isInJSXProp, isPandaAttribute, resolveLonghand, resolveShorthands, isColorAttribute, isColorToken, extractTokens, getInvalidTokens, getTokenImport, getTaggedTemplateCaller;
 var init_helpers = __esm({
   "src/utils/helpers.ts"() {
     "use strict";
@@ -8033,11 +8040,7 @@ var init_helpers = __esm({
     };
     getImports = (context) => {
       const imports = _getImports(context);
-      try {
-        return imports.filter((imp) => syncAction("matchImports", getSyncOpts(context), imp));
-      } catch (error) {
-        return [];
-      }
+      return imports.filter((imp) => syncAction("matchImports", getSyncOpts(context), imp));
     };
     isValidStyledProp = (node, context) => {
       if (typeof node === "string")
@@ -8096,7 +8099,7 @@ var init_helpers = __esm({
         return;
       return true;
     };
-    isStyledNode = (node, context, calleeName) => {
+    isStyledProperty = (node, context, calleeName) => {
       if (!isIdentifier(node.key) && !isLiteral(node.key) && !isTemplateLiteral(node.key))
         return;
       if (isIdentifier(node.key) && !isValidProperty(node.key.name, context, calleeName))
@@ -8107,13 +8110,6 @@ var init_helpers = __esm({
         return;
       return true;
     };
-    isStyledProperty = (node, context, calleeName) => {
-      const ancestor = node.parent.parent;
-      const isValidFuncAncestor = isCallExpression(ancestor) && isIdentifier(ancestor.callee) && isPandaIsh(ancestor.callee.name, context);
-      if (isValidFuncAncestor)
-        return isStyledNode(node, context, calleeName);
-      return isStyledNode(ancestor, context, calleeName) && isStyledNode(node, context, calleeName);
-    };
     isInPandaFunction = (node, context) => {
       const callAncestor = getAncestor(isCallExpression, node);
       if (!callAncestor)
@@ -8779,6 +8775,33 @@ var init_no_important = __esm({
 });
 
 // src/rules/no-invalid-nesting.ts
+function isInvalidNesting(node, context, caller) {
+  const recipe = getImports(context).find((imp) => ["cva", "sva"].includes(imp.name) && imp.alias === caller);
+  if (!recipe)
+    return checkNode(node);
+  let currentNode = node;
+  let length = 0;
+  let styleObjectParent = null;
+  while (currentNode) {
+    if (currentNode.key && ["base", "variants"].includes(currentNode.key.name)) {
+      styleObjectParent = currentNode.key.name;
+    }
+    currentNode = currentNode.parent;
+    if (!styleObjectParent)
+      length++;
+  }
+  const requiredLength = caller === "cva" ? 2 : 4;
+  const extraLength = styleObjectParent === "base" ? 0 : 4;
+  if (length >= requiredLength + extraLength) {
+    return checkNode(node);
+  }
+  return false;
+}
+function checkNode(node) {
+  const invalidLiteral = isLiteral(node.key) && typeof node.key.value === "string" && !node.key.value.includes("&");
+  const invalidTemplateLiteral = isTemplateLiteral(node.key) && !node.key.quasis[0].value.raw.includes("&");
+  return invalidLiteral || invalidTemplateLiteral;
+}
 var RULE_NAME8, rule8, no_invalid_nesting_default;
 var init_no_invalid_nesting = __esm({
   "src/rules/no-invalid-nesting.ts"() {
@@ -8806,18 +8829,18 @@ var init_no_invalid_nesting = __esm({
           Property(node) {
             if (!isObjectExpression(node.value) || isIdentifier(node.key))
               return;
-            if (!isInPandaFunction(node, context) && !isInJSXProp(node, context))
+            const caller = isInPandaFunction(node, context);
+            if (!caller && !isInJSXProp(node, context))
               return;
             if (isStyledProperty(node, context))
               return;
-            const invalidLiteral = isLiteral(node.key) && typeof node.key.value === "string" && !node.key.value.includes("&");
-            const invalidTemplateLiteral = isTemplateLiteral(node.key) && !node.key.quasis[0].value.raw.includes("&");
-            if (invalidLiteral || invalidTemplateLiteral) {
-              context.report({
-                node: node.key,
-                messageId: "nesting"
-              });
-            }
+            const invalidNesting = isInvalidNesting(node, context, caller);
+            if (!invalidNesting)
+              return;
+            context.report({
+              node: node.key,
+              messageId: "nesting"
+            });
           }
         };
       }
@@ -8867,6 +8890,8 @@ var init_no_invalid_token_paths = __esm({
         const sendReport = (node, _value) => {
           const value = _value ?? node.value?.toString();
           const tokens = getInvalidTokens(value, context);
+          if (!tokens)
+            return;
           if (tokens.length > 0) {
             tokens.forEach((token) => {
               context.report({
@@ -8908,6 +8933,8 @@ var init_no_invalid_token_paths = __esm({
             const quasis = node.quasi.quasis[0];
             const styles = quasis.value.raw;
             const tokens = getInvalidTokens(styles, context);
+            if (!tokens)
+              return;
             tokens.forEach((token, i, arr) => {
               if (arr.indexOf(token) < i)
                 return;

package/dist/utils/worker.js

@@ -3869,27 +3869,6 @@ async function getContext(opts) {
     return await promise;
   }
 }
-async function getExtendWarnings() {
-  if (!configPath)
-    return [];
-  const cwd = import_path.default.dirname(configPath);
-  const { config: config2 } = await (0, import_config3.bundleConfig)({ cwd, file: configPath });
-  if (!config2.presets || config2.presets.length === 0)
-    return [];
-  if (config2.eject)
-    return [];
-  const warnings = /* @__PURE__ */ new Set();
-  if (config2.theme && !config2.theme.extend) {
-    warnings.add("theme");
-  }
-  if (config2.conditions && !config2.conditions.extend) {
-    warnings.add("conditions");
-  }
-  if (config2.patterns && !config2.patterns.extend) {
-    warnings.add("patterns");
-  }
-  return Array.from(warnings);
-}
 async function filterInvalidTokens(ctx, paths) {
   return paths.filter((path2) => !ctx.utility.tokens.view.get(path2));
 }
@@ -3970,8 +3949,6 @@ async function runAsync(action, opts, ...args) {
       return isColorToken(ctx, ...args);
     case "filterInvalidTokens":
       return filterInvalidTokens(ctx, ...args);
-    case "getExtendWarnings":
-      return getExtendWarnings();
   }
 }
 function run(action, opts, ...args) {

package/dist/utils/worker.mjs

@@ -3830,7 +3830,7 @@ init_esm_shims();
 
 // src/utils/worker.ts
 import { resolveTsPathPattern } from "@pandacss/config/ts-path";
-import { findConfig, bundleConfig } from "@pandacss/config";
+import { findConfig } from "@pandacss/config";
 import path from "path";
 var promise;
 var configPath;
@@ -3853,27 +3853,6 @@ async function getContext(opts) {
     return await promise;
   }
 }
-async function getExtendWarnings() {
-  if (!configPath)
-    return [];
-  const cwd = path.dirname(configPath);
-  const { config: config2 } = await bundleConfig({ cwd, file: configPath });
-  if (!config2.presets || config2.presets.length === 0)
-    return [];
-  if (config2.eject)
-    return [];
-  const warnings = /* @__PURE__ */ new Set();
-  if (config2.theme && !config2.theme.extend) {
-    warnings.add("theme");
-  }
-  if (config2.conditions && !config2.conditions.extend) {
-    warnings.add("conditions");
-  }
-  if (config2.patterns && !config2.patterns.extend) {
-    warnings.add("patterns");
-  }
-  return Array.from(warnings);
-}
 async function filterInvalidTokens(ctx, paths) {
   return paths.filter((path2) => !ctx.utility.tokens.view.get(path2));
 }
@@ -3954,8 +3933,6 @@ async function runAsync(action, opts, ...args) {
       return isColorToken(ctx, ...args);
     case "filterInvalidTokens":
       return filterInvalidTokens(ctx, ...args);
-    case "getExtendWarnings":
-      return getExtendWarnings();
   }
 }
 function run(action, opts, ...args) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pandacss/eslint-plugin",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "description": "Eslint plugin for Panda CSS",
   "author": "Abraham Aremu <anubra266@gmail.com>",
   "main": "dist/index.js",