@salty-css/astro 0.1.0-alpha.12 → 0.1.0-alpha.14
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/astro-vite-plugin.cjs +4 -4
- package/astro-vite-plugin.js +15 -14
- package/package.json +2 -2
package/astro-vite-plugin.cjs
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const
|
|
2
|
-
${
|
|
1
|
+
"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const N=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 i=new H.SaltyCompiler(O);return{name:"stylegen",configureServer:function(t){i.importFile=async e=>{const n=Date.now();return t.ssrLoadModule(`${e}?t=${n}`)}},configResolved:async function(){try{await i.generateCss()}catch(t){throw console.error("Error during initial CSS generation:",t),t}},load:async function(t){var e,n;try{if(N.isSaltyFile(t)){const g=await i.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:$,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`---
|
|
2
|
+
${C.join(`
|
|
3
3
|
`)}
|
|
4
4
|
const __gp = ${JSON.stringify(F)};
|
|
5
5
|
const __r = resolveAstroProps(Astro.props, __gp, ${JSON.stringify(r)});
|
|
6
6
|
const Element = ${R};
|
|
7
7
|
---
|
|
8
|
-
<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
|
|
8
|
+
<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 i.compileSaltyFile(t,g),E=Object.entries(P.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:!1,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),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 $=m.generator._withBuildContext({callerName:o,isProduction:!1,config:{}}),a={componentName:o,tagName:r.replace(/['"`]/g,""),tagIsComponent:!1,classNames:$.classNames,imports:[],clientProps:$.clientProps},S=/^\w+$/.test(r);if(a.tagIsComponent=S,S){const _=E.some(([d])=>d===r),j=u.match(new RegExp(`import[^;]*${r}[^;]*;`));if(_){const d=M.toHash(r),J=`import ${r} from '${t}.astro?configFile=${d}.config';`;a.imports=[J]}else if(j){const d=j.at(0);a.imports=[d]}}const C=x.join(g,"astro");await f.readFile(C,"utf-8").catch(()=>!1)||await f.mkdir(C,{recursive:!0});const v=M.toHash(o),q=x.join(g,"astro",`${v}.config`);await f.writeFile(q,JSON.stringify(a)),h.push(`import ${o} from '${t}.astro?configFile=${v}.config';`),s.push(o)}return`${h.join(`
|
|
9
9
|
`)}
|
|
10
10
|
${l.join(`
|
|
11
11
|
`)}
|
|
12
|
-
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
|
|
12
|
+
export { ${s.join(", ")} };`}return}catch(c){console.error("Error during file compilation:",c);return}},handleHotUpdate:async function({file:t,server:e,modules:n}){try{if(await I.checkShouldRestart(t))return await i.generateCss(!1);if(!N.isSaltyFile(t))return;const h=await i.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{N.isSaltyFile(t)&&e.event!=="delete"&&(await I.checkShouldRestart(t)||await i.generateFile(t))}catch(n){console.error("Error during watch change handling:",n)}}}}};exports.default=D;exports.saltyPlugin=D;
|
package/astro-vite-plugin.js
CHANGED
|
@@ -6,18 +6,18 @@ import { toHash as M } from "@salty-css/core/util";
|
|
|
6
6
|
import { readFile as v, mkdir as k, writeFile as B } from "fs/promises";
|
|
7
7
|
import { join as x } from "path";
|
|
8
8
|
const K = (O) => {
|
|
9
|
-
const
|
|
9
|
+
const i = new H(O);
|
|
10
10
|
return {
|
|
11
11
|
name: "stylegen",
|
|
12
12
|
configureServer: function(t) {
|
|
13
|
-
|
|
13
|
+
i.importFile = async (o) => {
|
|
14
14
|
const n = Date.now();
|
|
15
15
|
return t.ssrLoadModule(`${o}?t=${n}`);
|
|
16
16
|
};
|
|
17
17
|
},
|
|
18
18
|
configResolved: async function() {
|
|
19
19
|
try {
|
|
20
|
-
await
|
|
20
|
+
await i.generateCss();
|
|
21
21
|
} catch (t) {
|
|
22
22
|
throw console.error("Error during initial CSS generation:", t), t;
|
|
23
23
|
}
|
|
@@ -26,14 +26,14 @@ const K = (O) => {
|
|
|
26
26
|
var o, n;
|
|
27
27
|
try {
|
|
28
28
|
if (S(t)) {
|
|
29
|
-
const f = await
|
|
29
|
+
const f = await i.getDestDir();
|
|
30
30
|
if (/.+\?configFile=(\w+).+/.test(t)) {
|
|
31
31
|
const h = new URLSearchParams(t.split("?")[1]).get("configFile");
|
|
32
32
|
if (!h) return;
|
|
33
33
|
const p = x(f, "astro", h), y = await v(p, "utf-8");
|
|
34
34
|
if (!y) return;
|
|
35
35
|
try {
|
|
36
|
-
const u = JSON.parse(y), { clientProps: w = {}, classNames: r = "", tagIsComponent: $, tagName:
|
|
36
|
+
const u = JSON.parse(y), { clientProps: w = {}, classNames: r = "", 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)}`;
|
|
37
37
|
return `---
|
|
38
38
|
${F.join(`
|
|
39
39
|
`)}
|
|
@@ -47,7 +47,7 @@ const K = (O) => {
|
|
|
47
47
|
return;
|
|
48
48
|
}
|
|
49
49
|
}
|
|
50
|
-
const d = ["import { classNameInstance } from '@salty-css/core/instances/classname-instance';"], l = [], s = [], m = await v(t, "utf-8"), j = await
|
|
50
|
+
const d = ["import { classNameInstance } from '@salty-css/core/instances/classname-instance';"], l = [], s = [], m = await v(t, "utf-8"), j = await i.compileSaltyFile(t, f), E = Object.entries(j.contents);
|
|
51
51
|
for (const [e, h] of E) {
|
|
52
52
|
const p = await G(h, 1);
|
|
53
53
|
if (!p.generator) continue;
|
|
@@ -69,7 +69,7 @@ const K = (O) => {
|
|
|
69
69
|
callerName: e,
|
|
70
70
|
isProduction: !1,
|
|
71
71
|
config: {}
|
|
72
|
-
}),
|
|
72
|
+
}), a = {
|
|
73
73
|
componentName: e,
|
|
74
74
|
tagName: r.replace(/['"`]/g, ""),
|
|
75
75
|
tagIsComponent: !1,
|
|
@@ -77,20 +77,20 @@ const K = (O) => {
|
|
|
77
77
|
imports: [],
|
|
78
78
|
clientProps: $.clientProps
|
|
79
79
|
}, N = /^\w+$/.test(r);
|
|
80
|
-
if (
|
|
80
|
+
if (a.tagIsComponent = N, N) {
|
|
81
81
|
const _ = E.some(([g]) => g === r), R = m.match(new RegExp(`import[^;]*${r}[^;]*;`));
|
|
82
82
|
if (_) {
|
|
83
83
|
const g = M(r), P = `import ${r} from '${t}.astro?configFile=${g}.config';`;
|
|
84
|
-
|
|
84
|
+
a.imports = [P];
|
|
85
85
|
} else if (R) {
|
|
86
86
|
const g = R.at(0);
|
|
87
|
-
|
|
87
|
+
a.imports = [g];
|
|
88
88
|
}
|
|
89
89
|
}
|
|
90
90
|
const F = x(f, "astro");
|
|
91
91
|
await v(F, "utf-8").catch(() => !1) || await k(F, { recursive: !0 });
|
|
92
92
|
const C = M(e), J = x(f, "astro", `${C}.config`);
|
|
93
|
-
await B(J, JSON.stringify(
|
|
93
|
+
await B(J, JSON.stringify(a)), d.push(`import ${e} from '${t}.astro?configFile=${C}.config';`), s.push(e);
|
|
94
94
|
}
|
|
95
95
|
return `${d.join(`
|
|
96
96
|
`)}
|
|
@@ -101,13 +101,14 @@ export { ${s.join(", ")} };`;
|
|
|
101
101
|
return;
|
|
102
102
|
} catch (c) {
|
|
103
103
|
console.error("Error during file compilation:", c);
|
|
104
|
+
return;
|
|
104
105
|
}
|
|
105
106
|
},
|
|
106
107
|
handleHotUpdate: async function({ file: t, server: o, modules: n }) {
|
|
107
108
|
try {
|
|
108
|
-
if (await D(t)) return
|
|
109
|
+
if (await D(t)) return await i.generateCss(!1);
|
|
109
110
|
if (!S(t)) return;
|
|
110
|
-
const d = await
|
|
111
|
+
const d = await i.getDestDir(), l = [];
|
|
111
112
|
for (const [s, m] of o.moduleGraph.idToModuleMap)
|
|
112
113
|
s.startsWith(t + ".astro?configFile=") && (o.moduleGraph.invalidateModule(m), l.push(m));
|
|
113
114
|
for (const s of o.moduleGraph.urlToModuleMap.values())
|
|
@@ -120,7 +121,7 @@ export { ${s.join(", ")} };`;
|
|
|
120
121
|
watchChange: {
|
|
121
122
|
handler: async function(t, o) {
|
|
122
123
|
try {
|
|
123
|
-
S(t) && o.event !== "delete" && (await D(t) || await
|
|
124
|
+
S(t) && o.event !== "delete" && (await D(t) || await i.generateFile(t));
|
|
124
125
|
} catch (n) {
|
|
125
126
|
console.error("Error during watch change handling:", n);
|
|
126
127
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@salty-css/astro",
|
|
3
|
-
"version": "0.1.0-alpha.
|
|
3
|
+
"version": "0.1.0-alpha.14",
|
|
4
4
|
"main": "./dist/index.js",
|
|
5
5
|
"module": "./dist/index.mjs",
|
|
6
6
|
"typings": "./dist/index.d.ts",
|
|
@@ -78,7 +78,7 @@
|
|
|
78
78
|
}
|
|
79
79
|
},
|
|
80
80
|
"dependencies": {
|
|
81
|
-
"@salty-css/core": "^0.1.0-alpha.
|
|
81
|
+
"@salty-css/core": "^0.1.0-alpha.14",
|
|
82
82
|
"astro": "^5.13.2",
|
|
83
83
|
"vite": "^6.3.5"
|
|
84
84
|
}
|