@angular/compiler 16.0.0-rc.1 → 16.0.0-rc.3
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/constant_pool.mjs +2 -1
- package/esm2022/src/i18n/extractor_merger.mjs +1 -1
- package/esm2022/src/i18n/i18n_ast.mjs +4 -4
- package/esm2022/src/i18n/serializers/xliff.mjs +1 -1
- package/esm2022/src/i18n/serializers/xliff2.mjs +4 -1
- package/esm2022/src/i18n/serializers/xtb.mjs +1 -1
- package/esm2022/src/i18n/translation_bundle.mjs +2 -2
- package/esm2022/src/jit_compiler_facade.mjs +1 -1
- package/esm2022/src/ml_parser/entities.mjs +4 -3
- package/esm2022/src/ml_parser/html_whitespaces.mjs +4 -5
- package/esm2022/src/ml_parser/xml_tags.mjs +2 -1
- package/esm2022/src/render3/partial/class_metadata.mjs +1 -1
- package/esm2022/src/render3/partial/directive.mjs +1 -1
- 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/view/compiler.mjs +5 -3
- package/esm2022/src/template/pipeline/ir/src/expression.mjs +33 -26
- package/esm2022/src/template/pipeline/ir/src/operations.mjs +12 -3
- package/esm2022/src/template/pipeline/ir/src/ops/create.mjs +6 -4
- package/esm2022/src/template/pipeline/ir/src/ops/shared.mjs +1 -2
- package/esm2022/src/template/pipeline/ir/src/traits.mjs +11 -6
- package/esm2022/src/template/pipeline/ir/src/variable.mjs +1 -1
- package/esm2022/src/template/pipeline/src/emit.mjs +30 -8
- package/esm2022/src/template/pipeline/src/ingest.mjs +17 -11
- package/esm2022/src/template/pipeline/src/instruction.mjs +14 -9
- package/esm2022/src/template/pipeline/src/phases/chaining.mjs +78 -0
- package/esm2022/src/template/pipeline/src/phases/generate_advance.mjs +2 -2
- package/esm2022/src/template/pipeline/src/phases/generate_variables.mjs +29 -21
- package/esm2022/src/template/pipeline/src/phases/naming.mjs +57 -40
- package/esm2022/src/template/pipeline/src/phases/next_context_merging.mjs +69 -0
- package/esm2022/src/template/pipeline/src/phases/reify.mjs +9 -9
- package/esm2022/src/template/pipeline/src/phases/resolve_contexts.mjs +2 -2
- package/esm2022/src/template/pipeline/src/phases/resolve_names.mjs +4 -4
- package/esm2022/src/template/pipeline/src/phases/slot_allocation.mjs +9 -2
- package/esm2022/src/template/pipeline/src/phases/variable_optimization.mjs +359 -0
- package/esm2022/src/version.mjs +1 -1
- package/fesm2022/compiler.mjs +724 -154
- package/fesm2022/compiler.mjs.map +1 -1
- package/fesm2022/testing.mjs +1 -1
- package/index.d.ts +3 -3
- package/package.json +2 -2
- package/testing/index.d.ts +1 -1
|
@@ -37,10 +37,7 @@ function recursivelyProcessView(view, parentScope) {
|
|
|
37
37
|
// Start the view creation block with an operation to save the current view context. This may be
|
|
38
38
|
// used to restore the view context in any listeners that may be present.
|
|
39
39
|
view.create.prepend([
|
|
40
|
-
ir.createVariableOp(view.tpl.allocateXrefId(),
|
|
41
|
-
kind: ir.SemanticVariableKind.SavedView,
|
|
42
|
-
view: view.xref,
|
|
43
|
-
}, new ir.GetCurrentViewExpr()),
|
|
40
|
+
ir.createVariableOp(view.tpl.allocateXrefId(), scope.savedViewVariable, new ir.GetCurrentViewExpr()),
|
|
44
41
|
]);
|
|
45
42
|
for (const op of view.create) {
|
|
46
43
|
switch (op.kind) {
|
|
@@ -51,10 +48,7 @@ function recursivelyProcessView(view, parentScope) {
|
|
|
51
48
|
case ir.OpKind.Listener:
|
|
52
49
|
// Listeners get a preamble which starts with a call to restore the view.
|
|
53
50
|
const preambleOps = [
|
|
54
|
-
ir.createVariableOp(view.tpl.allocateXrefId(),
|
|
55
|
-
kind: ir.SemanticVariableKind.Context,
|
|
56
|
-
view: view.xref,
|
|
57
|
-
}, new ir.RestoreViewExpr(view.xref)),
|
|
51
|
+
ir.createVariableOp(view.tpl.allocateXrefId(), scope.viewContextVariable, new ir.RestoreViewExpr(view.xref)),
|
|
58
52
|
// And includes all variables available to this view.
|
|
59
53
|
...generateVariablesInScopeForView(view, scope)
|
|
60
54
|
];
|
|
@@ -82,9 +76,27 @@ function recursivelyProcessView(view, parentScope) {
|
|
|
82
76
|
function getScopeForView(view, parent) {
|
|
83
77
|
const scope = {
|
|
84
78
|
view: view.xref,
|
|
79
|
+
viewContextVariable: {
|
|
80
|
+
kind: ir.SemanticVariableKind.Context,
|
|
81
|
+
name: null,
|
|
82
|
+
view: view.xref,
|
|
83
|
+
},
|
|
84
|
+
savedViewVariable: {
|
|
85
|
+
kind: ir.SemanticVariableKind.SavedView,
|
|
86
|
+
name: null,
|
|
87
|
+
view: view.xref,
|
|
88
|
+
},
|
|
89
|
+
contextVariables: new Map(),
|
|
85
90
|
references: [],
|
|
86
91
|
parent,
|
|
87
92
|
};
|
|
93
|
+
for (const identifier of view.contextVariables.keys()) {
|
|
94
|
+
scope.contextVariables.set(identifier, {
|
|
95
|
+
kind: ir.SemanticVariableKind.Identifier,
|
|
96
|
+
name: null,
|
|
97
|
+
identifier,
|
|
98
|
+
});
|
|
99
|
+
}
|
|
88
100
|
for (const op of view.create) {
|
|
89
101
|
switch (op.kind) {
|
|
90
102
|
case ir.OpKind.Element:
|
|
@@ -99,6 +111,11 @@ function getScopeForView(view, parent) {
|
|
|
99
111
|
name: op.localRefs[offset].name,
|
|
100
112
|
targetId: op.xref,
|
|
101
113
|
offset,
|
|
114
|
+
variable: {
|
|
115
|
+
kind: ir.SemanticVariableKind.Identifier,
|
|
116
|
+
name: null,
|
|
117
|
+
identifier: op.localRefs[offset].name,
|
|
118
|
+
},
|
|
102
119
|
});
|
|
103
120
|
}
|
|
104
121
|
break;
|
|
@@ -118,24 +135,15 @@ function generateVariablesInScopeForView(view, scope) {
|
|
|
118
135
|
// Before generating variables for a parent view, we need to switch to the context of the parent
|
|
119
136
|
// view with a `nextContext` expression. This context switching operation itself declares a
|
|
120
137
|
// variable, because the context of the view may be referenced directly.
|
|
121
|
-
newOps.push(ir.createVariableOp(view.tpl.allocateXrefId(),
|
|
122
|
-
kind: ir.SemanticVariableKind.Context,
|
|
123
|
-
view: scope.view,
|
|
124
|
-
}, new ir.NextContextExpr()));
|
|
138
|
+
newOps.push(ir.createVariableOp(view.tpl.allocateXrefId(), scope.viewContextVariable, new ir.NextContextExpr()));
|
|
125
139
|
}
|
|
126
140
|
// Add variables for all context variables available in this scope's view.
|
|
127
141
|
for (const [name, value] of view.tpl.views.get(scope.view).contextVariables) {
|
|
128
|
-
newOps.push(ir.createVariableOp(view.tpl.allocateXrefId(),
|
|
129
|
-
kind: ir.SemanticVariableKind.Identifier,
|
|
130
|
-
name,
|
|
131
|
-
}, new o.ReadPropExpr(new ir.ContextExpr(view.xref), value)));
|
|
142
|
+
newOps.push(ir.createVariableOp(view.tpl.allocateXrefId(), scope.contextVariables.get(name), new o.ReadPropExpr(new ir.ContextExpr(scope.view), value)));
|
|
132
143
|
}
|
|
133
144
|
// Add variables for all local references declared for elements in this scope.
|
|
134
145
|
for (const ref of scope.references) {
|
|
135
|
-
newOps.push(ir.createVariableOp(view.tpl.allocateXrefId(),
|
|
136
|
-
kind: ir.SemanticVariableKind.Identifier,
|
|
137
|
-
name: ref.name,
|
|
138
|
-
}, new ir.ReferenceExpr(ref.targetId, ref.offset)));
|
|
146
|
+
newOps.push(ir.createVariableOp(view.tpl.allocateXrefId(), ref.variable, new ir.ReferenceExpr(ref.targetId, ref.offset)));
|
|
139
147
|
}
|
|
140
148
|
if (scope.parent !== null) {
|
|
141
149
|
// Recursively add variables from the parent scope.
|
|
@@ -143,4 +151,4 @@ function generateVariablesInScopeForView(view, scope) {
|
|
|
143
151
|
}
|
|
144
152
|
return newOps;
|
|
145
153
|
}
|
|
146
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"generate_variables.js","sourceRoot":"","sources":["../../../../../../../../../../packages/compiler/src/template/pipeline/src/phases/generate_variables.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 o from '../../../../output/output_ast';\nimport * as ir from '../../ir';\n\nimport type {ComponentCompilation, ViewCompilation} from '../compilation';\n\n/**\n * Generate a preamble sequence for each view creation block and listener function which declares\n * any variables that be referenced in other operations in the block.\n *\n * Variables generated include:\n *   * a saved view context to be used to restore the current view in event listeners.\n *   * the context of the restored view within event listener handlers.\n *   * context variables from the current view as well as all parent views (including the root\n *     context if needed).\n *   * local references from elements within the current view and any lexical parents.\n *\n * Variables are generated here unconditionally, and may optimized away in future operations if it\n * turns out their values (and any side effects) are unused.\n */\nexport function phaseGenerateVariables(cpl: ComponentCompilation): void {\n  recursivelyProcessView(cpl.root, /* there is no parent scope for the root view */ null);\n}\n\n/**\n * Process the given `ViewCompilation` and generate preambles for it and any listeners that it\n * declares.\n *\n * @param `parentScope` a scope extracted from the parent view which captures any variables which\n *     should be inherited by this view. `null` if the current view is the root view.\n */\nfunction recursivelyProcessView(view: ViewCompilation, parentScope: Scope|null): void {\n  // Extract a `Scope` from this view.\n  const scope = getScopeForView(view, parentScope);\n\n  // Start the view creation block with an operation to save the current view context. This may be\n  // used to restore the view context in any listeners that may be present.\n  view.create.prepend([\n    ir.createVariableOp<ir.CreateOp>(\n        view.tpl.allocateXrefId(), {\n          kind: ir.SemanticVariableKind.SavedView,\n          view: view.xref,\n        },\n        new ir.GetCurrentViewExpr()),\n  ]);\n\n  for (const op of view.create) {\n    switch (op.kind) {\n      case ir.OpKind.Template:\n        // Descend into child embedded views.\n        recursivelyProcessView(view.tpl.views.get(op.xref)!, scope);\n        break;\n      case ir.OpKind.Listener:\n        // Listeners get a preamble which starts with a call to restore the view.\n        const preambleOps = [\n          ir.createVariableOp<ir.UpdateOp>(\n              view.tpl.allocateXrefId(), {\n                kind: ir.SemanticVariableKind.Context,\n                view: view.xref,\n              },\n              new ir.RestoreViewExpr(view.xref)),\n          // And includes all variables available to this view.\n          ...generateVariablesInScopeForView(view, scope)\n        ];\n\n        op.handlerOps.prepend(preambleOps);\n\n        // The \"restore view\" operation in listeners requires a call to `resetView` to reset the\n        // context prior to returning from the listener operation. Find any `return` statements in\n        // the listener body and wrap them in a call to reset the view.\n        for (const handlerOp of op.handlerOps) {\n          if (handlerOp.kind === ir.OpKind.Statement &&\n              handlerOp.statement instanceof o.ReturnStatement) {\n            handlerOp.statement.value = new ir.ResetViewExpr(handlerOp.statement.value);\n          }\n        }\n        break;\n    }\n  }\n\n  // Prepend the declarations for all available variables in scope to the `update` block.\n  const preambleOps = generateVariablesInScopeForView(view, scope);\n  view.update.prepend(preambleOps);\n}\n\n/**\n * Lexical scope of a view, including a reference to its parent view's scope, if any.\n */\ninterface Scope {\n  /**\n   * `XrefId` of the view to which this scope corresponds.\n   */\n  view: ir.XrefId;\n\n  /**\n   * Local references collected from elements within the view.\n   */\n  references: Reference[];\n\n  /**\n   * `Scope` of the parent view, if any.\n   */\n  parent: Scope|null;\n}\n\n/**\n * Information needed about a local reference collected from an element within a view.\n */\ninterface Reference {\n  /**\n   * Name given to the local reference variable within the template.\n   *\n   * This is not the name which will be used for the variable declaration in the generated\n   * template code.\n   */\n  name: string;\n\n  /**\n   * `XrefId` of the element-like node which this reference targets.\n   *\n   * The reference may be either to the element (or template) itself, or to a directive on it.\n   */\n  targetId: ir.XrefId;\n\n  /**\n   * A generated offset of this reference among all the references on a specific element.\n   */\n  offset: number;\n}\n\n/**\n * Process a view and generate a `Scope` representing the variables available for reference within\n * that view.\n */\nfunction getScopeForView(view: ViewCompilation, parent: Scope|null): Scope {\n  const scope: Scope = {\n    view: view.xref,\n    references: [],\n    parent,\n  };\n\n  for (const op of view.create) {\n    switch (op.kind) {\n      case ir.OpKind.Element:\n      case ir.OpKind.ElementStart:\n      case ir.OpKind.Template:\n        if (!Array.isArray(op.localRefs)) {\n          throw new Error(`AssertionError: expected localRefs to be an array`);\n        }\n\n        // Record available local references from this element.\n        for (let offset = 0; offset < op.localRefs.length; offset++) {\n          scope.references.push({\n            name: op.localRefs[offset].name,\n            targetId: op.xref,\n            offset,\n          });\n        }\n        break;\n    }\n  }\n\n  return scope;\n}\n\n/**\n * Generate declarations for all variables that are in scope for a given view.\n *\n * This is a recursive process, as views inherit variables available from their parent view, which\n * itself may have inherited variables, etc.\n */\nfunction generateVariablesInScopeForView(\n    view: ViewCompilation, scope: Scope): ir.VariableOp<ir.UpdateOp>[] {\n  const newOps: ir.VariableOp<ir.UpdateOp>[] = [];\n\n  if (scope.view !== view.xref) {\n    // Before generating variables for a parent view, we need to switch to the context of the parent\n    // view with a `nextContext` expression. This context switching operation itself declares a\n    // variable, because the context of the view may be referenced directly.\n    newOps.push(ir.createVariableOp(\n        view.tpl.allocateXrefId(), {\n          kind: ir.SemanticVariableKind.Context,\n          view: scope.view,\n        },\n        new ir.NextContextExpr()));\n  }\n\n  // Add variables for all context variables available in this scope's view.\n  for (const [name, value] of view.tpl.views.get(scope.view)!.contextVariables) {\n    newOps.push(ir.createVariableOp(\n        view.tpl.allocateXrefId(), {\n          kind: ir.SemanticVariableKind.Identifier,\n          name,\n        },\n        new o.ReadPropExpr(new ir.ContextExpr(view.xref), value)));\n  }\n\n  // Add variables for all local references declared for elements in this scope.\n  for (const ref of scope.references) {\n    newOps.push(ir.createVariableOp(\n        view.tpl.allocateXrefId(), {\n          kind: ir.SemanticVariableKind.Identifier,\n          name: ref.name,\n        },\n        new ir.ReferenceExpr(ref.targetId, ref.offset)));\n  }\n\n  if (scope.parent !== null) {\n    // Recursively add variables from the parent scope.\n    newOps.push(...generateVariablesInScopeForView(view, scope.parent));\n  }\n  return newOps;\n}\n"]}
|
|
154
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"generate_variables.js","sourceRoot":"","sources":["../../../../../../../../../../packages/compiler/src/template/pipeline/src/phases/generate_variables.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 o from '../../../../output/output_ast';\nimport * as ir from '../../ir';\n\nimport type {ComponentCompilation, ViewCompilation} from '../compilation';\n\n/**\n * Generate a preamble sequence for each view creation block and listener function which declares\n * any variables that be referenced in other operations in the block.\n *\n * Variables generated include:\n *   * a saved view context to be used to restore the current view in event listeners.\n *   * the context of the restored view within event listener handlers.\n *   * context variables from the current view as well as all parent views (including the root\n *     context if needed).\n *   * local references from elements within the current view and any lexical parents.\n *\n * Variables are generated here unconditionally, and may optimized away in future operations if it\n * turns out their values (and any side effects) are unused.\n */\nexport function phaseGenerateVariables(cpl: ComponentCompilation): void {\n  recursivelyProcessView(cpl.root, /* there is no parent scope for the root view */ null);\n}\n\n/**\n * Process the given `ViewCompilation` and generate preambles for it and any listeners that it\n * declares.\n *\n * @param `parentScope` a scope extracted from the parent view which captures any variables which\n *     should be inherited by this view. `null` if the current view is the root view.\n */\nfunction recursivelyProcessView(view: ViewCompilation, parentScope: Scope|null): void {\n  // Extract a `Scope` from this view.\n  const scope = getScopeForView(view, parentScope);\n\n  // Start the view creation block with an operation to save the current view context. This may be\n  // used to restore the view context in any listeners that may be present.\n  view.create.prepend([\n    ir.createVariableOp<ir.CreateOp>(\n        view.tpl.allocateXrefId(), scope.savedViewVariable, new ir.GetCurrentViewExpr()),\n  ]);\n\n  for (const op of view.create) {\n    switch (op.kind) {\n      case ir.OpKind.Template:\n        // Descend into child embedded views.\n        recursivelyProcessView(view.tpl.views.get(op.xref)!, scope);\n        break;\n      case ir.OpKind.Listener:\n        // Listeners get a preamble which starts with a call to restore the view.\n        const preambleOps = [\n          ir.createVariableOp<ir.UpdateOp>(\n              view.tpl.allocateXrefId(), scope.viewContextVariable,\n              new ir.RestoreViewExpr(view.xref)),\n          // And includes all variables available to this view.\n          ...generateVariablesInScopeForView(view, scope)\n        ];\n\n        op.handlerOps.prepend(preambleOps);\n\n        // The \"restore view\" operation in listeners requires a call to `resetView` to reset the\n        // context prior to returning from the listener operation. Find any `return` statements in\n        // the listener body and wrap them in a call to reset the view.\n        for (const handlerOp of op.handlerOps) {\n          if (handlerOp.kind === ir.OpKind.Statement &&\n              handlerOp.statement instanceof o.ReturnStatement) {\n            handlerOp.statement.value = new ir.ResetViewExpr(handlerOp.statement.value);\n          }\n        }\n        break;\n    }\n  }\n\n  // Prepend the declarations for all available variables in scope to the `update` block.\n  const preambleOps = generateVariablesInScopeForView(view, scope);\n  view.update.prepend(preambleOps);\n}\n\n/**\n * Lexical scope of a view, including a reference to its parent view's scope, if any.\n */\ninterface Scope {\n  /**\n   * `XrefId` of the view to which this scope corresponds.\n   */\n  view: ir.XrefId;\n\n  viewContextVariable: ir.SemanticVariable;\n\n  savedViewVariable: ir.SemanticVariable;\n\n  contextVariables: Map<string, ir.SemanticVariable>;\n\n  /**\n   * Local references collected from elements within the view.\n   */\n  references: Reference[];\n\n  /**\n   * `Scope` of the parent view, if any.\n   */\n  parent: Scope|null;\n}\n\n/**\n * Information needed about a local reference collected from an element within a view.\n */\ninterface Reference {\n  /**\n   * Name given to the local reference variable within the template.\n   *\n   * This is not the name which will be used for the variable declaration in the generated\n   * template code.\n   */\n  name: string;\n\n  /**\n   * `XrefId` of the element-like node which this reference targets.\n   *\n   * The reference may be either to the element (or template) itself, or to a directive on it.\n   */\n  targetId: ir.XrefId;\n\n  /**\n   * A generated offset of this reference among all the references on a specific element.\n   */\n  offset: number;\n\n  variable: ir.SemanticVariable;\n}\n\n/**\n * Process a view and generate a `Scope` representing the variables available for reference within\n * that view.\n */\nfunction getScopeForView(view: ViewCompilation, parent: Scope|null): Scope {\n  const scope: Scope = {\n    view: view.xref,\n    viewContextVariable: {\n      kind: ir.SemanticVariableKind.Context,\n      name: null,\n      view: view.xref,\n    },\n    savedViewVariable: {\n      kind: ir.SemanticVariableKind.SavedView,\n      name: null,\n      view: view.xref,\n    },\n    contextVariables: new Map<string, ir.SemanticVariable>(),\n    references: [],\n    parent,\n  };\n\n  for (const identifier of view.contextVariables.keys()) {\n    scope.contextVariables.set(identifier, {\n      kind: ir.SemanticVariableKind.Identifier,\n      name: null,\n      identifier,\n    });\n  }\n\n  for (const op of view.create) {\n    switch (op.kind) {\n      case ir.OpKind.Element:\n      case ir.OpKind.ElementStart:\n      case ir.OpKind.Template:\n        if (!Array.isArray(op.localRefs)) {\n          throw new Error(`AssertionError: expected localRefs to be an array`);\n        }\n\n        // Record available local references from this element.\n        for (let offset = 0; offset < op.localRefs.length; offset++) {\n          scope.references.push({\n            name: op.localRefs[offset].name,\n            targetId: op.xref,\n            offset,\n            variable: {\n              kind: ir.SemanticVariableKind.Identifier,\n              name: null,\n              identifier: op.localRefs[offset].name,\n            },\n          });\n        }\n        break;\n    }\n  }\n\n  return scope;\n}\n\n/**\n * Generate declarations for all variables that are in scope for a given view.\n *\n * This is a recursive process, as views inherit variables available from their parent view, which\n * itself may have inherited variables, etc.\n */\nfunction generateVariablesInScopeForView(\n    view: ViewCompilation, scope: Scope): ir.VariableOp<ir.UpdateOp>[] {\n  const newOps: ir.VariableOp<ir.UpdateOp>[] = [];\n\n  if (scope.view !== view.xref) {\n    // Before generating variables for a parent view, we need to switch to the context of the parent\n    // view with a `nextContext` expression. This context switching operation itself declares a\n    // variable, because the context of the view may be referenced directly.\n    newOps.push(ir.createVariableOp(\n        view.tpl.allocateXrefId(), scope.viewContextVariable, new ir.NextContextExpr()));\n  }\n\n  // Add variables for all context variables available in this scope's view.\n  for (const [name, value] of view.tpl.views.get(scope.view)!.contextVariables) {\n    newOps.push(ir.createVariableOp(\n        view.tpl.allocateXrefId(), scope.contextVariables.get(name)!,\n        new o.ReadPropExpr(new ir.ContextExpr(scope.view), value)));\n  }\n\n  // Add variables for all local references declared for elements in this scope.\n  for (const ref of scope.references) {\n    newOps.push(ir.createVariableOp(\n        view.tpl.allocateXrefId(), ref.variable, new ir.ReferenceExpr(ref.targetId, ref.offset)));\n  }\n\n  if (scope.parent !== null) {\n    // Recursively add variables from the parent scope.\n    newOps.push(...generateVariablesInScopeForView(view, scope.parent));\n  }\n  return newOps;\n}\n"]}
|
|
@@ -13,49 +13,66 @@ import * as ir from '../../ir';
|
|
|
13
13
|
* the reads can be emitted correctly.
|
|
14
14
|
*/
|
|
15
15
|
export function phaseNaming(cpl) {
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
// TODO(alxhub): convert this temporary name to match how the
|
|
34
|
-
// `TemplateDefinitionBuilder` names listener functions.
|
|
35
|
-
op.handlerFnName = `${view.fnName}_${op.name}_listener`;
|
|
36
|
-
}
|
|
37
|
-
break;
|
|
38
|
-
case ir.OpKind.Variable:
|
|
39
|
-
if (op.name === null) {
|
|
40
|
-
op.name = `_r${vIndex++}`;
|
|
41
|
-
varNames.set(op.xref, op.name);
|
|
16
|
+
addNamesToView(cpl.root, cpl.componentName, { index: 0 });
|
|
17
|
+
}
|
|
18
|
+
function addNamesToView(view, baseName, state) {
|
|
19
|
+
if (view.fnName === null) {
|
|
20
|
+
view.fnName = `${baseName}_Template`;
|
|
21
|
+
}
|
|
22
|
+
// Keep track of the names we assign to variables in the view. We'll need to propagate these
|
|
23
|
+
// into reads of those variables afterwards.
|
|
24
|
+
const varNames = new Map();
|
|
25
|
+
for (const op of view.ops()) {
|
|
26
|
+
switch (op.kind) {
|
|
27
|
+
case ir.OpKind.Listener:
|
|
28
|
+
if (op.handlerFnName === null) {
|
|
29
|
+
// TODO(alxhub): convert this temporary name to match how the
|
|
30
|
+
// `TemplateDefinitionBuilder` names listener functions.
|
|
31
|
+
if (op.slot === null) {
|
|
32
|
+
throw new Error(`Expected a slot to be assigned`);
|
|
42
33
|
}
|
|
43
|
-
|
|
44
|
-
}
|
|
45
|
-
}
|
|
46
|
-
// Having named all variables declared in the view, now we can push those names into the
|
|
47
|
-
// `ir.ReadVariableExpr` expressions which represent reads of those variables.
|
|
48
|
-
for (const op of view.ops()) {
|
|
49
|
-
ir.visitExpressionsInOp(op, expr => {
|
|
50
|
-
if (!(expr instanceof ir.ReadVariableExpr) || expr.name !== null) {
|
|
51
|
-
return;
|
|
34
|
+
op.handlerFnName = `${view.fnName}_${op.tag}_${op.name}_${op.slot}_listener`;
|
|
52
35
|
}
|
|
53
|
-
|
|
54
|
-
|
|
36
|
+
break;
|
|
37
|
+
case ir.OpKind.Variable:
|
|
38
|
+
varNames.set(op.xref, getVariableName(op.variable, state));
|
|
39
|
+
break;
|
|
40
|
+
case ir.OpKind.Template:
|
|
41
|
+
const childView = view.tpl.views.get(op.xref);
|
|
42
|
+
if (op.slot === null) {
|
|
43
|
+
throw new Error(`Expected slot to be assigned`);
|
|
55
44
|
}
|
|
56
|
-
|
|
57
|
-
|
|
45
|
+
// TODO: properly escape the tag name.
|
|
46
|
+
const safeTagName = op.tag.replace('-', '_');
|
|
47
|
+
addNamesToView(childView, `${baseName}_${safeTagName}_${op.slot}`, state);
|
|
48
|
+
break;
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
// Having named all variables declared in the view, now we can push those names into the
|
|
52
|
+
// `ir.ReadVariableExpr` expressions which represent reads of those variables.
|
|
53
|
+
for (const op of view.ops()) {
|
|
54
|
+
ir.visitExpressionsInOp(op, expr => {
|
|
55
|
+
if (!(expr instanceof ir.ReadVariableExpr) || expr.name !== null) {
|
|
56
|
+
return;
|
|
57
|
+
}
|
|
58
|
+
if (!varNames.has(expr.xref)) {
|
|
59
|
+
throw new Error(`Variable ${expr.xref} not yet named`);
|
|
60
|
+
}
|
|
61
|
+
expr.name = varNames.get(expr.xref);
|
|
62
|
+
});
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
function getVariableName(variable, state) {
|
|
66
|
+
if (variable.name === null) {
|
|
67
|
+
switch (variable.kind) {
|
|
68
|
+
case ir.SemanticVariableKind.Identifier:
|
|
69
|
+
variable.name = `${variable.identifier}_${state.index++}`;
|
|
70
|
+
break;
|
|
71
|
+
default:
|
|
72
|
+
variable.name = `_r${state.index++}`;
|
|
73
|
+
break;
|
|
58
74
|
}
|
|
59
75
|
}
|
|
76
|
+
return variable.name;
|
|
60
77
|
}
|
|
61
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
78
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmFtaW5nLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vcGFja2FnZXMvY29tcGlsZXIvc3JjL3RlbXBsYXRlL3BpcGVsaW5lL3NyYy9waGFzZXMvbmFtaW5nLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7R0FNRztBQUVILE9BQU8sS0FBSyxFQUFFLE1BQU0sVUFBVSxDQUFDO0FBSS9COzs7OztHQUtHO0FBQ0gsTUFBTSxVQUFVLFdBQVcsQ0FBQyxHQUF5QjtJQUNuRCxjQUFjLENBQUMsR0FBRyxDQUFDLElBQUksRUFBRSxHQUFHLENBQUMsYUFBYSxFQUFFLEVBQUMsS0FBSyxFQUFFLENBQUMsRUFBQyxDQUFDLENBQUM7QUFDMUQsQ0FBQztBQUVELFNBQVMsY0FBYyxDQUFDLElBQXFCLEVBQUUsUUFBZ0IsRUFBRSxLQUFzQjtJQUNyRixJQUFJLElBQUksQ0FBQyxNQUFNLEtBQUssSUFBSSxFQUFFO1FBQ3hCLElBQUksQ0FBQyxNQUFNLEdBQUcsR0FBRyxRQUFRLFdBQVcsQ0FBQztLQUN0QztJQUVELDRGQUE0RjtJQUM1Riw0Q0FBNEM7SUFDNUMsTUFBTSxRQUFRLEdBQUcsSUFBSSxHQUFHLEVBQXFCLENBQUM7SUFFOUMsS0FBSyxNQUFNLEVBQUUsSUFBSSxJQUFJLENBQUMsR0FBRyxFQUFFLEVBQUU7UUFDM0IsUUFBUSxFQUFFLENBQUMsSUFBSSxFQUFFO1lBQ2YsS0FBSyxFQUFFLENBQUMsTUFBTSxDQUFDLFFBQVE7Z0JBQ3JCLElBQUksRUFBRSxDQUFDLGFBQWEsS0FBSyxJQUFJLEVBQUU7b0JBQzdCLDZEQUE2RDtvQkFDN0Qsd0RBQXdEO29CQUN4RCxJQUFJLEVBQUUsQ0FBQyxJQUFJLEtBQUssSUFBSSxFQUFFO3dCQUNwQixNQUFNLElBQUksS0FBSyxDQUFDLGdDQUFnQyxDQUFDLENBQUM7cUJBQ25EO29CQUNELEVBQUUsQ0FBQyxhQUFhLEdBQUcsR0FBRyxJQUFJLENBQUMsTUFBTSxJQUFJLEVBQUUsQ0FBQyxHQUFHLElBQUksRUFBRSxDQUFDLElBQUksSUFBSSxFQUFFLENBQUMsSUFBSSxXQUFXLENBQUM7aUJBQzlFO2dCQUNELE1BQU07WUFDUixLQUFLLEVBQUUsQ0FBQyxNQUFNLENBQUMsUUFBUTtnQkFDckIsUUFBUSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsSUFBSSxFQUFFLGVBQWUsQ0FBQyxFQUFFLENBQUMsUUFBUSxFQUFFLEtBQUssQ0FBQyxDQUFDLENBQUM7Z0JBQzNELE1BQU07WUFDUixLQUFLLEVBQUUsQ0FBQyxNQUFNLENBQUMsUUFBUTtnQkFDckIsTUFBTSxTQUFTLEdBQUcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUUsQ0FBQztnQkFDL0MsSUFBSSxFQUFFLENBQUMsSUFBSSxLQUFLLElBQUksRUFBRTtvQkFDcEIsTUFBTSxJQUFJLEtBQUssQ0FBQyw4QkFBOEIsQ0FBQyxDQUFDO2lCQUNqRDtnQkFDRCxzQ0FBc0M7Z0JBQ3RDLE1BQU0sV0FBVyxHQUFHLEVBQUUsQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLEdBQUcsRUFBRSxHQUFHLENBQUMsQ0FBQztnQkFDN0MsY0FBYyxDQUFDLFNBQVMsRUFBRSxHQUFHLFFBQVEsSUFBSSxXQUFXLElBQUksRUFBRSxDQUFDLElBQUksRUFBRSxFQUFFLEtBQUssQ0FBQyxDQUFDO2dCQUMxRSxNQUFNO1NBQ1Q7S0FDRjtJQUVELHdGQUF3RjtJQUN4Riw4RUFBOEU7SUFDOUUsS0FBSyxNQUFNLEVBQUUsSUFBSSxJQUFJLENBQUMsR0FBRyxFQUFFLEVBQUU7UUFDM0IsRUFBRSxDQUFDLG9CQUFvQixDQUFDLEVBQUUsRUFBRSxJQUFJLENBQUMsRUFBRTtZQUNqQyxJQUFJLENBQUMsQ0FBQyxJQUFJLFlBQVksRUFBRSxDQUFDLGdCQUFnQixDQUFDLElBQUksSUFBSSxDQUFDLElBQUksS0FBSyxJQUFJLEVBQUU7Z0JBQ2hFLE9BQU87YUFDUjtZQUNELElBQUksQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsRUFBRTtnQkFDNUIsTUFBTSxJQUFJLEtBQUssQ0FBQyxZQUFZLElBQUksQ0FBQyxJQUFJLGdCQUFnQixDQUFDLENBQUM7YUFDeEQ7WUFDRCxJQUFJLENBQUMsSUFBSSxHQUFHLFFBQVEsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBRSxDQUFDO1FBQ3ZDLENBQUMsQ0FBQyxDQUFDO0tBQ0o7QUFDSCxDQUFDO0FBRUQsU0FBUyxlQUFlLENBQUMsUUFBNkIsRUFBRSxLQUFzQjtJQUM1RSxJQUFJLFFBQVEsQ0FBQyxJQUFJLEtBQUssSUFBSSxFQUFFO1FBQzFCLFFBQVEsUUFBUSxDQUFDLElBQUksRUFBRTtZQUNyQixLQUFLLEVBQUUsQ0FBQyxvQkFBb0IsQ0FBQyxVQUFVO2dCQUNyQyxRQUFRLENBQUMsSUFBSSxHQUFHLEdBQUcsUUFBUSxDQUFDLFVBQVUsSUFBSSxLQUFLLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQztnQkFDMUQsTUFBTTtZQUNSO2dCQUNFLFFBQVEsQ0FBQyxJQUFJLEdBQUcsS0FBSyxLQUFLLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQztnQkFDckMsTUFBTTtTQUNUO0tBQ0Y7SUFDRCxPQUFPLFFBQVEsQ0FBQyxJQUFJLENBQUM7QUFDdkIsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogQGxpY2Vuc2VcbiAqIENvcHlyaWdodCBHb29nbGUgTExDIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4gKlxuICogVXNlIG9mIHRoaXMgc291cmNlIGNvZGUgaXMgZ292ZXJuZWQgYnkgYW4gTUlULXN0eWxlIGxpY2Vuc2UgdGhhdCBjYW4gYmVcbiAqIGZvdW5kIGluIHRoZSBMSUNFTlNFIGZpbGUgYXQgaHR0cHM6Ly9hbmd1bGFyLmlvL2xpY2Vuc2VcbiAqL1xuXG5pbXBvcnQgKiBhcyBpciBmcm9tICcuLi8uLi9pcic7XG5cbmltcG9ydCB0eXBlIHtDb21wb25lbnRDb21waWxhdGlvbiwgVmlld0NvbXBpbGF0aW9ufSBmcm9tICcuLi9jb21waWxhdGlvbic7XG5cbi8qKlxuICogR2VuZXJhdGUgbmFtZXMgZm9yIGZ1bmN0aW9ucyBhbmQgdmFyaWFibGVzIGFjcm9zcyBhbGwgdmlld3MuXG4gKlxuICogVGhpcyBpbmNsdWRlcyBwcm9wYWdhdGluZyB0aG9zZSBuYW1lcyBpbnRvIGFueSBgaXIuUmVhZFZhcmlhYmxlRXhwcmBzIG9mIHRob3NlIHZhcmlhYmxlcywgc28gdGhhdFxuICogdGhlIHJlYWRzIGNhbiBiZSBlbWl0dGVkIGNvcnJlY3RseS5cbiAqL1xuZXhwb3J0IGZ1bmN0aW9uIHBoYXNlTmFtaW5nKGNwbDogQ29tcG9uZW50Q29tcGlsYXRpb24pOiB2b2lkIHtcbiAgYWRkTmFtZXNUb1ZpZXcoY3BsLnJvb3QsIGNwbC5jb21wb25lbnROYW1lLCB7aW5kZXg6IDB9KTtcbn1cblxuZnVuY3Rpb24gYWRkTmFtZXNUb1ZpZXcodmlldzogVmlld0NvbXBpbGF0aW9uLCBiYXNlTmFtZTogc3RyaW5nLCBzdGF0ZToge2luZGV4OiBudW1iZXJ9KTogdm9pZCB7XG4gIGlmICh2aWV3LmZuTmFtZSA9PT0gbnVsbCkge1xuICAgIHZpZXcuZm5OYW1lID0gYCR7YmFzZU5hbWV9X1RlbXBsYXRlYDtcbiAgfVxuXG4gIC8vIEtlZXAgdHJhY2sgb2YgdGhlIG5hbWVzIHdlIGFzc2lnbiB0byB2YXJpYWJsZXMgaW4gdGhlIHZpZXcuIFdlJ2xsIG5lZWQgdG8gcHJvcGFnYXRlIHRoZXNlXG4gIC8vIGludG8gcmVhZHMgb2YgdGhvc2UgdmFyaWFibGVzIGFmdGVyd2FyZHMuXG4gIGNvbnN0IHZhck5hbWVzID0gbmV3IE1hcDxpci5YcmVmSWQsIHN0cmluZz4oKTtcblxuICBmb3IgKGNvbnN0IG9wIG9mIHZpZXcub3BzKCkpIHtcbiAgICBzd2l0Y2ggKG9wLmtpbmQpIHtcbiAgICAgIGNhc2UgaXIuT3BLaW5kLkxpc3RlbmVyOlxuICAgICAgICBpZiAob3AuaGFuZGxlckZuTmFtZSA9PT0gbnVsbCkge1xuICAgICAgICAgIC8vIFRPRE8oYWx4aHViKTogY29udmVydCB0aGlzIHRlbXBvcmFyeSBuYW1lIHRvIG1hdGNoIGhvdyB0aGVcbiAgICAgICAgICAvLyBgVGVtcGxhdGVEZWZpbml0aW9uQnVpbGRlcmAgbmFtZXMgbGlzdGVuZXIgZnVuY3Rpb25zLlxuICAgICAgICAgIGlmIChvcC5zbG90ID09PSBudWxsKSB7XG4gICAgICAgICAgICB0aHJvdyBuZXcgRXJyb3IoYEV4cGVjdGVkIGEgc2xvdCB0byBiZSBhc3NpZ25lZGApO1xuICAgICAgICAgIH1cbiAgICAgICAgICBvcC5oYW5kbGVyRm5OYW1lID0gYCR7dmlldy5mbk5hbWV9XyR7b3AudGFnfV8ke29wLm5hbWV9XyR7b3Auc2xvdH1fbGlzdGVuZXJgO1xuICAgICAgICB9XG4gICAgICAgIGJyZWFrO1xuICAgICAgY2FzZSBpci5PcEtpbmQuVmFyaWFibGU6XG4gICAgICAgIHZhck5hbWVzLnNldChvcC54cmVmLCBnZXRWYXJpYWJsZU5hbWUob3AudmFyaWFibGUsIHN0YXRlKSk7XG4gICAgICAgIGJyZWFrO1xuICAgICAgY2FzZSBpci5PcEtpbmQuVGVtcGxhdGU6XG4gICAgICAgIGNvbnN0IGNoaWxkVmlldyA9IHZpZXcudHBsLnZpZXdzLmdldChvcC54cmVmKSE7XG4gICAgICAgIGlmIChvcC5zbG90ID09PSBudWxsKSB7XG4gICAgICAgICAgdGhyb3cgbmV3IEVycm9yKGBFeHBlY3RlZCBzbG90IHRvIGJlIGFzc2lnbmVkYCk7XG4gICAgICAgIH1cbiAgICAgICAgLy8gVE9ETzogcHJvcGVybHkgZXNjYXBlIHRoZSB0YWcgbmFtZS5cbiAgICAgICAgY29uc3Qgc2FmZVRhZ05hbWUgPSBvcC50YWcucmVwbGFjZSgnLScsICdfJyk7XG4gICAgICAgIGFkZE5hbWVzVG9WaWV3KGNoaWxkVmlldywgYCR7YmFzZU5hbWV9XyR7c2FmZVRhZ05hbWV9XyR7b3Auc2xvdH1gLCBzdGF0ZSk7XG4gICAgICAgIGJyZWFrO1xuICAgIH1cbiAgfVxuXG4gIC8vIEhhdmluZyBuYW1lZCBhbGwgdmFyaWFibGVzIGRlY2xhcmVkIGluIHRoZSB2aWV3LCBub3cgd2UgY2FuIHB1c2ggdGhvc2UgbmFtZXMgaW50byB0aGVcbiAgLy8gYGlyLlJlYWRWYXJpYWJsZUV4cHJgIGV4cHJlc3Npb25zIHdoaWNoIHJlcHJlc2VudCByZWFkcyBvZiB0aG9zZSB2YXJpYWJsZXMuXG4gIGZvciAoY29uc3Qgb3Agb2Ygdmlldy5vcHMoKSkge1xuICAgIGlyLnZpc2l0RXhwcmVzc2lvbnNJbk9wKG9wLCBleHByID0+IHtcbiAgICAgIGlmICghKGV4cHIgaW5zdGFuY2VvZiBpci5SZWFkVmFyaWFibGVFeHByKSB8fCBleHByLm5hbWUgIT09IG51bGwpIHtcbiAgICAgICAgcmV0dXJuO1xuICAgICAgfVxuICAgICAgaWYgKCF2YXJOYW1lcy5oYXMoZXhwci54cmVmKSkge1xuICAgICAgICB0aHJvdyBuZXcgRXJyb3IoYFZhcmlhYmxlICR7ZXhwci54cmVmfSBub3QgeWV0IG5hbWVkYCk7XG4gICAgICB9XG4gICAgICBleHByLm5hbWUgPSB2YXJOYW1lcy5nZXQoZXhwci54cmVmKSE7XG4gICAgfSk7XG4gIH1cbn1cblxuZnVuY3Rpb24gZ2V0VmFyaWFibGVOYW1lKHZhcmlhYmxlOiBpci5TZW1hbnRpY1ZhcmlhYmxlLCBzdGF0ZToge2luZGV4OiBudW1iZXJ9KTogc3RyaW5nIHtcbiAgaWYgKHZhcmlhYmxlLm5hbWUgPT09IG51bGwpIHtcbiAgICBzd2l0Y2ggKHZhcmlhYmxlLmtpbmQpIHtcbiAgICAgIGNhc2UgaXIuU2VtYW50aWNWYXJpYWJsZUtpbmQuSWRlbnRpZmllcjpcbiAgICAgICAgdmFyaWFibGUubmFtZSA9IGAke3ZhcmlhYmxlLmlkZW50aWZpZXJ9XyR7c3RhdGUuaW5kZXgrK31gO1xuICAgICAgICBicmVhaztcbiAgICAgIGRlZmF1bHQ6XG4gICAgICAgIHZhcmlhYmxlLm5hbWUgPSBgX3Ike3N0YXRlLmluZGV4Kyt9YDtcbiAgICAgICAgYnJlYWs7XG4gICAgfVxuICB9XG4gIHJldHVybiB2YXJpYWJsZS5uYW1lO1xufVxuIl19
|
|
@@ -0,0 +1,69 @@
|
|
|
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 o from '../../../../output/output_ast';
|
|
9
|
+
import * as ir from '../../ir';
|
|
10
|
+
/**
|
|
11
|
+
* Merges logically sequential `NextContextExpr` operations.
|
|
12
|
+
*
|
|
13
|
+
* `NextContextExpr` can be referenced repeatedly, "popping" the runtime's context stack each time.
|
|
14
|
+
* When two such expressions appear back-to-back, it's possible to merge them together into a single
|
|
15
|
+
* `NextContextExpr` that steps multiple contexts. This merging is possible if all conditions are
|
|
16
|
+
* met:
|
|
17
|
+
*
|
|
18
|
+
* * The result of the `NextContextExpr` that's folded into the subsequent one is not stored (that
|
|
19
|
+
* is, the call is purely side-effectful).
|
|
20
|
+
* * No operations in between them uses the implicit context.
|
|
21
|
+
*/
|
|
22
|
+
export function phaseMergeNextContext(cpl) {
|
|
23
|
+
for (const view of cpl.views.values()) {
|
|
24
|
+
for (const op of view.create) {
|
|
25
|
+
if (op.kind === ir.OpKind.Listener) {
|
|
26
|
+
mergeNextContextsInOps(op.handlerOps);
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
mergeNextContextsInOps(view.update);
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
function mergeNextContextsInOps(ops) {
|
|
33
|
+
for (const op of ops) {
|
|
34
|
+
// Look for a candidate operation to maybe merge.
|
|
35
|
+
if (op.kind !== ir.OpKind.Statement || !(op.statement instanceof o.ExpressionStatement) ||
|
|
36
|
+
!(op.statement.expr instanceof ir.NextContextExpr)) {
|
|
37
|
+
continue;
|
|
38
|
+
}
|
|
39
|
+
const mergeSteps = op.statement.expr.steps;
|
|
40
|
+
// Try to merge this `ir.NextContextExpr`.
|
|
41
|
+
let tryToMerge = true;
|
|
42
|
+
for (let candidate = op.next; candidate.kind !== ir.OpKind.ListEnd && tryToMerge; candidate = candidate.next) {
|
|
43
|
+
ir.visitExpressionsInOp(candidate, (expr, flags) => {
|
|
44
|
+
if (!tryToMerge) {
|
|
45
|
+
// Either we've already merged, or failed to merge.
|
|
46
|
+
return;
|
|
47
|
+
}
|
|
48
|
+
if (flags & ir.VisitorContextFlag.InChildOperation) {
|
|
49
|
+
// We cannot merge into child operations.
|
|
50
|
+
return;
|
|
51
|
+
}
|
|
52
|
+
switch (expr.kind) {
|
|
53
|
+
case ir.ExpressionKind.NextContext:
|
|
54
|
+
// Merge the previous `ir.NextContextExpr` into this one.
|
|
55
|
+
expr.steps += mergeSteps;
|
|
56
|
+
ir.OpList.remove(op);
|
|
57
|
+
tryToMerge = false;
|
|
58
|
+
break;
|
|
59
|
+
case ir.ExpressionKind.GetCurrentView:
|
|
60
|
+
case ir.ExpressionKind.Reference:
|
|
61
|
+
// Can't merge past a dependency on the context.
|
|
62
|
+
tryToMerge = false;
|
|
63
|
+
break;
|
|
64
|
+
}
|
|
65
|
+
});
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmV4dF9jb250ZXh0X21lcmdpbmcuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9jb21waWxlci9zcmMvdGVtcGxhdGUvcGlwZWxpbmUvc3JjL3BoYXNlcy9uZXh0X2NvbnRleHRfbWVyZ2luZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7O0dBTUc7QUFFSCxPQUFPLEtBQUssQ0FBQyxNQUFNLCtCQUErQixDQUFDO0FBQ25ELE9BQU8sS0FBSyxFQUFFLE1BQU0sVUFBVSxDQUFDO0FBSS9COzs7Ozs7Ozs7OztHQVdHO0FBQ0gsTUFBTSxVQUFVLHFCQUFxQixDQUFDLEdBQXlCO0lBQzdELEtBQUssTUFBTSxJQUFJLElBQUksR0FBRyxDQUFDLEtBQUssQ0FBQyxNQUFNLEVBQUUsRUFBRTtRQUNyQyxLQUFLLE1BQU0sRUFBRSxJQUFJLElBQUksQ0FBQyxNQUFNLEVBQUU7WUFDNUIsSUFBSSxFQUFFLENBQUMsSUFBSSxLQUFLLEVBQUUsQ0FBQyxNQUFNLENBQUMsUUFBUSxFQUFFO2dCQUNsQyxzQkFBc0IsQ0FBQyxFQUFFLENBQUMsVUFBVSxDQUFDLENBQUM7YUFDdkM7U0FDRjtRQUNELHNCQUFzQixDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQztLQUNyQztBQUNILENBQUM7QUFFRCxTQUFTLHNCQUFzQixDQUFDLEdBQTJCO0lBQ3pELEtBQUssTUFBTSxFQUFFLElBQUksR0FBRyxFQUFFO1FBQ3BCLGlEQUFpRDtRQUNqRCxJQUFJLEVBQUUsQ0FBQyxJQUFJLEtBQUssRUFBRSxDQUFDLE1BQU0sQ0FBQyxTQUFTLElBQUksQ0FBQyxDQUFDLEVBQUUsQ0FBQyxTQUFTLFlBQVksQ0FBQyxDQUFDLG1CQUFtQixDQUFDO1lBQ25GLENBQUMsQ0FBQyxFQUFFLENBQUMsU0FBUyxDQUFDLElBQUksWUFBWSxFQUFFLENBQUMsZUFBZSxDQUFDLEVBQUU7WUFDdEQsU0FBUztTQUNWO1FBRUQsTUFBTSxVQUFVLEdBQUcsRUFBRSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDO1FBRTNDLDBDQUEwQztRQUMxQyxJQUFJLFVBQVUsR0FBRyxJQUFJLENBQUM7UUFDdEIsS0FBSyxJQUFJLFNBQVMsR0FBRyxFQUFFLENBQUMsSUFBSyxFQUFFLFNBQVMsQ0FBQyxJQUFJLEtBQUssRUFBRSxDQUFDLE1BQU0sQ0FBQyxPQUFPLElBQUksVUFBVSxFQUM1RSxTQUFTLEdBQUcsU0FBUyxDQUFDLElBQUssRUFBRTtZQUNoQyxFQUFFLENBQUMsb0JBQW9CLENBQUMsU0FBUyxFQUFFLENBQUMsSUFBSSxFQUFFLEtBQUssRUFBRSxFQUFFO2dCQUNqRCxJQUFJLENBQUMsVUFBVSxFQUFFO29CQUNmLG1EQUFtRDtvQkFDbkQsT0FBTztpQkFDUjtnQkFFRCxJQUFJLEtBQUssR0FBRyxFQUFFLENBQUMsa0JBQWtCLENBQUMsZ0JBQWdCLEVBQUU7b0JBQ2xELHlDQUF5QztvQkFDekMsT0FBTztpQkFDUjtnQkFFRCxRQUFRLElBQUksQ0FBQyxJQUFJLEVBQUU7b0JBQ2pCLEtBQUssRUFBRSxDQUFDLGNBQWMsQ0FBQyxXQUFXO3dCQUNoQyx5REFBeUQ7d0JBQ3pELElBQUksQ0FBQyxLQUFLLElBQUksVUFBVSxDQUFDO3dCQUN6QixFQUFFLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxFQUFpQixDQUFDLENBQUM7d0JBQ3BDLFVBQVUsR0FBRyxLQUFLLENBQUM7d0JBQ25CLE1BQU07b0JBQ1IsS0FBSyxFQUFFLENBQUMsY0FBYyxDQUFDLGNBQWMsQ0FBQztvQkFDdEMsS0FBSyxFQUFFLENBQUMsY0FBYyxDQUFDLFNBQVM7d0JBQzlCLGdEQUFnRDt3QkFDaEQsVUFBVSxHQUFHLEtBQUssQ0FBQzt3QkFDbkIsTUFBTTtpQkFDVDtZQUNILENBQUMsQ0FBQyxDQUFDO1NBQ0o7S0FDRjtBQUNILENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqIEBsaWNlbnNlXG4gKiBDb3B5cmlnaHQgR29vZ2xlIExMQyBBbGwgUmlnaHRzIFJlc2VydmVkLlxuICpcbiAqIFVzZSBvZiB0aGlzIHNvdXJjZSBjb2RlIGlzIGdvdmVybmVkIGJ5IGFuIE1JVC1zdHlsZSBsaWNlbnNlIHRoYXQgY2FuIGJlXG4gKiBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlIGF0IGh0dHBzOi8vYW5ndWxhci5pby9saWNlbnNlXG4gKi9cblxuaW1wb3J0ICogYXMgbyBmcm9tICcuLi8uLi8uLi8uLi9vdXRwdXQvb3V0cHV0X2FzdCc7XG5pbXBvcnQgKiBhcyBpciBmcm9tICcuLi8uLi9pcic7XG5cbmltcG9ydCB0eXBlIHtDb21wb25lbnRDb21waWxhdGlvbn0gZnJvbSAnLi4vY29tcGlsYXRpb24nO1xuXG4vKipcbiAqIE1lcmdlcyBsb2dpY2FsbHkgc2VxdWVudGlhbCBgTmV4dENvbnRleHRFeHByYCBvcGVyYXRpb25zLlxuICpcbiAqIGBOZXh0Q29udGV4dEV4cHJgIGNhbiBiZSByZWZlcmVuY2VkIHJlcGVhdGVkbHksIFwicG9wcGluZ1wiIHRoZSBydW50aW1lJ3MgY29udGV4dCBzdGFjayBlYWNoIHRpbWUuXG4gKiBXaGVuIHR3byBzdWNoIGV4cHJlc3Npb25zIGFwcGVhciBiYWNrLXRvLWJhY2ssIGl0J3MgcG9zc2libGUgdG8gbWVyZ2UgdGhlbSB0b2dldGhlciBpbnRvIGEgc2luZ2xlXG4gKiBgTmV4dENvbnRleHRFeHByYCB0aGF0IHN0ZXBzIG11bHRpcGxlIGNvbnRleHRzLiBUaGlzIG1lcmdpbmcgaXMgcG9zc2libGUgaWYgYWxsIGNvbmRpdGlvbnMgYXJlXG4gKiBtZXQ6XG4gKlxuICogICAqIFRoZSByZXN1bHQgb2YgdGhlIGBOZXh0Q29udGV4dEV4cHJgIHRoYXQncyBmb2xkZWQgaW50byB0aGUgc3Vic2VxdWVudCBvbmUgaXMgbm90IHN0b3JlZCAodGhhdFxuICogICAgIGlzLCB0aGUgY2FsbCBpcyBwdXJlbHkgc2lkZS1lZmZlY3RmdWwpLlxuICogICAqIE5vIG9wZXJhdGlvbnMgaW4gYmV0d2VlbiB0aGVtIHVzZXMgdGhlIGltcGxpY2l0IGNvbnRleHQuXG4gKi9cbmV4cG9ydCBmdW5jdGlvbiBwaGFzZU1lcmdlTmV4dENvbnRleHQoY3BsOiBDb21wb25lbnRDb21waWxhdGlvbik6IHZvaWQge1xuICBmb3IgKGNvbnN0IHZpZXcgb2YgY3BsLnZpZXdzLnZhbHVlcygpKSB7XG4gICAgZm9yIChjb25zdCBvcCBvZiB2aWV3LmNyZWF0ZSkge1xuICAgICAgaWYgKG9wLmtpbmQgPT09IGlyLk9wS2luZC5MaXN0ZW5lcikge1xuICAgICAgICBtZXJnZU5leHRDb250ZXh0c0luT3BzKG9wLmhhbmRsZXJPcHMpO1xuICAgICAgfVxuICAgIH1cbiAgICBtZXJnZU5leHRDb250ZXh0c0luT3BzKHZpZXcudXBkYXRlKTtcbiAgfVxufVxuXG5mdW5jdGlvbiBtZXJnZU5leHRDb250ZXh0c0luT3BzKG9wczogaXIuT3BMaXN0PGlyLlVwZGF0ZU9wPik6IHZvaWQge1xuICBmb3IgKGNvbnN0IG9wIG9mIG9wcykge1xuICAgIC8vIExvb2sgZm9yIGEgY2FuZGlkYXRlIG9wZXJhdGlvbiB0byBtYXliZSBtZXJnZS5cbiAgICBpZiAob3Aua2luZCAhPT0gaXIuT3BLaW5kLlN0YXRlbWVudCB8fCAhKG9wLnN0YXRlbWVudCBpbnN0YW5jZW9mIG8uRXhwcmVzc2lvblN0YXRlbWVudCkgfHxcbiAgICAgICAgIShvcC5zdGF0ZW1lbnQuZXhwciBpbnN0YW5jZW9mIGlyLk5leHRDb250ZXh0RXhwcikpIHtcbiAgICAgIGNvbnRpbnVlO1xuICAgIH1cblxuICAgIGNvbnN0IG1lcmdlU3RlcHMgPSBvcC5zdGF0ZW1lbnQuZXhwci5zdGVwcztcblxuICAgIC8vIFRyeSB0byBtZXJnZSB0aGlzIGBpci5OZXh0Q29udGV4dEV4cHJgLlxuICAgIGxldCB0cnlUb01lcmdlID0gdHJ1ZTtcbiAgICBmb3IgKGxldCBjYW5kaWRhdGUgPSBvcC5uZXh0ITsgY2FuZGlkYXRlLmtpbmQgIT09IGlyLk9wS2luZC5MaXN0RW5kICYmIHRyeVRvTWVyZ2U7XG4gICAgICAgICBjYW5kaWRhdGUgPSBjYW5kaWRhdGUubmV4dCEpIHtcbiAgICAgIGlyLnZpc2l0RXhwcmVzc2lvbnNJbk9wKGNhbmRpZGF0ZSwgKGV4cHIsIGZsYWdzKSA9PiB7XG4gICAgICAgIGlmICghdHJ5VG9NZXJnZSkge1xuICAgICAgICAgIC8vIEVpdGhlciB3ZSd2ZSBhbHJlYWR5IG1lcmdlZCwgb3IgZmFpbGVkIHRvIG1lcmdlLlxuICAgICAgICAgIHJldHVybjtcbiAgICAgICAgfVxuXG4gICAgICAgIGlmIChmbGFncyAmIGlyLlZpc2l0b3JDb250ZXh0RmxhZy5JbkNoaWxkT3BlcmF0aW9uKSB7XG4gICAgICAgICAgLy8gV2UgY2Fubm90IG1lcmdlIGludG8gY2hpbGQgb3BlcmF0aW9ucy5cbiAgICAgICAgICByZXR1cm47XG4gICAgICAgIH1cblxuICAgICAgICBzd2l0Y2ggKGV4cHIua2luZCkge1xuICAgICAgICAgIGNhc2UgaXIuRXhwcmVzc2lvbktpbmQuTmV4dENvbnRleHQ6XG4gICAgICAgICAgICAvLyBNZXJnZSB0aGUgcHJldmlvdXMgYGlyLk5leHRDb250ZXh0RXhwcmAgaW50byB0aGlzIG9uZS5cbiAgICAgICAgICAgIGV4cHIuc3RlcHMgKz0gbWVyZ2VTdGVwcztcbiAgICAgICAgICAgIGlyLk9wTGlzdC5yZW1vdmUob3AgYXMgaXIuVXBkYXRlT3ApO1xuICAgICAgICAgICAgdHJ5VG9NZXJnZSA9IGZhbHNlO1xuICAgICAgICAgICAgYnJlYWs7XG4gICAgICAgICAgY2FzZSBpci5FeHByZXNzaW9uS2luZC5HZXRDdXJyZW50VmlldzpcbiAgICAgICAgICBjYXNlIGlyLkV4cHJlc3Npb25LaW5kLlJlZmVyZW5jZTpcbiAgICAgICAgICAgIC8vIENhbid0IG1lcmdlIHBhc3QgYSBkZXBlbmRlbmN5IG9uIHRoZSBjb250ZXh0LlxuICAgICAgICAgICAgdHJ5VG9NZXJnZSA9IGZhbHNlO1xuICAgICAgICAgICAgYnJlYWs7XG4gICAgICAgIH1cbiAgICAgIH0pO1xuICAgIH1cbiAgfVxufVxuIl19
|
|
@@ -24,7 +24,7 @@ export function phaseReify(cpl) {
|
|
|
24
24
|
}
|
|
25
25
|
function reifyCreateOperations(view, ops) {
|
|
26
26
|
for (const op of ops) {
|
|
27
|
-
ir.transformExpressionsInOp(op, reifyIrExpression);
|
|
27
|
+
ir.transformExpressionsInOp(op, reifyIrExpression, ir.VisitorContextFlag.None);
|
|
28
28
|
switch (op.kind) {
|
|
29
29
|
case ir.OpKind.Text:
|
|
30
30
|
ir.OpList.replace(op, ng.text(op.slot, op.initialValue));
|
|
@@ -40,17 +40,17 @@ function reifyCreateOperations(view, ops) {
|
|
|
40
40
|
break;
|
|
41
41
|
case ir.OpKind.Template:
|
|
42
42
|
const childView = view.tpl.views.get(op.xref);
|
|
43
|
-
ir.OpList.replace(op, ng.template(op.slot, o.variable(childView.fnName), childView.decls, childView.vars, op.tag, op.
|
|
43
|
+
ir.OpList.replace(op, ng.template(op.slot, o.variable(childView.fnName), childView.decls, childView.vars, op.tag, op.attributes));
|
|
44
44
|
break;
|
|
45
45
|
case ir.OpKind.Listener:
|
|
46
46
|
const listenerFn = reifyListenerHandler(view, op.handlerFnName, op.handlerOps);
|
|
47
47
|
ir.OpList.replace(op, ng.listener(op.name, listenerFn));
|
|
48
48
|
break;
|
|
49
49
|
case ir.OpKind.Variable:
|
|
50
|
-
if (op.name === null) {
|
|
50
|
+
if (op.variable.name === null) {
|
|
51
51
|
throw new Error(`AssertionError: unnamed variable ${op.xref}`);
|
|
52
52
|
}
|
|
53
|
-
ir.OpList.replace(op, ir.createStatementOp(new o.DeclareVarStmt(op.name, op.initializer)));
|
|
53
|
+
ir.OpList.replace(op, ir.createStatementOp(new o.DeclareVarStmt(op.variable.name, op.initializer, undefined, o.StmtModifier.Final)));
|
|
54
54
|
break;
|
|
55
55
|
case ir.OpKind.Statement:
|
|
56
56
|
// Pass statement operations directly through.
|
|
@@ -62,7 +62,7 @@ function reifyCreateOperations(view, ops) {
|
|
|
62
62
|
}
|
|
63
63
|
function reifyUpdateOperations(_view, ops) {
|
|
64
64
|
for (const op of ops) {
|
|
65
|
-
ir.transformExpressionsInOp(op, reifyIrExpression);
|
|
65
|
+
ir.transformExpressionsInOp(op, reifyIrExpression, ir.VisitorContextFlag.None);
|
|
66
66
|
switch (op.kind) {
|
|
67
67
|
case ir.OpKind.Advance:
|
|
68
68
|
ir.OpList.replace(op, ng.advance(op.delta));
|
|
@@ -74,10 +74,10 @@ function reifyUpdateOperations(_view, ops) {
|
|
|
74
74
|
ir.OpList.replace(op, ng.textInterpolate(op.strings, op.expressions));
|
|
75
75
|
break;
|
|
76
76
|
case ir.OpKind.Variable:
|
|
77
|
-
if (op.name === null) {
|
|
77
|
+
if (op.variable.name === null) {
|
|
78
78
|
throw new Error(`AssertionError: unnamed variable ${op.xref}`);
|
|
79
79
|
}
|
|
80
|
-
ir.OpList.replace(op, ir.createStatementOp(new o.DeclareVarStmt(op.name, op.initializer)));
|
|
80
|
+
ir.OpList.replace(op, ir.createStatementOp(new o.DeclareVarStmt(op.variable.name, op.initializer, undefined, o.StmtModifier.Final)));
|
|
81
81
|
break;
|
|
82
82
|
case ir.OpKind.Statement:
|
|
83
83
|
// Pass statement operations directly through.
|
|
@@ -90,7 +90,7 @@ function reifyUpdateOperations(_view, ops) {
|
|
|
90
90
|
function reifyIrExpression(expr) {
|
|
91
91
|
switch (expr.kind) {
|
|
92
92
|
case ir.ExpressionKind.NextContext:
|
|
93
|
-
return ng.nextContext();
|
|
93
|
+
return ng.nextContext(expr.steps);
|
|
94
94
|
case ir.ExpressionKind.Reference:
|
|
95
95
|
return ng.reference(expr.slot + 1 + expr.offset);
|
|
96
96
|
case ir.ExpressionKind.LexicalRead:
|
|
@@ -154,4 +154,4 @@ class LookForEventVisitor extends o.RecursiveAstVisitor {
|
|
|
154
154
|
}
|
|
155
155
|
}
|
|
156
156
|
}
|
|
157
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"reify.js","sourceRoot":"","sources":["../../../../../../../../../../packages/compiler/src/template/pipeline/src/phases/reify.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 o from '../../../../output/output_ast';\nimport * as ir from '../../ir';\n\nimport type {ComponentCompilation, ViewCompilation} from '../compilation';\nimport * as ng from '../instruction';\n\n/**\n * Compiles semantic operations across all views and generates output `o.Statement`s with actual\n * runtime calls in their place.\n *\n * Reification replaces semantic operations with selected Ivy instructions and other generated code\n * structures. After reification, the create/update operation lists of all views should only contain\n * `ir.StatementOp`s (which wrap generated `o.Statement`s).\n */\nexport function phaseReify(cpl: ComponentCompilation): void {\n  for (const [_, view] of cpl.views) {\n    reifyCreateOperations(view, view.create);\n    reifyUpdateOperations(view, view.update);\n  }\n}\n\nfunction reifyCreateOperations(view: ViewCompilation, ops: ir.OpList<ir.CreateOp>): void {\n  for (const op of ops) {\n    ir.transformExpressionsInOp(op, reifyIrExpression);\n\n    switch (op.kind) {\n      case ir.OpKind.Text:\n        ir.OpList.replace(op, ng.text(op.slot!, op.initialValue));\n        break;\n      case ir.OpKind.ElementStart:\n        ir.OpList.replace(\n            op,\n            ng.elementStart(\n                op.slot!, op.tag, op.attributes as number | null, op.localRefs as number | null));\n        break;\n      case ir.OpKind.Element:\n        ir.OpList.replace(\n            op,\n            ng.element(\n                op.slot!, op.tag, op.attributes as number | null, op.localRefs as number | null));\n        break;\n      case ir.OpKind.ElementEnd:\n        ir.OpList.replace(op, ng.elementEnd());\n        break;\n      case ir.OpKind.Template:\n        const childView = view.tpl.views.get(op.xref)!;\n        ir.OpList.replace(\n            op,\n            ng.template(\n                op.slot!,\n                o.variable(childView.fnName!),\n                childView.decls!,\n                childView.vars!,\n                op.tag,\n                op.localRefs as number,\n                ),\n        );\n        break;\n      case ir.OpKind.Listener:\n        const listenerFn = reifyListenerHandler(view, op.handlerFnName!, op.handlerOps);\n        ir.OpList.replace(\n            op,\n            ng.listener(\n                op.name,\n                listenerFn,\n                ));\n        break;\n      case ir.OpKind.Variable:\n        if (op.name === null) {\n          throw new Error(`AssertionError: unnamed variable ${op.xref}`);\n        }\n        ir.OpList.replace<ir.CreateOp>(\n            op, ir.createStatementOp(new o.DeclareVarStmt(op.name, op.initializer)));\n        break;\n      case ir.OpKind.Statement:\n        // Pass statement operations directly through.\n        break;\n      default:\n        throw new Error(\n            `AssertionError: Unsupported reification of create op ${ir.OpKind[op.kind]}`);\n    }\n  }\n}\n\nfunction reifyUpdateOperations(_view: ViewCompilation, ops: ir.OpList<ir.UpdateOp>): void {\n  for (const op of ops) {\n    ir.transformExpressionsInOp(op, reifyIrExpression);\n\n    switch (op.kind) {\n      case ir.OpKind.Advance:\n        ir.OpList.replace(op, ng.advance(op.delta));\n        break;\n      case ir.OpKind.Property:\n        ir.OpList.replace(op, ng.property(op.name, op.expression));\n        break;\n      case ir.OpKind.InterpolateText:\n        ir.OpList.replace(op, ng.textInterpolate(op.strings, op.expressions));\n        break;\n      case ir.OpKind.Variable:\n        if (op.name === null) {\n          throw new Error(`AssertionError: unnamed variable ${op.xref}`);\n        }\n        ir.OpList.replace<ir.UpdateOp>(\n            op, ir.createStatementOp(new o.DeclareVarStmt(op.name, op.initializer)));\n        break;\n      case ir.OpKind.Statement:\n        // Pass statement operations directly through.\n        break;\n      default:\n        throw new Error(\n            `AssertionError: Unsupported reification of update op ${ir.OpKind[op.kind]}`);\n    }\n  }\n}\n\nfunction reifyIrExpression(expr: ir.Expression): o.Expression {\n  switch (expr.kind) {\n    case ir.ExpressionKind.NextContext:\n      return ng.nextContext();\n    case ir.ExpressionKind.Reference:\n      return ng.reference(expr.slot! + 1 + expr.offset);\n    case ir.ExpressionKind.LexicalRead:\n      throw new Error(`AssertionError: unresolved LexicalRead of ${expr.name}`);\n    case ir.ExpressionKind.RestoreView:\n      if (typeof expr.view === 'number') {\n        throw new Error(`AssertionError: unresolved RestoreView`);\n      }\n      return ng.restoreView(expr.view);\n    case ir.ExpressionKind.ResetView:\n      return ng.resetView(expr.expr);\n    case ir.ExpressionKind.GetCurrentView:\n      return ng.getCurrentView();\n    case ir.ExpressionKind.ReadVariable:\n      if (expr.name === null) {\n        throw new Error(`Read of unnamed variable ${expr.xref}`);\n      }\n      return o.variable(expr.name);\n    default:\n      throw new Error(`AssertionError: Unsupported reification of ir.Expression kind: ${\n          ir.ExpressionKind[(expr as ir.Expression).kind]}`);\n  }\n}\n\n/**\n * Listeners get turned into a function expression, which may or may not have the `$event`\n * parameter defined.\n */\nfunction reifyListenerHandler(\n    view: ViewCompilation, name: string, handlerOps: ir.OpList<ir.UpdateOp>): o.FunctionExpr {\n  const lookForEvent = new LookForEventVisitor();\n\n  // First, reify all instruction calls within `handlerOps`.\n  reifyUpdateOperations(view, handlerOps);\n\n  // Next, extract all the `o.Statement`s from the reified operations. We can expect that at this\n  // point, all operations have been converted to statements.\n  const handlerStmts: o.Statement[] = [];\n  for (const op of handlerOps) {\n    if (op.kind !== ir.OpKind.Statement) {\n      throw new Error(\n          `AssertionError: expected reified statements, but found op ${ir.OpKind[op.kind]}`);\n    }\n    handlerStmts.push(op.statement);\n  }\n\n  // Scan the statement list for usages of `$event`. If referenced, we need to generate it as a\n  // parameter.\n  lookForEvent.visitAllStatements(handlerStmts, null);\n\n  const params: o.FnParam[] = [];\n  if (lookForEvent.seenEventRead) {\n    // We need the `$event` parameter.\n    params.push(new o.FnParam('$event'));\n  }\n\n  return o.fn(params, handlerStmts, undefined, undefined, name);\n}\n\n/**\n * Visitor which scans for reads of the `$event` special variable.\n */\nclass LookForEventVisitor extends o.RecursiveAstVisitor {\n  seenEventRead = false;\n\n  override visitReadVarExpr(ast: o.ReadVarExpr, context: any) {\n    if (ast.name === '$event') {\n      this.seenEventRead = true;\n    }\n  }\n}\n"]}
|
|
157
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"reify.js","sourceRoot":"","sources":["../../../../../../../../../../packages/compiler/src/template/pipeline/src/phases/reify.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 o from '../../../../output/output_ast';\nimport * as ir from '../../ir';\n\nimport type {ComponentCompilation, ViewCompilation} from '../compilation';\nimport * as ng from '../instruction';\n\n/**\n * Compiles semantic operations across all views and generates output `o.Statement`s with actual\n * runtime calls in their place.\n *\n * Reification replaces semantic operations with selected Ivy instructions and other generated code\n * structures. After reification, the create/update operation lists of all views should only contain\n * `ir.StatementOp`s (which wrap generated `o.Statement`s).\n */\nexport function phaseReify(cpl: ComponentCompilation): void {\n  for (const [_, view] of cpl.views) {\n    reifyCreateOperations(view, view.create);\n    reifyUpdateOperations(view, view.update);\n  }\n}\n\nfunction reifyCreateOperations(view: ViewCompilation, ops: ir.OpList<ir.CreateOp>): void {\n  for (const op of ops) {\n    ir.transformExpressionsInOp(op, reifyIrExpression, ir.VisitorContextFlag.None);\n\n    switch (op.kind) {\n      case ir.OpKind.Text:\n        ir.OpList.replace(op, ng.text(op.slot!, op.initialValue));\n        break;\n      case ir.OpKind.ElementStart:\n        ir.OpList.replace(\n            op,\n            ng.elementStart(\n                op.slot!, op.tag, op.attributes as number | null, op.localRefs as number | null));\n        break;\n      case ir.OpKind.Element:\n        ir.OpList.replace(\n            op,\n            ng.element(\n                op.slot!, op.tag, op.attributes as number | null, op.localRefs as number | null));\n        break;\n      case ir.OpKind.ElementEnd:\n        ir.OpList.replace(op, ng.elementEnd());\n        break;\n      case ir.OpKind.Template:\n        const childView = view.tpl.views.get(op.xref)!;\n        ir.OpList.replace(\n            op,\n            ng.template(\n                op.slot!,\n                o.variable(childView.fnName!),\n                childView.decls!,\n                childView.vars!,\n                op.tag,\n                op.attributes as number,\n                ),\n        );\n        break;\n      case ir.OpKind.Listener:\n        const listenerFn = reifyListenerHandler(view, op.handlerFnName!, op.handlerOps);\n        ir.OpList.replace(\n            op,\n            ng.listener(\n                op.name,\n                listenerFn,\n                ));\n        break;\n      case ir.OpKind.Variable:\n        if (op.variable.name === null) {\n          throw new Error(`AssertionError: unnamed variable ${op.xref}`);\n        }\n        ir.OpList.replace<ir.CreateOp>(\n            op,\n            ir.createStatementOp(new o.DeclareVarStmt(\n                op.variable.name, op.initializer, undefined, o.StmtModifier.Final)));\n        break;\n      case ir.OpKind.Statement:\n        // Pass statement operations directly through.\n        break;\n      default:\n        throw new Error(\n            `AssertionError: Unsupported reification of create op ${ir.OpKind[op.kind]}`);\n    }\n  }\n}\n\nfunction reifyUpdateOperations(_view: ViewCompilation, ops: ir.OpList<ir.UpdateOp>): void {\n  for (const op of ops) {\n    ir.transformExpressionsInOp(op, reifyIrExpression, ir.VisitorContextFlag.None);\n\n    switch (op.kind) {\n      case ir.OpKind.Advance:\n        ir.OpList.replace(op, ng.advance(op.delta));\n        break;\n      case ir.OpKind.Property:\n        ir.OpList.replace(op, ng.property(op.name, op.expression));\n        break;\n      case ir.OpKind.InterpolateText:\n        ir.OpList.replace(op, ng.textInterpolate(op.strings, op.expressions));\n        break;\n      case ir.OpKind.Variable:\n        if (op.variable.name === null) {\n          throw new Error(`AssertionError: unnamed variable ${op.xref}`);\n        }\n        ir.OpList.replace<ir.UpdateOp>(\n            op,\n            ir.createStatementOp(new o.DeclareVarStmt(\n                op.variable.name, op.initializer, undefined, o.StmtModifier.Final)));\n        break;\n      case ir.OpKind.Statement:\n        // Pass statement operations directly through.\n        break;\n      default:\n        throw new Error(\n            `AssertionError: Unsupported reification of update op ${ir.OpKind[op.kind]}`);\n    }\n  }\n}\n\nfunction reifyIrExpression(expr: ir.Expression): o.Expression {\n  switch (expr.kind) {\n    case ir.ExpressionKind.NextContext:\n      return ng.nextContext(expr.steps);\n    case ir.ExpressionKind.Reference:\n      return ng.reference(expr.slot! + 1 + expr.offset);\n    case ir.ExpressionKind.LexicalRead:\n      throw new Error(`AssertionError: unresolved LexicalRead of ${expr.name}`);\n    case ir.ExpressionKind.RestoreView:\n      if (typeof expr.view === 'number') {\n        throw new Error(`AssertionError: unresolved RestoreView`);\n      }\n      return ng.restoreView(expr.view);\n    case ir.ExpressionKind.ResetView:\n      return ng.resetView(expr.expr);\n    case ir.ExpressionKind.GetCurrentView:\n      return ng.getCurrentView();\n    case ir.ExpressionKind.ReadVariable:\n      if (expr.name === null) {\n        throw new Error(`Read of unnamed variable ${expr.xref}`);\n      }\n      return o.variable(expr.name);\n    default:\n      throw new Error(`AssertionError: Unsupported reification of ir.Expression kind: ${\n          ir.ExpressionKind[(expr as ir.Expression).kind]}`);\n  }\n}\n\n/**\n * Listeners get turned into a function expression, which may or may not have the `$event`\n * parameter defined.\n */\nfunction reifyListenerHandler(\n    view: ViewCompilation, name: string, handlerOps: ir.OpList<ir.UpdateOp>): o.FunctionExpr {\n  const lookForEvent = new LookForEventVisitor();\n\n  // First, reify all instruction calls within `handlerOps`.\n  reifyUpdateOperations(view, handlerOps);\n\n  // Next, extract all the `o.Statement`s from the reified operations. We can expect that at this\n  // point, all operations have been converted to statements.\n  const handlerStmts: o.Statement[] = [];\n  for (const op of handlerOps) {\n    if (op.kind !== ir.OpKind.Statement) {\n      throw new Error(\n          `AssertionError: expected reified statements, but found op ${ir.OpKind[op.kind]}`);\n    }\n    handlerStmts.push(op.statement);\n  }\n\n  // Scan the statement list for usages of `$event`. If referenced, we need to generate it as a\n  // parameter.\n  lookForEvent.visitAllStatements(handlerStmts, null);\n\n  const params: o.FnParam[] = [];\n  if (lookForEvent.seenEventRead) {\n    // We need the `$event` parameter.\n    params.push(new o.FnParam('$event'));\n  }\n\n  return o.fn(params, handlerStmts, undefined, undefined, name);\n}\n\n/**\n * Visitor which scans for reads of the `$event` special variable.\n */\nclass LookForEventVisitor extends o.RecursiveAstVisitor {\n  seenEventRead = false;\n\n  override visitReadVarExpr(ast: o.ReadVarExpr, context: any) {\n    if (ast.name === '$event') {\n      this.seenEventRead = true;\n    }\n  }\n}\n"]}
|
|
@@ -49,7 +49,7 @@ function processLexicalScope(view, ops) {
|
|
|
49
49
|
else {
|
|
50
50
|
return expr;
|
|
51
51
|
}
|
|
52
|
-
});
|
|
52
|
+
}, ir.VisitorContextFlag.None);
|
|
53
53
|
}
|
|
54
54
|
}
|
|
55
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
55
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVzb2x2ZV9jb250ZXh0cy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2NvbXBpbGVyL3NyYy90ZW1wbGF0ZS9waXBlbGluZS9zcmMvcGhhc2VzL3Jlc29sdmVfY29udGV4dHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7OztHQU1HO0FBRUgsT0FBTyxLQUFLLENBQUMsTUFBTSwrQkFBK0IsQ0FBQztBQUNuRCxPQUFPLEtBQUssRUFBRSxNQUFNLFVBQVUsQ0FBQztBQUcvQjs7OztHQUlHO0FBQ0gsTUFBTSxVQUFVLG9CQUFvQixDQUFDLEdBQXlCO0lBQzVELEtBQUssTUFBTSxJQUFJLElBQUksR0FBRyxDQUFDLEtBQUssQ0FBQyxNQUFNLEVBQUUsRUFBRTtRQUNyQyxtQkFBbUIsQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQ3ZDLG1CQUFtQixDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUM7S0FDeEM7QUFDSCxDQUFDO0FBRUQsU0FBUyxtQkFBbUIsQ0FBQyxJQUFxQixFQUFFLEdBQXVDO0lBQ3pGLDhGQUE4RjtJQUM5RixvQkFBb0I7SUFDcEIsTUFBTSxLQUFLLEdBQUcsSUFBSSxHQUFHLEVBQTJCLENBQUM7SUFFakQsb0VBQW9FO0lBQ3BFLEtBQUssQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLElBQUksRUFBRSxDQUFDLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUM7SUFFeEMsS0FBSyxNQUFNLEVBQUUsSUFBSSxHQUFHLEVBQUU7UUFDcEIsUUFBUSxFQUFFLENBQUMsSUFBSSxFQUFFO1lBQ2YsS0FBSyxFQUFFLENBQUMsTUFBTSxDQUFDLFFBQVE7Z0JBQ3JCLFFBQVEsRUFBRSxDQUFDLFFBQVEsQ0FBQyxJQUFJLEVBQUU7b0JBQ3hCLEtBQUssRUFBRSxDQUFDLG9CQUFvQixDQUFDLE9BQU87d0JBQ2xDLEtBQUssQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLFFBQVEsQ0FBQyxJQUFJLEVBQUUsSUFBSSxFQUFFLENBQUMsZ0JBQWdCLENBQUMsRUFBRSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUM7d0JBQzlELE1BQU07aUJBQ1Q7Z0JBQ0QsTUFBTTtZQUNSLEtBQUssRUFBRSxDQUFDLE1BQU0sQ0FBQyxRQUFRO2dCQUNyQixtQkFBbUIsQ0FBQyxJQUFJLEVBQUUsRUFBRSxDQUFDLFVBQVUsQ0FBQyxDQUFDO2dCQUN6QyxNQUFNO1NBQ1Q7S0FDRjtJQUVELEtBQUssTUFBTSxFQUFFLElBQUksR0FBRyxFQUFFO1FBQ3BCLEVBQUUsQ0FBQyx3QkFBd0IsQ0FBQyxFQUFFLEVBQUUsSUFBSSxDQUFDLEVBQUU7WUFDckMsSUFBSSxJQUFJLFlBQVksRUFBRSxDQUFDLFdBQVcsRUFBRTtnQkFDbEMsSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxFQUFFO29CQUN6QixNQUFNLElBQUksS0FBSyxDQUNYLDBDQUEwQyxJQUFJLENBQUMsSUFBSSxjQUFjLElBQUksQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFDO2lCQUNuRjtnQkFDRCxPQUFPLEtBQUssQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBRSxDQUFDO2FBQzlCO2lCQUFNO2dCQUNMLE9BQU8sSUFBSSxDQUFDO2FBQ2I7UUFDSCxDQUFDLEVBQUUsRUFBRSxDQUFDLGtCQUFrQixDQUFDLElBQUksQ0FBQyxDQUFDO0tBQ2hDO0FBQ0gsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogQGxpY2Vuc2VcbiAqIENvcHlyaWdodCBHb29nbGUgTExDIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4gKlxuICogVXNlIG9mIHRoaXMgc291cmNlIGNvZGUgaXMgZ292ZXJuZWQgYnkgYW4gTUlULXN0eWxlIGxpY2Vuc2UgdGhhdCBjYW4gYmVcbiAqIGZvdW5kIGluIHRoZSBMSUNFTlNFIGZpbGUgYXQgaHR0cHM6Ly9hbmd1bGFyLmlvL2xpY2Vuc2VcbiAqL1xuXG5pbXBvcnQgKiBhcyBvIGZyb20gJy4uLy4uLy4uLy4uL291dHB1dC9vdXRwdXRfYXN0JztcbmltcG9ydCAqIGFzIGlyIGZyb20gJy4uLy4uL2lyJztcbmltcG9ydCB7Q29tcG9uZW50Q29tcGlsYXRpb24sIFZpZXdDb21waWxhdGlvbn0gZnJvbSAnLi4vY29tcGlsYXRpb24nO1xuXG4vKipcbiAqIFJlc29sdmVzIGBpci5Db250ZXh0RXhwcmAgZXhwcmVzc2lvbnMgKHdoaWNoIHJlcHJlc2VudCBlbWJlZGRlZCB2aWV3IG9yIGNvbXBvbmVudCBjb250ZXh0cykgdG9cbiAqIGVpdGhlciB0aGUgYGN0eGAgcGFyYW1ldGVyIHRvIGNvbXBvbmVudCBmdW5jdGlvbnMgKGZvciB0aGUgY3VycmVudCB2aWV3IGNvbnRleHQpIG9yIHRvIHZhcmlhYmxlc1xuICogdGhhdCBzdG9yZSB0aG9zZSBjb250ZXh0cyAoZm9yIGNvbnRleHRzIGFjY2Vzc2VkIHZpYSB0aGUgYG5leHRDb250ZXh0KClgIGluc3RydWN0aW9uKS5cbiAqL1xuZXhwb3J0IGZ1bmN0aW9uIHBoYXNlUmVzb2x2ZUNvbnRleHRzKGNwbDogQ29tcG9uZW50Q29tcGlsYXRpb24pOiB2b2lkIHtcbiAgZm9yIChjb25zdCB2aWV3IG9mIGNwbC52aWV3cy52YWx1ZXMoKSkge1xuICAgIHByb2Nlc3NMZXhpY2FsU2NvcGUodmlldywgdmlldy5jcmVhdGUpO1xuICAgIHByb2Nlc3NMZXhpY2FsU2NvcGUodmlldywgdmlldy51cGRhdGUpO1xuICB9XG59XG5cbmZ1bmN0aW9uIHByb2Nlc3NMZXhpY2FsU2NvcGUodmlldzogVmlld0NvbXBpbGF0aW9uLCBvcHM6IGlyLk9wTGlzdDxpci5DcmVhdGVPcHxpci5VcGRhdGVPcD4pOiB2b2lkIHtcbiAgLy8gVHJhY2sgdGhlIGV4cHJlc3Npb25zIHVzZWQgdG8gYWNjZXNzIGFsbCBhdmFpbGFibGUgY29udGV4dHMgd2l0aGluIHRoZSBjdXJyZW50IHZpZXcsIGJ5IHRoZVxuICAvLyB2aWV3IGBpci5YcmVmSWRgLlxuICBjb25zdCBzY29wZSA9IG5ldyBNYXA8aXIuWHJlZklkLCBvLkV4cHJlc3Npb24+KCk7XG5cbiAgLy8gVGhlIGN1cnJlbnQgdmlldydzIGNvbnRleHQgaXMgYWNjZXNzaWJsZSB2aWEgdGhlIGBjdHhgIHBhcmFtZXRlci5cbiAgc2NvcGUuc2V0KHZpZXcueHJlZiwgby52YXJpYWJsZSgnY3R4JykpO1xuXG4gIGZvciAoY29uc3Qgb3Agb2Ygb3BzKSB7XG4gICAgc3dpdGNoIChvcC5raW5kKSB7XG4gICAgICBjYXNlIGlyLk9wS2luZC5WYXJpYWJsZTpcbiAgICAgICAgc3dpdGNoIChvcC52YXJpYWJsZS5raW5kKSB7XG4gICAgICAgICAgY2FzZSBpci5TZW1hbnRpY1ZhcmlhYmxlS2luZC5Db250ZXh0OlxuICAgICAgICAgICAgc2NvcGUuc2V0KG9wLnZhcmlhYmxlLnZpZXcsIG5ldyBpci5SZWFkVmFyaWFibGVFeHByKG9wLnhyZWYpKTtcbiAgICAgICAgICAgIGJyZWFrO1xuICAgICAgICB9XG4gICAgICAgIGJyZWFrO1xuICAgICAgY2FzZSBpci5PcEtpbmQuTGlzdGVuZXI6XG4gICAgICAgIHByb2Nlc3NMZXhpY2FsU2NvcGUodmlldywgb3AuaGFuZGxlck9wcyk7XG4gICAgICAgIGJyZWFrO1xuICAgIH1cbiAgfVxuXG4gIGZvciAoY29uc3Qgb3Agb2Ygb3BzKSB7XG4gICAgaXIudHJhbnNmb3JtRXhwcmVzc2lvbnNJbk9wKG9wLCBleHByID0+IHtcbiAgICAgIGlmIChleHByIGluc3RhbmNlb2YgaXIuQ29udGV4dEV4cHIpIHtcbiAgICAgICAgaWYgKCFzY29wZS5oYXMoZXhwci52aWV3KSkge1xuICAgICAgICAgIHRocm93IG5ldyBFcnJvcihcbiAgICAgICAgICAgICAgYE5vIGNvbnRleHQgZm91bmQgZm9yIHJlZmVyZW5jZSB0byB2aWV3ICR7ZXhwci52aWV3fSBmcm9tIHZpZXcgJHt2aWV3LnhyZWZ9YCk7XG4gICAgICAgIH1cbiAgICAgICAgcmV0dXJuIHNjb3BlLmdldChleHByLnZpZXcpITtcbiAgICAgIH0gZWxzZSB7XG4gICAgICAgIHJldHVybiBleHByO1xuICAgICAgfVxuICAgIH0sIGlyLlZpc2l0b3JDb250ZXh0RmxhZy5Ob25lKTtcbiAgfVxufVxuIl19
|
|
@@ -36,10 +36,10 @@ function processLexicalScope(view, ops, savedView) {
|
|
|
36
36
|
switch (op.variable.kind) {
|
|
37
37
|
case ir.SemanticVariableKind.Identifier:
|
|
38
38
|
// This variable represents some kind of identifier which can be used in the template.
|
|
39
|
-
if (scope.has(op.variable.
|
|
39
|
+
if (scope.has(op.variable.identifier)) {
|
|
40
40
|
continue;
|
|
41
41
|
}
|
|
42
|
-
scope.set(op.variable.
|
|
42
|
+
scope.set(op.variable.identifier, op.xref);
|
|
43
43
|
break;
|
|
44
44
|
case ir.SemanticVariableKind.SavedView:
|
|
45
45
|
// This variable represents a snapshot of the current view context, and can be used to
|
|
@@ -89,7 +89,7 @@ function processLexicalScope(view, ops, savedView) {
|
|
|
89
89
|
else {
|
|
90
90
|
return expr;
|
|
91
91
|
}
|
|
92
|
-
});
|
|
92
|
+
}, ir.VisitorContextFlag.None);
|
|
93
93
|
}
|
|
94
94
|
}
|
|
95
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
95
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"resolve_names.js","sourceRoot":"","sources":["../../../../../../../../../../packages/compiler/src/template/pipeline/src/phases/resolve_names.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 o from '../../../../output/output_ast';\nimport * as ir from '../../ir';\nimport {ComponentCompilation, ViewCompilation} from '../compilation';\n\n/**\n * Resolves lexical references in views (`ir.LexicalReadExpr`) to either a target variable or to\n * property reads on the top-level component context.\n *\n * Also matches `ir.RestoreViewExpr` expressions with the variables of their corresponding saved\n * views.\n */\nexport function phaseResolveNames(cpl: ComponentCompilation): void {\n  for (const [_, view] of cpl.views) {\n    processLexicalScope(view, view.create, null);\n    processLexicalScope(view, view.update, null);\n  }\n}\n\nfunction processLexicalScope(\n    view: ViewCompilation, ops: ir.OpList<ir.CreateOp>|ir.OpList<ir.UpdateOp>,\n    savedView: SavedView|null): void {\n  // Maps names defined in the lexical scope of this template to the `ir.XrefId`s of the variable\n  // declarations which represent those values.\n  //\n  // Since variables are generated in each view for the entire lexical scope (including any\n  // identifiers from parent templates) only local variables need be considered here.\n  const scope = new Map<string, ir.XrefId>();\n\n  // First, step through the operations list and:\n  // 1) build up the `scope` mapping\n  // 2) recurse into any listener functions\n  for (const op of ops) {\n    switch (op.kind) {\n      case ir.OpKind.Variable:\n        switch (op.variable.kind) {\n          case ir.SemanticVariableKind.Identifier:\n            // This variable represents some kind of identifier which can be used in the template.\n            if (scope.has(op.variable.identifier)) {\n              continue;\n            }\n            scope.set(op.variable.identifier, op.xref);\n            break;\n          case ir.SemanticVariableKind.SavedView:\n            // This variable represents a snapshot of the current view context, and can be used to\n            // restore that context within listener functions.\n            savedView = {\n              view: op.variable.view,\n              variable: op.xref,\n            };\n            break;\n        }\n        break;\n      case ir.OpKind.Listener:\n        // Listener functions have separate variable declarations, so process them as a separate\n        // lexical scope.\n        processLexicalScope(view, op.handlerOps, savedView);\n        break;\n    }\n  }\n\n  // Next, use the `scope` mapping to match `ir.LexicalReadExpr` with defined names in the lexical\n  // scope. Also, look for `ir.RestoreViewExpr`s and match them with the snapshotted view context\n  // variable.\n  for (const op of ops) {\n    ir.transformExpressionsInOp(op, expr => {\n      if (expr instanceof ir.LexicalReadExpr) {\n        // `expr` is a read of a name within the lexical scope of this view.\n        // Either that name is defined within the current view, or it represents a property from the\n        // main component context.\n        if (scope.has(expr.name)) {\n          // This was a defined variable in the current scope.\n          return new ir.ReadVariableExpr(scope.get(expr.name)!);\n        } else {\n          // Reading from the component context.\n          return new o.ReadPropExpr(new ir.ContextExpr(view.tpl.root.xref), expr.name);\n        }\n      } else if (expr instanceof ir.RestoreViewExpr && typeof expr.view === 'number') {\n        // `ir.RestoreViewExpr` happens in listener functions and restores a saved view from the\n        // parent creation list. We expect to find that we captured the `savedView` previously, and\n        // that it matches the expected view to be restored.\n        if (savedView === null || savedView.view !== expr.view) {\n          throw new Error(`AssertionError: no saved view ${expr.view} from view ${view.xref}`);\n        }\n        expr.view = new ir.ReadVariableExpr(savedView.variable);\n        return expr;\n      } else {\n        return expr;\n      }\n    }, ir.VisitorContextFlag.None);\n  }\n}\n\n/**\n * Information about a `SavedView` variable.\n */\ninterface SavedView {\n  /**\n   * The view `ir.XrefId` which was saved into this variable.\n   */\n  view: ir.XrefId;\n\n  /**\n   * The `ir.XrefId` of the variable into which the view was saved.\n   */\n  variable: ir.XrefId;\n}\n"]}
|