@angular/compiler 17.0.0-next.0 → 17.0.0-next.2
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/esm2022/src/compiler.mjs +2 -2
- package/esm2022/src/output/abstract_emitter.mjs +1 -1
- package/esm2022/src/output/abstract_js_emitter.mjs +25 -1
- package/esm2022/src/output/output_ast.mjs +44 -1
- package/esm2022/src/render3/partial/class_metadata.mjs +1 -1
- package/esm2022/src/render3/partial/directive.mjs +9 -4
- package/esm2022/src/render3/partial/factory.mjs +1 -1
- package/esm2022/src/render3/partial/injectable.mjs +1 -1
- package/esm2022/src/render3/partial/injector.mjs +1 -1
- package/esm2022/src/render3/partial/ng_module.mjs +1 -1
- package/esm2022/src/render3/partial/pipe.mjs +1 -1
- package/esm2022/src/render3/r3_ast.mjs +3 -4
- package/esm2022/src/render3/r3_control_flow.mjs +68 -25
- package/esm2022/src/render3/r3_identifiers.mjs +6 -1
- package/esm2022/src/render3/view/compiler.mjs +26 -9
- package/esm2022/src/render3/view/template.mjs +272 -36
- package/esm2022/src/render3/view/util.mjs +5 -2
- package/esm2022/src/template/pipeline/ir/src/enums.mjs +41 -17
- package/esm2022/src/template/pipeline/ir/src/expression.mjs +69 -2
- package/esm2022/src/template/pipeline/ir/src/operations.mjs +13 -1
- package/esm2022/src/template/pipeline/ir/src/ops/create.mjs +46 -25
- package/esm2022/src/template/pipeline/ir/src/ops/host.mjs +3 -2
- package/esm2022/src/template/pipeline/ir/src/ops/update.mjs +18 -2
- package/esm2022/src/template/pipeline/src/compilation.mjs +107 -87
- package/esm2022/src/template/pipeline/src/emit.mjs +69 -72
- package/esm2022/src/template/pipeline/src/ingest.mjs +93 -58
- package/esm2022/src/template/pipeline/src/instruction.mjs +27 -9
- package/esm2022/src/template/pipeline/src/phases/align_pipe_variadic_var_offset.mjs +4 -4
- package/esm2022/src/template/pipeline/src/phases/any_cast.mjs +4 -4
- package/esm2022/src/template/pipeline/src/phases/attribute_extraction.mjs +34 -12
- package/esm2022/src/template/pipeline/src/phases/binding_specialization.mjs +4 -5
- package/esm2022/src/template/pipeline/src/phases/chaining.mjs +4 -1
- package/esm2022/src/template/pipeline/src/phases/conditionals.mjs +44 -0
- package/esm2022/src/template/pipeline/src/phases/const_collection.mjs +49 -13
- package/esm2022/src/template/pipeline/src/phases/empty_elements.mjs +5 -4
- package/esm2022/src/template/pipeline/src/phases/generate_advance.mjs +5 -5
- package/esm2022/src/template/pipeline/src/phases/generate_i18n_blocks.mjs +38 -0
- package/esm2022/src/template/pipeline/src/phases/generate_variables.mjs +3 -3
- package/esm2022/src/template/pipeline/src/phases/host_style_property_parsing.mjs +10 -4
- package/esm2022/src/template/pipeline/src/phases/i18n_message_extraction.mjs +108 -0
- package/esm2022/src/template/pipeline/src/phases/i18n_text_extraction.mjs +32 -0
- package/esm2022/src/template/pipeline/src/phases/local_refs.mjs +5 -5
- package/esm2022/src/template/pipeline/src/phases/namespace.mjs +3 -3
- package/esm2022/src/template/pipeline/src/phases/naming.mjs +19 -14
- package/esm2022/src/template/pipeline/src/phases/next_context_merging.mjs +5 -5
- package/esm2022/src/template/pipeline/src/phases/ng_container.mjs +4 -4
- package/esm2022/src/template/pipeline/src/phases/nonbindable.mjs +3 -3
- package/esm2022/src/template/pipeline/src/phases/ordering.mjs +97 -0
- package/esm2022/src/template/pipeline/src/phases/parse_extracted_styles.mjs +3 -3
- package/esm2022/src/template/pipeline/src/phases/pipe_creation.mjs +9 -9
- package/esm2022/src/template/pipeline/src/phases/pipe_variadic.mjs +4 -4
- package/esm2022/src/template/pipeline/src/phases/reify.mjs +31 -3
- package/esm2022/src/template/pipeline/src/phases/resolve_dollar_event.mjs +6 -6
- package/esm2022/src/template/pipeline/src/phases/resolve_i18n_placeholders.mjs +63 -0
- package/esm2022/src/template/pipeline/src/phases/resolve_sanitizers.mjs +5 -5
- package/esm2022/src/template/pipeline/src/phases/save_restore_view.mjs +8 -8
- package/esm2022/src/template/pipeline/src/phases/slot_allocation.mjs +8 -8
- package/esm2022/src/template/pipeline/src/phases/var_counting.mjs +3 -3
- package/esm2022/src/template/pipeline/src/util/elements.mjs +3 -3
- package/esm2022/src/version.mjs +1 -1
- package/fesm2022/compiler.mjs +10290 -9380
- package/fesm2022/compiler.mjs.map +1 -1
- package/fesm2022/testing.mjs +1 -1
- package/index.d.ts +36 -4
- package/package.json +2 -2
- package/testing/index.d.ts +1 -1
- package/esm2022/src/template/pipeline/src/phases/property_ordering.mjs +0 -99
package/fesm2022/testing.mjs
CHANGED
package/index.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* @license Angular v17.0.0-next.
|
|
2
|
+
* @license Angular v17.0.0-next.2
|
|
3
3
|
* (c) 2010-2022 Google LLC. https://angular.io/
|
|
4
4
|
* License: MIT
|
|
5
5
|
*/
|
|
@@ -34,6 +34,18 @@ export declare class ArrayType extends Type {
|
|
|
34
34
|
visitType(visitor: TypeVisitor, context: any): any;
|
|
35
35
|
}
|
|
36
36
|
|
|
37
|
+
declare function arrowFn(params: FnParam[], body: Expression | Statement[], type?: Type | null, sourceSpan?: ParseSourceSpan | null): ArrowFunctionExpr;
|
|
38
|
+
|
|
39
|
+
export declare class ArrowFunctionExpr extends Expression {
|
|
40
|
+
params: FnParam[];
|
|
41
|
+
body: Expression | Statement[];
|
|
42
|
+
constructor(params: FnParam[], body: Expression | Statement[], type?: Type | null, sourceSpan?: ParseSourceSpan | null);
|
|
43
|
+
isEquivalent(e: Expression): boolean;
|
|
44
|
+
isConstant(): boolean;
|
|
45
|
+
visitExpression(visitor: ExpressionVisitor, context: any): any;
|
|
46
|
+
clone(): Expression;
|
|
47
|
+
}
|
|
48
|
+
|
|
37
49
|
export declare abstract class AST {
|
|
38
50
|
span: ParseSpan;
|
|
39
51
|
/**
|
|
@@ -1291,6 +1303,7 @@ export declare interface ExpressionVisitor {
|
|
|
1291
1303
|
visitCommaExpr(ast: CommaExpr, context: any): any;
|
|
1292
1304
|
visitWrappedNodeExpr(ast: WrappedNodeExpr<any>, context: any): any;
|
|
1293
1305
|
visitTypeofExpr(ast: TypeofExpr, context: any): any;
|
|
1306
|
+
visitArrowFunctionExpr(ast: ArrowFunctionExpr, context: any): any;
|
|
1294
1307
|
}
|
|
1295
1308
|
|
|
1296
1309
|
export declare class ExternalExpr extends Expression {
|
|
@@ -1340,6 +1353,15 @@ declare class FnParam {
|
|
|
1340
1353
|
clone(): FnParam;
|
|
1341
1354
|
}
|
|
1342
1355
|
|
|
1356
|
+
declare interface ForLoopBlockContext {
|
|
1357
|
+
$index?: string;
|
|
1358
|
+
$first?: string;
|
|
1359
|
+
$last?: string;
|
|
1360
|
+
$even?: string;
|
|
1361
|
+
$odd?: string;
|
|
1362
|
+
$count?: string;
|
|
1363
|
+
}
|
|
1364
|
+
|
|
1343
1365
|
/**
|
|
1344
1366
|
* Specifies how a forward ref has been handled in a MaybeForwardRefExpression
|
|
1345
1367
|
*/
|
|
@@ -2033,6 +2055,7 @@ declare namespace outputAst {
|
|
|
2033
2055
|
unary,
|
|
2034
2056
|
not,
|
|
2035
2057
|
fn,
|
|
2058
|
+
arrowFn,
|
|
2036
2059
|
ifStmt,
|
|
2037
2060
|
taggedTemplate,
|
|
2038
2061
|
literal,
|
|
@@ -2082,6 +2105,7 @@ declare namespace outputAst {
|
|
|
2082
2105
|
NotExpr,
|
|
2083
2106
|
FnParam,
|
|
2084
2107
|
FunctionExpr,
|
|
2108
|
+
ArrowFunctionExpr,
|
|
2085
2109
|
UnaryOperatorExpr,
|
|
2086
2110
|
BinaryOperatorExpr,
|
|
2087
2111
|
ReadPropExpr,
|
|
@@ -3719,6 +3743,11 @@ export declare class R3Identifiers {
|
|
|
3719
3743
|
static deferPrefetchOnHover: outputAst.ExternalReference;
|
|
3720
3744
|
static deferPrefetchOnInteraction: outputAst.ExternalReference;
|
|
3721
3745
|
static deferPrefetchOnViewport: outputAst.ExternalReference;
|
|
3746
|
+
static conditional: outputAst.ExternalReference;
|
|
3747
|
+
static repeater: outputAst.ExternalReference;
|
|
3748
|
+
static repeaterCreate: outputAst.ExternalReference;
|
|
3749
|
+
static repeaterTrackByIndex: outputAst.ExternalReference;
|
|
3750
|
+
static repeaterTrackByIdentity: outputAst.ExternalReference;
|
|
3722
3751
|
static text: outputAst.ExternalReference;
|
|
3723
3752
|
static enableBindings: outputAst.ExternalReference;
|
|
3724
3753
|
static disableBindings: outputAst.ExternalReference;
|
|
@@ -4249,6 +4278,7 @@ declare class RecursiveAstVisitor_2 implements StatementVisitor, ExpressionVisit
|
|
|
4249
4278
|
visitConditionalExpr(ast: ConditionalExpr, context: any): any;
|
|
4250
4279
|
visitNotExpr(ast: NotExpr, context: any): any;
|
|
4251
4280
|
visitFunctionExpr(ast: FunctionExpr, context: any): any;
|
|
4281
|
+
visitArrowFunctionExpr(ast: ArrowFunctionExpr, context: any): any;
|
|
4252
4282
|
visitUnaryOperatorExpr(ast: UnaryOperatorExpr, context: any): any;
|
|
4253
4283
|
visitBinaryOperatorExpr(ast: BinaryOperatorExpr, context: any): any;
|
|
4254
4284
|
visitReadPropExpr(ast: ReadPropExpr, context: any): any;
|
|
@@ -4518,6 +4548,7 @@ declare namespace t {
|
|
|
4518
4548
|
TmplAstDeferredBlock as DeferredBlock,
|
|
4519
4549
|
TmplAstSwitchBlock as SwitchBlock,
|
|
4520
4550
|
TmplAstSwitchBlockCase as SwitchBlockCase,
|
|
4551
|
+
ForLoopBlockContext,
|
|
4521
4552
|
TmplAstForLoopBlock as ForLoopBlock,
|
|
4522
4553
|
TmplAstForLoopBlockEmpty as ForLoopBlockEmpty,
|
|
4523
4554
|
TmplAstIfBlock as IfBlock,
|
|
@@ -4800,14 +4831,15 @@ export declare class TmplAstElement implements TmplAstNode {
|
|
|
4800
4831
|
|
|
4801
4832
|
export declare class TmplAstForLoopBlock implements TmplAstNode {
|
|
4802
4833
|
itemName: string;
|
|
4803
|
-
expression:
|
|
4804
|
-
trackBy:
|
|
4834
|
+
expression: ASTWithSource;
|
|
4835
|
+
trackBy: ASTWithSource;
|
|
4836
|
+
contextVariables: ForLoopBlockContext | null;
|
|
4805
4837
|
children: TmplAstNode[];
|
|
4806
4838
|
empty: TmplAstForLoopBlockEmpty | null;
|
|
4807
4839
|
sourceSpan: ParseSourceSpan;
|
|
4808
4840
|
startSourceSpan: ParseSourceSpan;
|
|
4809
4841
|
endSourceSpan: ParseSourceSpan | null;
|
|
4810
|
-
constructor(itemName: string, expression:
|
|
4842
|
+
constructor(itemName: string, expression: ASTWithSource, trackBy: ASTWithSource, contextVariables: ForLoopBlockContext | null, children: TmplAstNode[], empty: TmplAstForLoopBlockEmpty | null, sourceSpan: ParseSourceSpan, startSourceSpan: ParseSourceSpan, endSourceSpan: ParseSourceSpan | null);
|
|
4811
4843
|
visit<Result>(visitor: Visitor_3<Result>): Result;
|
|
4812
4844
|
}
|
|
4813
4845
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@angular/compiler",
|
|
3
|
-
"version": "17.0.0-next.
|
|
3
|
+
"version": "17.0.0-next.2",
|
|
4
4
|
"description": "Angular - the compiler library",
|
|
5
5
|
"author": "angular",
|
|
6
6
|
"license": "MIT",
|
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
"tslib": "^2.3.0"
|
|
12
12
|
},
|
|
13
13
|
"peerDependencies": {
|
|
14
|
-
"@angular/core": "17.0.0-next.
|
|
14
|
+
"@angular/core": "17.0.0-next.2"
|
|
15
15
|
},
|
|
16
16
|
"peerDependenciesMeta": {
|
|
17
17
|
"@angular/core": {
|
package/testing/index.d.ts
CHANGED
|
@@ -1,99 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* @license
|
|
3
|
-
* Copyright Google LLC All Rights Reserved.
|
|
4
|
-
*
|
|
5
|
-
* Use of this source code is governed by an MIT-style license that can be
|
|
6
|
-
* found in the LICENSE file at https://angular.io/license
|
|
7
|
-
*/
|
|
8
|
-
import * as ir from '../../ir';
|
|
9
|
-
function kindTest(kind) {
|
|
10
|
-
return (op) => op.kind === kind;
|
|
11
|
-
}
|
|
12
|
-
/**
|
|
13
|
-
* Defines the groups based on `OpKind` that ops will be divided into. Ops will be collected into
|
|
14
|
-
* groups, then optionally transformed, before recombining the groups in the order defined here.
|
|
15
|
-
*/
|
|
16
|
-
const ORDERING = [
|
|
17
|
-
{ test: kindTest(ir.OpKind.StyleMap), transform: keepLast },
|
|
18
|
-
{ test: kindTest(ir.OpKind.ClassMap), transform: keepLast },
|
|
19
|
-
{ test: kindTest(ir.OpKind.StyleProp) },
|
|
20
|
-
{ test: kindTest(ir.OpKind.ClassProp) },
|
|
21
|
-
{
|
|
22
|
-
test: (op) => (op.kind === ir.OpKind.Property || op.kind === ir.OpKind.HostProperty) &&
|
|
23
|
-
op.expression instanceof ir.Interpolation
|
|
24
|
-
},
|
|
25
|
-
{
|
|
26
|
-
test: (op) => (op.kind === ir.OpKind.Property || op.kind === ir.OpKind.HostProperty) &&
|
|
27
|
-
!(op.expression instanceof ir.Interpolation)
|
|
28
|
-
},
|
|
29
|
-
{ test: kindTest(ir.OpKind.Attribute) },
|
|
30
|
-
];
|
|
31
|
-
/**
|
|
32
|
-
* The set of all op kinds we handle in the reordering phase.
|
|
33
|
-
*/
|
|
34
|
-
const handledOpKinds = new Set([
|
|
35
|
-
ir.OpKind.StyleMap,
|
|
36
|
-
ir.OpKind.ClassMap,
|
|
37
|
-
ir.OpKind.StyleProp,
|
|
38
|
-
ir.OpKind.ClassProp,
|
|
39
|
-
ir.OpKind.Property,
|
|
40
|
-
ir.OpKind.HostProperty,
|
|
41
|
-
ir.OpKind.Attribute,
|
|
42
|
-
]);
|
|
43
|
-
/**
|
|
44
|
-
* Reorders property and attribute ops according to the following ordering:
|
|
45
|
-
* 1. styleMap & styleMapInterpolate (drops all but the last op in the group)
|
|
46
|
-
* 2. classMap & classMapInterpolate (drops all but the last op in the group)
|
|
47
|
-
* 3. styleProp & stylePropInterpolate (ordering preserved within group)
|
|
48
|
-
* 4. classProp (ordering preserved within group)
|
|
49
|
-
* 5. propertyInterpolate (ordering preserved within group)
|
|
50
|
-
* 6. property (ordering preserved within group)
|
|
51
|
-
* 7. attribute & attributeInterpolate (ordering preserve within group)
|
|
52
|
-
*/
|
|
53
|
-
export function phasePropertyOrdering(cpl) {
|
|
54
|
-
for (const unit of cpl.units) {
|
|
55
|
-
let opsToOrder = [];
|
|
56
|
-
for (const op of unit.update) {
|
|
57
|
-
if (handledOpKinds.has(op.kind)) {
|
|
58
|
-
// Pull out ops that need o be ordered.
|
|
59
|
-
opsToOrder.push(op);
|
|
60
|
-
ir.OpList.remove(op);
|
|
61
|
-
}
|
|
62
|
-
else {
|
|
63
|
-
// When we encounter an op that shouldn't be reordered, put the ones we've pulled so far
|
|
64
|
-
// back in the correct order.
|
|
65
|
-
for (const orderedOp of reorder(opsToOrder)) {
|
|
66
|
-
ir.OpList.insertBefore(orderedOp, op);
|
|
67
|
-
}
|
|
68
|
-
opsToOrder = [];
|
|
69
|
-
}
|
|
70
|
-
}
|
|
71
|
-
// If we still have ops pulled at the end, put them back in the correct order.
|
|
72
|
-
for (const orderedOp of reorder(opsToOrder)) {
|
|
73
|
-
unit.update.push(orderedOp);
|
|
74
|
-
}
|
|
75
|
-
}
|
|
76
|
-
}
|
|
77
|
-
/**
|
|
78
|
-
* Reorders the given list of ops according to the ordering defined by `ORDERING`.
|
|
79
|
-
*/
|
|
80
|
-
function reorder(ops) {
|
|
81
|
-
// Break the ops list into groups based on OpKind.
|
|
82
|
-
const groups = Array.from(ORDERING, () => new Array());
|
|
83
|
-
for (const op of ops) {
|
|
84
|
-
const groupIndex = ORDERING.findIndex(o => o.test(op));
|
|
85
|
-
groups[groupIndex].push(op);
|
|
86
|
-
}
|
|
87
|
-
// Reassemble the groups into a single list, in the correct order.
|
|
88
|
-
return groups.flatMap((group, i) => {
|
|
89
|
-
const transform = ORDERING[i].transform;
|
|
90
|
-
return transform ? transform(group) : group;
|
|
91
|
-
});
|
|
92
|
-
}
|
|
93
|
-
/**
|
|
94
|
-
* Keeps only the last op in a list of ops.
|
|
95
|
-
*/
|
|
96
|
-
function keepLast(ops) {
|
|
97
|
-
return ops.slice(ops.length - 1);
|
|
98
|
-
}
|
|
99
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"property_ordering.js","sourceRoot":"","sources":["../../../../../../../../../../packages/compiler/src/template/pipeline/src/phases/property_ordering.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @license\n * Copyright Google LLC All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\n\nimport * as ir from '../../ir';\nimport type {CompilationJob} from '../compilation';\n\nfunction kindTest(kind: ir.OpKind): (op: ir.UpdateOp) => boolean {\n  return (op: ir.UpdateOp) => op.kind === kind;\n}\n\n/**\n * Defines the groups based on `OpKind` that ops will be divided into. Ops will be collected into\n * groups, then optionally transformed, before recombining the groups in the order defined here.\n */\nconst ORDERING: {\n  test: (op: ir.UpdateOp) => boolean,\n  transform?: (ops: Array<ir.UpdateOp>) => Array<ir.UpdateOp>\n}[] =\n    [\n      {test: kindTest(ir.OpKind.StyleMap), transform: keepLast},\n      {test: kindTest(ir.OpKind.ClassMap), transform: keepLast},\n      {test: kindTest(ir.OpKind.StyleProp)},\n      {test: kindTest(ir.OpKind.ClassProp)},\n      {\n        test: (op: ir.UpdateOp) =>\n            (op.kind === ir.OpKind.Property || op.kind === ir.OpKind.HostProperty) &&\n            op.expression instanceof ir.Interpolation\n      },\n      {\n        test: (op: ir.UpdateOp) =>\n            (op.kind === ir.OpKind.Property || op.kind === ir.OpKind.HostProperty) &&\n            !(op.expression instanceof ir.Interpolation)\n      },\n      {test: kindTest(ir.OpKind.Attribute)},\n    ];\n\n/**\n * The set of all op kinds we handle in the reordering phase.\n */\nconst handledOpKinds = new Set([\n  ir.OpKind.StyleMap,\n  ir.OpKind.ClassMap,\n  ir.OpKind.StyleProp,\n  ir.OpKind.ClassProp,\n  ir.OpKind.Property,\n  ir.OpKind.HostProperty,\n  ir.OpKind.Attribute,\n]);\n\n/**\n * Reorders property and attribute ops according to the following ordering:\n * 1. styleMap & styleMapInterpolate (drops all but the last op in the group)\n * 2. classMap & classMapInterpolate (drops all but the last op in the group)\n * 3. styleProp & stylePropInterpolate (ordering preserved within group)\n * 4. classProp (ordering preserved within group)\n * 5. propertyInterpolate (ordering preserved within group)\n * 6. property (ordering preserved within group)\n * 7. attribute & attributeInterpolate (ordering preserve within group)\n */\nexport function phasePropertyOrdering(cpl: CompilationJob) {\n  for (const unit of cpl.units) {\n    let opsToOrder = [];\n    for (const op of unit.update) {\n      if (handledOpKinds.has(op.kind)) {\n        // Pull out ops that need o be ordered.\n        opsToOrder.push(op);\n        ir.OpList.remove(op);\n      } else {\n        // When we encounter an op that shouldn't be reordered, put the ones we've pulled so far\n        // back in the correct order.\n        for (const orderedOp of reorder(opsToOrder)) {\n          ir.OpList.insertBefore(orderedOp, op);\n        }\n        opsToOrder = [];\n      }\n    }\n    // If we still have ops pulled at the end, put them back in the correct order.\n    for (const orderedOp of reorder(opsToOrder)) {\n      unit.update.push(orderedOp);\n    }\n  }\n}\n\n/**\n * Reorders the given list of ops according to the ordering defined by `ORDERING`.\n */\nfunction reorder(ops: Array<ir.UpdateOp>): Array<ir.UpdateOp> {\n  // Break the ops list into groups based on OpKind.\n  const groups = Array.from(ORDERING, () => new Array<ir.UpdateOp>());\n  for (const op of ops) {\n    const groupIndex = ORDERING.findIndex(o => o.test(op));\n    groups[groupIndex].push(op);\n  }\n  // Reassemble the groups into a single list, in the correct order.\n  return groups.flatMap((group, i) => {\n    const transform = ORDERING[i].transform;\n    return transform ? transform(group) : group;\n  });\n}\n\n/**\n * Keeps only the last op in a list of ops.\n */\nfunction keepLast<T>(ops: Array<T>) {\n  return ops.slice(ops.length - 1);\n}\n"]}
|