@salty-css/astro 0.0.1-alpha.317 → 0.0.1-alpha.319

package/astro-vite-plugin.cjs

@@ -1,10 +1,11 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const h=require("@salty-css/core/compiler/helpers"),O=require("@salty-css/core/compiler/get-function-range"),_=require("@salty-css/core/compiler/as-class"),S=require("@salty-css/core/server"),k=require("@salty-css/core/util"),i=require("fs/promises"),w=require("path"),x=R=>{const r=new _.SaltyCompiler(R);return{name:"stylegen",configureServer(t){r.importFile=async s=>{const n=Date.now();return t.ssrLoadModule(`${s}?t=${n}`)}},buildStart:async()=>{await r.generateCss()},load:async t=>{var n,p;if(h.isSaltyFile(t)){const c=await r.getDestDir();if(/.+\?configFile=(\w+).+/.test(t)){const l=new URLSearchParams(t.split("?")[1]).get("configFile");if(!l)return;const a=w.join(c,"astro",l),u=await i.readFile(a,"utf-8");if(!u)return;try{const o=JSON.parse(u);return`---
-            ${(o.imports||[]).join(`
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const j=require("@salty-css/core/compiler/helpers"),H=require("@salty-css/core/compiler/get-function-range"),M=require("@salty-css/core/compiler/as-class"),b=require("@salty-css/core/server"),D=require("@salty-css/core/util"),f=require("fs/promises"),x=require("path"),I=O=>{const m=new M.SaltyCompiler(O);return{name:"stylegen",configureServer(t){m.importFile=async r=>{const i=Date.now();return t.ssrLoadModule(`${r}?t=${i}`)}},buildStart:async()=>{await m.generateCss()},load:async t=>{var i,F;if(j.isSaltyFile(t)){const d=await m.getDestDir();if(/.+\?configFile=(\w+).+/.test(t)){const h=new URLSearchParams(t.split("?")[1]).get("configFile");if(!h)return;const a=x.join(d,"astro",h),$=await f.readFile(a,"utf-8");if(!$)return;try{const c=JSON.parse($),{clientProps:o={},classNames:s="",tagIsComponent:u,tagName:n="div"}=c,w=c.imports||[],y=u?n:`props.element || "${o.element||n}"`;let l="";if(o.element&&u&&(l+=` element="${o.element}"`),o.attr)for(const[S,p]of Object.entries(o.attr))l+=` ${S}="${p}"`;return l=l.trim(),`---
+            ${w.join(`
 `)}
             const { props } = Astro;
+            const Element = ${y};
             ---
-            <${o.tagName} class="${o.classNames}" data-component-name="${o.componentName}" {...props}><slot/></${o.tagName}>`}catch(o){console.error("Error parsing config file:",o);return}}const y=[],F=[],d=[],f=await i.readFile(t,"utf-8"),j=await r.compileSaltyFile(t,c);for(const[e,l]of Object.entries(j.contents)){const a=await h.resolveExportValue(l,1);if(!a.generator)continue;if(a.isClassName){const g=a.generator._withBuildContext({callerName:e,isProduction:!1,config:{}});F.push(`const ${e} = '${g.classNames}';`),d.push(e);continue}const[u,o]=await O.getFunctionRange(f,e),$=f.slice(u,o),m=(p=(n=/styled\(([^,]+),/.exec($))==null?void 0:n.at(1))==null?void 0:p.trim();if(!m){console.warn(`Could not determine tag name for ${e} in ${t}`);continue}const q=a.generator._withBuildContext({callerName:e,isProduction:!1,config:{}}),C={componentName:e,tagName:m.replace(/['"`]/g,""),classNames:q.classNames,imports:[]};if(/^\w+$/.test(m)){const g=f.match(new RegExp(`import[^;]*${m}[^;]*;`));if(g){const b=g.at(0);C.imports=[b]}}const N=w.join(c,"astro");await i.readFile(N,"utf-8").catch(()=>!1)||await i.mkdir(N,{recursive:!0});const v=k.toHash(e),D=w.join(c,"astro",`${v}.config`);await i.writeFile(D,JSON.stringify(C)),y.push(`import ${e} from '${t}.astro?configFile=${v}.config';`),d.push(e)}return`${y.join(`
+            <Element class:list={["${s}", props.class]} ${l} {...props}><slot/></Element>`}catch(c){console.error("Error parsing config file:",c);return}}const R=[],q=[],C=[],v=await f.readFile(t,"utf-8"),k=await m.compileSaltyFile(t,d),E=Object.entries(k.contents);for(const[e,h]of E){const a=await j.resolveExportValue(h,1);if(!a.generator)continue;if(a.isClassName){const p=a.generator._withBuildContext({callerName:e,isProduction:!1,config:{}});q.push(`const ${e} = '${p.classNames}';`),C.push(e);continue}const[$,c]=await H.getFunctionRange(v,e),o=v.slice($,c),s=(F=(i=/styled\(([^,]+),/.exec(o))==null?void 0:i.at(1))==null?void 0:F.trim();if(!s){console.warn(`Could not determine tag name for ${e} in ${t}`);continue}const u=a.generator._withBuildContext({callerName:e,isProduction:!1,config:{}}),n={componentName:e,tagName:s.replace(/['"`]/g,""),tagIsComponent:!1,classNames:u.classNames,imports:[],clientProps:u.clientProps},w=/^\w+$/.test(s);if(n.tagIsComponent=w,w){const p=E.some(([g])=>g===s),P=v.match(new RegExp(`import[^;]*${s}[^;]*;`));if(p){const g=D.toHash(s),_=`import ${s} from '${t}.astro?configFile=${g}.config';`;n.imports=[_]}else if(P){const g=P.at(0);n.imports=[g]}}const y=x.join(d,"astro");await f.readFile(y,"utf-8").catch(()=>!1)||await f.mkdir(y,{recursive:!0});const N=D.toHash(e),S=x.join(d,"astro",`${N}.config`);await f.writeFile(S,JSON.stringify(n)),R.push(`import ${e} from '${t}.astro?configFile=${N}.config';`),C.push(e)}return`${R.join(`
 `)}
-${F.join(`
+${q.join(`
 `)}
-export { ${d.join(", ")} };`}},handleHotUpdate:async({file:t,server:s})=>{await S.checkShouldRestart(t)&&s.restart()},watchChange:{handler:async(t,s)=>{h.isSaltyFile(t)&&s.event!=="delete"&&(await S.checkShouldRestart(t)||await r.generateFile(t))}}}};exports.default=x;exports.saltyPlugin=x;
+export { ${C.join(", ")} };`}},handleHotUpdate:async({file:t,server:r})=>{await b.checkShouldRestart(t)&&r.restart()},watchChange:{handler:async(t,r)=>{j.isSaltyFile(t)&&r.event!=="delete"&&(await b.checkShouldRestart(t)||await m.generateFile(t))}}}};exports.default=I;exports.saltyPlugin=I;

package/astro-vite-plugin.js

@@ -1,103 +1,111 @@
-import { isSaltyFile as x, resolveExportValue as O } from "@salty-css/core/compiler/helpers";
-import { getFunctionRange as b } from "@salty-css/core/compiler/get-function-range";
-import { SaltyCompiler as k } from "@salty-css/core/compiler/as-class";
-import { checkShouldRestart as v } from "@salty-css/core/server";
-import { toHash as B } from "@salty-css/core/util";
-import { readFile as d, mkdir as H, writeFile as J } from "fs/promises";
-import { join as w } from "path";
-const z = (S) => {
-  const r = new k(S);
+import { isSaltyFile as I, resolveExportValue as B } from "@salty-css/core/compiler/helpers";
+import { getFunctionRange as H } from "@salty-css/core/compiler/get-function-range";
+import { SaltyCompiler as J } from "@salty-css/core/compiler/as-class";
+import { checkShouldRestart as O } from "@salty-css/core/server";
+import { toHash as P } from "@salty-css/core/util";
+import { readFile as x, mkdir as L, writeFile as U } from "fs/promises";
+import { join as S } from "path";
+const T = (b) => {
+  const m = new J(b);
   return {
     name: "stylegen",
     configureServer(t) {
-      r.importFile = async (n) => {
-        const s = Date.now();
-        return t.ssrLoadModule(`${n}?t=${s}`);
+      m.importFile = async (r) => {
+        const a = Date.now();
+        return t.ssrLoadModule(`${r}?t=${a}`);
       };
     },
     buildStart: async () => {
-      await r.generateCss();
+      await m.generateCss();
     },
     load: async (t) => {
-      var s, f;
-      if (x(t)) {
-        const i = await r.getDestDir();
+      var a, y;
+      if (I(t)) {
+        const u = await m.getDestDir();
         if (/.+\?configFile=(\w+).+/.test(t)) {
-          const c = new URLSearchParams(t.split("?")[1]).get("configFile");
-          if (!c) return;
-          const a = w(i, "astro", c), l = await d(a, "utf-8");
-          if (!l) return;
+          const d = new URLSearchParams(t.split("?")[1]).get("configFile");
+          if (!d) return;
+          const i = S(u, "astro", d), $ = await x(i, "utf-8");
+          if (!$) return;
           try {
-            const e = JSON.parse(l);
-            return `---
-            ${(e.imports || []).join(`
+            const c = JSON.parse($), { clientProps: s = {}, classNames: o = "", tagIsComponent: p, tagName: n = "div" } = c, w = c.imports || [], h = p ? n : `props.element || "${s.element || n}"`;
+            let l = "";
+            if (s.element && p && (l += ` element="${s.element}"`), s.attr) for (const [v, f] of Object.entries(s.attr)) l += ` ${v}="${f}"`;
+            return l = l.trim(), `---
+            ${w.join(`
 `)}
             const { props } = Astro;
+            const Element = ${h};
             ---
-            <${e.tagName} class="${e.classNames}" data-component-name="${e.componentName}" {...props}><slot/></${e.tagName}>`;
-          } catch (e) {
-            console.error("Error parsing config file:", e);
+            <Element class:list={["${o}", props.class]} ${l} {...props}><slot/></Element>`;
+          } catch (c) {
+            console.error("Error parsing config file:", c);
             return;
           }
         }
-        const h = [], $ = [], g = [], u = await d(t, "utf-8"), R = await r.compileSaltyFile(t, i);
-        for (const [o, c] of Object.entries(R.contents)) {
-          const a = await O(c, 1);
-          if (!a.generator) continue;
-          if (a.isClassName) {
-            const p = a.generator._withBuildContext({
-              callerName: o,
+        const R = [], j = [], F = [], C = await x(t, "utf-8"), k = await m.compileSaltyFile(t, u), E = Object.entries(k.contents);
+        for (const [e, d] of E) {
+          const i = await B(d, 1);
+          if (!i.generator) continue;
+          if (i.isClassName) {
+            const f = i.generator._withBuildContext({
+              callerName: e,
               isProduction: !1,
               config: {}
             });
-            $.push(`const ${o} = '${p.classNames}';`), g.push(o);
+            j.push(`const ${e} = '${f.classNames}';`), F.push(e);
             continue;
           }
-          const [l, e] = await b(u, o), y = u.slice(l, e), m = (f = (s = /styled\(([^,]+),/.exec(y)) == null ? void 0 : s.at(1)) == null ? void 0 : f.trim();
-          if (!m) {
-            console.warn(`Could not determine tag name for ${o} in ${t}`);
+          const [$, c] = await H(C, e), s = C.slice($, c), o = (y = (a = /styled\(([^,]+),/.exec(s)) == null ? void 0 : a.at(1)) == null ? void 0 : y.trim();
+          if (!o) {
+            console.warn(`Could not determine tag name for ${e} in ${t}`);
             continue;
           }
-          const j = a.generator._withBuildContext({
-            callerName: o,
+          const p = i.generator._withBuildContext({
+            callerName: e,
             isProduction: !1,
             config: {}
-          }), F = {
-            componentName: o,
-            tagName: m.replace(/['"`]/g, ""),
-            classNames: j.classNames,
-            imports: []
-          };
-          if (/^\w+$/.test(m)) {
-            const p = u.match(new RegExp(`import[^;]*${m}[^;]*;`));
-            if (p) {
-              const E = p.at(0);
-              F.imports = [E];
+          }), n = {
+            componentName: e,
+            tagName: o.replace(/['"`]/g, ""),
+            tagIsComponent: !1,
+            classNames: p.classNames,
+            imports: [],
+            clientProps: p.clientProps
+          }, w = /^\w+$/.test(o);
+          if (n.tagIsComponent = w, w) {
+            const f = E.some(([g]) => g === o), D = C.match(new RegExp(`import[^;]*${o}[^;]*;`));
+            if (f) {
+              const g = P(o), A = `import ${o} from '${t}.astro?configFile=${g}.config';`;
+              n.imports = [A];
+            } else if (D) {
+              const g = D.at(0);
+              n.imports = [g];
             }
           }
-          const N = w(i, "astro");
-          await d(N, "utf-8").catch(() => !1) || await H(N, { recursive: !0 });
-          const C = B(o), D = w(i, "astro", `${C}.config`);
-          await J(D, JSON.stringify(F)), h.push(`import ${o} from '${t}.astro?configFile=${C}.config';`), g.push(o);
+          const h = S(u, "astro");
+          await x(h, "utf-8").catch(() => !1) || await L(h, { recursive: !0 });
+          const N = P(e), v = S(u, "astro", `${N}.config`);
+          await U(v, JSON.stringify(n)), R.push(`import ${e} from '${t}.astro?configFile=${N}.config';`), F.push(e);
         }
-        return `${h.join(`
+        return `${R.join(`
 `)}
-${$.join(`
+${j.join(`
 `)}
-export { ${g.join(", ")} };`;
+export { ${F.join(", ")} };`;
       }
     },
-    handleHotUpdate: async ({ file: t, server: n }) => {
-      await v(t) && n.restart();
+    handleHotUpdate: async ({ file: t, server: r }) => {
+      await O(t) && r.restart();
     },
     watchChange: {
-      handler: async (t, n) => {
-        x(t) && n.event !== "delete" && (await v(t) || await r.generateFile(t));
+      handler: async (t, r) => {
+        I(t) && r.event !== "delete" && (await O(t) || await m.generateFile(t));
       }
     }
   };
 };
 export {
-  z as default,
-  z as saltyPlugin
+  T as default,
+  T as saltyPlugin
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salty-css/astro",
-  "version": "0.0.1-alpha.317",
+  "version": "0.0.1-alpha.319",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
   "typings": "./dist/index.d.ts",
@@ -66,7 +66,7 @@
     }
   },
   "dependencies": {
-    "@salty-css/core": "^0.0.1-alpha.317",
+    "@salty-css/core": "^0.0.1-alpha.319",
     "astro": "^5.13.2",
     "vite": "^6.3.5"
   }