Skip to content
This repository was archived by the owner on Sep 16, 2022. It is now read-only.

Commit d332d6f

Browse files
committed
refactor(Compiler/Runtime): Further remove the concept of "debug" mode.
This one includes: * Removing `DebugAppView` * Removing `DebugContext` and `DebugNode` * Removing many different paths in the compiler around these concepts PiperOrigin-RevId: 200438655
1 parent 7a6ad11 commit d332d6f

File tree

49 files changed

+1890
-3357
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+1890
-3357
lines changed

_goldens/test/_files/change_detection.template_debug.golden

Lines changed: 133 additions & 163 deletions
Large diffs are not rendered by default.

_goldens/test/_files/component_loader_pattern.template_debug.golden

Lines changed: 20 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -12,57 +12,51 @@ import 'package:angular/src/di/reflector.dart' as _ngRef;
1212
import 'example_of_file_that_is_not_generated_yet.template.dart' as _ref0;
1313
import 'package:angular/angular.template.dart' as _ref1;
1414
import 'package:angular/di.template.dart' as _ref2;
15-
import 'package:angular/src/debug/debug_context.dart';
16-
import 'package:angular/src/debug/debug_app_view.dart';
17-
import 'component_loader_pattern.dart' as import2;
18-
import 'package:angular/src/core/render/api.dart';
1915
import 'package:angular/src/core/linker/app_view.dart';
20-
import 'package:angular/src/core/linker/view_type.dart' as import5;
16+
import 'component_loader_pattern.dart' as import1;
17+
import 'package:angular/src/core/render/api.dart';
18+
import 'package:angular/src/core/linker/view_type.dart' as import3;
2119
import 'package:angular/src/core/change_detection/change_detection.dart';
22-
import 'dart:html' as import7;
23-
import 'package:angular/src/core/linker/app_view_utils.dart' as import8;
20+
import 'dart:html' as import5;
21+
import 'package:angular/src/core/linker/app_view_utils.dart' as import6;
2422
import 'package:angular/angular.dart';
2523

2624
final List<dynamic> styles$TestComponent = const [];
27-
List<StaticNodeDebugInfo> nodeDebugInfos_TestComponent0 = [];
2825

29-
class ViewTestComponent0 extends DebugAppView<import2.TestComponent> {
26+
class ViewTestComponent0 extends AppView<import1.TestComponent> {
3027
static RenderComponentType _renderType;
31-
ViewTestComponent0(AppView<dynamic> parentView, int parentIndex) : super(import5.ViewType.component, {}, parentView, parentIndex, ChangeDetectionStrategy.CheckAlways, nodeDebugInfos_TestComponent0) {
32-
rootEl = import7.document.createElement('test');
33-
_renderType ??= import8.appViewUtils.createRenderType('asset:_goldens/test/_files/component_loader_pattern.dart class TestComponent - inline template', ViewEncapsulation.None, styles$TestComponent);
28+
ViewTestComponent0(AppView<dynamic> parentView, int parentIndex) : super(import3.ViewType.component, {}, parentView, parentIndex, ChangeDetectionStrategy.CheckAlways) {
29+
rootEl = import5.document.createElement('test');
30+
_renderType ??= import6.appViewUtils.createRenderType('asset:_goldens/test/_files/component_loader_pattern.dart class TestComponent - inline template', ViewEncapsulation.None, styles$TestComponent);
3431
setupComponentType(_renderType);
3532
}
3633
@override
37-
ComponentRef<import2.TestComponent> build() {
34+
ComponentRef<import1.TestComponent> build() {
3835
final _rootEl = rootEl;
39-
final import7.HtmlElement parentRenderNode = initViewRoot(_rootEl);
40-
init(const [], null, []);
36+
final import5.HtmlElement parentRenderNode = initViewRoot(_rootEl);
37+
init(const [], null);
4138
return null;
4239
}
4340
}
4441

45-
AppView<import2.TestComponent> viewFactory_TestComponent0(AppView<dynamic> parentView, int parentIndex) {
42+
AppView<import1.TestComponent> viewFactory_TestComponent0(AppView<dynamic> parentView, int parentIndex) {
4643
return new ViewTestComponent0(parentView, parentIndex);
4744
}
4845

4946
final List<dynamic> styles$TestComponentHost = const [];
50-
List<StaticNodeDebugInfo> nodeDebugInfos_TestComponentHost0 = [
51-
new StaticNodeDebugInfo([import2.TestComponent], import2.TestComponent, <String, dynamic>{})
52-
];
5347

54-
class _ViewTestComponentHost0 extends DebugAppView<dynamic> {
48+
class _ViewTestComponentHost0 extends AppView<dynamic> {
5549
ViewTestComponent0 _compView_0;
56-
import2.TestComponent _TestComponent_0_5;
57-
_ViewTestComponentHost0(AppView<dynamic> parentView, int parentIndex) : super(import5.ViewType.host, {}, parentView, parentIndex, ChangeDetectionStrategy.CheckAlways, nodeDebugInfos_TestComponentHost0);
50+
import1.TestComponent _TestComponent_0_5;
51+
_ViewTestComponentHost0(AppView<dynamic> parentView, int parentIndex) : super(import3.ViewType.host, {}, parentView, parentIndex, ChangeDetectionStrategy.CheckAlways);
5852
@override
5953
ComponentRef build() {
6054
_compView_0 = new ViewTestComponent0(this, 0);
6155
rootEl = _compView_0.rootEl;
62-
_TestComponent_0_5 = new import2.TestComponent();
56+
_TestComponent_0_5 = new import1.TestComponent();
6357
_compView_0.create(_TestComponent_0_5, projectableNodes);
64-
init0Dbg(rootEl, [rootEl]);
65-
return new ComponentRef<import2.TestComponent>(0, this, rootEl, _TestComponent_0_5);
58+
init0(rootEl);
59+
return new ComponentRef<import1.TestComponent>(0, this, rootEl, _TestComponent_0_5);
6660
}
6761

6862
@override
@@ -80,7 +74,7 @@ AppView viewFactory_TestComponentHost0(AppView<dynamic> parentView, int parentIn
8074
return new _ViewTestComponentHost0(parentView, parentIndex);
8175
}
8276

83-
const ComponentFactory<import2.TestComponent> TestComponentNgFactory = const ComponentFactory<import2.TestComponent>('test', viewFactory_TestComponentHost0, _TestComponentMetadata);
77+
const ComponentFactory<import1.TestComponent> TestComponentNgFactory = const ComponentFactory<import1.TestComponent>('test', viewFactory_TestComponentHost0, _TestComponentMetadata);
8478
const _TestComponentMetadata = const [];
8579
var _visited = false;
8680
void initReflector() {

_goldens/test/_files/core_directives.template_debug.golden

Lines changed: 44 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -8,65 +8,58 @@ export 'core_directives.dart';
88
import 'package:angular/angular.dart';
99
import 'package:angular/src/di/reflector.dart' as _ngRef;
1010
import 'package:angular/angular.template.dart' as _ref0;
11-
import 'package:angular/src/debug/debug_context.dart';
12-
import 'package:angular/src/common/directives/ng_if.dart';
13-
import 'package:angular/src/core/linker/template_ref.dart';
14-
import 'package:angular/src/common/directives/ng_for.dart' as import3;
15-
import 'package:angular/src/debug/debug_app_view.dart';
16-
import 'core_directives.dart' as import5;
17-
import 'dart:html' as import6;
11+
import 'package:angular/src/core/linker/app_view.dart';
12+
import 'core_directives.dart' as import1;
13+
import 'dart:html' as import2;
1814
import 'package:angular/src/core/linker/view_container.dart';
15+
import 'package:angular/src/common/directives/ng_for.dart' as import4;
1916
import 'package:angular/src/core/render/api.dart';
20-
import 'package:angular/src/core/linker/app_view.dart';
21-
import 'package:angular/src/core/linker/view_type.dart' as import10;
17+
import 'package:angular/src/core/linker/view_type.dart' as import6;
2218
import 'package:angular/src/core/change_detection/change_detection.dart';
23-
import 'package:angular/src/core/linker/app_view_utils.dart' as import12;
19+
import 'package:angular/src/core/linker/app_view_utils.dart' as import8;
2420
import 'package:angular/angular.dart';
21+
import 'package:angular/src/core/linker/template_ref.dart';
2522
import 'dart:core';
2623

2724
final List<dynamic> styles$TestFooComponent = const [];
28-
List<StaticNodeDebugInfo> nodeDebugInfos_TestFooComponent0 = [
29-
new StaticNodeDebugInfo([NgIf], null, <String, dynamic>{}),
30-
new StaticNodeDebugInfo([TemplateRef, import3.NgFor], null, <String, dynamic>{})
31-
];
32-
33-
class ViewTestFooComponent0 extends DebugAppView<import5.TestFooComponent> {
34-
import6.Comment _anchor_0;
35-
import6.DivElement _el_0_0;
36-
import6.Text _text_0_1;
25+
26+
class ViewTestFooComponent0 extends AppView<import1.TestFooComponent> {
27+
import2.Comment _anchor_0;
28+
import2.DivElement _el_0_0;
29+
import2.Text _text_0_1;
3730
ViewContainer _appEl_1;
38-
import3.NgFor _NgFor_1_9;
31+
import4.NgFor _NgFor_1_9;
3932
static RenderComponentType _renderType;
40-
ViewTestFooComponent0(AppView<dynamic> parentView, int parentIndex) : super(import10.ViewType.component, {}, parentView, parentIndex, ChangeDetectionStrategy.CheckAlways, nodeDebugInfos_TestFooComponent0) {
41-
rootEl = import6.document.createElement('test-foo');
42-
_renderType ??= import12.appViewUtils.createRenderType('asset:_goldens/test/_files/core_directives.dart class TestFooComponent - inline template', ViewEncapsulation.None, styles$TestFooComponent);
33+
ViewTestFooComponent0(AppView<dynamic> parentView, int parentIndex) : super(import6.ViewType.component, {}, parentView, parentIndex, ChangeDetectionStrategy.CheckAlways) {
34+
rootEl = import2.document.createElement('test-foo');
35+
_renderType ??= import8.appViewUtils.createRenderType('asset:_goldens/test/_files/core_directives.dart class TestFooComponent - inline template', ViewEncapsulation.None, styles$TestFooComponent);
4336
setupComponentType(_renderType);
4437
}
4538
@override
46-
ComponentRef<import5.TestFooComponent> build() {
39+
ComponentRef<import1.TestFooComponent> build() {
4740
final _rootEl = rootEl;
48-
final import6.HtmlElement parentRenderNode = initViewRoot(_rootEl);
41+
final import2.HtmlElement parentRenderNode = initViewRoot(_rootEl);
4942
_anchor_0 = createViewContainerAnchor();
5043
parentRenderNode.append(_anchor_0);
5144
final _anchor_1 = createViewContainerAnchor();
5245
parentRenderNode.append(_anchor_1);
5346
_appEl_1 = new ViewContainer(1, null, this, _anchor_1);
5447
TemplateRef _TemplateRef_1_8 = new TemplateRef(_appEl_1, viewFactory_TestFooComponent2);
55-
_NgFor_1_9 = new import3.NgFor(_appEl_1, _TemplateRef_1_8);
56-
init([], null, [_anchor_0, _anchor_1]);
48+
_NgFor_1_9 = new import4.NgFor(_appEl_1, _TemplateRef_1_8);
49+
init([], null);
5750
return null;
5851
}
5952

6053
@override
6154
void detectChangesInternal() {
62-
final import5.TestFooComponent _ctx = ctx;
55+
final import1.TestFooComponent _ctx = ctx;
6356
bool firstCheck = (this.cdState == 0);
6457
if (firstCheck) {
6558
if (!identical(_ctx.foo, null)) {
6659
if (_ctx.foo) {
67-
var doc = import6.document;
60+
var doc = import2.document;
6861
_el_0_0 = doc.createElement('div');
69-
_text_0_1 = new import6.Text('Foo');
62+
_text_0_1 = new import2.Text('Foo');
7063
_el_0_0.append(_text_0_1);
7164
addInlinedNodes(_anchor_0, [_el_0_0], true);
7265
}
@@ -77,7 +70,7 @@ class ViewTestFooComponent0 extends DebugAppView<import5.TestFooComponent> {
7770
(_NgFor_1_9.ngForOf = _ctx.bars);
7871
}
7972
}
80-
if (!import12.AppViewUtils.throwOnChanges) {
73+
if (!import8.AppViewUtils.throwOnChanges) {
8174
_NgFor_1_9.ngDoCheck();
8275
}
8376
_appEl_1.detectChangesInNestedViews();
@@ -89,71 +82,64 @@ class ViewTestFooComponent0 extends DebugAppView<import5.TestFooComponent> {
8982
}
9083
}
9184

92-
AppView<import5.TestFooComponent> viewFactory_TestFooComponent0(AppView<dynamic> parentView, int parentIndex) {
85+
AppView<import1.TestFooComponent> viewFactory_TestFooComponent0(AppView<dynamic> parentView, int parentIndex) {
9386
return new ViewTestFooComponent0(parentView, parentIndex);
9487
}
9588

96-
List<StaticNodeDebugInfo> nodeDebugInfos_TestFooComponent2 = [null, null, null];
97-
98-
class _ViewTestFooComponent2 extends DebugAppView<import5.TestFooComponent> {
99-
import6.DivElement _el_0;
100-
import6.Element _el_1;
101-
import6.Text _text_2;
89+
class _ViewTestFooComponent2 extends AppView<import1.TestFooComponent> {
90+
import2.DivElement _el_0;
91+
import2.Element _el_1;
92+
import2.Text _text_2;
10293
var _expr_0;
103-
_ViewTestFooComponent2(AppView<dynamic> parentView, int parentIndex) : super(import10.ViewType.embedded, {'\$implicit': null}, parentView, parentIndex, ChangeDetectionStrategy.CheckAlways, nodeDebugInfos_TestFooComponent2) {
94+
_ViewTestFooComponent2(AppView<dynamic> parentView, int parentIndex) : super(import6.ViewType.embedded, {'\$implicit': null}, parentView, parentIndex, ChangeDetectionStrategy.CheckAlways) {
10495
componentType = ViewTestFooComponent0._renderType;
10596
}
10697
@override
107-
ComponentRef<import5.TestFooComponent> build() {
108-
var doc = import6.document;
98+
ComponentRef<import1.TestFooComponent> build() {
99+
var doc = import2.document;
109100
_el_0 = doc.createElement('div');
110101
_el_1 = createSpanAndAppend(doc, _el_0);
111-
_text_2 = new import6.Text('');
102+
_text_2 = new import2.Text('');
112103
_el_1.append(_text_2);
113104
_el_1.addEventListener('click', eventHandler1(_handle_click_1_0));
114-
init0Dbg(_el_0, [_el_0, _el_1, _text_2]);
105+
init0(_el_0);
115106
return null;
116107
}
117108

118109
@override
119110
void detectChangesInternal() {
120111
final String local_bar = locals['\$implicit'];
121-
dbg(2, 2, 35);
122-
final currVal_0 = import12.interpolate0(local_bar);
123-
if (import12.checkBinding(_expr_0, currVal_0)) {
112+
final currVal_0 = import8.interpolate0(local_bar);
113+
if (import8.checkBinding(_expr_0, currVal_0)) {
124114
_text_2.text = currVal_0;
125115
_expr_0 = currVal_0;
126116
}
127117
}
128118

129119
void _handle_click_1_0($event) {
130120
final String local_bar = locals['\$implicit'];
131-
dbg(1, 2, 12);
132121
ctx.onClick(local_bar);
133122
}
134123
}
135124

136-
AppView<import5.TestFooComponent> viewFactory_TestFooComponent2(AppView<dynamic> parentView, int parentIndex) {
125+
AppView<import1.TestFooComponent> viewFactory_TestFooComponent2(AppView<dynamic> parentView, int parentIndex) {
137126
return new _ViewTestFooComponent2(parentView, parentIndex);
138127
}
139128

140129
final List<dynamic> styles$TestFooComponentHost = const [];
141-
List<StaticNodeDebugInfo> nodeDebugInfos_TestFooComponentHost0 = [
142-
new StaticNodeDebugInfo([import5.TestFooComponent], import5.TestFooComponent, <String, dynamic>{})
143-
];
144130

145-
class _ViewTestFooComponentHost0 extends DebugAppView<dynamic> {
131+
class _ViewTestFooComponentHost0 extends AppView<dynamic> {
146132
ViewTestFooComponent0 _compView_0;
147-
import5.TestFooComponent _TestFooComponent_0_5;
148-
_ViewTestFooComponentHost0(AppView<dynamic> parentView, int parentIndex) : super(import10.ViewType.host, {}, parentView, parentIndex, ChangeDetectionStrategy.CheckAlways, nodeDebugInfos_TestFooComponentHost0);
133+
import1.TestFooComponent _TestFooComponent_0_5;
134+
_ViewTestFooComponentHost0(AppView<dynamic> parentView, int parentIndex) : super(import6.ViewType.host, {}, parentView, parentIndex, ChangeDetectionStrategy.CheckAlways);
149135
@override
150136
ComponentRef build() {
151137
_compView_0 = new ViewTestFooComponent0(this, 0);
152138
rootEl = _compView_0.rootEl;
153-
_TestFooComponent_0_5 = new import5.TestFooComponent();
139+
_TestFooComponent_0_5 = new import1.TestFooComponent();
154140
_compView_0.create(_TestFooComponent_0_5, projectableNodes);
155-
init0Dbg(rootEl, [rootEl]);
156-
return new ComponentRef<import5.TestFooComponent>(0, this, rootEl, _TestFooComponent_0_5);
141+
init0(rootEl);
142+
return new ComponentRef<import1.TestFooComponent>(0, this, rootEl, _TestFooComponent_0_5);
157143
}
158144

159145
@override
@@ -171,7 +157,7 @@ AppView viewFactory_TestFooComponentHost0(AppView<dynamic> parentView, int paren
171157
return new _ViewTestFooComponentHost0(parentView, parentIndex);
172158
}
173159

174-
const ComponentFactory<import5.TestFooComponent> TestFooComponentNgFactory = const ComponentFactory<import5.TestFooComponent>('test-foo', viewFactory_TestFooComponentHost0, _TestFooComponentMetadata);
160+
const ComponentFactory<import1.TestFooComponent> TestFooComponentNgFactory = const ComponentFactory<import1.TestFooComponent>('test-foo', viewFactory_TestFooComponentHost0, _TestFooComponentMetadata);
175161
const _TestFooComponentMetadata = const [];
176162
var _visited = false;
177163
void initReflector() {

0 commit comments

Comments
 (0)