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