Skip to content

Commit 2856aef

Browse files
rkirovrkirov
committed
788937b feat(test): Implement fakeAsync using the FakeAsyncTestZoneSpec from zone.js.
1 parent beccd2b commit 2856aef

341 files changed

Lines changed: 25563 additions & 18809 deletions

File tree

Some content is hidden

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

‎BUILD_INFO‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Thu Apr 21 22:47:16 UTC 2016
2-
bab81a98314291f02a09baf96d0b85a0f8e62e9d
1+
Thu Apr 21 23:00:27 UTC 2016
2+
788937be3a66067d3c4f1318bd969fa0eaa7a7fb

‎_analyzer.dart‎

Lines changed: 465 additions & 456 deletions
Large diffs are not rendered by default.

‎lib/angular2.dart‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@ export 'package:angular2/instrumentation.dart';
1111
export 'package:angular2/src/core/angular_entrypoint.dart'
1212
show AngularEntrypoint;
1313
export 'package:angular2/src/core/application_tokens.dart'
14-
hide APP_ID_RANDOM_PROVIDER;
14+
hide APP_COMPONENT_REF_PROMISE, APP_ID_RANDOM_PROVIDER;
1515
export 'package:angular2/src/platform/dom/dom_tokens.dart';
1616
export 'package:angular2/src/platform/dom/dom_adapter.dart';
1717
export 'package:angular2/src/platform/dom/events/event_manager.dart';
18-
export 'package:angular2/src/compiler/compiler.dart'
19-
show UrlResolver, DirectiveResolver, ViewResolver;
18+
export 'package:angular2/src/compiler/url_resolver.dart';

‎lib/compiler.dart‎

Lines changed: 3 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -5,34 +5,6 @@
55
*/
66
library angular2.compiler;
77

8-
export "package:angular2/src/compiler/compiler.dart"
9-
show
10-
PLATFORM_DIRECTIVES,
11-
PLATFORM_PIPES,
12-
COMPILER_PROVIDERS,
13-
TEMPLATE_TRANSFORMS,
14-
CompilerConfig,
15-
RenderTypes,
16-
UrlResolver,
17-
DEFAULT_PACKAGE_URL_PROVIDER,
18-
createOfflineCompileUrlResolver,
19-
XHR,
20-
ViewResolver,
21-
DirectiveResolver,
22-
PipeResolver,
23-
SourceModule,
24-
NormalizedComponentWithViewDirectives,
25-
OfflineCompiler,
26-
CompileMetadataWithIdentifier,
27-
CompileMetadataWithType,
28-
CompileIdentifierMetadata,
29-
CompileDiDependencyMetadata,
30-
CompileProviderMetadata,
31-
CompileFactoryMetadata,
32-
CompileTokenMetadata,
33-
CompileTypeMetadata,
34-
CompileQueryMetadata,
35-
CompileTemplateMetadata,
36-
CompileDirectiveMetadata,
37-
CompilePipeMetadata;
38-
export "package:angular2/src/compiler/template_ast.dart";
8+
export "src/compiler/url_resolver.dart";
9+
export "src/compiler/xhr.dart";
10+
export "src/compiler/compiler.dart";

‎lib/core.dart‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,14 @@ export 'package:angular2/src/facade/lang.dart' show enableProdMode;
77
export './src/core/di.dart' hide ForwardRefFn, resolveForwardRef, forwardRef;
88
export './src/facade/facade.dart';
99
export './src/core/application_ref.dart'
10-
show
11-
createPlatform,
12-
assertPlatform,
13-
disposePlatform,
14-
getPlatform,
15-
coreLoadAndBootstrap,
16-
coreBootstrap,
17-
createNgZone,
18-
PlatformRef,
19-
ApplicationRef;
10+
show platform, createNgZone, PlatformRef, ApplicationRef;
2011
export './src/core/application_tokens.dart'
21-
show APP_ID, APP_INITIALIZER, PACKAGE_ROOT_URL, PLATFORM_INITIALIZER;
12+
show
13+
APP_ID,
14+
APP_COMPONENT,
15+
APP_INITIALIZER,
16+
PACKAGE_ROOT_URL,
17+
PLATFORM_INITIALIZER;
2218
export './src/core/zone.dart';
2319
export './src/core/render.dart';
2420
export './src/core/linker.dart';

‎lib/extract_messages.dart‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
import 'package:build/build.dart';
22
import 'package:analyzer/src/generated/element.dart';
33
import 'src/transform/common/url_resolver.dart';
4-
54
import 'dart:async';
65
import 'package:angular2/i18n.dart';
7-
import 'package:angular2/src/compiler/expression_parser/parser.dart';
8-
import 'package:angular2/src/compiler/expression_parser/lexer.dart';
6+
import 'package:angular2/src/core/change_detection/parser/parser.dart';
7+
import 'package:angular2/src/core/change_detection/parser/lexer.dart';
8+
import 'package:angular2/src/core/reflection/reflector.dart';
9+
import 'package:angular2/src/core/reflection/reflection_capabilities.dart';
910
import 'package:angular2/src/compiler/html_parser.dart';
1011

1112
/**
@@ -50,11 +51,11 @@ class I18nMessageExtractorBuilder implements Builder {
5051
}
5152

5253
class I18nMessageExtractor {
53-
final urlResovler = createOfflineCompileUrlResolver();
54+
final TransformerUrlResolver urlResovler = new TransformerUrlResolver();
5455
final List<Message> messages = [];
5556
final List errors = [];
5657
final HtmlParser htmlParser = new HtmlParser();
57-
final Parser parser = new Parser(new Lexer());
58+
final Parser parser = new Parser(new Lexer(), new Reflector(new ReflectionCapabilities()));
5859

5960
final Function readInput;
6061

‎lib/platform/browser.dart‎

Lines changed: 9 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,11 @@ export "package:angular2/src/platform/browser_common.dart"
1616
DOCUMENT,
1717
enableDebugTools,
1818
disableDebugTools;
19-
import "package:angular2/src/facade/lang.dart" show Type, isPresent, isBlank;
19+
import "package:angular2/src/facade/lang.dart" show Type, isPresent;
2020
import "package:angular2/src/platform/browser_common.dart"
21-
show
22-
BROWSER_PROVIDERS,
23-
BROWSER_APP_COMMON_PROVIDERS,
24-
BROWSER_PLATFORM_MARKER;
21+
show BROWSER_PROVIDERS, BROWSER_APP_COMMON_PROVIDERS;
2522
import "package:angular2/compiler.dart" show COMPILER_PROVIDERS;
26-
import "package:angular2/core.dart"
27-
show
28-
ComponentRef,
29-
coreLoadAndBootstrap,
30-
reflector,
31-
ReflectiveInjector,
32-
PlatformRef,
33-
OpaqueToken,
34-
getPlatform,
35-
createPlatform,
36-
assertPlatform;
23+
import "package:angular2/core.dart" show ComponentRef, platform, reflector;
3724
import "package:angular2/src/core/reflection/reflection_capabilities.dart"
3825
show ReflectionCapabilities;
3926
import "package:angular2/src/platform/browser/xhr_impl.dart" show XHRImpl;
@@ -48,13 +35,6 @@ const List<dynamic> BROWSER_APP_PROVIDERS = const [
4835
COMPILER_PROVIDERS,
4936
const Provider(XHR, useClass: XHRImpl)
5037
];
51-
PlatformRef browserPlatform() {
52-
if (isBlank(getPlatform())) {
53-
createPlatform(ReflectiveInjector.resolveAndCreate(BROWSER_PROVIDERS));
54-
}
55-
return assertPlatform(BROWSER_PLATFORM_MARKER);
56-
}
57-
5838
/**
5939
* Bootstrapping for Angular applications.
6040
*
@@ -126,9 +106,10 @@ PlatformRef browserPlatform() {
126106
Future<ComponentRef> bootstrap(Type appComponentType,
127107
[List<dynamic> customProviders]) {
128108
reflector.reflectionCapabilities = new ReflectionCapabilities();
129-
var appInjector = ReflectiveInjector.resolveAndCreate([
130-
BROWSER_APP_PROVIDERS,
131-
isPresent(customProviders) ? customProviders : []
132-
], browserPlatform().injector);
133-
return coreLoadAndBootstrap(appInjector, appComponentType);
109+
var appProviders = isPresent(customProviders)
110+
? [BROWSER_APP_PROVIDERS, customProviders]
111+
: BROWSER_APP_PROVIDERS;
112+
return platform(BROWSER_PROVIDERS)
113+
.application(appProviders)
114+
.bootstrap(appComponentType);
134115
}

‎lib/platform/browser_static.dart‎

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -14,35 +14,17 @@ export "package:angular2/src/platform/browser_common.dart"
1414
Title,
1515
enableDebugTools,
1616
disableDebugTools;
17-
import "package:angular2/src/facade/lang.dart" show Type, isPresent, isBlank;
17+
import "package:angular2/src/facade/lang.dart" show Type, isPresent;
1818
import "package:angular2/src/platform/browser_common.dart"
19-
show
20-
BROWSER_PROVIDERS,
21-
BROWSER_APP_COMMON_PROVIDERS,
22-
BROWSER_PLATFORM_MARKER;
23-
import "package:angular2/core.dart"
24-
show
25-
ComponentRef,
26-
coreLoadAndBootstrap,
27-
ReflectiveInjector,
28-
PlatformRef,
29-
getPlatform,
30-
createPlatform,
31-
assertPlatform;
19+
show BROWSER_PROVIDERS, BROWSER_APP_COMMON_PROVIDERS;
20+
import "package:angular2/core.dart" show ComponentRef, platform;
3221

3322
/**
3423
* An array of providers that should be passed into `application()` when bootstrapping a component
3524
* when all templates
3625
* have been precompiled offline.
3726
*/
3827
const List<dynamic> BROWSER_APP_PROVIDERS = BROWSER_APP_COMMON_PROVIDERS;
39-
PlatformRef browserStaticPlatform() {
40-
if (isBlank(getPlatform())) {
41-
createPlatform(ReflectiveInjector.resolveAndCreate(BROWSER_PROVIDERS));
42-
}
43-
return assertPlatform(BROWSER_PLATFORM_MARKER);
44-
}
45-
4628
/**
4729
* See [bootstrap] for more information.
4830
*/
@@ -54,7 +36,7 @@ Future<ComponentRef> bootstrapStatic(Type appComponentType,
5436
var appProviders = isPresent(customProviders)
5537
? [BROWSER_APP_PROVIDERS, customProviders]
5638
: BROWSER_APP_PROVIDERS;
57-
var appInjector = ReflectiveInjector.resolveAndCreate(
58-
appProviders, browserStaticPlatform().injector);
59-
return coreLoadAndBootstrap(appInjector, appComponentType);
39+
return platform(BROWSER_PROVIDERS)
40+
.application(appProviders)
41+
.bootstrap(appComponentType);
6042
}

‎lib/platform/testing/browser_static.dart‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@ library angular2.platform.testing.browser_static;
33
import "package:angular2/core.dart"
44
show
55
APP_ID,
6+
DirectiveResolver,
67
NgZone,
78
Provider,
9+
ViewResolver,
810
PLATFORM_COMMON_PROVIDERS,
911
PLATFORM_INITIALIZER;
10-
import "package:angular2/compiler.dart" show DirectiveResolver, ViewResolver;
1112
import "package:angular2/src/platform/browser_common.dart"
1213
show BROWSER_APP_COMMON_PROVIDERS;
1314
import "package:angular2/src/platform/browser/browser_adapter.dart"

‎lib/platform/worker_app.dart‎

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
11
library angular2.platform.worker_app;
22

3-
import "package:angular2/src/platform/worker_app_common.dart";
4-
import "package:angular2/src/platform/worker_app.dart";
5-
import 'package:angular2/core.dart';
6-
import 'package:angular2/src/facade/lang.dart';
7-
import 'dart:isolate';
8-
import 'dart:async';
9-
103
export "package:angular2/src/platform/worker_app_common.dart"
114
show WORKER_APP_PLATFORM, WORKER_APP_APPLICATION_COMMON;
125
export "package:angular2/src/core/angular_entrypoint.dart"
@@ -21,30 +14,3 @@ export 'package:angular2/src/web_workers/shared/serializer.dart' show PRIMITIVE;
2114
export 'package:angular2/src/web_workers/shared/message_bus.dart';
2215
export 'package:angular2/src/web_workers/worker/router_providers.dart'
2316
show WORKER_APP_ROUTER;
24-
25-
PlatformRef _platform = null;
26-
SendPort _renderSendPort = null;
27-
28-
PlatformRef workerAppPlatform(SendPort renderSendPort) {
29-
if (isBlank(getPlatform())) {
30-
createPlatform(ReflectiveInjector.resolveAndCreate([
31-
WORKER_APP_PLATFORM,
32-
new Provider(RENDER_SEND_PORT, useValue: renderSendPort)
33-
]));
34-
}
35-
var platform = assertPlatform(WORKER_APP_PLATFORM_MARKER);
36-
if (platform.injector.get(RENDER_SEND_PORT, null) != renderSendPort) {
37-
throw 'Platform has already been created with a different SendPort. Please distroy it first.';
38-
}
39-
return platform;
40-
}
41-
42-
Future<ComponentRef> bootstrapApp(
43-
SendPort renderSendPort, Type appComponentType,
44-
[List<dynamic /*Type | Provider | any[]*/ > customProviders]) {
45-
var appInjector = ReflectiveInjector.resolveAndCreate([
46-
WORKER_APP_APPLICATION,
47-
isPresent(customProviders) ? customProviders : []
48-
], workerAppPlatform(renderSendPort).injector);
49-
return coreLoadAndBootstrap(appInjector, appComponentType);
50-
}

0 commit comments

Comments
 (0)