@salty-css/eslint-plugin-core 0.0.1-alpha.12 → 0.0.1-alpha.14

package/index.cjs

@@ -1 +1 @@
-"use strict";require("esbuild");const d=require("winston");require("child_process");require("path");require("fs");require("fs/promises");function y(e){const r=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(e){for(const n in e)if(n!=="default"){const t=Object.getOwnPropertyDescriptor(e,n);Object.defineProperty(r,n,t.get?t:{enumerable:!0,get:()=>e[n]})}}return r.default=e,Object.freeze(r)}const a=y(d);a.createLogger({level:"info",format:a.format.combine(a.format.colorize(),a.format.cli()),transports:[new a.transports.Console({})]});const f=["salty","css","styles","styled"],m=(e=[])=>new RegExp(`\\.(${[...f,...e].join("|")})\\.`),p=(e,r=[])=>m(r).test(e),b={meta:{type:"problem",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(e){return p(e.filename)?{CallExpression:n=>{try{const{callee:t,arguments:u}=n;if(!(t.type==="Identifier"&&t.name==="styled"))return;const i=u[0];if(!i||!(i.type==="ObjectExpression"))return;const o=i.properties.find(s=>s.type==="Property"&&s.key.type==="Identifier"&&s.key.name==="base");if(!o)return;const{value:l}=o;if(!(l.type==="ObjectExpression"))return;const c=l.properties.find(s=>s.type==="Property"&&s.key.type==="Identifier"&&s.key.name==="variants");if(!c)return;e.report({node:c,messageId:"nestedVariants"})}catch(t){console.log("ESlint error",t);return}}}:{}}},g={rules:{"no-variants-in-base":b}};module.exports=g;
+"use strict";require("esbuild");const x=require("winston");require("child_process");require("path");require("fs");require("fs/promises");function P(e){const n=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(e){for(const a in e)if(a!=="default"){const s=Object.getOwnPropertyDescriptor(e,a);Object.defineProperty(n,a,s.get?s:{enumerable:!0,get:()=>e[a]})}}return n.default=e,Object.freeze(n)}const i=P(x);i.createLogger({level:"info",format:i.format.combine(i.format.colorize(),i.format.cli()),transports:[new i.transports.Console({})]});const v=["salty","css","styles","styled"],E=(e=[])=>new RegExp(`\\.(${[...v,...e].join("|")})\\.`),O=(e,n=[])=>E(n).test(e),h={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(e){return O(e.filename)?{CallExpression:a=>{try{const{callee:s,arguments:p}=a;if(!(s.type==="Identifier"&&s.name==="styled"))return;const o=p[1];if(!o||!(o.type==="ObjectExpression"))return;const c=o.properties.find(t=>t.type==="Property"&&t.key.type==="Identifier"&&t.key.name==="base");if(!c)return;const{value:l}=c;if(!(l.type==="ObjectExpression"))return;const r=l.properties.find(t=>t.type==="Property"&&t.key.type==="Identifier"&&t.key.name==="variants");if(!r)return;e.report({node:r,messageId:"nestedVariants",fix:t=>{if(!r.range)return null;const{sourceCode:f}=e,m=f.getText(r),g=o.properties.indexOf(c),u=o.properties[g];if(!u.range)return null;const b=[u.range[1],u.range[1]],d=[r.range[0]-1,r.range[1]];if(l.properties.at(-1)===r){const y=f.text.slice(r.range[1]).match(/^\s*,/);y&&(d[1]+=y[0].length)}return[t.removeRange(d),t.insertTextAfterRange(b,`, ${m}`)]}})}catch(s){console.log("ESlint error",s);return}}}:{}}},j={rules:{"no-variants-in-base":h}};module.exports=j;

package/index.js

@@ -1,17 +1,18 @@
 import "esbuild";
-import * as s from "winston";
+import * as n from "winston";
 import "child_process";
 import "path";
 import "fs";
 import "fs/promises";
-s.createLogger({
+n.createLogger({
   level: "info",
-  format: s.format.combine(s.format.colorize(), s.format.cli()),
-  transports: [new s.transports.Console({})]
+  format: n.format.combine(n.format.colorize(), n.format.cli()),
+  transports: [new n.transports.Console({})]
 });
-const d = ["salty", "css", "styles", "styled"], m = (t = []) => new RegExp(`\\.(${[...d, ...t].join("|")})\\.`), p = (t, a = []) => m(a).test(t), f = {
+const x = ["salty", "css", "styles", "styled"], v = (s = []) => new RegExp(`\\.(${[...x, ...s].join("|")})\\.`), P = (s, c = []) => v(c).test(s), E = {
   meta: {
     type: "problem",
+    fixable: "code",
     docs: {
       description: "Ensure `variants` are not nested inside `base` in styled calls",
       category: "Errors",
@@ -21,38 +22,53 @@ const d = ["salty", "css", "styles", "styled"], m = (t = []) => new RegExp(`\\.(
       nestedVariants: "`variants` should not be nested inside `base`."
     }
   },
-  create(t) {
-    return p(t.filename) ? {
-      CallExpression: (c) => {
+  create(s) {
+    return P(s.filename) ? {
+      CallExpression: (y) => {
         try {
-          const { callee: r, arguments: y } = c;
-          if (!(r.type === "Identifier" && r.name === "styled")) return;
-          const n = y[0];
-          if (!n || !(n.type === "ObjectExpression")) return;
-          const i = n.properties.find((e) => e.type === "Property" && e.key.type === "Identifier" && e.key.name === "base");
-          if (!i) return;
-          const { value: o } = i;
-          if (!(o.type === "ObjectExpression")) return;
-          const l = o.properties.find(
+          const { callee: a, arguments: f } = y;
+          if (!(a.type === "Identifier" && a.name === "styled")) return;
+          const r = f[1];
+          if (!r || !(r.type === "ObjectExpression")) return;
+          const o = r.properties.find((e) => e.type === "Property" && e.key.type === "Identifier" && e.key.name === "base");
+          if (!o) return;
+          const { value: i } = o;
+          if (!(i.type === "ObjectExpression")) return;
+          const t = i.properties.find(
             (e) => e.type === "Property" && e.key.type === "Identifier" && e.key.name === "variants"
           );
-          if (!l) return;
-          t.report({
-            node: l,
-            messageId: "nestedVariants"
+          if (!t) return;
+          s.report({
+            node: t,
+            messageId: "nestedVariants",
+            fix: (e) => {
+              if (!t.range) return null;
+              const { sourceCode: m } = s, g = m.getText(t), u = r.properties.indexOf(o), l = r.properties[u];
+              if (!l.range) return null;
+              const b = [l.range[1], l.range[1]], p = [
+                t.range[0] - 1,
+                // Include the preceding comma (if any)
+                t.range[1]
+              ];
+              if (i.properties.at(-1) === t) {
+                const d = m.text.slice(t.range[1]).match(/^\s*,/);
+                d && (p[1] += d[0].length);
+              }
+              return [e.removeRange(p), e.insertTextAfterRange(b, `, ${g}`)];
+            }
           });
-        } catch (r) {
-          console.log("ESlint error", r);
+        } catch (a) {
+          console.log("ESlint error", a);
           return;
         }
       }
     } : {};
   }
-}, I = {
+}, T = {
   rules: {
-    "no-variants-in-base": f
+    "no-variants-in-base": E
   }
 };
 export {
-  I as default
+  T as default
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salty-css/eslint-plugin-core",
-  "version": "0.0.1-alpha.12",
+  "version": "0.0.1-alpha.14",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
   "typings": "./dist/index.d.ts",