@salty-css/astro 0.1.0-alpha.10 → 0.1.0-alpha.12

package/astro-vite-plugin.cjs

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

package/astro-vite-plugin.js

@@ -1,112 +1,129 @@
-import { isSaltyFile as S, resolveExportValue as A } 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/salty-compiler";
-import { checkShouldRestart as O } from "@salty-css/core/server";
-import { toHash as j } from "@salty-css/core/util";
-import { readFile as v, mkdir as B, writeFile as G } from "fs/promises";
+import { isSaltyFile as S, resolveExportValue as G } from "@salty-css/core/compiler/helpers";
+import { getFunctionRange as A } from "@salty-css/core/compiler/get-function-range";
+import { SaltyCompiler as H } from "@salty-css/core/compiler/salty-compiler";
+import { checkShouldRestart as D } from "@salty-css/core/server";
+import { toHash as M } from "@salty-css/core/util";
+import { readFile as v, mkdir as k, writeFile as B } from "fs/promises";
 import { join as x } from "path";
-const K = (J) => {
-  const l = new k(J);
+const K = (O) => {
+  const a = new H(O);
   return {
     name: "stylegen",
-    configureServer(t) {
-      l.importFile = async (e) => {
+    configureServer: function(t) {
+      a.importFile = async (o) => {
         const n = Date.now();
-        return t.ssrLoadModule(`${e}?t=${n}`);
+        return t.ssrLoadModule(`${o}?t=${n}`);
       };
     },
-    buildStart: async () => {
-      await l.generateCss();
+    configResolved: async function() {
+      try {
+        await a.generateCss();
+      } catch (t) {
+        throw console.error("Error during initial CSS generation:", t), t;
+      }
     },
     load: async function(t) {
-      var n, u;
-      if (S(t)) {
-        const m = await l.getDestDir();
-        if (/.+\?configFile=(\w+).+/.test(t)) {
-          const d = new URLSearchParams(t.split("?")[1]).get("configFile");
-          if (!d) return;
-          const r = x(m, "astro", d);
-          this.addWatchFile(r);
-          const h = await v(r, "utf-8");
-          if (!h) return;
-          try {
-            const c = JSON.parse(h), { clientProps: y = {}, classNames: s = "", tagIsComponent: w, tagName: a = "div" } = c, $ = ["import { resolveAstroProps } from '@salty-css/astro/element-props';", ...c.imports || []], R = w ? a : `__r.element || ${JSON.stringify(y.element || a)}`;
-            return `---
-            ${$.join(`
+      var o, n;
+      try {
+        if (S(t)) {
+          const f = await a.getDestDir();
+          if (/.+\?configFile=(\w+).+/.test(t)) {
+            const h = new URLSearchParams(t.split("?")[1]).get("configFile");
+            if (!h) return;
+            const p = x(f, "astro", h), y = await v(p, "utf-8");
+            if (!y) return;
+            try {
+              const u = JSON.parse(y), { clientProps: w = {}, classNames: r = "", tagIsComponent: $, tagName: i = "div" } = u, F = ["import { resolveAstroProps } from '@salty-css/astro/element-props';", ...u.imports || []], I = $ ? i : `__r.element || ${JSON.stringify(w.element || i)}`;
+              return `---
+            ${F.join(`
 `)}
-            const __gp = ${JSON.stringify(y)};
-            const __r = resolveAstroProps(Astro.props, __gp, ${JSON.stringify(s)});
-            const Element = ${R};
+            const __gp = ${JSON.stringify(w)};
+            const __r = resolveAstroProps(Astro.props, __gp, ${JSON.stringify(r)});
+            const Element = ${I};
             ---
             <Element class:list={__r.class} style={__r.style} {...__r.rest}><slot/></Element>`;
-          } catch (c) {
-            console.error("Error parsing config file:", c);
-            return;
+            } catch (u) {
+              console.error("Error parsing config file:", u);
+              return;
+            }
           }
-        }
-        const p = ["import { classNameInstance } from '@salty-css/core/instances/classname-instance';"], g = [], i = [], F = await v(t, "utf-8"), P = await l.compileSaltyFile(t, m), I = Object.entries(P.contents);
-        for (const [o, d] of I) {
-          const r = await A(d, 1);
-          if (!r.generator) continue;
-          if (r.isClassName) {
-            const _ = r.generator._withBuildContext({
-              callerName: o,
+          const d = ["import { classNameInstance } from '@salty-css/core/instances/classname-instance';"], l = [], s = [], m = await v(t, "utf-8"), j = await a.compileSaltyFile(t, f), E = Object.entries(j.contents);
+          for (const [e, h] of E) {
+            const p = await G(h, 1);
+            if (!p.generator) continue;
+            if (p.isClassName) {
+              const _ = p.generator._withBuildContext({
+                callerName: e,
+                isProduction: !1,
+                config: {}
+              });
+              l.push(`const ${e} = classNameInstance(${JSON.stringify(_.params)});`), s.push(e);
+              continue;
+            }
+            const [y, u] = await A(m, e), w = m.slice(y, u), r = (n = (o = /styled\(([^,]+),/.exec(w)) == null ? void 0 : o.at(1)) == null ? void 0 : n.trim();
+            if (!r) {
+              console.warn(`Could not determine tag name for ${e} in ${t}`);
+              continue;
+            }
+            const $ = p.generator._withBuildContext({
+              callerName: e,
               isProduction: !1,
               config: {}
-            });
-            g.push(`const ${o} = classNameInstance(${JSON.stringify(_.params)});`), i.push(o);
-            continue;
-          }
-          const [h, c] = await b(F, o), y = F.slice(h, c), s = (u = (n = /styled\(([^,]+),/.exec(y)) == null ? void 0 : n.at(1)) == null ? void 0 : u.trim();
-          if (!s) {
-            console.warn(`Could not determine tag name for ${o} in ${t}`);
-            continue;
-          }
-          const w = r.generator._withBuildContext({
-            callerName: o,
-            isProduction: !1,
-            config: {}
-          }), a = {
-            componentName: o,
-            tagName: s.replace(/['"`]/g, ""),
-            tagIsComponent: !1,
-            classNames: w.classNames,
-            imports: [],
-            clientProps: w.clientProps
-          }, N = /^\w+$/.test(s);
-          if (a.tagIsComponent = N, N) {
-            const _ = I.some(([f]) => f === s), E = F.match(new RegExp(`import[^;]*${s}[^;]*;`));
-            if (_) {
-              const f = j(s), M = `import ${s} from '${t}.astro?configFile=${f}.config';`;
-              a.imports = [M];
-            } else if (E) {
-              const f = E.at(0);
-              a.imports = [f];
+            }), i = {
+              componentName: e,
+              tagName: r.replace(/['"`]/g, ""),
+              tagIsComponent: !1,
+              classNames: $.classNames,
+              imports: [],
+              clientProps: $.clientProps
+            }, N = /^\w+$/.test(r);
+            if (i.tagIsComponent = N, N) {
+              const _ = E.some(([g]) => g === r), R = m.match(new RegExp(`import[^;]*${r}[^;]*;`));
+              if (_) {
+                const g = M(r), P = `import ${r} from '${t}.astro?configFile=${g}.config';`;
+                i.imports = [P];
+              } else if (R) {
+                const g = R.at(0);
+                i.imports = [g];
+              }
             }
+            const F = x(f, "astro");
+            await v(F, "utf-8").catch(() => !1) || await k(F, { recursive: !0 });
+            const C = M(e), J = x(f, "astro", `${C}.config`);
+            await B(J, JSON.stringify(i)), d.push(`import ${e} from '${t}.astro?configFile=${C}.config';`), s.push(e);
           }
-          const $ = x(m, "astro");
-          await v($, "utf-8").catch(() => !1) || await B($, { recursive: !0 });
-          const C = j(o), D = x(m, "astro", `${C}.config`);
-          await G(D, JSON.stringify(a)), p.push(`import ${o} from '${t}.astro?configFile=${C}.config';`), i.push(o);
-        }
-        return `${p.join(`
+          return `${d.join(`
 `)}
-${g.join(`
+${l.join(`
 `)}
-export { ${i.join(", ")} };`;
+export { ${s.join(", ")} };`;
+        }
+        return;
+      } catch (c) {
+        console.error("Error during file compilation:", c);
       }
     },
-    handleHotUpdate: async ({ file: t, server: e, modules: n }) => {
-      if (await O(t)) return e.restart();
-      if (!S(t)) return;
-      const p = [];
-      for (const [g, i] of e.moduleGraph.idToModuleMap)
-        g.startsWith(t + ".astro?configFile=") && (e.moduleGraph.invalidateModule(i), p.push(i));
-      return [...n, ...p];
+    handleHotUpdate: async function({ file: t, server: o, modules: n }) {
+      try {
+        if (await D(t)) return o.restart();
+        if (!S(t)) return;
+        const d = await a.getDestDir(), l = [];
+        for (const [s, m] of o.moduleGraph.idToModuleMap)
+          s.startsWith(t + ".astro?configFile=") && (o.moduleGraph.invalidateModule(m), l.push(m));
+        for (const s of o.moduleGraph.urlToModuleMap.values())
+          s.file && s.file.startsWith(d) && (o.moduleGraph.invalidateModule(s), l.push(s));
+        return o.ws.send({ type: "update", updates: [] }), [...n, ...l];
+      } catch (c) {
+        console.error("Error during hot update handling:", c);
+      }
     },
     watchChange: {
-      handler: async (t, e) => {
-        S(t) && e.event !== "delete" && (await O(t) || await l.generateFile(t));
+      handler: async function(t, o) {
+        try {
+          S(t) && o.event !== "delete" && (await D(t) || await a.generateFile(t));
+        } catch (n) {
+          console.error("Error during watch change handling:", n);
+        }
       }
     }
   };

package/package.json

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