@salty-css/vite 0.0.1-alpha.141 → 0.0.1-alpha.143

package/index.cjs

@@ -1,29 +1,37 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const pe=require("esbuild"),de=require("child_process"),a=require("path"),u=require("fs"),X=require("fs/promises"),J=require("winston");var Z=typeof document<"u"?document.currentScript:null;function ye(e){const t=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(e){for(const s in e)if(s!=="default"){const n=Object.getOwnPropertyDescriptor(e,s);Object.defineProperty(t,s,n.get?n:{enumerable:!0,get:()=>e[s]})}}return t.default=e,Object.freeze(t)}const Y=ye(pe),U=e=>String.fromCharCode(e+(e>25?39:97)),ge=(e,t)=>{let s="",n;for(n=Math.abs(e);n>52;n=n/52|0)s=U(n%52)+s;return s=U(n%52)+s,s.length<t?s=s.padStart(t,"a"):s.length>t&&(s=s.slice(-t)),s},me=(e,t)=>{let s=t.length;for(;s;)e=e*33^t.charCodeAt(--s);return e},L=(e,t=5)=>{const s=me(5381,JSON.stringify(e))>>>0;return ge(s,t)};function E(e){return e?typeof e!="string"?E(String(e)):e.replace(/[\s.]/g,"-").replace(/[A-Z](?:(?=[^A-Z])|[A-Z]*(?=[A-Z][^A-Z]|$))/g,(t,s)=>(s>0?"-":"")+t.toLowerCase()):""}const he=(e,t)=>{if(typeof e!="string")return{result:e};if(!t)return{result:e};const s=[];return Object.values(t).forEach(n=>{const{pattern:i,transform:o}=n;e=e.replace(i,l=>{const{value:d,css:c}=o(l);return c&&s.push(c),d})}),{result:e,additionalCss:s}},Q=e=>typeof e!="string"?{result:e}:/\{[^{}]+\}/g.test(e)?{result:e.replace(/\{([^{}]+)\}/g,(...n)=>`var(--${E(n[1].replaceAll(".","-"))})`)}:{result:e},D=(e,t,s)=>{if(!e)return"";const n=[],i=Object.entries(e).reduce((l,[d,c])=>{const r=d.trim();if(typeof c=="function"&&(c=c()),typeof c=="object"){if(!c)return l;if(r==="variants")return Object.entries(c).forEach(([f,g])=>{g&&Object.entries(g).forEach(([N,b])=>{if(!b)return;const T=`${t}.${f}-${N}`,k=D(b,T);n.push(k)})}),l;if(r==="defaultVariants")return l;if(r==="compoundVariants")return c.forEach(f=>{const{css:g,...N}=f,b=Object.entries(N).reduce((k,[p,m])=>`${k}.${p}-${m}`,t),T=D(g,b);n.push(T)}),l;if(r.startsWith("@")){const f=D(c,t),g=`${r} {
- ${f.replace(`
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const pt=require("esbuild"),dt=require("child_process"),c=require("path"),l=require("fs"),X=require("fs/promises"),W=require("winston");var I=typeof document<"u"?document.currentScript:null;function yt(t){const e=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(t){for(const s in t)if(s!=="default"){const n=Object.getOwnPropertyDescriptor(t,s);Object.defineProperty(e,s,n.get?n:{enumerable:!0,get:()=>t[s]})}}return e.default=t,Object.freeze(e)}const Y=yt(pt),U=t=>String.fromCharCode(t+(t>25?39:97)),gt=(t,e)=>{let s="",n;for(n=Math.abs(t);n>52;n=n/52|0)s=U(n%52)+s;return s=U(n%52)+s,s.length<e?s=s.padStart(e,"a"):s.length>e&&(s=s.slice(-e)),s},mt=(t,e)=>{let s=e.length;for(;s;)t=t*33^e.charCodeAt(--s);return t},J=(t,e=5)=>{const s=mt(5381,JSON.stringify(t))>>>0;return gt(s,e)};function V(t){return t?typeof t!="string"?V(String(t)):t.replace(/[\s.]/g,"-").replace(/[A-Z](?:(?=[^A-Z])|[A-Z]*(?=[A-Z][^A-Z]|$))/g,(e,s)=>(s>0?"-":"")+e.toLowerCase()):""}const ht=(t,e)=>{if(typeof t!="string")return{result:t};if(!e)return{result:t};const s=[];return Object.values(e).forEach(n=>{const{pattern:i,transform:o}=n;t=t.replace(i,f=>{const{value:g,css:a}=o(f);return a&&s.push(a),g})}),{result:t,additionalCss:s}},Q=t=>typeof t!="string"?{result:t}:/\{[^{}]+\}/g.test(t)?{result:t.replace(/\{([^{}]+)\}/g,(...n)=>`var(--${V(n[1].replaceAll(".","-"))})`)}:{result:t},M=(t,e,s)=>{if(!t)return"";const n=[],i=Object.entries(t).reduce((f,[g,a])=>{const r=g.trim();if(typeof a=="function"&&(a=a()),typeof a=="object"){if(!a)return f;if(r==="variants")return Object.entries(a).forEach(([u,m])=>{m&&Object.entries(m).forEach(([x,F])=>{if(!F)return;const T=`${e}.${u}-${x}`,N=M(F,T);n.push(N)})}),f;if(r==="defaultVariants")return f;if(r==="compoundVariants")return a.forEach(u=>{const{css:m,...x}=u,F=Object.entries(x).reduce((N,[y,$])=>`${N}.${y}-${$}`,e),T=M(m,F);n.push(T)}),f;if(r.startsWith("@")){const u=M(a,e),m=`${r} {
+ ${u.replace(`
 `,`
  `)}
-}`;return n.push(g),l}const y=d.includes("&")?r.replace("&",t):r.startsWith(":")?`${t}${r}`:`${t} ${r}`,w=D(c,y);return n.push(w),l}const h=r.startsWith("-")?r:E(r),F=(y,w=";")=>l=`${l}${y}${w}`,j=y=>F(`${h}:${y}`);if(typeof c=="number")return j(c);if(typeof c!="string")if("toString"in c)c=c.toString();else return l;const{modifiers:S}={},_=function*(){yield Q(c),yield he(c,S)}();for(const{result:y,additionalCss:w=[]}of _)c=y,w.forEach(f=>{const g=D(f,"");F(g,"")});return j(c)},"");return i?t?[`${t} { ${i} }`,...n].join(`
+}`;return n.push(m),f}const d=g.includes("&")?r.replace("&",e):r.startsWith(":")?`${e}${r}`:`${e} ${r}`,j=M(a,d);return n.push(j),f}const p=r.startsWith("-")?r:V(r),h=(d,j=";")=>f=`${f}${d}${j}`,w=d=>h(`${p}:${d}`);if(typeof a=="number")return w(a);if(typeof a!="string")if("toString"in a)a=a.toString();else return f;const{modifiers:b}={},C=function*(){yield Q(a),yield ht(a,b)}();for(const{result:d,additionalCss:j=[]}of C)a=d,j.forEach(u=>{const m=M(u,"");h(m,"")});return w(a)},"");return i?e?[`${e} { ${i} }`,...n].join(`
 `):i:n.join(`
-`)},v=(e,t=[])=>{if(!e)return"";const s=[],n={};if(Object.entries(e).forEach(([i,o])=>{if(typeof o=="object"){if(!o)return;const l=i.trim(),d=v(o,[...t,l]);s.push(d)}else n[i]=o}),Object.keys(n).length){const i=t.map(E).join("-"),o=D(n,`.${i}`);s.push(o)}return s.join(`
-`)},Se=e=>Object.entries(e).reduce((t,[s,n])=>(typeof n=="object"&&(t[s]=ee(n).map(i=>`"${i}"`).join(" | ")),t),{}),ee=(e,t="",s=new Set)=>e?(Object.entries(e).forEach(([n,i])=>{const o=t?`${t}.${n}`:n;return typeof i=="object"?ee(i,o,s):s.add(t)}),[...s]):[],te=e=>{if(!e||e==="/")throw new Error("Could not find package.json file");const t=a.join(e,"package.json");return u.existsSync(t)?t:te(a.join(e,".."))},$e=async e=>{const t=te(e);return await X.readFile(t,"utf-8").then(JSON.parse).catch(()=>{})},be=async e=>{const t=await $e(e);if(t)return t.type};let R;const se=async e=>{if(R)return R;const t=await be(e);return t==="module"?R="esm":(t==="commonjs"||(typeof document>"u"?require("url").pathToFileURL(__filename).href:Z&&Z.tagName.toUpperCase()==="SCRIPT"&&Z.src||new URL("index.cjs",document.baseURI).href).endsWith(".cjs"))&&(R="cjs"),R||"esm"},I=J.createLogger({level:"debug",format:J.format.combine(J.format.colorize(),J.format.cli()),transports:[new J.transports.Console({})]});function ne(e){return e?typeof e!="string"?ne(String(e)):e.replace(/[\s-]/g,".").replace(/[A-Z](?:(?=[^A-Z])|[A-Z]*(?=[A-Z][^A-Z]|$))/g,(t,s)=>(s>0?".":"")+t.toLowerCase()):""}const je={"*, *::before, *::after":{boxSizing:"border-box"},"*":{margin:0},html:{lineHeight:1.15,textSizeAdjust:"100%",WebkitFontSmoothing:"antialiased"},"img, picture, video, canvas, svg":{display:"block",maxWidth:"100%"},"p, h1, h2, h3, h4, h5, h6":{overflowWrap:"break-word"},p:{textWrap:"pretty"},"h1, h2, h3, h4, h5, h6":{textWrap:"balance"},a:{color:"currentColor"},button:{lineHeight:"1em",color:"currentColor"},"input, optgroup, select, textarea":{fontFamily:"inherit",fontSize:"100%",lineHeight:"1.15em"}},q={externalModules:[]},oe=e=>{if(q.externalModules.length>0)return q.externalModules;const t=a.join(e,"salty.config.ts"),n=u.readFileSync(t,"utf8").match(/externalModules:\s?\[(.*)\]/);if(!n)return[];const i=n[1].split(",").map(o=>o.replace(/['"`]/g,"").trim());return q.externalModules=i,i},z=e=>a.join(e,"./saltygen"),re=["salty","css","styles","styled"],we=(e=[])=>new RegExp(`\\.(${[...re,...e].join("|")})\\.`),W=(e,t=[])=>we(t).test(e),Fe=async e=>{const t=z(e),s=a.join(e,"salty.config.ts"),n=a.join(t,"salty.config.js"),i=await se(e),o=oe(e);await Y.build({entryPoints:[s],minify:!0,treeShaking:!0,bundle:!0,outfile:n,format:i,external:o});const l=Date.now(),{config:d}=await import(`${n}?t=${l}`);return d},xe=async e=>{const t=await Fe(e),s=new Set,n=(p,m=[])=>p?Object.entries(p).flatMap(([C,$])=>{if(!$)return;if(typeof $=="object")return n($,[...m,C]);const M=ne(C),A=E(C),V=[...m,M].join(".");s.add(`"${V}"`);const P=[...m.map(E),A].join("-"),{result:O}=Q($);return`--${P}: ${O};`}):[],i=p=>p?Object.entries(p).flatMap(([m,C])=>{const $=n(C);return m==="base"?$.join(""):`${m} { ${$.join("")} }`}):[],o=p=>p?Object.entries(p).flatMap(([m,C])=>Object.entries(C).flatMap(([$,M])=>{const A=n(M,[m]),V=`.${m}-${$}, [data-${m}="${$}"]`,P=A.join("");return`${V} { ${P} }`})):[],l=n(t.variables),d=i(t.responsiveVariables),c=o(t.conditionalVariables),r=z(e),h=a.join(r,"css/_variables.css"),F=`:root { ${l.join("")} ${d.join("")} } ${c.join("")}`;u.writeFileSync(h,F);const j=a.join(r,"css/_global.css"),S=D(t.global,"");u.writeFileSync(j,`@layer global { ${S} }`);const x=a.join(r,"css/_reset.css"),y=t.reset==="none"?{}:typeof t.reset=="object"?t.reset:je,w=D(y,"");u.writeFileSync(x,`@layer reset { ${w} }`);const f=a.join(r,"css/_templates.css"),g=v(t.templates),N=Se(t.templates);u.writeFileSync(f,g);const b=a.join(r,"types/css-tokens.d.ts"),k=`
+`)},v=(t,e=[])=>{if(!t)return"";const s=[],n={};if(Object.entries(t).forEach(([i,o])=>{if(typeof o=="object"){if(!o)return;const f=i.trim(),g=v(o,[...e,f]);s.push(g)}else n[i]=o}),Object.keys(n).length){const i=e.map(V).join("-"),o=M(n,`.${i}`);s.push(o)}return s.join(`
+`)},$t=t=>Object.entries(t).reduce((e,[s,n])=>(typeof n=="object"&&(e[s]=tt(n).map(i=>`"${i}"`).join(" | ")),e),{}),tt=(t,e="",s=new Set)=>t?(Object.entries(t).forEach(([n,i])=>{const o=e?`${e}.${n}`:n;return typeof i=="object"?tt(i,o,s):s.add(e)}),[...s]):[],et=t=>{if(!t||t==="/")throw new Error("Could not find package.json file");const e=c.join(t,"package.json");return l.existsSync(e)?e:et(c.join(t,".."))},St=async t=>{const e=et(t);return await X.readFile(e,"utf-8").then(JSON.parse).catch(()=>{})},bt=async t=>{const e=await St(t);if(e)return e.type};let A;const st=async t=>{if(A)return A;const e=await bt(t);return e==="module"?A="esm":(e==="commonjs"||(typeof document>"u"?require("url").pathToFileURL(__filename).href:I&&I.tagName.toUpperCase()==="SCRIPT"&&I.src||new URL("index.cjs",document.baseURI).href).endsWith(".cjs"))&&(A="cjs"),A||"esm"},Z=W.createLogger({level:"debug",format:W.format.combine(W.format.colorize(),W.format.cli()),transports:[new W.transports.Console({})]});function nt(t){return t?typeof t!="string"?nt(String(t)):t.replace(/[\s-]/g,".").replace(/[A-Z](?:(?=[^A-Z])|[A-Z]*(?=[A-Z][^A-Z]|$))/g,(e,s)=>(s>0?".":"")+e.toLowerCase()):""}const jt={"*, *::before, *::after":{boxSizing:"border-box"},"*":{margin:0},html:{lineHeight:1.15,textSizeAdjust:"100%",WebkitFontSmoothing:"antialiased"},"img, picture, video, canvas, svg":{display:"block",maxWidth:"100%"},"p, h1, h2, h3, h4, h5, h6":{overflowWrap:"break-word"},p:{textWrap:"pretty"},"h1, h2, h3, h4, h5, h6":{textWrap:"balance"},a:{color:"currentColor"},button:{lineHeight:"1em",color:"currentColor"},"input, optgroup, select, textarea":{fontFamily:"inherit",fontSize:"100%",lineHeight:"1.15em"}},q={externalModules:[]},ot=t=>{if(q.externalModules.length>0)return q.externalModules;const e=c.join(t,"salty.config.ts"),n=l.readFileSync(e,"utf8").match(/externalModules:\s?\[(.*)\]/);if(!n)return[];const i=n[1].split(",").map(o=>o.replace(/['"`]/g,"").trim());return q.externalModules=i,i},H=t=>c.join(t,"./saltygen"),rt=["salty","css","styles","styled"],wt=(t=[])=>new RegExp(`\\.(${[...rt,...t].join("|")})\\.`),z=(t,e=[])=>wt(e).test(t),Ft=async t=>{const e=H(t),s=c.join(t,"salty.config.ts"),n=c.join(e,"salty.config.js"),i=await st(t),o=ot(t);await Y.build({entryPoints:[s],minify:!0,treeShaking:!0,bundle:!0,outfile:n,format:i,external:o});const f=Date.now(),{config:g}=await import(`${n}?t=${f}`);return g},Ct=async t=>{const e=await Ft(t),s=new Set,n=(y,$=[])=>y?Object.entries(y).flatMap(([k,S])=>{if(!S)return;if(typeof S=="object")return n(S,[...$,k]);const E=nt(k),R=V(k),_=[...$,E].join(".");s.add(`"${_}"`);const O=[...$.map(V),R].join("-"),{result:D}=Q(S);return`--${O}: ${D};`}):[],i=y=>y?Object.entries(y).flatMap(([$,k])=>{const S=n(k);return $==="base"?S.join(""):`${$} { ${S.join("")} }`}):[],o=y=>y?Object.entries(y).flatMap(([$,k])=>Object.entries(k).flatMap(([S,E])=>{const R=n(E,[$]),_=`.${$}-${S}, [data-${$}="${S}"]`,O=R.join("");return`${_} { ${O} }`})):[],f=n(e.variables),g=i(e.responsiveVariables),a=o(e.conditionalVariables),r=H(t),p=c.join(r,"css/_variables.css"),h=`:root { ${f.join("")} ${g.join("")} } ${a.join("")}`;l.writeFileSync(p,h);const w=c.join(r,"css/_global.css"),b=M(e.global,"");l.writeFileSync(w,`@layer global { ${b} }`);const P=c.join(r,"css/_reset.css"),d=e.reset==="none"?{}:typeof e.reset=="object"?e.reset:jt,j=M(d,"");l.writeFileSync(P,`@layer reset { ${j} }`);const u=c.join(r,"css/_templates.css"),m=v(e.templates),x=$t(e.templates);l.writeFileSync(u,m);const F=c.join(r,"types/css-tokens.d.ts"),N=`
   // Variable types
   type VariableTokens = ${[...s].join("|")}; 
   type PropertyValueToken = \`{\${VariableTokens}}\`;
 
   // Template types
   type TemplateTokens = {
-    ${Object.entries(N).map(([p,m])=>`${p}?: ${m}`).join(`
+    ${Object.entries(x).map(([y,$])=>`${y}?: ${$}`).join(`
 `)}
   }
-  `;u.writeFileSync(b,k)},G=e=>e.replace(/styled\(([^"'`{,]+),/g,(t,s)=>{const n=/^['"`]/.test(s);if(n&&console.log("String tag",s),n)return t;const i=new RegExp(`import[^;]*${s}[,\\s{][^;]*from\\s?([^{};]+);`),o=i.test(e);if(o||console.log("Not imported",s),!o)return t;const l=i.exec(e);if(l){const d=l.at(1),c=re.some(r=>d==null?void 0:d.includes(r));if(c&&console.log("Salty import for",s,`"${l.at(0)}"`),c)return t}return console.log("Replacing",s),"styled('div',"}),H=async(e,t,s)=>{console.log({sourceFilePath:t});const n=L(t),i=a.join(s,"./temp");u.existsSync(i)||u.mkdirSync(i);const o=a.parse(t);let l=u.readFileSync(t,"utf8");l=G(l);const d=a.join(s,"js",n+".js"),c=oe(e),r=await se(e);await Y.build({stdin:{contents:l,sourcefile:o.base,resolveDir:o.dir,loader:"tsx"},minify:!1,treeShaking:!0,bundle:!0,outfile:d,format:r,target:["node20"],keepNames:!0,external:c,packages:"external",plugins:[{name:"test",setup:j=>{j.onLoad({filter:/.*.css.ts/},S=>{console.log("Loading",{sourceFilePath:t,args:S});const x=u.readFileSync(S.path,"utf8");return{contents:G(x),loader:"ts"}})}}]});const h=Date.now();return await import(`${d}?t=${h}`)},B=async e=>{const t=z(e),s=a.join(t,"salty.config.js"),n=Date.now(),{config:i}=await import(`${s}?t=${n}`);return i},ie=()=>{try{return process.env.NODE_ENV==="production"}catch{return!1}},Ce=async(e,t=ie())=>{try{const s=Date.now();t?I.info("Generating CSS in production mode! 🔥"):I.info("Generating CSS in development mode! 🚀");const n=[],i=[],o=z(e),l=a.join(o,"index.css");(()=>{u.existsSync(o)&&de.execSync("rm -rf "+o),u.mkdirSync(o),u.mkdirSync(a.join(o,"css")),u.mkdirSync(a.join(o,"types"))})(),await xe(e);const c=await B(e);async function r(f,g){const N=["node_modules","saltygen"],b=u.statSync(f);if(b.isDirectory()){const T=u.readdirSync(f);if(N.some(p=>f.includes(p)))return;await Promise.all(T.map(p=>r(a.join(f,p),a.join(g,p))))}else if(b.isFile()&&W(f)){const k=await H(e,f,o),p=[];Object.entries(k).forEach(([V,P])=>{if(P.isKeyframes&&P.css){const K=`a_${P.animationName}.css`,fe=`css/${K}`,ue=a.join(o,fe);n.push(K),u.writeFileSync(ue,P.css);return}if(!P.generator)return;const O=P.generator._withBuildContext({name:V,config:c,prod:t});i[O.priority]||(i[O.priority]=[]),i[O.priority].push(O.cssFileName),p.push(O.cssFileName);const ae=`css/${O.cssFileName}`,le=a.join(o,ae);u.writeFileSync(le,O.css)});const m=p.map(V=>`@import url('./${V}');`).join(`
-`),C=L(f,6),$=a.parse(f),M=E($.name),A=a.join(o,`css/f_${M}-${C}.css`);u.writeFileSync(A,m)}}await r(e,o);const h=n.map(f=>`@import url('./css/${f}');`).join(`
-`);let x=`@layer reset, global, l0, l1, l2, l3, l4, l5, l6, l7, l8;
+  `;l.writeFileSync(F,N)},G=t=>t.replace(/styled\(([^"'`{,]+),/g,(e,s)=>{if(/^['"`]/.test(s))return e;const i=new RegExp(`import[^;]*${s}[,\\s{][^;]*from\\s?([^{};]+);`);if(!i.test(t))return e;const f=i.exec(t);if(f){const g=f.at(1);if(rt.some(r=>g==null?void 0:g.includes(r)))return e}return"styled('div',"}),L=async(t,e,s)=>{const n=J(e),i=c.join(s,"./temp");l.existsSync(i)||l.mkdirSync(i);const o=c.parse(e);let f=l.readFileSync(e,"utf8");f=G(f);const g=c.join(s,"js",n+".js"),a=ot(t),r=await st(t);await Y.build({stdin:{contents:f,sourcefile:o.base,resolveDir:o.dir,loader:"tsx"},minify:!1,treeShaking:!0,bundle:!0,outfile:g,format:r,target:["node20"],keepNames:!0,external:a,packages:"external",plugins:[{name:"test",setup:w=>{w.onLoad({filter:/.*\.css|salty|styles|styled\.ts/},b=>{const P=l.readFileSync(b.path,"utf8");return{contents:G(P),loader:"ts"}})}}]});const p=Date.now();return await import(`${g}?t=${p}`)},B=async t=>{const e=H(t),s=c.join(e,"salty.config.js"),n=Date.now(),{config:i}=await import(`${s}?t=${n}`);return i},it=()=>{try{return process.env.NODE_ENV==="production"}catch{return!1}},xt=async(t,e=it())=>{try{const s=Date.now();e?Z.info("Generating CSS in production mode! 🔥"):Z.info("Generating CSS in development mode! 🚀");const n=[],i=[],o=H(t),f=c.join(o,"index.css");(()=>{l.existsSync(o)&&dt.execSync("rm -rf "+o),l.mkdirSync(o),l.mkdirSync(c.join(o,"css")),l.mkdirSync(c.join(o,"types"))})(),await Ct(t);const a=await B(t);async function r(u,m){const x=["node_modules","saltygen"],F=l.statSync(u);if(F.isDirectory()){const T=l.readdirSync(u);if(x.some(y=>u.includes(y)))return;await Promise.all(T.map(y=>r(c.join(u,y),c.join(m,y))))}else if(F.isFile()&&z(u)){const N=await L(t,u,o),y=[];Object.entries(N).forEach(([_,O])=>{if(O.isKeyframes&&O.css){const K=`a_${O.animationName}.css`,ft=`css/${K}`,ut=c.join(o,ft);n.push(K),l.writeFileSync(ut,O.css);return}if(!O.generator)return;const D=O.generator._withBuildContext({name:_,config:a,prod:e});i[D.priority]||(i[D.priority]=[]),i[D.priority].push(D.cssFileName),y.push(D.cssFileName);const at=`css/${D.cssFileName}`,lt=c.join(o,at);l.writeFileSync(lt,D.css)});const $=y.map(_=>`@import url('./${_}');`).join(`
+`),k=J(u,6),S=c.parse(u),E=V(S.name),R=c.join(o,`css/f_${E}-${k}.css`);l.writeFileSync(R,$)}}await r(t,o);const p=n.map(u=>`@import url('./css/${u}');`).join(`
+`);let P=`@layer reset, global, l0, l1, l2, l3, l4, l5, l6, l7, l8;
 
-${["_variables.css","_reset.css","_global.css","_templates.css"].filter(f=>{try{return u.readFileSync(a.join(o,"css",f),"utf8").length>0}catch{return!1}}).map(f=>`@import url('./css/${f}');`).join(`
+${["_variables.css","_reset.css","_global.css","_templates.css"].filter(u=>{try{return l.readFileSync(c.join(o,"css",u),"utf8").length>0}catch{return!1}}).map(u=>`@import url('./css/${u}');`).join(`
 `)}
-${h}`;if(c.importStrategy!=="component"){const f=i.reduce((g,N,b)=>{const T=N.reduce((C,$)=>{const M=u.readFileSync(a.join(o,"css",$),"utf8");return`${C}
-${M}`},""),k=`l_${b}.css`,p=a.join(o,"css",k),m=`@layer l${b} { ${T} }`;return u.writeFileSync(p,m),`${g}
-@import url('./css/${k}');`},"");x+=f}u.writeFileSync(l,x);const y=Date.now()-s,w=y<200?"🔥":y<500?"🚀":y<1e3?"🎉":y<2e3?"🚗":y<5e3?"🤔":"🥴";I.info(`Generated CSS in ${y}ms! ${w}`)}catch(s){console.error(s)}},ke=async(e,t)=>{try{const s=[],n=a.join(e,"./saltygen"),i=a.join(n,"index.css");if(W(t)){const l=await B(e),d=await H(e,t,n);Object.entries(d).forEach(([j,S])=>{if(S.isKeyframes&&S.css){const f=`css/${`a_${S.animationName}.css`}`,g=a.join(n,f);u.writeFileSync(g,S.css);return}if(!S.generator)return;const x=S.generator._withBuildContext({name:j,config:l}),_=`css/${x.cssFileName}`,y=a.join(n,_);s.push(x.cssFileName),u.writeFileSync(y,x.css)});const c=u.readFileSync(i,"utf8").split(`
-`),r=s.map(j=>`@import url('../saltygen/css/${j}');`),F=[...new Set([...c,...r])].join(`
-`);u.writeFileSync(i,F)}}catch(s){console.error(s)}},Ne=async(e,t,s=ie())=>{try{const n=a.join(e,"./saltygen");if(W(t)){const o=u.readFileSync(t,"utf8");o.replace(/^(?!export\s)const\s.*/gm,h=>`export ${h}`)!==o&&await X.writeFile(t,o);const d=await B(e),c=await H(e,t,n);let r=o;if(Object.entries(c).forEach(([h,F])=>{var C;if(F.isKeyframes||!F.generator)return;const j=F.generator._withBuildContext({name:h,config:d,prod:s}),S=new RegExp(`\\s${h}[=\\s]+[^()]+styled\\(([^,]+),`,"g").exec(o);if(!S)return console.error("Could not find the original declaration");const x=(C=S.at(1))==null?void 0:C.trim(),_=new RegExp(`\\s${h}[=\\s]+styled\\(`,"g").exec(r);if(!_)return console.error("Could not find the original declaration");const{index:y}=_;let w=!1;const f=setTimeout(()=>w=!0,5e3);let g=0,N=!1,b=0;for(;!N&&!w;){const $=r[y+g];$==="("&&b++,$===")"&&b--,b===0&&$===")"&&(N=!0),g>r.length&&(w=!0),g++}if(!w)clearTimeout(f);else throw new Error("Failed to find the end of the styled call and timed out");const T=y+g,k=r.slice(y,T),p=r,m=` ${h} = styled(${x}, "${j.classNames}", ${JSON.stringify(j.props)});`;r=r.replace(k,m),p===r&&console.error("Minimize file failed to change content",{name:h,tagName:x})}),d.importStrategy==="component"){const h=L(t,6),F=a.parse(t);r=`import '../../saltygen/css/${`f_${E(F.name)}-${h}.css`}';
-${r}`}return r=r.replace("{ styled }","{ styledClient as styled }"),r=r.replace("@salty-css/react/styled","@salty-css/react/styled-client"),r}}catch(n){console.error("Error in minimizeFile:",n)}},ce=e=>({name:"stylegen",buildStart:()=>Ce(e),load:async t=>{if(W(t))return await Ne(e,t)},handleHotUpdate:async({file:t,server:s})=>{t.includes("salty.config")&&await s.restart()},watchChange:{handler:async t=>{W(t)&&await ke(e,t)}}});exports.default=ce;exports.saltyPlugin=ce;
+${p}`;if(a.importStrategy!=="component"){const u=i.reduce((m,x,F)=>{const T=x.reduce((k,S)=>{const E=c.join(o,"css",S),R=l.readFileSync(E,"utf8"),_=J(E,6);return`${k}
+/*start:${_}*/
+${R}
+/*end:${_}*/
+`},""),N=`l_${F}.css`,y=c.join(o,"css",N),$=`@layer l${F} { ${T}
+ }`;return l.writeFileSync(y,$),`${m}
+@import url('./css/${N}');`},"");P+=u}l.writeFileSync(f,P);const d=Date.now()-s,j=d<200?"🔥":d<500?"🚀":d<1e3?"🎉":d<2e3?"🚗":d<5e3?"🤔":"🥴";Z.info(`Generated CSS in ${d}ms! ${j}`)}catch(s){console.error(s)}},kt=async(t,e)=>{try{const s=c.join(t,"./saltygen"),n=c.join(s,"index.css");if(z(e)){const o=[],f=await B(t),g=await L(t,e,s);Object.entries(g).forEach(([r,p])=>{if(p.isKeyframes&&p.css){const C=`css/${`a_${p.animationName}.css`}`,d=c.join(s,C);l.writeFileSync(d,p.css);return}if(!p.generator)return;const h=p.generator._withBuildContext({name:r,config:f}),w=`css/${h.cssFileName}`,b=c.join(s,w);l.writeFileSync(b,h.css),o[h.priority]||(o[h.priority]=[]),o[h.priority].push(h.cssFileName)});const a=l.readFileSync(n,"utf8").split(`
+`);f.importStrategy!=="component"&&o.forEach((r,p)=>{const h=`l_${p}.css`,w=c.join(s,"css",h);let b=l.readFileSync(w,"utf8");r.forEach(P=>{const C=c.join(s,"css",P),d=J(C,6),j=b.includes(d);if(console.log({layer:p,filepath:C,filepathHash:d,found:j}),!j){const u=l.readFileSync(C,"utf8"),m=J(C,6),x=`/*start:${m}*/
+${u}
+/*end:${m}*/
+`;b=`${b.replace(/\}$/,"")}
+${x}
+}`}}),l.writeFileSync(w,b)})}}catch(s){console.error(s)}},Pt=async(t,e,s=it())=>{try{const n=c.join(t,"./saltygen");if(z(e)){const o=l.readFileSync(e,"utf8");o.replace(/^(?!export\s)const\s.*/gm,p=>`export ${p}`)!==o&&await X.writeFile(e,o);const g=await B(t),a=await L(t,e,n);let r=o;if(Object.entries(a).forEach(([p,h])=>{var k;if(h.isKeyframes||!h.generator)return;const w=h.generator._withBuildContext({name:p,config:g,prod:s}),b=new RegExp(`\\s${p}[=\\s]+[^()]+styled\\(([^,]+),`,"g").exec(o);if(!b)return console.error("Could not find the original declaration");const P=(k=b.at(1))==null?void 0:k.trim(),C=new RegExp(`\\s${p}[=\\s]+styled\\(`,"g").exec(r);if(!C)return console.error("Could not find the original declaration");const{index:d}=C;let j=!1;const u=setTimeout(()=>j=!0,5e3);let m=0,x=!1,F=0;for(;!x&&!j;){const S=r[d+m];S==="("&&F++,S===")"&&F--,F===0&&S===")"&&(x=!0),m>r.length&&(j=!0),m++}if(!j)clearTimeout(u);else throw new Error("Failed to find the end of the styled call and timed out");const T=d+m,N=r.slice(d,T),y=r,$=` ${p} = styled(${P}, "${w.classNames}", ${JSON.stringify(w.props)});`;r=r.replace(N,$),y===r&&console.error("Minimize file failed to change content",{name:p,tagName:P})}),g.importStrategy==="component"){const p=J(e,6),h=c.parse(e);r=`import '../../saltygen/css/${`f_${V(h.name)}-${p}.css`}';
+${r}`}return r=r.replace("{ styled }","{ styledClient as styled }"),r=r.replace("@salty-css/react/styled","@salty-css/react/styled-client"),r}}catch(n){console.error("Error in minimizeFile:",n)}},ct=t=>({name:"stylegen",buildStart:()=>xt(t),load:async e=>{if(z(e))return await Pt(t,e)},handleHotUpdate:async({file:e,server:s})=>{e.includes("salty.config")&&await s.restart()},watchChange:{handler:async e=>{z(e)&&await kt(t,e)}}});exports.default=ct;exports.saltyPlugin=ct;

package/index.js

@@ -1,9 +1,9 @@
 import * as v from "esbuild";
 import { execSync as dt } from "child_process";
-import { join as f, parse as B } from "path";
-import { existsSync as K, mkdirSync as z, statSync as gt, readdirSync as yt, writeFileSync as k, readFileSync as A } from "fs";
+import { join as a, parse as K } from "path";
+import { existsSync as G, mkdirSync as H, statSync as gt, readdirSync as yt, writeFileSync as P, readFileSync as V } from "fs";
 import { readFile as mt, writeFile as ht } from "fs/promises";
-import { createLogger as $t, format as H, transports as bt } from "winston";
+import { createLogger as $t, format as I, transports as bt } from "winston";
 const Y = (t) => String.fromCharCode(t + (t > 25 ? 39 : 97)), St = (t, e) => {
   let s = "", n;
   for (n = Math.abs(t); n > 52; n = n / 52 | 0) s = Y(n % 52) + s;
@@ -12,12 +12,12 @@ const Y = (t) => String.fromCharCode(t + (t > 25 ? 39 : 97)), St = (t, e) => {
   let s = e.length;
   for (; s; ) t = t * 33 ^ e.charCodeAt(--s);
   return t;
-}, G = (t, e = 5) => {
+}, W = (t, e = 5) => {
   const s = wt(5381, JSON.stringify(t)) >>> 0;
   return St(s, e);
 };
-function V(t) {
-  return t ? typeof t != "string" ? V(String(t)) : t.replace(/[\s.]/g, "-").replace(/[A-Z](?:(?=[^A-Z])|[A-Z]*(?=[A-Z][^A-Z]|$))/g, (e, s) => (s > 0 ? "-" : "") + e.toLowerCase()) : "";
+function A(t) {
+  return t ? typeof t != "string" ? A(String(t)) : t.replace(/[\s.]/g, "-").replace(/[A-Z](?:(?=[^A-Z])|[A-Z]*(?=[A-Z][^A-Z]|$))/g, (e, s) => (s > 0 ? "-" : "") + e.toLowerCase()) : "";
 }
 const jt = (t, e) => {
   if (typeof t != "string") return { result: t };
@@ -25,57 +25,57 @@ const jt = (t, e) => {
   const s = [];
   return Object.values(e).forEach((n) => {
     const { pattern: i, transform: o } = n;
-    t = t.replace(i, (a) => {
-      const { value: u, css: c } = o(a);
-      return c && s.push(c), u;
+    t = t.replace(i, (l) => {
+      const { value: g, css: c } = o(l);
+      return c && s.push(c), g;
     });
   }), { result: t, additionalCss: s };
-}, tt = (t) => typeof t != "string" ? { result: t } : /\{[^{}]+\}/g.test(t) ? { result: t.replace(/\{([^{}]+)\}/g, (...n) => `var(--${V(n[1].replaceAll(".", "-"))})`) } : { result: t }, O = (t, e, s) => {
+}, tt = (t) => typeof t != "string" ? { result: t } : /\{[^{}]+\}/g.test(t) ? { result: t.replace(/\{([^{}]+)\}/g, (...n) => `var(--${A(n[1].replaceAll(".", "-"))})`) } : { result: t }, M = (t, e, s) => {
   if (!t) return "";
-  const n = [], i = Object.entries(t).reduce((a, [u, c]) => {
-    const r = u.trim();
+  const n = [], i = Object.entries(t).reduce((l, [g, c]) => {
+    const r = g.trim();
     if (typeof c == "function" && (c = c()), typeof c == "object") {
-      if (!c) return a;
+      if (!c) return l;
       if (r === "variants")
-        return Object.entries(c).forEach(([l, g]) => {
-          g && Object.entries(g).forEach(([N, b]) => {
-            if (!b) return;
-            const T = `${e}.${l}-${N}`, F = O(b, T);
-            n.push(F);
+        return Object.entries(c).forEach(([f, y]) => {
+          y && Object.entries(y).forEach(([C, j]) => {
+            if (!j) return;
+            const T = `${e}.${f}-${C}`, N = M(j, T);
+            n.push(N);
           });
-        }), a;
+        }), l;
       if (r === "defaultVariants")
-        return a;
+        return l;
       if (r === "compoundVariants")
-        return c.forEach((l) => {
-          const { css: g, ...N } = l, b = Object.entries(N).reduce((F, [p, y]) => `${F}.${p}-${y}`, e), T = O(g, b);
+        return c.forEach((f) => {
+          const { css: y, ...C } = f, j = Object.entries(C).reduce((N, [d, h]) => `${N}.${d}-${h}`, e), T = M(y, j);
           n.push(T);
-        }), a;
+        }), l;
       if (r.startsWith("@")) {
-        const l = O(c, e), g = `${r} {
- ${l.replace(`
+        const f = M(c, e), y = `${r} {
+ ${f.replace(`
 `, `
  `)}
 }`;
-        return n.push(g), a;
+        return n.push(y), l;
       }
-      const d = u.includes("&") ? r.replace("&", e) : r.startsWith(":") ? `${e}${r}` : `${e} ${r}`, w = O(c, d);
-      return n.push(w), a;
+      const u = g.includes("&") ? r.replace("&", e) : r.startsWith(":") ? `${e}${r}` : `${e} ${r}`, S = M(c, u);
+      return n.push(S), l;
     }
-    const m = r.startsWith("-") ? r : V(r), j = (d, w = ";") => a = `${a}${d}${w}`, S = (d) => j(`${m}:${d}`);
-    if (typeof c == "number") return S(c);
+    const p = r.startsWith("-") ? r : A(r), m = (u, S = ";") => l = `${l}${u}${S}`, w = (u) => m(`${p}:${u}`);
+    if (typeof c == "number") return w(c);
     if (typeof c != "string")
       if ("toString" in c) c = c.toString();
-      else return a;
-    const { modifiers: h } = {}, D = function* () {
-      yield tt(c), yield jt(c, h);
+      else return l;
+    const { modifiers: b } = {}, F = function* () {
+      yield tt(c), yield jt(c, b);
     }();
-    for (const { result: d, additionalCss: w = [] } of D)
-      c = d, w.forEach((l) => {
-        const g = O(l, "");
-        j(g, "");
+    for (const { result: u, additionalCss: S = [] } of F)
+      c = u, S.forEach((f) => {
+        const y = M(f, "");
+        m(y, "");
       });
-    return S(c);
+    return w(c);
   }, "");
   return i ? e ? [`${e} { ${i} }`, ...n].join(`
 `) : i : n.join(`
@@ -86,40 +86,40 @@ const jt = (t, e) => {
   if (Object.entries(t).forEach(([i, o]) => {
     if (typeof o == "object") {
       if (!o) return;
-      const a = i.trim(), u = et(o, [...e, a]);
-      s.push(u);
+      const l = i.trim(), g = et(o, [...e, l]);
+      s.push(g);
     } else
       n[i] = o;
   }), Object.keys(n).length) {
-    const i = e.map(V).join("-"), o = O(n, `.${i}`);
+    const i = e.map(A).join("-"), o = M(n, `.${i}`);
     s.push(o);
   }
   return s.join(`
 `);
-}, xt = (t) => Object.entries(t).reduce((e, [s, n]) => (typeof n == "object" && (e[s] = st(n).map((i) => `"${i}"`).join(" | ")), e), {}), st = (t, e = "", s = /* @__PURE__ */ new Set()) => t ? (Object.entries(t).forEach(([n, i]) => {
+}, Ft = (t) => Object.entries(t).reduce((e, [s, n]) => (typeof n == "object" && (e[s] = st(n).map((i) => `"${i}"`).join(" | ")), e), {}), st = (t, e = "", s = /* @__PURE__ */ new Set()) => t ? (Object.entries(t).forEach(([n, i]) => {
   const o = e ? `${e}.${n}` : n;
   return typeof i == "object" ? st(i, o, s) : s.add(e);
 }), [...s]) : [], nt = (t) => {
   if (!t || t === "/") throw new Error("Could not find package.json file");
-  const e = f(t, "package.json");
-  return K(e) ? e : nt(f(t, ".."));
+  const e = a(t, "package.json");
+  return G(e) ? e : nt(a(t, ".."));
 }, Ct = async (t) => {
   const e = nt(t);
   return await mt(e, "utf-8").then(JSON.parse).catch(() => {
   });
-}, Ft = async (t) => {
+}, xt = async (t) => {
   const e = await Ct(t);
   if (e)
     return e.type;
 };
-let R;
+let J;
 const ot = async (t) => {
-  if (R) return R;
-  const e = await Ft(t);
-  return e === "module" ? R = "esm" : (e === "commonjs" || import.meta.url.endsWith(".cjs")) && (R = "cjs"), R || "esm";
-}, I = $t({
+  if (J) return J;
+  const e = await xt(t);
+  return e === "module" ? J = "esm" : (e === "commonjs" || import.meta.url.endsWith(".cjs")) && (J = "cjs"), J || "esm";
+}, L = $t({
   level: "debug",
-  format: H.combine(H.colorize(), H.cli()),
+  format: I.combine(I.colorize(), I.cli()),
   transports: [new bt.Console({})]
 });
 function rt(t) {
@@ -171,16 +171,16 @@ const kt = {
     fontSize: "100%",
     lineHeight: "1.15em"
   }
-}, L = {
+}, B = {
   externalModules: []
 }, it = (t) => {
-  if (L.externalModules.length > 0) return L.externalModules;
-  const e = f(t, "salty.config.ts"), n = A(e, "utf8").match(/externalModules:\s?\[(.*)\]/);
+  if (B.externalModules.length > 0) return B.externalModules;
+  const e = a(t, "salty.config.ts"), n = V(e, "utf8").match(/externalModules:\s?\[(.*)\]/);
   if (!n) return [];
   const i = n[1].split(",").map((o) => o.replace(/['"`]/g, "").trim());
-  return L.externalModules = i, i;
-}, Z = (t) => f(t, "./saltygen"), ct = ["salty", "css", "styles", "styled"], Nt = (t = []) => new RegExp(`\\.(${[...ct, ...t].join("|")})\\.`), W = (t, e = []) => Nt(e).test(t), Tt = async (t) => {
-  const e = Z(t), s = f(t, "salty.config.ts"), n = f(e, "salty.config.js"), i = await ot(t), o = it(t);
+  return B.externalModules = i, i;
+}, Z = (t) => a(t, "./saltygen"), ct = ["salty", "css", "styles", "styled"], Nt = (t = []) => new RegExp(`\\.(${[...ct, ...t].join("|")})\\.`), z = (t, e = []) => Nt(e).test(t), Pt = async (t) => {
+  const e = Z(t), s = a(t, "salty.config.ts"), n = a(e, "salty.config.js"), i = await ot(t), o = it(t);
   await v.build({
     entryPoints: [s],
     minify: !0,
@@ -190,64 +190,62 @@ const kt = {
     format: i,
     external: o
   });
-  const a = Date.now(), { config: u } = await import(`${n}?t=${a}`);
-  return u;
-}, Pt = async (t) => {
-  const e = await Tt(t), s = /* @__PURE__ */ new Set(), n = (p, y = []) => p ? Object.entries(p).flatMap(([C, $]) => {
+  const l = Date.now(), { config: g } = await import(`${n}?t=${l}`);
+  return g;
+}, Tt = async (t) => {
+  const e = await Pt(t), s = /* @__PURE__ */ new Set(), n = (d, h = []) => d ? Object.entries(d).flatMap(([x, $]) => {
     if (!$) return;
-    if (typeof $ == "object") return n($, [...y, C]);
-    const M = rt(C), J = V(C), _ = [...y, M].join(".");
-    s.add(`"${_}"`);
-    const P = [...y.map(V), J].join("-"), { result: E } = tt($);
-    return `--${P}: ${E};`;
-  }) : [], i = (p) => p ? Object.entries(p).flatMap(([y, C]) => {
-    const $ = n(C);
-    return y === "base" ? $.join("") : `${y} { ${$.join("")} }`;
-  }) : [], o = (p) => p ? Object.entries(p).flatMap(([y, C]) => Object.entries(C).flatMap(([$, M]) => {
-    const J = n(M, [y]), _ = `.${y}-${$}, [data-${y}="${$}"]`, P = J.join("");
-    return `${_} { ${P} }`;
-  })) : [], a = n(e.variables), u = i(e.responsiveVariables), c = o(e.conditionalVariables), r = Z(t), m = f(r, "css/_variables.css"), j = `:root { ${a.join("")} ${u.join("")} } ${c.join("")}`;
-  k(m, j);
-  const S = f(r, "css/_global.css"), h = O(e.global, "");
-  k(S, `@layer global { ${h} }`);
-  const x = f(r, "css/_reset.css"), d = e.reset === "none" ? {} : typeof e.reset == "object" ? e.reset : kt, w = O(d, "");
-  k(x, `@layer reset { ${w} }`);
-  const l = f(r, "css/_templates.css"), g = et(e.templates), N = xt(e.templates);
-  k(l, g);
-  const b = f(r, "types/css-tokens.d.ts"), F = `
+    if (typeof $ == "object") return n($, [...h, x]);
+    const _ = rt(x), R = A(x), E = [...h, _].join(".");
+    s.add(`"${E}"`);
+    const D = [...h.map(A), R].join("-"), { result: O } = tt($);
+    return `--${D}: ${O};`;
+  }) : [], i = (d) => d ? Object.entries(d).flatMap(([h, x]) => {
+    const $ = n(x);
+    return h === "base" ? $.join("") : `${h} { ${$.join("")} }`;
+  }) : [], o = (d) => d ? Object.entries(d).flatMap(([h, x]) => Object.entries(x).flatMap(([$, _]) => {
+    const R = n(_, [h]), E = `.${h}-${$}, [data-${h}="${$}"]`, D = R.join("");
+    return `${E} { ${D} }`;
+  })) : [], l = n(e.variables), g = i(e.responsiveVariables), c = o(e.conditionalVariables), r = Z(t), p = a(r, "css/_variables.css"), m = `:root { ${l.join("")} ${g.join("")} } ${c.join("")}`;
+  P(p, m);
+  const w = a(r, "css/_global.css"), b = M(e.global, "");
+  P(w, `@layer global { ${b} }`);
+  const k = a(r, "css/_reset.css"), u = e.reset === "none" ? {} : typeof e.reset == "object" ? e.reset : kt, S = M(u, "");
+  P(k, `@layer reset { ${S} }`);
+  const f = a(r, "css/_templates.css"), y = et(e.templates), C = Ft(e.templates);
+  P(f, y);
+  const j = a(r, "types/css-tokens.d.ts"), N = `
   // Variable types
   type VariableTokens = ${[...s].join("|")}; 
   type PropertyValueToken = \`{\${VariableTokens}}\`;
 
   // Template types
   type TemplateTokens = {
-    ${Object.entries(N).map(([p, y]) => `${p}?: ${y}`).join(`
+    ${Object.entries(C).map(([d, h]) => `${d}?: ${h}`).join(`
 `)}
   }
   `;
-  k(b, F);
+  P(j, N);
 }, Q = (t) => t.replace(/styled\(([^"'`{,]+),/g, (e, s) => {
-  const n = /^['"`]/.test(s);
-  if (n && console.log("String tag", s), n) return e;
-  const i = new RegExp(`import[^;]*${s}[,\\s{][^;]*from\\s?([^{};]+);`), o = i.test(t);
-  if (o || console.log("Not imported", s), !o) return e;
-  const a = i.exec(t);
-  if (a) {
-    const u = a.at(1), c = ct.some((r) => u == null ? void 0 : u.includes(r));
-    if (c && console.log("Salty import for", s, `"${a.at(0)}"`), c) return e;
+  if (/^['"`]/.test(s)) return e;
+  const i = new RegExp(`import[^;]*${s}[,\\s{][^;]*from\\s?([^{};]+);`);
+  if (!i.test(t)) return e;
+  const l = i.exec(t);
+  if (l) {
+    const g = l.at(1);
+    if (ct.some((r) => g == null ? void 0 : g.includes(r))) return e;
   }
-  return console.log("Replacing", s), "styled('div',";
+  return "styled('div',";
 }), q = async (t, e, s) => {
-  console.log({ sourceFilePath: e });
-  const n = G(e), i = f(s, "./temp");
-  K(i) || z(i);
-  const o = B(e);
-  let a = A(e, "utf8");
-  a = Q(a);
-  const u = f(s, "js", n + ".js"), c = it(t), r = await ot(t);
+  const n = W(e), i = a(s, "./temp");
+  G(i) || H(i);
+  const o = K(e);
+  let l = V(e, "utf8");
+  l = Q(l);
+  const g = a(s, "js", n + ".js"), c = it(t), r = await ot(t);
   await v.build({
     stdin: {
-      contents: a,
+      contents: l,
       sourcefile: o.base,
       resolveDir: o.dir,
       loader: "tsx"
@@ -255,7 +253,7 @@ const kt = {
     minify: !1,
     treeShaking: !0,
     bundle: !0,
-    outfile: u,
+    outfile: g,
     format: r,
     target: ["node20"],
     keepNames: !0,
@@ -264,23 +262,19 @@ const kt = {
     plugins: [
       {
         name: "test",
-        setup: (S) => {
-          S.onLoad({ filter: /.*.css.ts/ }, (h) => {
-            console.log("Loading", {
-              sourceFilePath: e,
-              args: h
-            });
-            const x = A(h.path, "utf8");
-            return { contents: Q(x), loader: "ts" };
+        setup: (w) => {
+          w.onLoad({ filter: /.*\.css|salty|styles|styled\.ts/ }, (b) => {
+            const k = V(b.path, "utf8");
+            return { contents: Q(k), loader: "ts" };
           });
         }
       }
     ]
   });
-  const m = Date.now();
-  return await import(`${u}?t=${m}`);
+  const p = Date.now();
+  return await import(`${g}?t=${p}`);
 }, U = async (t) => {
-  const e = Z(t), s = f(e, "salty.config.js"), n = Date.now(), { config: i } = await import(`${s}?t=${n}`);
+  const e = Z(t), s = a(e, "salty.config.js"), n = Date.now(), { config: i } = await import(`${s}?t=${n}`);
   return i;
 }, at = () => {
   try {
@@ -288,136 +282,154 @@ const kt = {
   } catch {
     return !1;
   }
-}, Dt = async (t, e = at()) => {
+}, Et = async (t, e = at()) => {
   try {
     const s = Date.now();
-    e ? I.info("Generating CSS in production mode! 🔥") : I.info("Generating CSS in development mode! 🚀");
-    const n = [], i = [], o = Z(t), a = f(o, "index.css");
+    e ? L.info("Generating CSS in production mode! 🔥") : L.info("Generating CSS in development mode! 🚀");
+    const n = [], i = [], o = Z(t), l = a(o, "index.css");
     (() => {
-      K(o) && dt("rm -rf " + o), z(o), z(f(o, "css")), z(f(o, "types"));
-    })(), await Pt(t);
+      G(o) && dt("rm -rf " + o), H(o), H(a(o, "css")), H(a(o, "types"));
+    })(), await Tt(t);
     const c = await U(t);
-    async function r(l, g) {
-      const N = ["node_modules", "saltygen"], b = gt(l);
-      if (b.isDirectory()) {
-        const T = yt(l);
-        if (N.some((p) => l.includes(p))) return;
-        await Promise.all(T.map((p) => r(f(l, p), f(g, p))));
-      } else if (b.isFile() && W(l)) {
-        const F = await q(t, l, o), p = [];
-        Object.entries(F).forEach(([_, P]) => {
-          if (P.isKeyframes && P.css) {
-            const X = `a_${P.animationName}.css`, pt = `css/${X}`, ut = f(o, pt);
-            n.push(X), k(ut, P.css);
+    async function r(f, y) {
+      const C = ["node_modules", "saltygen"], j = gt(f);
+      if (j.isDirectory()) {
+        const T = yt(f);
+        if (C.some((d) => f.includes(d))) return;
+        await Promise.all(T.map((d) => r(a(f, d), a(y, d))));
+      } else if (j.isFile() && z(f)) {
+        const N = await q(t, f, o), d = [];
+        Object.entries(N).forEach(([E, D]) => {
+          if (D.isKeyframes && D.css) {
+            const X = `a_${D.animationName}.css`, pt = `css/${X}`, ut = a(o, pt);
+            n.push(X), P(ut, D.css);
             return;
           }
-          if (!P.generator) return;
-          const E = P.generator._withBuildContext({
-            name: _,
+          if (!D.generator) return;
+          const O = D.generator._withBuildContext({
+            name: E,
             config: c,
             prod: e
           });
-          i[E.priority] || (i[E.priority] = []), i[E.priority].push(E.cssFileName), p.push(E.cssFileName);
-          const lt = `css/${E.cssFileName}`, ft = f(o, lt);
-          k(ft, E.css);
+          i[O.priority] || (i[O.priority] = []), i[O.priority].push(O.cssFileName), d.push(O.cssFileName);
+          const lt = `css/${O.cssFileName}`, ft = a(o, lt);
+          P(ft, O.css);
         });
-        const y = p.map((_) => `@import url('./${_}');`).join(`
-`), C = G(l, 6), $ = B(l), M = V($.name), J = f(o, `css/f_${M}-${C}.css`);
-        k(J, y);
+        const h = d.map((E) => `@import url('./${E}');`).join(`
+`), x = W(f, 6), $ = K(f), _ = A($.name), R = a(o, `css/f_${_}-${x}.css`);
+        P(R, h);
       }
     }
     await r(t, o);
-    const m = n.map((l) => `@import url('./css/${l}');`).join(`
+    const p = n.map((f) => `@import url('./css/${f}');`).join(`
 `);
-    let x = `@layer reset, global, l0, l1, l2, l3, l4, l5, l6, l7, l8;
+    let k = `@layer reset, global, l0, l1, l2, l3, l4, l5, l6, l7, l8;
 
-${["_variables.css", "_reset.css", "_global.css", "_templates.css"].filter((l) => {
+${["_variables.css", "_reset.css", "_global.css", "_templates.css"].filter((f) => {
       try {
-        return A(f(o, "css", l), "utf8").length > 0;
+        return V(a(o, "css", f), "utf8").length > 0;
       } catch {
         return !1;
       }
-    }).map((l) => `@import url('./css/${l}');`).join(`
+    }).map((f) => `@import url('./css/${f}');`).join(`
 `)}
-${m}`;
+${p}`;
     if (c.importStrategy !== "component") {
-      const l = i.reduce((g, N, b) => {
-        const T = N.reduce((C, $) => {
-          const M = A(f(o, "css", $), "utf8");
-          return `${C}
-${M}`;
-        }, ""), F = `l_${b}.css`, p = f(o, "css", F), y = `@layer l${b} { ${T} }`;
-        return k(p, y), `${g}
-@import url('./css/${F}');`;
+      const f = i.reduce((y, C, j) => {
+        const T = C.reduce((x, $) => {
+          const _ = a(o, "css", $), R = V(_, "utf8"), E = W(_, 6);
+          return `${x}
+/*start:${E}*/
+${R}
+/*end:${E}*/
+`;
+        }, ""), N = `l_${j}.css`, d = a(o, "css", N), h = `@layer l${j} { ${T}
+ }`;
+        return P(d, h), `${y}
+@import url('./css/${N}');`;
       }, "");
-      x += l;
+      k += f;
     }
-    k(a, x);
-    const d = Date.now() - s, w = d < 200 ? "🔥" : d < 500 ? "🚀" : d < 1e3 ? "🎉" : d < 2e3 ? "🚗" : d < 5e3 ? "🤔" : "🥴";
-    I.info(`Generated CSS in ${d}ms! ${w}`);
+    P(l, k);
+    const u = Date.now() - s, S = u < 200 ? "🔥" : u < 500 ? "🚀" : u < 1e3 ? "🎉" : u < 2e3 ? "🚗" : u < 5e3 ? "🤔" : "🥴";
+    L.info(`Generated CSS in ${u}ms! ${S}`);
   } catch (s) {
     console.error(s);
   }
-}, Et = async (t, e) => {
+}, Dt = async (t, e) => {
   try {
-    const s = [], n = f(t, "./saltygen"), i = f(n, "index.css");
-    if (W(e)) {
-      const a = await U(t), u = await q(t, e, n);
-      Object.entries(u).forEach(([S, h]) => {
-        if (h.isKeyframes && h.css) {
-          const l = `css/${`a_${h.animationName}.css`}`, g = f(n, l);
-          k(g, h.css);
+    const s = a(t, "./saltygen"), n = a(s, "index.css");
+    if (z(e)) {
+      const o = [], l = await U(t), g = await q(t, e, s);
+      Object.entries(g).forEach(([r, p]) => {
+        if (p.isKeyframes && p.css) {
+          const F = `css/${`a_${p.animationName}.css`}`, u = a(s, F);
+          P(u, p.css);
           return;
         }
-        if (!h.generator) return;
-        const x = h.generator._withBuildContext({
-          name: S,
-          config: a
-        }), D = `css/${x.cssFileName}`, d = f(n, D);
-        s.push(x.cssFileName), k(d, x.css);
+        if (!p.generator) return;
+        const m = p.generator._withBuildContext({
+          name: r,
+          config: l
+        }), w = `css/${m.cssFileName}`, b = a(s, w);
+        P(b, m.css), o[m.priority] || (o[m.priority] = []), o[m.priority].push(m.cssFileName);
       });
-      const c = A(i, "utf8").split(`
-`), r = s.map((S) => `@import url('../saltygen/css/${S}');`), j = [.../* @__PURE__ */ new Set([...c, ...r])].join(`
+      const c = V(n, "utf8").split(`
 `);
-      k(i, j);
+      l.importStrategy !== "component" && o.forEach((r, p) => {
+        const m = `l_${p}.css`, w = a(s, "css", m);
+        let b = V(w, "utf8");
+        r.forEach((k) => {
+          const F = a(s, "css", k), u = W(F, 6), S = b.includes(u);
+          if (console.log({ layer: p, filepath: F, filepathHash: u, found: S }), !S) {
+            const f = V(F, "utf8"), y = W(F, 6), C = `/*start:${y}*/
+${f}
+/*end:${y}*/
+`;
+            b = `${b.replace(/\}$/, "")}
+${C}
+}`;
+          }
+        }), P(w, b);
+      });
     }
   } catch (s) {
     console.error(s);
   }
 }, Ot = async (t, e, s = at()) => {
   try {
-    const n = f(t, "./saltygen");
-    if (W(e)) {
-      const o = A(e, "utf8");
-      o.replace(/^(?!export\s)const\s.*/gm, (m) => `export ${m}`) !== o && await ht(e, o);
-      const u = await U(t), c = await q(t, e, n);
+    const n = a(t, "./saltygen");
+    if (z(e)) {
+      const o = V(e, "utf8");
+      o.replace(/^(?!export\s)const\s.*/gm, (p) => `export ${p}`) !== o && await ht(e, o);
+      const g = await U(t), c = await q(t, e, n);
       let r = o;
-      if (Object.entries(c).forEach(([m, j]) => {
-        var C;
-        if (j.isKeyframes || !j.generator) return;
-        const S = j.generator._withBuildContext({
-          name: m,
-          config: u,
+      if (Object.entries(c).forEach(([p, m]) => {
+        var x;
+        if (m.isKeyframes || !m.generator) return;
+        const w = m.generator._withBuildContext({
+          name: p,
+          config: g,
           prod: s
-        }), h = new RegExp(`\\s${m}[=\\s]+[^()]+styled\\(([^,]+),`, "g").exec(o);
-        if (!h) return console.error("Could not find the original declaration");
-        const x = (C = h.at(1)) == null ? void 0 : C.trim(), D = new RegExp(`\\s${m}[=\\s]+styled\\(`, "g").exec(r);
-        if (!D) return console.error("Could not find the original declaration");
-        const { index: d } = D;
-        let w = !1;
-        const l = setTimeout(() => w = !0, 5e3);
-        let g = 0, N = !1, b = 0;
-        for (; !N && !w; ) {
-          const $ = r[d + g];
-          $ === "(" && b++, $ === ")" && b--, b === 0 && $ === ")" && (N = !0), g > r.length && (w = !0), g++;
+        }), b = new RegExp(`\\s${p}[=\\s]+[^()]+styled\\(([^,]+),`, "g").exec(o);
+        if (!b) return console.error("Could not find the original declaration");
+        const k = (x = b.at(1)) == null ? void 0 : x.trim(), F = new RegExp(`\\s${p}[=\\s]+styled\\(`, "g").exec(r);
+        if (!F) return console.error("Could not find the original declaration");
+        const { index: u } = F;
+        let S = !1;
+        const f = setTimeout(() => S = !0, 5e3);
+        let y = 0, C = !1, j = 0;
+        for (; !C && !S; ) {
+          const $ = r[u + y];
+          $ === "(" && j++, $ === ")" && j--, j === 0 && $ === ")" && (C = !0), y > r.length && (S = !0), y++;
         }
-        if (!w) clearTimeout(l);
+        if (!S) clearTimeout(f);
         else throw new Error("Failed to find the end of the styled call and timed out");
-        const T = d + g, F = r.slice(d, T), p = r, y = ` ${m} = styled(${x}, "${S.classNames}", ${JSON.stringify(S.props)});`;
-        r = r.replace(F, y), p === r && console.error("Minimize file failed to change content", { name: m, tagName: x });
-      }), u.importStrategy === "component") {
-        const m = G(e, 6), j = B(e);
-        r = `import '../../saltygen/css/${`f_${V(j.name)}-${m}.css`}';
+        const T = u + y, N = r.slice(u, T), d = r, h = ` ${p} = styled(${k}, "${w.classNames}", ${JSON.stringify(w.props)});`;
+        r = r.replace(N, h), d === r && console.error("Minimize file failed to change content", { name: p, tagName: k });
+      }), g.importStrategy === "component") {
+        const p = W(e, 6), m = K(e);
+        r = `import '../../saltygen/css/${`f_${A(m.name)}-${p}.css`}';
 ${r}`;
       }
       return r = r.replace("{ styled }", "{ styledClient as styled }"), r = r.replace("@salty-css/react/styled", "@salty-css/react/styled-client"), r;
@@ -427,9 +439,9 @@ ${r}`;
   }
 }, Jt = (t) => ({
   name: "stylegen",
-  buildStart: () => Dt(t),
+  buildStart: () => Et(t),
   load: async (e) => {
-    if (W(e))
+    if (z(e))
       return await Ot(t, e);
   },
   handleHotUpdate: async ({ file: e, server: s }) => {
@@ -437,7 +449,7 @@ ${r}`;
   },
   watchChange: {
     handler: async (e) => {
-      W(e) && await Et(t, e);
+      z(e) && await Dt(t, e);
     }
   }
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salty-css/vite",
-  "version": "0.0.1-alpha.141",
+  "version": "0.0.1-alpha.143",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
   "typings": "./dist/index.d.ts",
@@ -34,6 +34,6 @@
     }
   },
   "dependencies": {
-    "@salty-css/core": "^0.0.1-alpha.141"
+    "@salty-css/core": "^0.0.1-alpha.143"
   }
 }