@salty-css/eslint-plugin-core 0.0.1-alpha.152 → 0.0.1-alpha.154

package/index.cjs

@@ -1 +1 @@
-"use strict";require("esbuild");require("child_process");require("path");require("fs");require("fs/promises");const o=require("winston");o.createLogger({level:"debug",format:o.format.combine(o.format.colorize(),o.format.cli()),transports:[new o.transports.Console({})]});const h=["salty","css","styles","styled"],P=(r=[])=>new RegExp(`\\.(${[...h,...r].join("|")})\\.`),x=(r,l=[])=>P(l).test(r),S={meta:{type:"problem",fixable:"code",docs:{description:"Ensure `variants` are not nested inside `base` in styled calls",category:"Errors",recommended:!0},messages:{nestedVariants:"`variants` should not be nested inside `base`."}},create(r){return x(r.filename)?{CallExpression:c=>{try{const{callee:i,arguments:e}=c;if(!(i.type==="Identifier"&&i.name==="styled"))return;const t=e[1];if(!t||!(t.type==="ObjectExpression"))return;const u=t.properties.find(s=>s.type==="Property"&&s.key.type==="Identifier"&&s.key.name==="base");if(!u)return;const{value:f}=u;if(!(f.type==="ObjectExpression"))return;const n=f.properties.find(s=>s.type==="Property"&&s.key.type==="Identifier"&&s.key.name==="variants");if(!n)return;r.report({node:n,messageId:"nestedVariants",fix:s=>{if(!n.range)return null;const{sourceCode:y}=r,b=y.getText(n),E=t.properties.indexOf(u),p=t.properties[E];if(!p.range)return null;const v=[p.range[1],p.range[1]],m=[n.range[0]-1,n.range[1]];if(f.properties.at(-1)===n){const g=y.text.slice(n.range[1]).match(/^\s*,/);g&&(m[1]+=g[0].length)}return[s.removeRange(m),s.insertTextAfterRange(v,`, ${b}`)]}})}catch(i){console.log("ESlint error",i);return}}}:{}}},I={meta:{type:"problem",fixable:"code",docs:{description:"Salty CSS related function calls or other values must be exported",category:"Errors",recommended:!0},messages:{mustBeExported:"Salty CSS related function calls or other values must be exported"}},create(r){if(!x(r.filename))return{};function c(e){if(e.type==="VariableDeclaration"){const a=e.declarations[0];if(a.type!=="VariableDeclarator")return;const t=a.init;if((t==null?void 0:t.type)!=="CallExpression")return;const d=["styled","keyframes"];if(t.callee.type==="Identifier"&&d.includes(t.callee.name))return!0}return!1}function i(e){const a=e.parent;return a.type==="ExportNamedDeclaration"||a.type==="ExportDefaultDeclaration"}return{VariableDeclaration:e=>{c(e)&&(i(e)||r.report({node:e,messageId:"mustBeExported",fix:a=>a.insertTextBefore(e,"export ")}))}}}},V={rules:{"no-variants-in-base":S,"must-be-exported":I}};module.exports=V;
+"use strict";require("esbuild");require("child_process");require("path");require("fs");require("fs/promises");const l=require("winston");l.createLogger({level:"debug",format:l.format.combine(l.format.colorize(),l.format.cli()),transports:[new l.transports.Console({})]});const h=["salty","css","styles","styled"],I=(r=[])=>new RegExp(`\\.(${[...h,...r].join("|")})\\.`),x=(r,c=[])=>I(c).test(r),P={meta:{type:"problem",fixable:"code",docs:{description:"Ensure `variants` are not nested inside `base` in styled calls",category:"Errors",recommended:!0},messages:{nestedVariants:"`variants` should not be nested inside `base`."}},create(r){return x(r.filename)?{CallExpression:u=>{try{const{callee:i,arguments:t}=u;if(!(i.type==="Identifier"&&i.name==="styled"))return;const e=t[1];if(!e||!(e.type==="ObjectExpression"))return;const o=e.properties.find(s=>s.type==="Property"&&s.key.type==="Identifier"&&s.key.name==="base");if(!o)return;const{value:f}=o;if(!(f.type==="ObjectExpression"))return;const a=f.properties.find(s=>s.type==="Property"&&s.key.type==="Identifier"&&s.key.name==="variants");if(!a)return;r.report({node:a,messageId:"nestedVariants",fix:s=>{if(!a.range)return null;const{sourceCode:y}=r,b=y.getText(a),E=e.properties.indexOf(o),d=e.properties[E];if(!d.range)return null;const v=[d.range[1],d.range[1]],m=[a.range[0]-1,a.range[1]];if(f.properties.at(-1)===a){const g=y.text.slice(a.range[1]).match(/^\s*,/);g&&(m[1]+=g[0].length)}return[s.removeRange(m),s.insertTextAfterRange(v,`, ${b}`)]}})}catch(i){console.log("ESlint error",i);return}}}:{}}},S={meta:{type:"problem",fixable:"code",docs:{description:"Salty CSS related function calls or other values must be exported",category:"Errors",recommended:!0},messages:{mustBeExported:"Salty CSS related function calls or other values must be exported"}},create(r){if(!x(r.filename))return{};function u(t){if(t.type==="VariableDeclaration"){const n=t.declarations[0];if(n.type!=="VariableDeclarator")return;const e=n.init;if((e==null?void 0:e.type)!=="CallExpression")return;const p=["styled","keyframes"];if(e.callee.type==="Identifier"&&p.includes(e.callee.name))return!0;const o=/^define[A-Z]/;if(e.callee.type==="Identifier"&&o.test(e.callee.name))return!0}return!1}function i(t){const n=t.parent;return n.type==="ExportNamedDeclaration"||n.type==="ExportDefaultDeclaration"}return{VariableDeclaration:t=>{u(t)&&(i(t)||r.report({node:t,messageId:"mustBeExported",fix:n=>n.insertTextBefore(t,"export ")}))}}}},F={rules:{"no-variants-in-base":P,"must-be-exported":S}};module.exports=F;

package/index.js

@@ -3,13 +3,13 @@ import "child_process";
 import "path";
 import "fs";
 import "fs/promises";
-import { createLogger as h, format as f, transports as P } from "winston";
+import { createLogger as h, format as f, transports as I } from "winston";
 h({
   level: "debug",
   format: f.combine(f.colorize(), f.cli()),
-  transports: [new P.Console({})]
+  transports: [new I.Console({})]
 });
-const S = ["salty", "css", "styles", "styled"], I = (r = []) => new RegExp(`\\.(${[...S, ...r].join("|")})\\.`), x = (r, i = []) => I(i).test(r), V = {
+const P = ["salty", "css", "styles", "styled"], S = (r = []) => new RegExp(`\\.(${[...P, ...r].join("|")})\\.`), x = (r, l = []) => S(l).test(r), F = {
   meta: {
     type: "problem",
     fixable: "code",
@@ -24,47 +24,47 @@ const S = ["salty", "css", "styles", "styled"], I = (r = []) => new RegExp(`\\.(
   },
   create(r) {
     return x(r.filename) ? {
-      CallExpression: (l) => {
+      CallExpression: (c) => {
         try {
-          const { callee: o, arguments: e } = l;
-          if (!(o.type === "Identifier" && o.name === "styled")) return;
-          const t = e[1];
-          if (!t || !(t.type === "ObjectExpression")) return;
-          const c = t.properties.find((s) => s.type === "Property" && s.key.type === "Identifier" && s.key.name === "base");
-          if (!c) return;
-          const { value: p } = c;
-          if (!(p.type === "ObjectExpression")) return;
-          const n = p.properties.find(
+          const { callee: i, arguments: t } = c;
+          if (!(i.type === "Identifier" && i.name === "styled")) return;
+          const e = t[1];
+          if (!e || !(e.type === "ObjectExpression")) return;
+          const o = e.properties.find((s) => s.type === "Property" && s.key.type === "Identifier" && s.key.name === "base");
+          if (!o) return;
+          const { value: u } = o;
+          if (!(u.type === "ObjectExpression")) return;
+          const a = u.properties.find(
             (s) => s.type === "Property" && s.key.type === "Identifier" && s.key.name === "variants"
           );
-          if (!n) return;
+          if (!a) return;
           r.report({
-            node: n,
+            node: a,
             messageId: "nestedVariants",
             fix: (s) => {
-              if (!n.range) return null;
-              const { sourceCode: m } = r, b = m.getText(n), E = t.properties.indexOf(c), u = t.properties[E];
-              if (!u.range) return null;
-              const v = [u.range[1], u.range[1]], y = [
-                n.range[0] - 1,
+              if (!a.range) return null;
+              const { sourceCode: m } = r, b = m.getText(a), E = e.properties.indexOf(o), p = e.properties[E];
+              if (!p.range) return null;
+              const v = [p.range[1], p.range[1]], y = [
+                a.range[0] - 1,
                 // Include the preceding comma (if any)
-                n.range[1]
+                a.range[1]
               ];
-              if (p.properties.at(-1) === n) {
-                const g = m.text.slice(n.range[1]).match(/^\s*,/);
+              if (u.properties.at(-1) === a) {
+                const g = m.text.slice(a.range[1]).match(/^\s*,/);
                 g && (y[1] += g[0].length);
               }
               return [s.removeRange(y), s.insertTextAfterRange(v, `, ${b}`)];
             }
           });
-        } catch (o) {
-          console.log("ESlint error", o);
+        } catch (i) {
+          console.log("ESlint error", i);
           return;
         }
       }
     } : {};
   }
-}, C = {
+}, V = {
   meta: {
     type: "problem",
     fixable: "code",
@@ -79,36 +79,39 @@ const S = ["salty", "css", "styles", "styled"], I = (r = []) => new RegExp(`\\.(
   },
   create(r) {
     if (!x(r.filename)) return {};
-    function l(e) {
-      if (e.type === "VariableDeclaration") {
-        const a = e.declarations[0];
-        if (a.type !== "VariableDeclarator") return;
-        const t = a.init;
-        if ((t == null ? void 0 : t.type) !== "CallExpression") return;
+    function c(t) {
+      if (t.type === "VariableDeclaration") {
+        const n = t.declarations[0];
+        if (n.type !== "VariableDeclarator") return;
+        const e = n.init;
+        if ((e == null ? void 0 : e.type) !== "CallExpression") return;
         const d = ["styled", "keyframes"];
-        if (t.callee.type === "Identifier" && d.includes(t.callee.name))
+        if (e.callee.type === "Identifier" && d.includes(e.callee.name))
+          return !0;
+        const o = /^define[A-Z]/;
+        if (e.callee.type === "Identifier" && o.test(e.callee.name))
           return !0;
       }
       return !1;
     }
-    function o(e) {
-      const a = e.parent;
-      return a.type === "ExportNamedDeclaration" || a.type === "ExportDefaultDeclaration";
+    function i(t) {
+      const n = t.parent;
+      return n.type === "ExportNamedDeclaration" || n.type === "ExportDefaultDeclaration";
     }
     return {
-      VariableDeclaration: (e) => {
-        l(e) && (o(e) || r.report({
-          node: e,
+      VariableDeclaration: (t) => {
+        c(t) && (i(t) || r.report({
+          node: t,
           messageId: "mustBeExported",
-          fix: (a) => a.insertTextBefore(e, "export ")
+          fix: (n) => n.insertTextBefore(t, "export ")
         }));
       }
     };
   }
 }, L = {
   rules: {
-    "no-variants-in-base": V,
-    "must-be-exported": C
+    "no-variants-in-base": F,
+    "must-be-exported": V
   }
 };
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salty-css/eslint-plugin-core",
-  "version": "0.0.1-alpha.152",
+  "version": "0.0.1-alpha.154",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
   "typings": "./dist/index.d.ts",
@@ -34,7 +34,7 @@
     }
   },
   "dependencies": {
-    "@salty-css/core": "^0.0.1-alpha.152",
+    "@salty-css/core": "^0.0.1-alpha.154",
     "eslint": ">=9.x || >=8.x || >=7.x"
   }
 }