nexa-compiler 0.4.5 → 0.4.7
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/dist/codegen/render.d.ts +1 -0
- package/dist/codegen/render.d.ts.map +1 -1
- package/dist/codegen/render.js +60 -38
- package/dist/codegen/render.js.map +1 -1
- package/dist/parse/template.js +3 -6
- package/dist/parse/template.js.map +1 -1
- package/dist/transform/style.d.ts.map +1 -1
- package/dist/transform/style.js +32 -17
- package/dist/transform/style.js.map +1 -1
- package/package.json +1 -1
package/dist/codegen/render.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../../src/codegen/render.ts"],"names":[],"mappings":"AAKA,MAAM,MAAM,eAAe,GAAG;IAC5B,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE;IACzC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;IACvB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;IACrB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;IACpB,MAAM,EAAE,OAAO,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,CAAA;CACf,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../../src/codegen/render.ts"],"names":[],"mappings":"AAKA,MAAM,MAAM,eAAe,GAAG;IAC5B,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE;IACzC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;IACvB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;IACrB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;IACpB,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,MAAM,EAAE,OAAO,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,CAAA;CACf,GAAG,MAAM,CAmIT;AAED,wBAAgB,kCAAkC,CAChD,GAAG,EAAE;IACH,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;IACvB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;IACrB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;IACpB,MAAM,EAAE,OAAO,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,CAAA;CACf,EACD,OAAO,GAAE,eAAoB,GAC5B;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAgBtC"}
|
package/dist/codegen/render.js
CHANGED
|
@@ -47,51 +47,73 @@ export function generateComponentCode(sfc) {
|
|
|
47
47
|
}
|
|
48
48
|
const { scopeId, styleCode } = transformStyle(sfc.style, sfc.scoped, sfc.template);
|
|
49
49
|
const fullScript = setupLines.join('\n');
|
|
50
|
-
const
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
50
|
+
const isSetup = sfc.setup === true;
|
|
51
|
+
let componentDefinition = '';
|
|
52
|
+
let allBindings = [];
|
|
53
|
+
if (isSetup) {
|
|
54
|
+
const propsDef = parseDefineProps(fullScript);
|
|
55
|
+
const emitsDef = parseDefineEmits(fullScript);
|
|
56
|
+
const cleanSetup = stripMacroLines(fullScript);
|
|
57
|
+
const scriptBindings = extractBindings(cleanSetup);
|
|
58
|
+
const importBindings = extractImportBindings(importLines).filter(b => !['h', 'hText', 'effect', 'defineComponent', 'registerComponent', 'reloadComponent', 'injectStyle', 'signal', 'computed', 'watch', 'onMounted', 'onUnmounted', 'Teleport', 'Transition'].includes(b));
|
|
59
|
+
allBindings = [...new Set([...scriptBindings, ...importBindings])];
|
|
60
|
+
componentDefinition = 'defineComponent({\n';
|
|
61
|
+
if (scopeId)
|
|
62
|
+
componentDefinition += ` __scopeId: '${scopeId}',\n`;
|
|
63
|
+
if (sfc.hmrId)
|
|
64
|
+
componentDefinition += ` __hmrId: '${sfc.hmrId}',\n`;
|
|
65
|
+
if (propsDef) {
|
|
66
|
+
componentDefinition += ' props: {\n';
|
|
67
|
+
for (const [key, val] of Object.entries(propsDef)) {
|
|
68
|
+
componentDefinition += ` "${key}": ${val},\n`;
|
|
69
|
+
}
|
|
70
|
+
componentDefinition += ' },\n';
|
|
68
71
|
}
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
}
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
72
|
+
if (emitsDef) {
|
|
73
|
+
componentDefinition += ` emits: [${emitsDef.map(e => `'${e}'`).join(', ')}],\n`;
|
|
74
|
+
}
|
|
75
|
+
componentDefinition += ' setup(props, setupContext) {\n';
|
|
76
|
+
componentDefinition += ' const { emit, slots } = setupContext\n';
|
|
77
|
+
for (const line of cleanSetup.split('\n')) {
|
|
78
|
+
const trimmed = line.trim();
|
|
79
|
+
if (trimmed && !trimmed.startsWith('import ') && !trimmed.startsWith('export ')) {
|
|
80
|
+
componentDefinition += ` ${line}\n`;
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
if (allBindings.length > 0) {
|
|
84
|
+
componentDefinition += ` return { ${allBindings.join(', ')} }\n`;
|
|
80
85
|
}
|
|
86
|
+
componentDefinition += ' }\n})';
|
|
81
87
|
}
|
|
82
|
-
|
|
83
|
-
|
|
88
|
+
else {
|
|
89
|
+
// Regular script: Extract export default or treat as options object
|
|
90
|
+
const exportMatch = fullScript.match(/export\s+default\s+([\s\S]+)/);
|
|
91
|
+
if (exportMatch) {
|
|
92
|
+
componentDefinition = `defineComponent(${exportMatch[1].trim().replace(/;$/, '')})`;
|
|
93
|
+
// We might need to inject scopeId and hmrId into this object later
|
|
94
|
+
// For now, let's keep it simple and assume they use script setup for scope support
|
|
95
|
+
}
|
|
96
|
+
else {
|
|
97
|
+
componentDefinition = `defineComponent({\n setup() {\n${fullScript}\n }\n})`;
|
|
98
|
+
}
|
|
84
99
|
}
|
|
85
|
-
lines.push('
|
|
100
|
+
lines.push('');
|
|
101
|
+
lines.push(`const _sfc_main = ${componentDefinition}`);
|
|
86
102
|
if (sfc.template) {
|
|
87
|
-
lines.push('
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
103
|
+
lines.push('');
|
|
104
|
+
lines.push('// Injected render function');
|
|
105
|
+
lines.push('_sfc_main.render = function(ctx) {');
|
|
106
|
+
const renderBindings = ['props', '$slots', ...allBindings];
|
|
107
|
+
lines.push(` const { ${[...new Set(renderBindings)].join(', ')} } = ctx`);
|
|
91
108
|
lines.push(generateRenderCode(sfc.template, scopeId || undefined));
|
|
92
|
-
lines.push('
|
|
109
|
+
lines.push('}');
|
|
110
|
+
}
|
|
111
|
+
if (scopeId) {
|
|
112
|
+
lines.push(`_sfc_main.__scopeId = '${scopeId}'`);
|
|
113
|
+
}
|
|
114
|
+
if (sfc.hmrId) {
|
|
115
|
+
lines.push(`_sfc_main.__hmrId = '${sfc.hmrId}'`);
|
|
93
116
|
}
|
|
94
|
-
lines.push('})');
|
|
95
117
|
lines.push('');
|
|
96
118
|
lines.push('export default _sfc_main');
|
|
97
119
|
if (styleCode) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render.js","sourceRoot":"","sources":["../../src/codegen/render.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AAClD,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,eAAe,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAA;AACzH,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAA;AAQlD,MAAM,UAAU,qBAAqB,CAAC,
|
|
1
|
+
{"version":3,"file":"render.js","sourceRoot":"","sources":["../../src/codegen/render.ts"],"names":[],"mappings":"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"}
|
package/dist/parse/template.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
const tagRegex = /<(\/?)(\w[\w-]*)(
|
|
1
|
+
const tagRegex = /<(\/?)(\w[\w-]*)([^>]*?)(\/?)>/g;
|
|
2
2
|
const attrRegex = /([@:]?\w[\w-]*)(?:\s*=\s*(?:"([^"]*)"|'([^']*)'|(\{[^}]+\})))?/g;
|
|
3
3
|
const mustacheRegex = /\{\{(.*?)\}\}/g;
|
|
4
4
|
export function parseTemplate(template) {
|
|
@@ -27,13 +27,13 @@ export function parseTemplate(template) {
|
|
|
27
27
|
continue;
|
|
28
28
|
}
|
|
29
29
|
const attrs = parseAttrs(attrsStr.trim());
|
|
30
|
-
const isSelfClosing = selfClose
|
|
30
|
+
const isSelfClosing = selfClose === '/' || isVoidElement(tag);
|
|
31
31
|
const node = {
|
|
32
32
|
type: 'element',
|
|
33
33
|
tag,
|
|
34
34
|
attrs,
|
|
35
35
|
children: [],
|
|
36
|
-
isSelfClosing: isSelfClosing
|
|
36
|
+
isSelfClosing: isSelfClosing,
|
|
37
37
|
};
|
|
38
38
|
const isSlot = tag === 'slot';
|
|
39
39
|
if (isSlot) {
|
|
@@ -110,9 +110,6 @@ function parseText(text) {
|
|
|
110
110
|
}
|
|
111
111
|
return nodes;
|
|
112
112
|
}
|
|
113
|
-
function hasChildren(attrs) {
|
|
114
|
-
return attrs.some(a => a.name === 'v-if' || a.name === 'v-for');
|
|
115
|
-
}
|
|
116
113
|
const voidElements = new Set([
|
|
117
114
|
'area', 'base', 'br', 'col', 'embed', 'hr', 'img', 'input',
|
|
118
115
|
'link', 'meta', 'param', 'source', 'track', 'wbr',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"template.js","sourceRoot":"","sources":["../../src/parse/template.ts"],"names":[],"mappings":"AAgEA,MAAM,QAAQ,GAAG,
|
|
1
|
+
{"version":3,"file":"template.js","sourceRoot":"","sources":["../../src/parse/template.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"style.d.ts","sourceRoot":"","sources":["../../src/transform/style.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,oBAAoB,GAAG;IACjC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;IACtB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAA;CACzB,CAAA;AAED,wBAAgB,cAAc,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,GAAG,oBAAoB,
|
|
1
|
+
{"version":3,"file":"style.d.ts","sourceRoot":"","sources":["../../src/transform/style.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,oBAAoB,GAAG;IACjC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;IACtB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAA;CACzB,CAAA;AAED,wBAAgB,cAAc,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,GAAG,oBAAoB,CAqD1H"}
|
package/dist/transform/style.js
CHANGED
|
@@ -3,32 +3,47 @@ export function transformStyle(styleContent, scoped, template) {
|
|
|
3
3
|
return { scopeId: null, styleCode: styleContent };
|
|
4
4
|
}
|
|
5
5
|
const scopeId = `data-v-${hashCode(template || '')}`;
|
|
6
|
+
let inBlock = false;
|
|
6
7
|
const scopedCss = styleContent
|
|
7
8
|
.split('\n')
|
|
8
9
|
.map(line => {
|
|
9
10
|
const trimmed = line.trim();
|
|
10
|
-
if (!trimmed || trimmed.startsWith('
|
|
11
|
+
if (!trimmed || trimmed.startsWith('/*') || trimmed.startsWith('@'))
|
|
11
12
|
return line;
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
13
|
+
if (trimmed.includes('{')) {
|
|
14
|
+
const braceIndex = line.indexOf('{');
|
|
15
|
+
const selectorsPart = line.slice(0, braceIndex);
|
|
16
|
+
const rest = line.slice(braceIndex);
|
|
17
|
+
const scopedSelectors = selectorsPart
|
|
18
|
+
.split(',')
|
|
19
|
+
.map(s => {
|
|
20
|
+
const sel = s.trim();
|
|
21
|
+
if (!sel || sel.includes(':root') || sel.includes('html') || sel.includes('body'))
|
|
22
|
+
return sel;
|
|
23
|
+
if (sel.includes(':')) {
|
|
24
|
+
return sel.replace(':', `[${scopeId}]:`);
|
|
25
|
+
}
|
|
26
|
+
return `${sel}[${scopeId}]`;
|
|
27
|
+
})
|
|
28
|
+
.join(', ');
|
|
29
|
+
inBlock = !trimmed.includes('}');
|
|
30
|
+
return `${scopedSelectors}${rest}`;
|
|
31
|
+
}
|
|
32
|
+
if (trimmed.includes('}')) {
|
|
33
|
+
inBlock = false;
|
|
17
34
|
return line;
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
35
|
+
}
|
|
36
|
+
if (inBlock)
|
|
37
|
+
return line;
|
|
38
|
+
// Selector on its own line
|
|
39
|
+
return line.split(',').map(s => {
|
|
21
40
|
const sel = s.trim();
|
|
22
|
-
if (!sel)
|
|
23
|
-
return
|
|
24
|
-
|
|
25
|
-
if (sel.includes(':')) {
|
|
41
|
+
if (!sel || sel.includes(':root') || sel.includes('html') || sel.includes('body'))
|
|
42
|
+
return sel;
|
|
43
|
+
if (sel.includes(':'))
|
|
26
44
|
return sel.replace(':', `[${scopeId}]:`);
|
|
27
|
-
}
|
|
28
45
|
return `${sel}[${scopeId}]`;
|
|
29
|
-
})
|
|
30
|
-
.join(', ');
|
|
31
|
-
return ` ${scopedSelectors} ${rest}`;
|
|
46
|
+
}).join(', ');
|
|
32
47
|
})
|
|
33
48
|
.join('\n');
|
|
34
49
|
return { scopeId, styleCode: scopedCss };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"style.js","sourceRoot":"","sources":["../../src/transform/style.ts"],"names":[],"mappings":"AAKA,MAAM,UAAU,cAAc,CAAC,YAA2B,EAAE,MAAe,EAAE,QAAuB;IAClG,IAAI,CAAC,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;QAC7B,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,CAAA;IACnD,CAAC;IAED,MAAM,OAAO,GAAG,UAAU,QAAQ,CAAC,QAAQ,IAAI,EAAE,CAAC,EAAE,CAAA;IAEpD,MAAM,SAAS,GAAG,YAAY;SAC3B,KAAK,CAAC,IAAI,CAAC;SACX,GAAG,CAAC,IAAI,CAAC,EAAE;QACV,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,EAAE,CAAA;QAC3B,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,UAAU,CAAC,
|
|
1
|
+
{"version":3,"file":"style.js","sourceRoot":"","sources":["../../src/transform/style.ts"],"names":[],"mappings":"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"}
|