@salty-css/astro 0.1.0-alpha.9 → 0.1.0-refactor-add-additional-paths-to-config-cache.0

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`---
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const S=require("@salty-css/core/compiler/helpers"),G=require("@salty-css/core/compiler/get-function-range"),j=require("@salty-css/core/server"),I=require("@salty-css/core/util"),f=require("fs/promises"),x=require("path"),M=D=>{const n=D.compiler;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(S.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:N,tagName:a="div"}=p,$=["import { resolveAstroProps } from '@salty-css/astro/element-props';",...p.imports||[]],R=N?a:`__r.element || ${JSON.stringify(F.element||a)}`;return`---
             ${$.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(i)});
+            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"),O=await n.compileSaltyFile(t,d),E=Object.entries(O.contents);for(const[o,y]of E){const m=await S.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 G.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 N=m.generator._withBuildContext({callerName:o,isProduction:n.isProduction,config:{}}),a={componentName:o,tagName:i.replace(/['"`]/g,""),tagIsComponent:!1,classNames:N.classNames,imports:[],clientProps:N.clientProps},v=/^\w+$/.test(i);if(a.tagIsComponent=v,v){const _=E.some(([g])=>g===i),P=u.match(new RegExp(`import[^;]*${i}[^;]*;`));if(_){const g=I.toHash(i),J=`import ${i} from '${t}.astro?configFile=${g}.config';`;a.imports=[J]}else if(P){const g=P.at(0);a.imports=[g]}}const $=x.join(d,"astro");await f.readFile($,"utf-8").catch(()=>!1)||await f.mkdir($,{recursive:!0});const C=I.toHash(o),q=x.join(d,"astro",`${C}.config`);await f.writeFile(q,JSON.stringify(a)),h.push(`import ${o} from '${t}.astro?configFile=${C}.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);return}},handleHotUpdate:async function({file:t,server:e,modules:r}){try{if(await j.checkShouldRestart(t))return await n.generateCss(!1);if(!S.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{S.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;

package/astro-vite-plugin.d.ts

@@ -1,3 +1,14 @@
+import { SaltyCompiler, SaltyCompilerMode } from '@salty-css/core/compiler/salty-compiler';
 import { PluginOption } from 'vite';
-export declare const saltyPlugin: (dir: string) => PluginOption;
+export interface SaltyAstroPluginOptions {
+    /**
+     * Explicit build mode. Defaults to NODE_ENV-based detection.
+     */
+    mode?: SaltyCompilerMode;
+    /**
+     * Reuse an existing SaltyCompiler instance instead of creating a new one.
+     */
+    compiler: SaltyCompiler;
+}
+export declare const saltyPlugin: (options: SaltyAstroPluginOptions) => PluginOption;
 export default saltyPlugin;

package/astro-vite-plugin.js

@@ -1,117 +1,134 @@
-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 v, resolveExportValue as G } from "@salty-css/core/compiler/helpers";
+import { getFunctionRange as A } from "@salty-css/core/compiler/get-function-range";
+import { checkShouldRestart as D } from "@salty-css/core/server";
+import { toHash as P } from "@salty-css/core/util";
+import { readFile as S, mkdir as H, writeFile as k } from "fs/promises";
 import { join as x } from "path";
-const K = (J) => {
-  const l = new k(J);
+const q = (M) => {
+  const n = M.compiler;
   return {
     name: "stylegen",
-    configureServer(t) {
-      l.importFile = async (e) => {
-        const n = Date.now();
-        return t.ssrLoadModule(`${e}?t=${n}`);
+    configureServer: function(t) {
+      n.importFile = async (o) => {
+        const r = Date.now();
+        return t.ssrLoadModule(`${o}?t=${r}`);
       };
     },
-    buildStart: async () => {
-      await l.generateCss();
+    configResolved: async function() {
+      try {
+        await n.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, r;
+      try {
+        if (v(t)) {
+          const f = await n.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 S(p, "utf-8");
+            if (!y) 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)}`;
+              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(i)});
+            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,
-              isProduction: !1,
+          const g = ["import { classNameInstance } from '@salty-css/core/instances/classname-instance';"], l = [], s = [], m = await S(t, "utf-8"), O = await n.compileSaltyFile(t, f), E = Object.entries(O.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: n.isProduction,
+                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), i = (r = (o = /styled\(([^,]+),/.exec(w)) == null ? void 0 : o.at(1)) == null ? void 0 : r.trim();
+            if (!i) {
+              console.warn(`Could not determine tag name for ${e} in ${t}`);
+              continue;
+            }
+            const $ = p.generator._withBuildContext({
+              callerName: e,
+              isProduction: n.isProduction,
               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];
+            }), a = {
+              componentName: e,
+              tagName: i.replace(/['"`]/g, ""),
+              tagIsComponent: !1,
+              classNames: $.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), J = `import ${i} from '${t}.astro?configFile=${d}.config';`;
+                a.imports = [J];
+              } else if (R) {
+                const d = R.at(0);
+                a.imports = [d];
+              }
             }
+            const F = x(f, "astro");
+            await S(F, "utf-8").catch(() => !1) || await H(F, { recursive: !0 });
+            const C = P(e), j = x(f, "astro", `${C}.config`);
+            await k(j, JSON.stringify(a)), g.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 `${g.join(`
 `)}
-${g.join(`
+${l.join(`
 `)}
-export { ${i.join(", ")} };`;
+export { ${s.join(", ")} };`;
+        }
+        return;
+      } catch (c) {
+        console.error("Error during file compilation:", c);
+        return;
       }
     },
-    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: r }) {
+      try {
+        if (await D(t)) return await n.generateCss(!1);
+        if (!v(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);
+      }
     },
     watchChange: {
-      handler: async (t, e) => {
-        S(t) && e.event !== "delete" && (await O(t) || await l.generateFile(t));
+      handler: async function(t, o) {
+        try {
+          v(t) && o.event !== "delete" && (await D(t) || await n.generateFile(t));
+        } catch (r) {
+          console.error("Error during watch change handling:", r);
+        }
       }
     }
   };
 };
 export {
-  K as default,
-  K as saltyPlugin
+  q as default,
+  q as saltyPlugin
 };

package/integration.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const a=require("./astro-vite-plugin.cjs"),u=require("path"),t=(e={})=>({name:"astro-salty-integration",hooks:{"astro:config:setup":({config:r,updateConfig:o})=>{const{srcDir:i="src",rootDir:n=r.root.pathname}=e,s=u.join(n,i);o({vite:{plugins:[a.default(s)]}})}}});exports.default=t;exports.saltyIntegration=t;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const u=require("@salty-css/core/compiler/salty-compiler"),s=require("@salty-css/core/compiler/copy-config-cache"),g=require("./astro-vite-plugin.cjs"),d=require("path"),f=require("url"),a=(n={})=>{let e,t;return{name:"astro-salty-integration",hooks:{"astro:config:setup":({config:o,updateConfig:r})=>{const{srcDir:i="src",rootDir:c=o.root.pathname,mode:l}=n;t=d.join(c,i),e=new u.SaltyCompiler(t,{mode:l}),r({vite:{plugins:[g.default({compiler:e})]}})},"astro:build:done":async({dir:o})=>{if(!e||!t||!e.isProduction)return;const r=f.fileURLToPath(o),i=s.resolveCopyConfigCacheDestinations(n.copyConfigCache,r,t);await s.copyConfigCacheTo(e,i)}}}};exports.default=a;exports.saltyIntegration=a;

package/integration.d.ts

@@ -1,4 +1,6 @@
 import { AstroIntegration } from 'astro';
+import { SaltyCompilerMode } from '@salty-css/core/compiler/salty-compiler';
+import { CopyConfigCacheOption } from '@salty-css/core/compiler/copy-config-cache';
 interface SaltyIntegrationOptions {
     /**
      * The source directory where SaltyCSS Config is located.
@@ -10,6 +12,20 @@ interface SaltyIntegrationOptions {
      * Default is the current directory of the Astro configuration.
      */
     rootDir?: string;
+    /**
+     * Explicit build mode. Defaults to NODE_ENV-based detection.
+     */
+    mode?: SaltyCompilerMode;
+    /**
+     * Where to copy the Salty `config-cache.json` after a production build.
+     *
+     * - `true` (default) → copy to Astro's `dist` output dir.
+     * - `false` → no copy.
+     * - `string | string[]` → copy to the default destination PLUS each listed path.
+     *   Useful for adapters that emit a separate server bundle (e.g. Cloudflare's
+     *   `dist/_worker.js/`, Vercel's `.vercel/output/functions/...`).
+     */
+    copyConfigCache?: CopyConfigCacheOption;
 }
 export declare const saltyIntegration: (options?: SaltyIntegrationOptions) => AstroIntegration;
 export default saltyIntegration;

package/integration.js

@@ -1,19 +1,28 @@
-import a from "./astro-vite-plugin.js";
-import { join as e } from "path";
-const l = (t = {}) => ({
-  name: "astro-salty-integration",
-  hooks: {
-    "astro:config:setup": ({ config: o, updateConfig: r }) => {
-      const { srcDir: i = "src", rootDir: n = o.root.pathname } = t, s = e(n, i);
-      r({
-        vite: {
-          plugins: [a(s)]
-        }
-      });
+import { SaltyCompiler as c } from "@salty-css/core/compiler/salty-compiler";
+import { resolveCopyConfigCacheDestinations as m, copyConfigCacheTo as l } from "@salty-css/core/compiler/copy-config-cache";
+import f from "./astro-vite-plugin.js";
+import { join as p } from "path";
+import { fileURLToPath as u } from "url";
+const D = (e = {}) => {
+  let o, t;
+  return {
+    name: "astro-salty-integration",
+    hooks: {
+      "astro:config:setup": ({ config: r, updateConfig: i }) => {
+        const { srcDir: n = "src", rootDir: a = r.root.pathname, mode: s } = e;
+        t = p(a, n), o = new c(t, { mode: s }), i({
+          vite: { plugins: [f({ compiler: o })] }
+        });
+      },
+      "astro:build:done": async ({ dir: r }) => {
+        if (!o || !t || !o.isProduction) return;
+        const i = u(r), n = m(e.copyConfigCache, i, t);
+        await l(o, n);
+      }
     }
-  }
-});
+  };
+};
 export {
-  l as default,
-  l as saltyIntegration
+  D as default,
+  D as saltyIntegration
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salty-css/astro",
-  "version": "0.1.0-alpha.9",
+  "version": "0.1.0-refactor-add-additional-paths-to-config-cache.0",
   "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.9",
+    "@salty-css/core": "^0.1.0-refactor-add-additional-paths-to-config-cache.0",
     "astro": "^5.13.2",
     "vite": "^6.3.5"
   }