@analogjs/vite-plugin-angular 2.6.0-beta.3 → 2.6.0-beta.5
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/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@analogjs/vite-plugin-angular",
|
|
3
|
-
"version": "2.6.0-beta.
|
|
3
|
+
"version": "2.6.0-beta.5",
|
|
4
4
|
"description": "Vite Plugin for Angular",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"keywords": [
|
|
@@ -24,8 +24,8 @@
|
|
|
24
24
|
"url": "https://github.com/sponsors/brandonroberts"
|
|
25
25
|
},
|
|
26
26
|
"peerDependencies": {
|
|
27
|
-
"@angular-devkit/build-angular": "^17.0.0 || ^18.0.0 || ^19.0.0 || ^20.0.0 || ^21.0.0 || ^22.0.0
|
|
28
|
-
"@angular/build": "^18.0.0 || ^19.0.0 || ^20.0.0 || ^21.0.0 || ^22.0.0
|
|
27
|
+
"@angular-devkit/build-angular": "^17.0.0 || ^18.0.0 || ^19.0.0 || ^20.0.0 || ^21.0.0 || ^22.0.0",
|
|
28
|
+
"@angular/build": "^18.0.0 || ^19.0.0 || ^20.0.0 || ^21.0.0 || ^22.0.0",
|
|
29
29
|
"vite": "^6.0.0 || ^7.0.0 || ^8.0.0"
|
|
30
30
|
},
|
|
31
31
|
"peerDependenciesMeta": {
|
|
@@ -56,7 +56,15 @@ export function jitTransform(sourceCode, fileName) {
|
|
|
56
56
|
const typeOnlyImports = detectTypeOnlyImportNames(sourceCode);
|
|
57
57
|
let hasAngularClass = false;
|
|
58
58
|
const allClasses = findAllClasses(program.body);
|
|
59
|
-
|
|
59
|
+
// Accumulates every class's emitted statements so the post-loop import
|
|
60
|
+
// detection (missing field-decorator imports) can scan all of them.
|
|
61
|
+
// The statements themselves are inserted in-scope after each class via
|
|
62
|
+
// `ms.appendLeft(node.end, ...)` rather than dumped at the end of the
|
|
63
|
+
// file — a class declared inside a function/callback scope (e.g. a host
|
|
64
|
+
// `@Component` defined inside a `describe(...)`/`it(...)` block in a test)
|
|
65
|
+
// is not in scope at module end, so a file-end emit would reference an
|
|
66
|
+
// undefined name (#2360).
|
|
67
|
+
const allEmittedStatements = [];
|
|
60
68
|
let importCounter = 0;
|
|
61
69
|
const resourceImports = [];
|
|
62
70
|
let needsJitImport = false;
|
|
@@ -80,6 +88,9 @@ export function jitTransform(sourceCode, fileName) {
|
|
|
80
88
|
if (!className)
|
|
81
89
|
continue;
|
|
82
90
|
hasAngularClass = true;
|
|
91
|
+
// Statements emitted for THIS class. Inserted directly after the class
|
|
92
|
+
// body (see end of loop) so they run in the class's own lexical scope.
|
|
93
|
+
const classStatements = [];
|
|
83
94
|
// 1. Remove Angular decorators from source
|
|
84
95
|
for (const dec of angularDecs) {
|
|
85
96
|
const start = dec.start;
|
|
@@ -155,34 +166,34 @@ export function jitTransform(sourceCode, fileName) {
|
|
|
155
166
|
decoratorMeta.push({ name: decName, argsText: '{}' });
|
|
156
167
|
return `{ type: ${decName} }`;
|
|
157
168
|
});
|
|
158
|
-
|
|
169
|
+
classStatements.push(`${className}.decorators = [${decoratorEntries.join(', ')}];`);
|
|
159
170
|
// 2b. Trigger JIT compilation with the rewritten decorator metadata
|
|
160
171
|
for (const dm of decoratorMeta) {
|
|
161
172
|
needsJitImport = true;
|
|
162
173
|
switch (dm.name) {
|
|
163
174
|
case 'Component':
|
|
164
|
-
|
|
175
|
+
classStatements.push(`_jitCompileComponent(${className}, ${dm.argsText});`);
|
|
165
176
|
break;
|
|
166
177
|
case 'Directive':
|
|
167
|
-
|
|
178
|
+
classStatements.push(`_jitCompileDirective(${className}, ${dm.argsText});`);
|
|
168
179
|
break;
|
|
169
180
|
case 'Pipe':
|
|
170
|
-
|
|
181
|
+
classStatements.push(`_jitCompilePipe(${className}, ${dm.argsText});`);
|
|
171
182
|
break;
|
|
172
183
|
case 'NgModule':
|
|
173
|
-
|
|
184
|
+
classStatements.push(`_jitCompileNgModule(${className}, ${dm.argsText});`);
|
|
174
185
|
break;
|
|
175
186
|
}
|
|
176
187
|
}
|
|
177
188
|
// 3. Emit Class.ctorParameters for constructor DI
|
|
178
189
|
const ctorParams = buildCtorParameters(node, sourceCode, typeOnlyImports);
|
|
179
190
|
if (ctorParams) {
|
|
180
|
-
|
|
191
|
+
classStatements.push(`${className}.ctorParameters = () => [${ctorParams}];`);
|
|
181
192
|
}
|
|
182
193
|
// 4. Emit Class.propDecorators for field decorators + signal APIs
|
|
183
194
|
const propDecorators = buildPropDecorators(node, sourceCode);
|
|
184
195
|
if (propDecorators) {
|
|
185
|
-
|
|
196
|
+
classStatements.push(`${className}.propDecorators = ${propDecorators};`);
|
|
186
197
|
}
|
|
187
198
|
// 5. Remove member and parameter decorators from source now that
|
|
188
199
|
// they have been extracted into static metadata above.
|
|
@@ -219,6 +230,16 @@ export function jitTransform(sourceCode, fileName) {
|
|
|
219
230
|
}
|
|
220
231
|
}
|
|
221
232
|
}
|
|
233
|
+
// Insert this class's metadata statements directly after the class body
|
|
234
|
+
// so they execute in the class's own lexical scope. `node.end` is the
|
|
235
|
+
// position just past the closing brace (decorators were stripped before
|
|
236
|
+
// `node.start`), so for a top-level class this is module scope and for a
|
|
237
|
+
// class nested in a function/callback it is that enclosing scope —
|
|
238
|
+
// keeping the class identifier in scope either way (#2360).
|
|
239
|
+
if (classStatements.length > 0) {
|
|
240
|
+
allEmittedStatements.push(...classStatements);
|
|
241
|
+
ms.appendLeft(node.end, '\n' + classStatements.join('\n') + '\n');
|
|
242
|
+
}
|
|
222
243
|
}
|
|
223
244
|
if (!hasAngularClass) {
|
|
224
245
|
return { code: sourceCode, map: null };
|
|
@@ -240,7 +261,7 @@ export function jitTransform(sourceCode, fileName) {
|
|
|
240
261
|
}
|
|
241
262
|
}
|
|
242
263
|
}
|
|
243
|
-
const allPostCode =
|
|
264
|
+
const allPostCode = allEmittedStatements.join('\n');
|
|
244
265
|
const missingDecorators = [];
|
|
245
266
|
for (const dec of FIELD_DECORATORS) {
|
|
246
267
|
if (allPostCode.includes(`type: ${dec}`) && !existingImports.has(dec)) {
|
|
@@ -254,10 +275,6 @@ export function jitTransform(sourceCode, fileName) {
|
|
|
254
275
|
if (needsJitImport) {
|
|
255
276
|
ms.prepend(`import { ɵcompileComponent as _jitCompileComponent, ɵcompileDirective as _jitCompileDirective, ɵcompilePipe as _jitCompilePipe, ɵcompileNgModule as _jitCompileNgModule } from '@angular/core';\n`);
|
|
256
277
|
}
|
|
257
|
-
// Append all post-class statements at the end
|
|
258
|
-
if (postClassStatements.length > 0) {
|
|
259
|
-
ms.append('\n' + postClassStatements.join('\n') + '\n');
|
|
260
|
-
}
|
|
261
278
|
const map = ms.generateMap({
|
|
262
279
|
source: fileName,
|
|
263
280
|
file: fileName + '.js',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jit-transform.js","sourceRoot":"","sources":["../../../../../../packages/vite-plugin-angular/src/lib/compiler/jit-transform.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,WAAW,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,yBAAyB,EAAE,MAAM,mBAAmB,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAC7E,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAOtE;;;GAGG;AACH,SAAS,cAAc,CAAC,IAAS;IAC/B,MAAM,MAAM,GAAU,EAAE,CAAC;IACzB,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ;QAAE,OAAO,MAAM,CAAC;IACrD,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;QACxB,KAAK,MAAM,IAAI,IAAI,IAAI,EAAE,CAAC;YACxB,MAAM,CAAC,IAAI,CAAC,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC;QACvC,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,IAAI,IAAI,CAAC,IAAI,KAAK,kBAAkB,IAAI,IAAI,CAAC,IAAI,KAAK,iBAAiB,EAAE,CAAC;QACxE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACpB,CAAC;IACD,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QACpC,IACE,GAAG,KAAK,MAAM;YACd,GAAG,KAAK,OAAO;YACf,GAAG,KAAK,KAAK;YACb,GAAG,KAAK,OAAO;YACf,GAAG,KAAK,KAAK;YAEb,SAAS;QACX,MAAM,CAAC,IAAI,CAAC,GAAG,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAC5C,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,UAAU,YAAY,CAC1B,UAAkB,EAClB,QAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,GAAG,SAAS,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;IACpD,MAAM,EAAE,GAAG,IAAI,WAAW,CAAC,UAAU,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC;IAC/D,MAAM,eAAe,GAAG,yBAAyB,CAAC,UAAU,CAAC,CAAC;IAC9D,IAAI,eAAe,GAAG,KAAK,CAAC;IAE5B,MAAM,UAAU,GAAG,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAEhD,MAAM,
|
|
1
|
+
{"version":3,"file":"jit-transform.js","sourceRoot":"","sources":["../../../../../../packages/vite-plugin-angular/src/lib/compiler/jit-transform.ts"],"names":[],"mappings":"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"}
|