@salty-css/astro 0.1.0-alpha.34 → 0.1.0-alpha.36

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

package/astro-vite-plugin.js

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

package/framework-registry.d.ts

@@ -0,0 +1,12 @@
+import { SaltyCompiler } from '@salty-css/core/compiler/salty-compiler';
+type Importer = undefined | ((path: string) => Promise<any>);
+export type SaltyFileTransform = (compiler: SaltyCompiler, file: string) => Promise<string | undefined>;
+export interface FrameworkEntry {
+    name: string;
+    importMarkers: RegExp[];
+    loadTransform: (importer: Importer) => Promise<SaltyFileTransform>;
+}
+export declare const frameworkRegistry: FrameworkEntry[];
+export declare const getFrameworkTransform: (entry: FrameworkEntry, importer: Importer) => Promise<SaltyFileTransform>;
+export declare const detectFramework: (source: string) => FrameworkEntry | undefined;
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salty-css/astro",
-  "version": "0.1.0-alpha.34",
+  "version": "0.1.0-alpha.36",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
   "typings": "./dist/index.d.ts",
@@ -74,8 +74,16 @@
     }
   },
   "dependencies": {
-    "@salty-css/core": "0.1.0-alpha.34",
+    "@salty-css/core": "0.1.0-alpha.36",
     "astro": "^5.13.2",
     "vite": "^6.3.5"
+  },
+  "peerDependencies": {
+    "@salty-css/react": "0.1.0-alpha.36"
+  },
+  "peerDependenciesMeta": {
+    "@salty-css/react": {
+      "optional": true
+    }
   }
 }