@salty-css/astro 0.1.0-alpha.14 → 0.1.0-alpha.16
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.d.ts +8 -1
- package/astro-vite-plugin.js +42 -42
- 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 N=require("@salty-css/core/compiler/helpers"),
|
|
1
|
+
"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`---
|
|
2
2
|
${C.join(`
|
|
3
3
|
`)}
|
|
4
4
|
const __gp = ${JSON.stringify(F)};
|
|
5
|
-
const __r = resolveAstroProps(Astro.props, __gp, ${JSON.stringify(
|
|
5
|
+
const __r = resolveAstroProps(Astro.props, __gp, ${JSON.stringify(i)});
|
|
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"),
|
|
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"),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(`
|
|
9
9
|
`)}
|
|
10
10
|
${l.join(`
|
|
11
11
|
`)}
|
|
12
|
-
export { ${s.join(", ")} };`}return}catch(c){console.error("Error during file compilation:",c);return}},handleHotUpdate:async function({file:t,server:e,modules:
|
|
12
|
+
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;
|
package/astro-vite-plugin.d.ts
CHANGED
|
@@ -1,3 +1,10 @@
|
|
|
1
|
+
import { SaltyCompilerMode } from '@salty-css/core/compiler/salty-compiler';
|
|
1
2
|
import { PluginOption } from 'vite';
|
|
2
|
-
export
|
|
3
|
+
export interface SaltyAstroPluginOptions {
|
|
4
|
+
/**
|
|
5
|
+
* Explicit build mode. Defaults to NODE_ENV-based detection.
|
|
6
|
+
*/
|
|
7
|
+
mode?: SaltyCompilerMode;
|
|
8
|
+
}
|
|
9
|
+
export declare const saltyPlugin: (dir: string, options?: SaltyAstroPluginOptions) => PluginOption;
|
|
3
10
|
export default saltyPlugin;
|
package/astro-vite-plugin.js
CHANGED
|
@@ -1,44 +1,44 @@
|
|
|
1
|
-
import { isSaltyFile as S, resolveExportValue as
|
|
2
|
-
import { getFunctionRange as
|
|
3
|
-
import { SaltyCompiler as
|
|
1
|
+
import { isSaltyFile as S, resolveExportValue as A } from "@salty-css/core/compiler/helpers";
|
|
2
|
+
import { getFunctionRange as H } from "@salty-css/core/compiler/get-function-range";
|
|
3
|
+
import { SaltyCompiler as k } from "@salty-css/core/compiler/salty-compiler";
|
|
4
4
|
import { checkShouldRestart as D } from "@salty-css/core/server";
|
|
5
|
-
import { toHash as
|
|
6
|
-
import { readFile as v, mkdir as
|
|
5
|
+
import { toHash as P } from "@salty-css/core/util";
|
|
6
|
+
import { readFile as v, mkdir as B, writeFile as L } from "fs/promises";
|
|
7
7
|
import { join as x } from "path";
|
|
8
|
-
const
|
|
9
|
-
const
|
|
8
|
+
const Q = (M, O = {}) => {
|
|
9
|
+
const n = new k(M, { mode: O.mode });
|
|
10
10
|
return {
|
|
11
11
|
name: "stylegen",
|
|
12
12
|
configureServer: function(t) {
|
|
13
|
-
|
|
14
|
-
const
|
|
15
|
-
return t.ssrLoadModule(`${o}?t=${
|
|
13
|
+
n.importFile = async (o) => {
|
|
14
|
+
const r = Date.now();
|
|
15
|
+
return t.ssrLoadModule(`${o}?t=${r}`);
|
|
16
16
|
};
|
|
17
17
|
},
|
|
18
18
|
configResolved: async function() {
|
|
19
19
|
try {
|
|
20
|
-
await
|
|
20
|
+
await n.generateCss();
|
|
21
21
|
} catch (t) {
|
|
22
22
|
throw console.error("Error during initial CSS generation:", t), t;
|
|
23
23
|
}
|
|
24
24
|
},
|
|
25
25
|
load: async function(t) {
|
|
26
|
-
var o,
|
|
26
|
+
var o, r;
|
|
27
27
|
try {
|
|
28
28
|
if (S(t)) {
|
|
29
|
-
const f = await
|
|
29
|
+
const f = await n.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:
|
|
36
|
+
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)}`;
|
|
37
37
|
return `---
|
|
38
38
|
${F.join(`
|
|
39
39
|
`)}
|
|
40
40
|
const __gp = ${JSON.stringify(w)};
|
|
41
|
-
const __r = resolveAstroProps(Astro.props, __gp, ${JSON.stringify(
|
|
41
|
+
const __r = resolveAstroProps(Astro.props, __gp, ${JSON.stringify(i)});
|
|
42
42
|
const Element = ${I};
|
|
43
43
|
---
|
|
44
44
|
<Element class:list={__r.class} style={__r.style} {...__r.rest}><slot/></Element>`;
|
|
@@ -47,52 +47,52 @@ const K = (O) => {
|
|
|
47
47
|
return;
|
|
48
48
|
}
|
|
49
49
|
}
|
|
50
|
-
const
|
|
50
|
+
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);
|
|
51
51
|
for (const [e, h] of E) {
|
|
52
|
-
const p = await
|
|
52
|
+
const p = await A(h, 1);
|
|
53
53
|
if (!p.generator) continue;
|
|
54
54
|
if (p.isClassName) {
|
|
55
55
|
const _ = p.generator._withBuildContext({
|
|
56
56
|
callerName: e,
|
|
57
|
-
isProduction:
|
|
57
|
+
isProduction: n.isProduction,
|
|
58
58
|
config: {}
|
|
59
59
|
});
|
|
60
60
|
l.push(`const ${e} = classNameInstance(${JSON.stringify(_.params)});`), s.push(e);
|
|
61
61
|
continue;
|
|
62
62
|
}
|
|
63
|
-
const [y, u] = await
|
|
64
|
-
if (!
|
|
63
|
+
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();
|
|
64
|
+
if (!i) {
|
|
65
65
|
console.warn(`Could not determine tag name for ${e} in ${t}`);
|
|
66
66
|
continue;
|
|
67
67
|
}
|
|
68
68
|
const $ = p.generator._withBuildContext({
|
|
69
69
|
callerName: e,
|
|
70
|
-
isProduction:
|
|
70
|
+
isProduction: n.isProduction,
|
|
71
71
|
config: {}
|
|
72
72
|
}), a = {
|
|
73
73
|
componentName: e,
|
|
74
|
-
tagName:
|
|
74
|
+
tagName: i.replace(/['"`]/g, ""),
|
|
75
75
|
tagIsComponent: !1,
|
|
76
76
|
classNames: $.classNames,
|
|
77
77
|
imports: [],
|
|
78
78
|
clientProps: $.clientProps
|
|
79
|
-
}, N = /^\w+$/.test(
|
|
79
|
+
}, N = /^\w+$/.test(i);
|
|
80
80
|
if (a.tagIsComponent = N, N) {
|
|
81
|
-
const _ = E.some(([
|
|
81
|
+
const _ = E.some(([d]) => d === i), R = m.match(new RegExp(`import[^;]*${i}[^;]*;`));
|
|
82
82
|
if (_) {
|
|
83
|
-
const
|
|
84
|
-
a.imports = [
|
|
83
|
+
const d = P(i), G = `import ${i} from '${t}.astro?configFile=${d}.config';`;
|
|
84
|
+
a.imports = [G];
|
|
85
85
|
} else if (R) {
|
|
86
|
-
const
|
|
87
|
-
a.imports = [
|
|
86
|
+
const d = R.at(0);
|
|
87
|
+
a.imports = [d];
|
|
88
88
|
}
|
|
89
89
|
}
|
|
90
90
|
const F = x(f, "astro");
|
|
91
|
-
await v(F, "utf-8").catch(() => !1) || await
|
|
92
|
-
const C =
|
|
93
|
-
await
|
|
91
|
+
await v(F, "utf-8").catch(() => !1) || await B(F, { recursive: !0 });
|
|
92
|
+
const C = P(e), J = x(f, "astro", `${C}.config`);
|
|
93
|
+
await L(J, JSON.stringify(a)), g.push(`import ${e} from '${t}.astro?configFile=${C}.config';`), s.push(e);
|
|
94
94
|
}
|
|
95
|
-
return `${
|
|
95
|
+
return `${g.join(`
|
|
96
96
|
`)}
|
|
97
97
|
${l.join(`
|
|
98
98
|
`)}
|
|
@@ -104,16 +104,16 @@ export { ${s.join(", ")} };`;
|
|
|
104
104
|
return;
|
|
105
105
|
}
|
|
106
106
|
},
|
|
107
|
-
handleHotUpdate: async function({ file: t, server: o, modules:
|
|
107
|
+
handleHotUpdate: async function({ file: t, server: o, modules: r }) {
|
|
108
108
|
try {
|
|
109
|
-
if (await D(t)) return await
|
|
109
|
+
if (await D(t)) return await n.generateCss(!1);
|
|
110
110
|
if (!S(t)) return;
|
|
111
|
-
const
|
|
111
|
+
const g = await n.getDestDir(), l = [];
|
|
112
112
|
for (const [s, m] of o.moduleGraph.idToModuleMap)
|
|
113
113
|
s.startsWith(t + ".astro?configFile=") && (o.moduleGraph.invalidateModule(m), l.push(m));
|
|
114
114
|
for (const s of o.moduleGraph.urlToModuleMap.values())
|
|
115
|
-
s.file && s.file.startsWith(
|
|
116
|
-
return o.ws.send({ type: "update", updates: [] }), [...
|
|
115
|
+
s.file && s.file.startsWith(g) && (o.moduleGraph.invalidateModule(s), l.push(s));
|
|
116
|
+
return o.ws.send({ type: "update", updates: [] }), [...r, ...l];
|
|
117
117
|
} catch (c) {
|
|
118
118
|
console.error("Error during hot update handling:", c);
|
|
119
119
|
}
|
|
@@ -121,15 +121,15 @@ export { ${s.join(", ")} };`;
|
|
|
121
121
|
watchChange: {
|
|
122
122
|
handler: async function(t, o) {
|
|
123
123
|
try {
|
|
124
|
-
S(t) && o.event !== "delete" && (await D(t) || await
|
|
125
|
-
} catch (
|
|
126
|
-
console.error("Error during watch change handling:",
|
|
124
|
+
S(t) && o.event !== "delete" && (await D(t) || await n.generateFile(t));
|
|
125
|
+
} catch (r) {
|
|
126
|
+
console.error("Error during watch change handling:", r);
|
|
127
127
|
}
|
|
128
128
|
}
|
|
129
129
|
}
|
|
130
130
|
};
|
|
131
131
|
};
|
|
132
132
|
export {
|
|
133
|
-
|
|
134
|
-
|
|
133
|
+
Q as default,
|
|
134
|
+
Q as saltyPlugin
|
|
135
135
|
};
|
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.16",
|
|
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.16",
|
|
82
82
|
"astro": "^5.13.2",
|
|
83
83
|
"vite": "^6.3.5"
|
|
84
84
|
}
|