From 6248a5e846a226a0460c21f51cca851bdce94135 Mon Sep 17 00:00:00 2001 From: Tobias Bosch Date: Fri, 2 Oct 2015 07:37:23 -0700 Subject: [PATCH] refactor(core): move core/compiler to core/linker, adjust imports --- modules/angular2/core.dart | 2 +- modules/angular2/core.ts | 2 +- modules/angular2/lifecycle_hooks.ts | 2 +- .../src/compiler/change_definition_factory.ts | 2 +- .../angular2/src/compiler/command_compiler.ts | 4 +-- modules/angular2/src/compiler/compiler.ts | 2 +- .../src/compiler/directive_metadata.ts | 2 +- .../angular2/src/compiler/runtime_compiler.ts | 6 ++-- .../angular2/src/compiler/runtime_metadata.ts | 8 ++--- .../src/compiler/template_compiler.ts | 2 +- modules/angular2/src/core/application.dart | 4 +-- modules/angular2/src/core/application.ts | 4 +-- .../angular2/src/core/application_common.ts | 2 +- modules/angular2/src/core/application_ref.ts | 22 ++++++------- .../angular2/src/core/application_static.dart | 2 +- .../angular2/src/core/debug/debug_element.ts | 8 ++--- .../core/debug/debug_element_view_listener.ts | 4 +-- .../angular2/src/core/directives/ng_class.ts | 2 +- .../angular2/src/core/directives/ng_for.ts | 2 +- modules/angular2/src/core/directives/ng_if.ts | 2 +- .../angular2/src/core/directives/ng_style.ts | 2 +- .../angular2/src/core/directives/ng_switch.ts | 2 +- .../directives/checkbox_value_accessor.ts | 2 +- .../directives/default_value_accessor.ts | 2 +- .../select_control_value_accessor.ts | 2 +- .../src/core/forms/directives/shared.ts | 4 +-- modules/angular2/src/core/linker.ts | 22 ++++++------- modules/angular2/src/core/linker/compiler.ts | 8 ++--- .../linker/directive_lifecycle_reflector.dart | 2 +- .../core/linker/dynamic_component_loader.ts | 2 +- modules/angular2/src/core/services/ruler.ts | 2 +- .../src/mock/directive_resolver_mock.ts | 2 +- .../angular2/src/mock/view_resolver_mock.ts | 2 +- modules/angular2/src/router/router_outlet.ts | 2 +- .../src/test_lib/test_component_builder.ts | 10 +++--- .../angular2/src/test_lib/test_injector.ts | 16 +++++----- modules/angular2/src/tools/common_tools.ts | 2 +- modules/angular2/src/tools/tools.dart | 2 +- modules/angular2/src/tools/tools.ts | 2 +- .../src/web_workers/ui/di_bindings.ts | 16 +++++----- .../src/web_workers/worker/application.dart | 2 +- .../src/web_workers/worker/application.ts | 2 +- .../web_workers/worker/application_common.ts | 2 +- .../test/compiler/command_compiler_spec.ts | 4 +-- .../test/compiler/directive_metadata_spec.ts | 4 +-- .../test/compiler/runtime_compiler_spec.ts | 8 ++--- .../test/compiler/runtime_metadata_spec.ts | 2 +- .../test/compiler/template_compiler_spec.ts | 2 +- .../debug/debug_element_view_listener_spec.ts | 2 +- .../test/core/directives/ng_class_spec.ts | 2 +- .../test/core/directives/non_bindable_spec.ts | 2 +- .../test/core/linker/compiler_spec.ts | 8 ++--- .../core/linker/directive_lifecycle_spec.dart | 4 +-- .../core/linker/directive_lifecycle_spec.ts | 4 +-- .../core/linker/directive_resolver_spec.ts | 2 +- .../linker/dynamic_component_loader_spec.ts | 4 +-- .../test/core/linker/element_injector_spec.ts | 12 +++---- .../test/core/linker/integration_spec.ts | 12 +++---- .../test/core/linker/query_list_spec.ts | 2 +- .../core/linker/view_container_ref_spec.ts | 10 +++--- .../test/core/linker/view_manager_spec.ts | 12 +++---- .../core/linker/view_manager_utils_spec.ts | 10 +++--- .../test/core/linker/view_pool_spec.ts | 4 +-- .../test/core/render/view_factory_spec.ts | 2 +- modules/angular2/test/core/spies.dart | 16 +++++----- modules/angular2/test/core/spies.ts | 16 +++++----- .../router/integration/lifecycle_hook_spec.ts | 2 +- .../router/integration/navigation_spec.ts | 2 +- modules/angular2/test/router/router_spec.ts | 2 +- modules/angular2/test/tools/spies.dart | 2 +- modules/angular2/test/tools/spies.ts | 2 +- modules/angular2/web_worker/worker.ts | 2 +- .../src/compiler/compiler_benchmark.ts | 2 +- .../element_injector_benchmark.ts | 2 +- .../src/largetable/largetable_benchmark.ts | 2 +- .../src/naive_infinite_scroll/index.ts | 2 +- .../src/static_tree/tree_benchmark.ts | 2 +- modules/benchmarks/src/tree/tree_benchmark.ts | 2 +- .../examples/src/observable_models/index.dart | 2 +- .../common/directive_metadata_reader.dart | 2 +- .../transform/common/interface_matcher.dart | 32 +++++++++---------- .../directive_processor/all_tests.dart | 2 +- .../interfaces_files/soup.dart | 2 +- .../soup.dart | 2 +- .../soup.dart | 2 +- .../superclass_lifecycle_files/soup.dart | 2 +- 86 files changed, 204 insertions(+), 204 deletions(-) diff --git a/modules/angular2/core.dart b/modules/angular2/core.dart index 8ed4f2ae25..78077c0131 100644 --- a/modules/angular2/core.dart +++ b/modules/angular2/core.dart @@ -10,7 +10,7 @@ export 'package:angular2/src/core/facade.dart'; //export 'package:angular2/src/core/application.dart'; export 'package:angular2/src/core/application_ref.dart'; export 'package:angular2/src/core/services.dart'; -export 'package:angular2/src/core/compiler.dart'; +export 'package:angular2/src/core/linker.dart'; export 'package:angular2/src/core/lifecycle.dart'; export 'package:angular2/src/core/zone.dart'; export 'package:angular2/src/core/render.dart'; diff --git a/modules/angular2/core.ts b/modules/angular2/core.ts index 39ae69ae8e..83b9ab4d93 100644 --- a/modules/angular2/core.ts +++ b/modules/angular2/core.ts @@ -11,7 +11,7 @@ export * from './src/core/facade'; export * from './src/core/application'; export * from './src/core/bootstrap'; export * from './src/core/services'; -export * from './src/core/compiler'; +export * from './src/core/linker'; export * from './src/core/lifecycle'; export * from './src/core/zone'; export * from './src/core/render'; diff --git a/modules/angular2/lifecycle_hooks.ts b/modules/angular2/lifecycle_hooks.ts index ce78f771f9..b6e3636171 100644 --- a/modules/angular2/lifecycle_hooks.ts +++ b/modules/angular2/lifecycle_hooks.ts @@ -14,4 +14,4 @@ export { OnDestroy, OnInit, DoCheck -} from './src/core/compiler/interfaces'; +} from './src/core/linker/interfaces'; diff --git a/modules/angular2/src/compiler/change_definition_factory.ts b/modules/angular2/src/compiler/change_definition_factory.ts index 893293bf09..1aff05b978 100644 --- a/modules/angular2/src/compiler/change_definition_factory.ts +++ b/modules/angular2/src/compiler/change_definition_factory.ts @@ -30,7 +30,7 @@ import { AttrAst, TextAst } from './template_ast'; -import {LifecycleHooks} from 'angular2/src/core/compiler/interfaces'; +import {LifecycleHooks} from 'angular2/src/core/linker/interfaces'; export function createChangeDetectorDefinitions( componentType: CompileTypeMetadata, componentStrategy: ChangeDetectionStrategy, diff --git a/modules/angular2/src/compiler/command_compiler.ts b/modules/angular2/src/compiler/command_compiler.ts index 04d07a4289..e9f29862f0 100644 --- a/modules/angular2/src/compiler/command_compiler.ts +++ b/modules/angular2/src/compiler/command_compiler.ts @@ -10,7 +10,7 @@ import { endComponent, embeddedTemplate, CompiledTemplate -} from 'angular2/src/core/compiler/template_commands'; +} from 'angular2/src/core/linker/template_commands'; import { TemplateAst, TemplateAstVisitor, @@ -41,7 +41,7 @@ import {escapeSingleQuoteString, MODULE_SUFFIX} from './util'; import {Injectable} from 'angular2/src/core/di'; export var TEMPLATE_COMMANDS_MODULE_REF = - moduleRef(`package:angular2/src/core/compiler/template_commands${MODULE_SUFFIX}`); + moduleRef(`package:angular2/src/core/linker/template_commands${MODULE_SUFFIX}`); const IMPLICIT_TEMPLATE_VAR = '\$implicit'; diff --git a/modules/angular2/src/compiler/compiler.ts b/modules/angular2/src/compiler/compiler.ts index 079311c1fb..8be6b75b85 100644 --- a/modules/angular2/src/compiler/compiler.ts +++ b/modules/angular2/src/compiler/compiler.ts @@ -17,7 +17,7 @@ import {StyleCompiler} from 'angular2/src/compiler/style_compiler'; import {CommandCompiler} from 'angular2/src/compiler/command_compiler'; import {TemplateCompiler} from 'angular2/src/compiler/template_compiler'; import {ChangeDetectorGenConfig} from 'angular2/src/core/change_detection/change_detection'; -import {Compiler} from 'angular2/src/core/compiler/compiler'; +import {Compiler} from 'angular2/src/core/linker/compiler'; import {RuntimeCompiler} from 'angular2/src/compiler/runtime_compiler'; import {ElementSchemaRegistry} from 'angular2/src/core/render/dom/schema/element_schema_registry'; import { diff --git a/modules/angular2/src/compiler/directive_metadata.ts b/modules/angular2/src/compiler/directive_metadata.ts index 357895f4b3..2c2a1fb16a 100644 --- a/modules/angular2/src/compiler/directive_metadata.ts +++ b/modules/angular2/src/compiler/directive_metadata.ts @@ -15,7 +15,7 @@ import { import {ViewEncapsulation, VIEW_ENCAPSULATION_VALUES} from 'angular2/src/core/render/api'; import {CssSelector} from 'angular2/src/core/render/dom/compiler/selector'; import {splitAtColon} from './util'; -import {LifecycleHooks, LIFECYCLE_HOOKS_VALUES} from 'angular2/src/core/compiler/interfaces'; +import {LifecycleHooks, LIFECYCLE_HOOKS_VALUES} from 'angular2/src/core/linker/interfaces'; // group 1: "property" from "[property]" // group 2: "event" from "(event)" diff --git a/modules/angular2/src/compiler/runtime_compiler.ts b/modules/angular2/src/compiler/runtime_compiler.ts index 7addd41f6b..30a4100d67 100644 --- a/modules/angular2/src/compiler/runtime_compiler.ts +++ b/modules/angular2/src/compiler/runtime_compiler.ts @@ -1,6 +1,6 @@ -import {Compiler, internalCreateProtoView} from 'angular2/src/core/compiler/compiler'; -import {ProtoViewRef} from 'angular2/src/core/compiler/view_ref'; -import {ProtoViewFactory} from 'angular2/src/core/compiler/proto_view_factory'; +import {Compiler, internalCreateProtoView} from 'angular2/src/core/linker/compiler'; +import {ProtoViewRef} from 'angular2/src/core/linker/view_ref'; +import {ProtoViewFactory} from 'angular2/src/core/linker/proto_view_factory'; import {TemplateCompiler} from './template_compiler'; import {Injectable} from 'angular2/src/core/di'; diff --git a/modules/angular2/src/compiler/runtime_metadata.ts b/modules/angular2/src/compiler/runtime_metadata.ts index e75a70067d..10f0361ba6 100644 --- a/modules/angular2/src/compiler/runtime_metadata.ts +++ b/modules/angular2/src/compiler/runtime_metadata.ts @@ -11,11 +11,11 @@ import {BaseException} from 'angular2/src/core/facade/exceptions'; import {MapWrapper, StringMapWrapper, ListWrapper} from 'angular2/src/core/facade/collection'; import * as cpl from './directive_metadata'; import * as dirAnn from 'angular2/src/core/metadata/directives'; -import {DirectiveResolver} from 'angular2/src/core/compiler/directive_resolver'; -import {ViewResolver} from 'angular2/src/core/compiler/view_resolver'; +import {DirectiveResolver} from 'angular2/src/core/linker/directive_resolver'; +import {ViewResolver} from 'angular2/src/core/linker/view_resolver'; import {ViewMetadata} from 'angular2/src/core/metadata/view'; -import {hasLifecycleHook} from 'angular2/src/core/compiler/directive_lifecycle_reflector'; -import {LifecycleHooks, LIFECYCLE_HOOKS_VALUES} from 'angular2/src/core/compiler/interfaces'; +import {hasLifecycleHook} from 'angular2/src/core/linker/directive_lifecycle_reflector'; +import {LifecycleHooks, LIFECYCLE_HOOKS_VALUES} from 'angular2/src/core/linker/interfaces'; import {reflector} from 'angular2/src/core/reflection/reflection'; import {Injectable} from 'angular2/src/core/di'; import {MODULE_SUFFIX} from './util'; diff --git a/modules/angular2/src/compiler/template_compiler.ts b/modules/angular2/src/compiler/template_compiler.ts index 664dd38de2..2cfc500ace 100644 --- a/modules/angular2/src/compiler/template_compiler.ts +++ b/modules/angular2/src/compiler/template_compiler.ts @@ -7,7 +7,7 @@ import { TemplateCmd, nextTemplateId, CompiledHostTemplate -} from 'angular2/src/core/compiler/template_commands'; +} from 'angular2/src/core/linker/template_commands'; import { createHostComponentMeta, CompileDirectiveMetadata, diff --git a/modules/angular2/src/core/application.dart b/modules/angular2/src/core/application.dart index f515ec31cb..7a31b9b31d 100644 --- a/modules/angular2/src/core/application.dart +++ b/modules/angular2/src/core/application.dart @@ -8,8 +8,8 @@ import 'package:angular2/src/core/reflection/reflection_capabilities.dart' import 'application_common.dart'; import 'package:angular2/src/compiler/compiler.dart'; -import 'package:angular2/src/core/compiler/dynamic_component_loader.dart'; -export 'package:angular2/src/core/compiler/dynamic_component_loader.dart' show ComponentRef; +import 'package:angular2/src/core/linker/dynamic_component_loader.dart'; +export 'package:angular2/src/core/linker/dynamic_component_loader.dart' show ComponentRef; /// Starts an application from a root component. This implementation uses /// mirrors. Angular 2 transformer automatically replaces this method with a diff --git a/modules/angular2/src/core/application.ts b/modules/angular2/src/core/application.ts index 995e533e9a..e65389c06a 100644 --- a/modules/angular2/src/core/application.ts +++ b/modules/angular2/src/core/application.ts @@ -4,7 +4,7 @@ import {Type, isPresent} from 'angular2/src/core/facade/lang'; import {Promise} from 'angular2/src/core/facade/async'; import {compilerBindings} from 'angular2/src/compiler/compiler'; import {commonBootstrap} from './application_common'; -import {ComponentRef} from './compiler/dynamic_component_loader'; +import {ComponentRef} from './linker/dynamic_component_loader'; export {APP_COMPONENT} from './application_tokens'; export {platform} from './application_common'; @@ -26,4 +26,4 @@ export function bootstrap(appComponentType: /*Type*/ any, bindings.push(appBindings); } return commonBootstrap(appComponentType, bindings); -} \ No newline at end of file +} diff --git a/modules/angular2/src/core/application_common.ts b/modules/angular2/src/core/application_common.ts index 251f346af3..12c07f2d83 100644 --- a/modules/angular2/src/core/application_common.ts +++ b/modules/angular2/src/core/application_common.ts @@ -27,7 +27,7 @@ import {AnchorBasedAppRootUrl} from 'angular2/src/core/services/anchor_based_app import { ComponentRef, DynamicComponentLoader -} from 'angular2/src/core/compiler/dynamic_component_loader'; +} from 'angular2/src/core/linker/dynamic_component_loader'; import {TestabilityRegistry, Testability} from 'angular2/src/core/testability/testability'; import {Renderer} from 'angular2/src/core/render/api'; import {DomRenderer, DOCUMENT, APP_ID_RANDOM_BINDING} from 'angular2/src/core/render/render'; diff --git a/modules/angular2/src/core/application_ref.ts b/modules/angular2/src/core/application_ref.ts index e267e32c29..9e70db01d2 100644 --- a/modules/angular2/src/core/application_ref.ts +++ b/modules/angular2/src/core/application_ref.ts @@ -9,14 +9,14 @@ import {TestabilityRegistry, Testability} from 'angular2/src/core/testability/te import { ComponentRef, DynamicComponentLoader -} from 'angular2/src/core/compiler/dynamic_component_loader'; +} from 'angular2/src/core/linker/dynamic_component_loader'; import { BaseException, WrappedException, ExceptionHandler } from 'angular2/src/core/facade/exceptions'; import {DOM} from 'angular2/src/core/dom/dom_adapter'; -import {internalView} from 'angular2/src/core/compiler/view_ref'; +import {internalView} from 'angular2/src/core/linker/view_ref'; import {LifeCycle} from 'angular2/src/core/life_cycle/life_cycle'; import { Parser, @@ -26,20 +26,20 @@ import { KeyValueDiffers, defaultKeyValueDiffers } from 'angular2/src/core/change_detection/change_detection'; -import {AppViewPool, APP_VIEW_POOL_CAPACITY} from 'angular2/src/core/compiler/view_pool'; -import {AppViewManager} from 'angular2/src/core/compiler/view_manager'; -import {AppViewManagerUtils} from 'angular2/src/core/compiler/view_manager_utils'; -import {AppViewListener} from 'angular2/src/core/compiler/view_listener'; -import {ProtoViewFactory} from './compiler/proto_view_factory'; +import {AppViewPool, APP_VIEW_POOL_CAPACITY} from 'angular2/src/core/linker/view_pool'; +import {AppViewManager} from 'angular2/src/core/linker/view_manager'; +import {AppViewManagerUtils} from 'angular2/src/core/linker/view_manager_utils'; +import {AppViewListener} from 'angular2/src/core/linker/view_listener'; +import {ProtoViewFactory} from './linker/proto_view_factory'; import {DEFAULT_PIPES} from 'angular2/src/core/pipes'; -import {ViewResolver} from './compiler/view_resolver'; -import {DirectiveResolver} from './compiler/directive_resolver'; -import {PipeResolver} from './compiler/pipe_resolver'; +import {ViewResolver} from './linker/view_resolver'; +import {DirectiveResolver} from './linker/directive_resolver'; +import {PipeResolver} from './linker/pipe_resolver'; import {UrlResolver} from 'angular2/src/core/services/url_resolver'; import { APP_ID_RANDOM_BINDING, } from 'angular2/src/core/render/render'; -import {Compiler} from 'angular2/src/core/compiler/compiler'; +import {Compiler} from 'angular2/src/core/linker/compiler'; /** * Constructs the set of bindings meant for use at the platform level. diff --git a/modules/angular2/src/core/application_static.dart b/modules/angular2/src/core/application_static.dart index fd71062bfb..8ba5d7c70a 100644 --- a/modules/angular2/src/core/application_static.dart +++ b/modules/angular2/src/core/application_static.dart @@ -2,7 +2,7 @@ library angular2.src.core.application_static; import 'dart:async'; import 'application_common.dart'; -import 'package:angular2/src/core/compiler/dynamic_component_loader.dart' show ComponentRef; +import 'package:angular2/src/core/linker/dynamic_component_loader.dart' show ComponentRef; /// Starts an application from a root component. /// diff --git a/modules/angular2/src/core/debug/debug_element.ts b/modules/angular2/src/core/debug/debug_element.ts index ac47875b54..973db100ab 100644 --- a/modules/angular2/src/core/debug/debug_element.ts +++ b/modules/angular2/src/core/debug/debug_element.ts @@ -3,10 +3,10 @@ import {ListWrapper, MapWrapper, Predicate} from 'angular2/src/core/facade/colle import {DOM} from 'angular2/src/core/dom/dom_adapter'; -import {ElementInjector} from 'angular2/src/core/compiler/element_injector'; -import {AppView} from 'angular2/src/core/compiler/view'; -import {internalView} from 'angular2/src/core/compiler/view_ref'; -import {ElementRef} from 'angular2/src/core/compiler/element_ref'; +import {ElementInjector} from 'angular2/src/core/linker/element_injector'; +import {AppView} from 'angular2/src/core/linker/view'; +import {internalView} from 'angular2/src/core/linker/view_ref'; +import {ElementRef} from 'angular2/src/core/linker/element_ref'; /** * A DebugElement contains information from the Angular compiler about an diff --git a/modules/angular2/src/core/debug/debug_element_view_listener.ts b/modules/angular2/src/core/debug/debug_element_view_listener.ts index 61dcd49ff5..42ed16944d 100644 --- a/modules/angular2/src/core/debug/debug_element_view_listener.ts +++ b/modules/angular2/src/core/debug/debug_element_view_listener.ts @@ -1,8 +1,8 @@ import {CONST_EXPR, isPresent, NumberWrapper, StringWrapper} from 'angular2/src/core/facade/lang'; import {MapWrapper, Map, ListWrapper} from 'angular2/src/core/facade/collection'; import {Injectable, bind, Binding} from 'angular2/src/core/di'; -import {AppViewListener} from 'angular2/src/core/compiler/view_listener'; -import {AppView} from 'angular2/src/core/compiler/view'; +import {AppViewListener} from 'angular2/src/core/linker/view_listener'; +import {AppView} from 'angular2/src/core/linker/view'; import {DOM} from 'angular2/src/core/dom/dom_adapter'; import {Renderer} from 'angular2/src/core/render/api'; import {DebugElement} from './debug_element'; diff --git a/modules/angular2/src/core/directives/ng_class.ts b/modules/angular2/src/core/directives/ng_class.ts index db7bf24646..7078fa34fb 100644 --- a/modules/angular2/src/core/directives/ng_class.ts +++ b/modules/angular2/src/core/directives/ng_class.ts @@ -1,7 +1,7 @@ import {isPresent, isString, StringWrapper, isBlank} from 'angular2/src/core/facade/lang'; import {DoCheck, OnDestroy} from 'angular2/lifecycle_hooks'; import {Directive} from 'angular2/src/core/metadata'; -import {ElementRef} from 'angular2/src/core/compiler'; +import {ElementRef} from 'angular2/src/core/linker'; import { IterableDiffer, IterableDiffers, diff --git a/modules/angular2/src/core/directives/ng_for.ts b/modules/angular2/src/core/directives/ng_for.ts index 140cd4b7dd..51f574f13e 100644 --- a/modules/angular2/src/core/directives/ng_for.ts +++ b/modules/angular2/src/core/directives/ng_for.ts @@ -5,7 +5,7 @@ import { IterableDiffer, IterableDiffers } from 'angular2/src/core/change_detection'; -import {ViewContainerRef, TemplateRef, ViewRef} from 'angular2/src/core/compiler'; +import {ViewContainerRef, TemplateRef, ViewRef} from 'angular2/src/core/linker'; import {isPresent, isBlank} from 'angular2/src/core/facade/lang'; /** diff --git a/modules/angular2/src/core/directives/ng_if.ts b/modules/angular2/src/core/directives/ng_if.ts index 6e749ce52f..405d390c6e 100644 --- a/modules/angular2/src/core/directives/ng_if.ts +++ b/modules/angular2/src/core/directives/ng_if.ts @@ -1,5 +1,5 @@ import {Directive} from 'angular2/src/core/metadata'; -import {ViewContainerRef, TemplateRef} from 'angular2/src/core/compiler'; +import {ViewContainerRef, TemplateRef} from 'angular2/src/core/linker'; import {isBlank} from 'angular2/src/core/facade/lang'; /** diff --git a/modules/angular2/src/core/directives/ng_style.ts b/modules/angular2/src/core/directives/ng_style.ts index 69aec04597..9090ca045c 100644 --- a/modules/angular2/src/core/directives/ng_style.ts +++ b/modules/angular2/src/core/directives/ng_style.ts @@ -3,7 +3,7 @@ import { KeyValueDiffer, KeyValueDiffers, } from 'angular2/src/core/change_detection'; -import {ElementRef} from 'angular2/src/core/compiler'; +import {ElementRef} from 'angular2/src/core/linker'; import {Directive} from 'angular2/src/core/metadata'; import {Renderer} from 'angular2/src/core/render'; import {isPresent, isBlank, print} from 'angular2/src/core/facade/lang'; diff --git a/modules/angular2/src/core/directives/ng_switch.ts b/modules/angular2/src/core/directives/ng_switch.ts index 9f723a29fc..d7886499ea 100644 --- a/modules/angular2/src/core/directives/ng_switch.ts +++ b/modules/angular2/src/core/directives/ng_switch.ts @@ -1,6 +1,6 @@ import {Directive} from 'angular2/src/core/metadata'; import {Host} from 'angular2/src/core/di'; -import {ViewContainerRef, TemplateRef} from 'angular2/src/core/compiler'; +import {ViewContainerRef, TemplateRef} from 'angular2/src/core/linker'; import {isPresent, isBlank, normalizeBlank, CONST_EXPR} from 'angular2/src/core/facade/lang'; import {ListWrapper, Map} from 'angular2/src/core/facade/collection'; diff --git a/modules/angular2/src/core/forms/directives/checkbox_value_accessor.ts b/modules/angular2/src/core/forms/directives/checkbox_value_accessor.ts index d9da0f0afd..89d4a06925 100644 --- a/modules/angular2/src/core/forms/directives/checkbox_value_accessor.ts +++ b/modules/angular2/src/core/forms/directives/checkbox_value_accessor.ts @@ -1,6 +1,6 @@ import {Directive} from 'angular2/src/core/metadata'; import {Renderer} from 'angular2/src/core/render'; -import {ElementRef} from 'angular2/src/core/compiler'; +import {ElementRef} from 'angular2/src/core/linker'; import {Self, forwardRef, Binding} from 'angular2/src/core/di'; import {NG_VALUE_ACCESSOR, ControlValueAccessor} from './control_value_accessor'; diff --git a/modules/angular2/src/core/forms/directives/default_value_accessor.ts b/modules/angular2/src/core/forms/directives/default_value_accessor.ts index c092c80ef9..72b729ca5d 100644 --- a/modules/angular2/src/core/forms/directives/default_value_accessor.ts +++ b/modules/angular2/src/core/forms/directives/default_value_accessor.ts @@ -1,5 +1,5 @@ import {Directive} from 'angular2/src/core/metadata'; -import {ElementRef} from 'angular2/src/core/compiler'; +import {ElementRef} from 'angular2/src/core/linker'; import {Renderer} from 'angular2/src/core/render'; import {Self, forwardRef, Binding} from 'angular2/src/core/di'; import {NG_VALUE_ACCESSOR, ControlValueAccessor} from './control_value_accessor'; diff --git a/modules/angular2/src/core/forms/directives/select_control_value_accessor.ts b/modules/angular2/src/core/forms/directives/select_control_value_accessor.ts index 2989e58b81..235121f9e5 100644 --- a/modules/angular2/src/core/forms/directives/select_control_value_accessor.ts +++ b/modules/angular2/src/core/forms/directives/select_control_value_accessor.ts @@ -1,6 +1,6 @@ import {Self, forwardRef, Binding} from 'angular2/src/core/di'; import {Renderer} from 'angular2/src/core/render'; -import {ElementRef, QueryList} from 'angular2/src/core/compiler'; +import {ElementRef, QueryList} from 'angular2/src/core/linker'; import {Query, Directive} from 'angular2/src/core/metadata'; import {ObservableWrapper} from 'angular2/src/core/facade/async'; diff --git a/modules/angular2/src/core/forms/directives/shared.ts b/modules/angular2/src/core/forms/directives/shared.ts index 41312017a2..5a6b5f2548 100644 --- a/modules/angular2/src/core/forms/directives/shared.ts +++ b/modules/angular2/src/core/forms/directives/shared.ts @@ -7,7 +7,7 @@ import {NgControl} from './ng_control'; import {Control} from '../model'; import {Validators} from '../validators'; import {ControlValueAccessor} from './control_value_accessor'; -import {ElementRef, QueryList} from 'angular2/src/core/compiler'; +import {ElementRef, QueryList} from 'angular2/src/core/linker'; import {Renderer} from 'angular2/src/core/render'; import {DefaultValueAccessor} from './default_value_accessor'; import {CheckboxControlValueAccessor} from './checkbox_value_accessor'; @@ -91,4 +91,4 @@ export function selectValueAccessor(dir: NgControl, valueAccessors: ControlValue _throwError(dir, "No valid value accessor for"); return null; -} \ No newline at end of file +} diff --git a/modules/angular2/src/core/linker.ts b/modules/angular2/src/core/linker.ts index add7d03e14..825fae51f5 100644 --- a/modules/angular2/src/core/linker.ts +++ b/modules/angular2/src/core/linker.ts @@ -8,14 +8,14 @@ export { OnDestroy, OnInit, DoCheck -} from './compiler/interfaces'; -export {DirectiveResolver} from './compiler/directive_resolver'; -export {Compiler} from './compiler/compiler'; -export {AppViewManager} from './compiler/view_manager'; -export {QueryList} from './compiler/query_list'; -export {DynamicComponentLoader} from './compiler/dynamic_component_loader'; -export {ElementRef} from './compiler/element_ref'; -export {TemplateRef} from './compiler/template_ref'; -export {ViewRef, HostViewRef, ProtoViewRef} from './compiler/view_ref'; -export {ViewContainerRef} from './compiler/view_container_ref'; -export {ComponentRef} from './compiler/dynamic_component_loader'; +} from './linker/interfaces'; +export {DirectiveResolver} from './linker/directive_resolver'; +export {Compiler} from './linker/compiler'; +export {AppViewManager} from './linker/view_manager'; +export {QueryList} from './linker/query_list'; +export {DynamicComponentLoader} from './linker/dynamic_component_loader'; +export {ElementRef} from './linker/element_ref'; +export {TemplateRef} from './linker/template_ref'; +export {ViewRef, HostViewRef, ProtoViewRef} from './linker/view_ref'; +export {ViewContainerRef} from './linker/view_container_ref'; +export {ComponentRef} from './linker/dynamic_component_loader'; diff --git a/modules/angular2/src/core/linker/compiler.ts b/modules/angular2/src/core/linker/compiler.ts index 116cf7bd09..53968d4d93 100644 --- a/modules/angular2/src/core/linker/compiler.ts +++ b/modules/angular2/src/core/linker/compiler.ts @@ -1,12 +1,12 @@ -import {ProtoViewRef} from 'angular2/src/core/compiler/view_ref'; -import {ProtoViewFactory} from 'angular2/src/core/compiler/proto_view_factory'; +import {ProtoViewRef} from 'angular2/src/core/linker/view_ref'; +import {ProtoViewFactory} from 'angular2/src/core/linker/proto_view_factory'; import {Injectable} from 'angular2/src/core/di'; import {Type, isBlank, stringify} from 'angular2/src/core/facade/lang'; import {BaseException} from 'angular2/src/core/facade/exceptions'; import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async'; import {reflector} from 'angular2/src/core/reflection/reflection'; -import {CompiledHostTemplate} from 'angular2/src/core/compiler/template_commands'; +import {CompiledHostTemplate} from 'angular2/src/core/linker/template_commands'; /** * Low-level service for compiling {@link Component}s into {@link ProtoViewRef ProtoViews}s, which @@ -49,4 +49,4 @@ export class Compiler { export function internalCreateProtoView(compiler: Compiler, compiledHostTemplate: CompiledHostTemplate): ProtoViewRef { return (compiler)._createProtoView(compiledHostTemplate); -} \ No newline at end of file +} diff --git a/modules/angular2/src/core/linker/directive_lifecycle_reflector.dart b/modules/angular2/src/core/linker/directive_lifecycle_reflector.dart index bd5e3992ce..46c340a834 100644 --- a/modules/angular2/src/core/linker/directive_lifecycle_reflector.dart +++ b/modules/angular2/src/core/linker/directive_lifecycle_reflector.dart @@ -1,7 +1,7 @@ library angular2.src.core.compiler.directive_lifecycle_reflector; import 'package:angular2/src/core/reflection/reflection.dart'; -import 'package:angular2/src/core/compiler/interfaces.dart'; +import 'package:angular2/src/core/linker/interfaces.dart'; const INTERFACES = const { LifecycleHooks.OnInit: OnInit, diff --git a/modules/angular2/src/core/linker/dynamic_component_loader.ts b/modules/angular2/src/core/linker/dynamic_component_loader.ts index 1e7a8eaba3..097de50576 100644 --- a/modules/angular2/src/core/linker/dynamic_component_loader.ts +++ b/modules/angular2/src/core/linker/dynamic_component_loader.ts @@ -2,7 +2,7 @@ import {Key, Injector, ResolvedBinding, Binding, bind, Injectable} from 'angular import {Compiler} from './compiler'; import {isType, Type, stringify, isPresent} from 'angular2/src/core/facade/lang'; import {Promise} from 'angular2/src/core/facade/async'; -import {AppViewManager} from 'angular2/src/core/compiler/view_manager'; +import {AppViewManager} from 'angular2/src/core/linker/view_manager'; import {ElementRef} from './element_ref'; import {ViewRef, HostViewRef} from './view_ref'; diff --git a/modules/angular2/src/core/services/ruler.ts b/modules/angular2/src/core/services/ruler.ts index f2e563655d..d6395755cb 100644 --- a/modules/angular2/src/core/services/ruler.ts +++ b/modules/angular2/src/core/services/ruler.ts @@ -1,6 +1,6 @@ import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async'; import {DomAdapter} from 'angular2/src/core/dom/dom_adapter'; -import {ElementRef} from 'angular2/src/core/compiler/element_ref'; +import {ElementRef} from 'angular2/src/core/linker/element_ref'; export class Rectangle { left; diff --git a/modules/angular2/src/mock/directive_resolver_mock.ts b/modules/angular2/src/mock/directive_resolver_mock.ts index 113688b751..f5ea859374 100644 --- a/modules/angular2/src/mock/directive_resolver_mock.ts +++ b/modules/angular2/src/mock/directive_resolver_mock.ts @@ -1,7 +1,7 @@ import {Map, MapWrapper, ListWrapper} from 'angular2/src/core/facade/collection'; import {Type, isPresent, stringify, isBlank, print} from 'angular2/src/core/facade/lang'; import {DirectiveMetadata, ComponentMetadata} from '../core/metadata'; -import {DirectiveResolver} from 'angular2/src/core/compiler/directive_resolver'; +import {DirectiveResolver} from 'angular2/src/core/linker/directive_resolver'; export class MockDirectiveResolver extends DirectiveResolver { private _bindingsOverrides = new Map(); diff --git a/modules/angular2/src/mock/view_resolver_mock.ts b/modules/angular2/src/mock/view_resolver_mock.ts index 0d1a9f063e..03d59de5a9 100644 --- a/modules/angular2/src/mock/view_resolver_mock.ts +++ b/modules/angular2/src/mock/view_resolver_mock.ts @@ -3,7 +3,7 @@ import {Type, isPresent, stringify, isBlank} from 'angular2/src/core/facade/lang import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions'; import {ViewMetadata} from '../core/metadata'; -import {ViewResolver} from 'angular2/src/core/compiler/view_resolver'; +import {ViewResolver} from 'angular2/src/core/linker/view_resolver'; export class MockViewResolver extends ViewResolver { _views = new Map(); diff --git a/modules/angular2/src/router/router_outlet.ts b/modules/angular2/src/router/router_outlet.ts index aa2d42a470..8bb71731e3 100644 --- a/modules/angular2/src/router/router_outlet.ts +++ b/modules/angular2/src/router/router_outlet.ts @@ -4,7 +4,7 @@ import {isBlank, isPresent} from 'angular2/src/core/facade/lang'; import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions'; import {Directive, Attribute} from 'angular2/src/core/metadata'; -import {DynamicComponentLoader, ComponentRef, ElementRef} from 'angular2/src/core/compiler'; +import {DynamicComponentLoader, ComponentRef, ElementRef} from 'angular2/src/core/linker'; import {Injector, bind, Dependency} from 'angular2/src/core/di'; import * as routerMod from './router'; diff --git a/modules/angular2/src/test_lib/test_component_builder.ts b/modules/angular2/src/test_lib/test_component_builder.ts index b838ee32c1..eb51c29f20 100644 --- a/modules/angular2/src/test_lib/test_component_builder.ts +++ b/modules/angular2/src/test_lib/test_component_builder.ts @@ -6,14 +6,14 @@ import {ListWrapper, MapWrapper} from 'angular2/src/core/facade/collection'; import {ViewMetadata} from '../core/metadata'; -import {DirectiveResolver} from 'angular2/src/core/compiler/directive_resolver'; -import {ViewResolver} from 'angular2/src/core/compiler/view_resolver'; -import {AppView} from 'angular2/src/core/compiler/view'; -import {internalView, ViewRef} from 'angular2/src/core/compiler/view_ref'; +import {DirectiveResolver} from 'angular2/src/core/linker/directive_resolver'; +import {ViewResolver} from 'angular2/src/core/linker/view_resolver'; +import {AppView} from 'angular2/src/core/linker/view'; +import {internalView, ViewRef} from 'angular2/src/core/linker/view_ref'; import { DynamicComponentLoader, ComponentRef -} from 'angular2/src/core/compiler/dynamic_component_loader'; +} from 'angular2/src/core/linker/dynamic_component_loader'; import {el} from './utils'; diff --git a/modules/angular2/src/test_lib/test_injector.ts b/modules/angular2/src/test_lib/test_injector.ts index e615e1ccdf..6c11f8ea1c 100644 --- a/modules/angular2/src/test_lib/test_injector.ts +++ b/modules/angular2/src/test_lib/test_injector.ts @@ -3,7 +3,7 @@ import {DEFAULT_PIPES} from 'angular2/src/core/pipes'; import {AnimationBuilder} from 'angular2/src/animate/animation_builder'; import {MockAnimationBuilder} from 'angular2/src/mock/animation_builder_mock'; -import {ProtoViewFactory} from 'angular2/src/core/compiler/proto_view_factory'; +import {ProtoViewFactory} from 'angular2/src/core/linker/proto_view_factory'; import {Reflector, reflector} from 'angular2/src/core/reflection/reflection'; import { Parser, @@ -15,10 +15,10 @@ import { ChangeDetectorGenConfig } from 'angular2/src/core/change_detection/change_detection'; import {ExceptionHandler} from 'angular2/src/core/facade/exceptions'; -import {ViewResolver} from 'angular2/src/core/compiler/view_resolver'; -import {DirectiveResolver} from 'angular2/src/core/compiler/directive_resolver'; -import {PipeResolver} from 'angular2/src/core/compiler/pipe_resolver'; -import {DynamicComponentLoader} from 'angular2/src/core/compiler/dynamic_component_loader'; +import {ViewResolver} from 'angular2/src/core/linker/view_resolver'; +import {DirectiveResolver} from 'angular2/src/core/linker/directive_resolver'; +import {PipeResolver} from 'angular2/src/core/linker/pipe_resolver'; +import {DynamicComponentLoader} from 'angular2/src/core/linker/dynamic_component_loader'; import {XHR} from 'angular2/src/core/render/xhr'; import {UrlResolver} from 'angular2/src/core/services/url_resolver'; import {AppRootUrl} from 'angular2/src/core/services/app_root_url'; @@ -48,9 +48,9 @@ import {ELEMENT_PROBE_BINDINGS} from 'angular2/src/core/debug'; import {ListWrapper} from 'angular2/src/core/facade/collection'; import {FunctionWrapper, Type} from 'angular2/src/core/facade/lang'; -import {AppViewPool, APP_VIEW_POOL_CAPACITY} from 'angular2/src/core/compiler/view_pool'; -import {AppViewManager} from 'angular2/src/core/compiler/view_manager'; -import {AppViewManagerUtils} from 'angular2/src/core/compiler/view_manager_utils'; +import {AppViewPool, APP_VIEW_POOL_CAPACITY} from 'angular2/src/core/linker/view_pool'; +import {AppViewManager} from 'angular2/src/core/linker/view_manager'; +import {AppViewManagerUtils} from 'angular2/src/core/linker/view_manager_utils'; import {Renderer} from 'angular2/src/core/render/api'; import { DomRenderer, diff --git a/modules/angular2/src/tools/common_tools.ts b/modules/angular2/src/tools/common_tools.ts index 436b2fbce3..68af2eb3b2 100644 --- a/modules/angular2/src/tools/common_tools.ts +++ b/modules/angular2/src/tools/common_tools.ts @@ -1,5 +1,5 @@ import {LifeCycle} from 'angular2/angular2'; -import {ComponentRef} from 'angular2/src/core/compiler/dynamic_component_loader'; +import {ComponentRef} from 'angular2/src/core/linker/dynamic_component_loader'; import {isPresent, NumberWrapper} from 'angular2/src/core/facade/lang'; import {performance, window} from 'angular2/src/core/facade/browser'; import {DOM} from 'angular2/src/core/dom/dom_adapter'; diff --git a/modules/angular2/src/tools/tools.dart b/modules/angular2/src/tools/tools.dart index cb8d650ddd..51c43cb243 100644 --- a/modules/angular2/src/tools/tools.dart +++ b/modules/angular2/src/tools/tools.dart @@ -1,7 +1,7 @@ library angular2.src.tools.tools; import 'dart:js'; -import 'package:angular2/src/core/compiler/dynamic_component_loader.dart' show ComponentRef; +import 'package:angular2/src/core/linker/dynamic_component_loader.dart' show ComponentRef; import 'common_tools.dart' show AngularTools; /** diff --git a/modules/angular2/src/tools/tools.ts b/modules/angular2/src/tools/tools.ts index 2247e1090c..566df4e171 100644 --- a/modules/angular2/src/tools/tools.ts +++ b/modules/angular2/src/tools/tools.ts @@ -1,5 +1,5 @@ import {global} from 'angular2/src/core/facade/lang'; -import {ComponentRef} from 'angular2/src/core/compiler/dynamic_component_loader'; +import {ComponentRef} from 'angular2/src/core/linker/dynamic_component_loader'; import {AngularTools} from './common_tools'; var context = global; diff --git a/modules/angular2/src/web_workers/ui/di_bindings.ts b/modules/angular2/src/web_workers/ui/di_bindings.ts index 4736a0b9b8..ec5de61814 100644 --- a/modules/angular2/src/web_workers/ui/di_bindings.ts +++ b/modules/angular2/src/web_workers/ui/di_bindings.ts @@ -11,11 +11,11 @@ import { DomEventsPlugin, EVENT_MANAGER_PLUGINS } from 'angular2/src/core/render/dom/events/event_manager'; -import {ProtoViewFactory} from 'angular2/src/core/compiler/proto_view_factory'; +import {ProtoViewFactory} from 'angular2/src/core/linker/proto_view_factory'; import {BrowserDomAdapter} from 'angular2/src/core/dom/browser_adapter'; import {KeyEventsPlugin} from 'angular2/src/core/render/dom/events/key_events'; import {HammerGesturesPlugin} from 'angular2/src/core/render/dom/events/hammer_gestures'; -import {AppViewPool, APP_VIEW_POOL_CAPACITY} from 'angular2/src/core/compiler/view_pool'; +import {AppViewPool, APP_VIEW_POOL_CAPACITY} from 'angular2/src/core/linker/view_pool'; import {Renderer} from 'angular2/src/core/render/api'; import {AppRootUrl} from 'angular2/src/core/services/app_root_url'; import {DomRenderer, DOCUMENT, APP_ID_RANDOM_BINDING} from 'angular2/src/core/render/render'; @@ -29,13 +29,13 @@ import { } from 'angular2/src/core/render/dom/view/shared_styles_host'; import {DOM} from 'angular2/src/core/dom/dom_adapter'; import {NgZone} from 'angular2/src/core/zone/ng_zone'; -import {AppViewManager} from 'angular2/src/core/compiler/view_manager'; -import {AppViewManagerUtils} from 'angular2/src/core/compiler/view_manager_utils'; -import {AppViewListener} from 'angular2/src/core/compiler/view_listener'; -import {ViewResolver} from 'angular2/src/core/compiler/view_resolver'; -import {DirectiveResolver} from 'angular2/src/core/compiler/directive_resolver'; +import {AppViewManager} from 'angular2/src/core/linker/view_manager'; +import {AppViewManagerUtils} from 'angular2/src/core/linker/view_manager_utils'; +import {AppViewListener} from 'angular2/src/core/linker/view_listener'; +import {ViewResolver} from 'angular2/src/core/linker/view_resolver'; +import {DirectiveResolver} from 'angular2/src/core/linker/directive_resolver'; import {ExceptionHandler} from 'angular2/src/core/facade/exceptions'; -import {DynamicComponentLoader} from 'angular2/src/core/compiler/dynamic_component_loader'; +import {DynamicComponentLoader} from 'angular2/src/core/linker/dynamic_component_loader'; import {UrlResolver} from 'angular2/src/core/services/url_resolver'; import {Testability} from 'angular2/src/core/testability/testability'; import {XHR} from 'angular2/src/core/render/xhr'; diff --git a/modules/angular2/src/web_workers/worker/application.dart b/modules/angular2/src/web_workers/worker/application.dart index ea6ccdbbea..7ad5d3a4b6 100644 --- a/modules/angular2/src/web_workers/worker/application.dart +++ b/modules/angular2/src/web_workers/worker/application.dart @@ -5,7 +5,7 @@ import "package:angular2/src/web_workers/worker/application_common.dart" show bootstrapWebWorkerCommon; import "package:angular2/src/core/facade/async.dart" show Future; import "package:angular2/src/core/facade/lang.dart" show Type, BaseException; -import "package:angular2/src/core/compiler/dynamic_component_loader.dart" show ComponentRef; +import "package:angular2/src/core/linker/dynamic_component_loader.dart" show ComponentRef; import "dart:isolate"; import "dart:async"; import 'dart:core'; diff --git a/modules/angular2/src/web_workers/worker/application.ts b/modules/angular2/src/web_workers/worker/application.ts index d6ba0f4c55..cc31751a27 100644 --- a/modules/angular2/src/web_workers/worker/application.ts +++ b/modules/angular2/src/web_workers/worker/application.ts @@ -8,7 +8,7 @@ import {Binding, Injectable} from "angular2/src/core/di"; import {Map} from 'angular2/src/core/facade/collection'; import {Promise} from 'angular2/src/core/facade/async'; import {bootstrapWebWorkerCommon} from "angular2/src/web_workers/worker/application_common"; -import {ComponentRef} from "angular2/src/core/compiler/dynamic_component_loader"; +import {ComponentRef} from "angular2/src/core/linker/dynamic_component_loader"; export * from "angular2/src/web_workers/shared/message_bus"; import {Parse5DomAdapter} from 'angular2/src/core/dom/parse5_adapter'; diff --git a/modules/angular2/src/web_workers/worker/application_common.ts b/modules/angular2/src/web_workers/worker/application_common.ts index 0654b33f2e..e476e504dc 100644 --- a/modules/angular2/src/web_workers/worker/application_common.ts +++ b/modules/angular2/src/web_workers/worker/application_common.ts @@ -33,7 +33,7 @@ import { import {ObservableWrapper} from 'angular2/src/core/facade/async'; import {SETUP_CHANNEL} from 'angular2/src/web_workers/shared/messaging_api'; import {WebWorkerEventDispatcher} from 'angular2/src/web_workers/worker/event_dispatcher'; -import {ComponentRef} from 'angular2/src/core/compiler/dynamic_component_loader'; +import {ComponentRef} from 'angular2/src/core/linker/dynamic_component_loader'; import {NgZone} from 'angular2/src/core/zone/ng_zone'; import {compilerBindings} from 'angular2/src/compiler/compiler'; diff --git a/modules/angular2/test/compiler/command_compiler_spec.ts b/modules/angular2/test/compiler/command_compiler_spec.ts index c3a925cead..2c034c6814 100644 --- a/modules/angular2/test/compiler/command_compiler_spec.ts +++ b/modules/angular2/test/compiler/command_compiler_spec.ts @@ -27,7 +27,7 @@ import { TemplateCmd, visitAllCommands, CompiledTemplate -} from 'angular2/src/core/compiler/template_commands'; +} from 'angular2/src/core/linker/template_commands'; import {CommandCompiler} from 'angular2/src/compiler/command_compiler'; import { CompileDirectiveMetadata, @@ -57,7 +57,7 @@ const EMBEDDED_TEMPLATE = 'EMBEDDED_TEMPLATE'; var THIS_MODULE_URL = `package:angular2/test/compiler/command_compiler_spec${MODULE_SUFFIX}`; var THIS_MODULE_REF = moduleRef(THIS_MODULE_URL); var TEMPLATE_COMMANDS_MODULE_REF = - moduleRef(`package:angular2/src/core/compiler/template_commands${MODULE_SUFFIX}`); + moduleRef(`package:angular2/src/core/linker/template_commands${MODULE_SUFFIX}`); // Attention: read by eval! export class RootComp {} diff --git a/modules/angular2/test/compiler/directive_metadata_spec.ts b/modules/angular2/test/compiler/directive_metadata_spec.ts index 6567da27be..f2a6a0d279 100644 --- a/modules/angular2/test/compiler/directive_metadata_spec.ts +++ b/modules/angular2/test/compiler/directive_metadata_spec.ts @@ -19,7 +19,7 @@ import { } from 'angular2/src/compiler/directive_metadata'; import {ViewEncapsulation} from 'angular2/src/core/render/api'; import {ChangeDetectionStrategy} from 'angular2/src/core/change_detection'; -import {LifecycleHooks} from 'angular2/src/core/compiler/interfaces'; +import {LifecycleHooks} from 'angular2/src/core/linker/interfaces'; export function main() { describe('DirectiveMetadata', () => { @@ -87,4 +87,4 @@ export function main() { }); }); }); -} \ No newline at end of file +} diff --git a/modules/angular2/test/compiler/runtime_compiler_spec.ts b/modules/angular2/test/compiler/runtime_compiler_spec.ts index bd2169a2e8..c2a12b122a 100644 --- a/modules/angular2/test/compiler/runtime_compiler_spec.ts +++ b/modules/angular2/test/compiler/runtime_compiler_spec.ts @@ -20,10 +20,10 @@ import { CompiledHostTemplate, CompiledTemplate, BeginComponentCmd -} from 'angular2/src/core/compiler/template_commands'; +} from 'angular2/src/core/linker/template_commands'; import {RuntimeCompiler} from 'angular2/src/compiler/runtime_compiler'; -import {ProtoViewFactory} from 'angular2/src/core/compiler/proto_view_factory'; -import {AppProtoView} from 'angular2/src/core/compiler/view'; +import {ProtoViewFactory} from 'angular2/src/core/linker/proto_view_factory'; +import {AppProtoView} from 'angular2/src/core/linker/view'; export function main() { describe('RuntimeCompiler', () => { @@ -89,4 +89,4 @@ export function main() { @Component({selector: 'some-comp'}) @View({template: ''}) class SomeComponent { -} \ No newline at end of file +} diff --git a/modules/angular2/test/compiler/runtime_metadata_spec.ts b/modules/angular2/test/compiler/runtime_metadata_spec.ts index 545b3a7983..fea2cf0cbe 100644 --- a/modules/angular2/test/compiler/runtime_metadata_spec.ts +++ b/modules/angular2/test/compiler/runtime_metadata_spec.ts @@ -15,7 +15,7 @@ import { import {stringify} from 'angular2/src/core/facade/lang'; import {RuntimeMetadataResolver} from 'angular2/src/compiler/runtime_metadata'; -import {LifecycleHooks, LIFECYCLE_HOOKS_VALUES} from 'angular2/src/core/compiler/interfaces'; +import {LifecycleHooks, LIFECYCLE_HOOKS_VALUES} from 'angular2/src/core/linker/interfaces'; import { Component, View, diff --git a/modules/angular2/test/compiler/template_compiler_spec.ts b/modules/angular2/test/compiler/template_compiler_spec.ts index 9d0f8a2f32..f52c0a8b03 100644 --- a/modules/angular2/test/compiler/template_compiler_spec.ts +++ b/modules/angular2/test/compiler/template_compiler_spec.ts @@ -39,7 +39,7 @@ import { TemplateCmd, visitAllCommands, CompiledTemplate -} from 'angular2/src/core/compiler/template_commands'; +} from 'angular2/src/core/linker/template_commands'; import {Component, View, Directive, bind} from 'angular2/core'; diff --git a/modules/angular2/test/core/debug/debug_element_view_listener_spec.ts b/modules/angular2/test/core/debug/debug_element_view_listener_spec.ts index d8f12dd3b9..4c9e8a826d 100644 --- a/modules/angular2/test/core/debug/debug_element_view_listener_spec.ts +++ b/modules/angular2/test/core/debug/debug_element_view_listener_spec.ts @@ -14,7 +14,7 @@ import { TestComponentBuilder, } from 'angular2/test_lib'; import {global} from 'angular2/src/core/facade/lang'; -import {APP_VIEW_POOL_CAPACITY} from 'angular2/src/core/compiler/view_pool'; +import {APP_VIEW_POOL_CAPACITY} from 'angular2/src/core/linker/view_pool'; import {bind, Component, Directive, Injectable, View} from 'angular2/core'; import {inspectNativeElement} from 'angular2/src/core/debug'; import {IS_DART} from '../../platform'; diff --git a/modules/angular2/test/core/directives/ng_class_spec.ts b/modules/angular2/test/core/directives/ng_class_spec.ts index 5d03e408db..065bb7f8ca 100644 --- a/modules/angular2/test/core/directives/ng_class_spec.ts +++ b/modules/angular2/test/core/directives/ng_class_spec.ts @@ -17,7 +17,7 @@ import { import {ListWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection'; import {Component, View, NgFor, bind} from 'angular2/angular2'; import {NgClass} from 'angular2/src/core/directives/ng_class'; -import {APP_VIEW_POOL_CAPACITY} from 'angular2/src/core/compiler/view_pool'; +import {APP_VIEW_POOL_CAPACITY} from 'angular2/src/core/linker/view_pool'; function detectChangesAndCheck(rootTC: RootTestComponent, classes: string, elIndex: number = 0) { rootTC.detectChanges(); diff --git a/modules/angular2/test/core/directives/non_bindable_spec.ts b/modules/angular2/test/core/directives/non_bindable_spec.ts index 4cfe92ed8a..de09af4097 100644 --- a/modules/angular2/test/core/directives/non_bindable_spec.ts +++ b/modules/angular2/test/core/directives/non_bindable_spec.ts @@ -13,7 +13,7 @@ import { } from 'angular2/test_lib'; import {DOM} from 'angular2/src/core/dom/dom_adapter'; import {Component, Directive, View} from 'angular2/core'; -import {ElementRef} from 'angular2/src/core/compiler/element_ref'; +import {ElementRef} from 'angular2/src/core/linker/element_ref'; export function main() { describe('non-bindable', () => { diff --git a/modules/angular2/test/core/linker/compiler_spec.ts b/modules/angular2/test/core/linker/compiler_spec.ts index 4a9ef48549..d68a5cb46a 100644 --- a/modules/angular2/test/core/linker/compiler_spec.ts +++ b/modules/angular2/test/core/linker/compiler_spec.ts @@ -19,11 +19,11 @@ import { CompiledHostTemplate, CompiledTemplate, BeginComponentCmd -} from 'angular2/src/core/compiler/template_commands'; -import {Compiler} from 'angular2/src/core/compiler/compiler'; -import {ProtoViewFactory} from 'angular2/src/core/compiler/proto_view_factory'; +} from 'angular2/src/core/linker/template_commands'; +import {Compiler} from 'angular2/src/core/linker/compiler'; +import {ProtoViewFactory} from 'angular2/src/core/linker/proto_view_factory'; import {reflector, ReflectionInfo} from 'angular2/src/core/reflection/reflection'; -import {AppProtoView} from 'angular2/src/core/compiler/view'; +import {AppProtoView} from 'angular2/src/core/linker/view'; export function main() { describe('Compiler', () => { diff --git a/modules/angular2/test/core/linker/directive_lifecycle_spec.dart b/modules/angular2/test/core/linker/directive_lifecycle_spec.dart index c218d22fa6..494d9ca526 100644 --- a/modules/angular2/test/core/linker/directive_lifecycle_spec.dart +++ b/modules/angular2/test/core/linker/directive_lifecycle_spec.dart @@ -1,8 +1,8 @@ library angular2.test.core.compiler.directive_lifecycle_spec; import 'package:angular2/test_lib.dart'; -import 'package:angular2/src/core/compiler/directive_lifecycle_reflector.dart'; -import 'package:angular2/src/core/compiler/interfaces.dart'; +import 'package:angular2/src/core/linker/directive_lifecycle_reflector.dart'; +import 'package:angular2/src/core/linker/interfaces.dart'; main() { describe('Create DirectiveMetadata', () { diff --git a/modules/angular2/test/core/linker/directive_lifecycle_spec.ts b/modules/angular2/test/core/linker/directive_lifecycle_spec.ts index a1f967f954..abd0cddb64 100644 --- a/modules/angular2/test/core/linker/directive_lifecycle_spec.ts +++ b/modules/angular2/test/core/linker/directive_lifecycle_spec.ts @@ -13,8 +13,8 @@ import { proxy } from 'angular2/test_lib'; -import {hasLifecycleHook} from 'angular2/src/core/compiler/directive_lifecycle_reflector'; -import {LifecycleHooks} from 'angular2/src/core/compiler/interfaces'; +import {hasLifecycleHook} from 'angular2/src/core/linker/directive_lifecycle_reflector'; +import {LifecycleHooks} from 'angular2/src/core/linker/interfaces'; export function main() { describe('Create DirectiveMetadata', () => { diff --git a/modules/angular2/test/core/linker/directive_resolver_spec.ts b/modules/angular2/test/core/linker/directive_resolver_spec.ts index 7f76459e29..d77abb9136 100644 --- a/modules/angular2/test/core/linker/directive_resolver_spec.ts +++ b/modules/angular2/test/core/linker/directive_resolver_spec.ts @@ -1,5 +1,5 @@ import {ddescribe, describe, it, iit, expect, beforeEach} from 'angular2/test_lib'; -import {DirectiveResolver} from 'angular2/src/core/compiler/directive_resolver'; +import {DirectiveResolver} from 'angular2/src/core/linker/directive_resolver'; import { DirectiveMetadata, Directive, diff --git a/modules/angular2/test/core/linker/dynamic_component_loader_spec.ts b/modules/angular2/test/core/linker/dynamic_component_loader_spec.ts index 4d5a7df4f6..5fd056070f 100644 --- a/modules/angular2/test/core/linker/dynamic_component_loader_spec.ts +++ b/modules/angular2/test/core/linker/dynamic_component_loader_spec.ts @@ -20,8 +20,8 @@ import {OnDestroy} from 'angular2/lifecycle_hooks'; import {Injector, NgIf} from 'angular2/core'; import {inspectElement, By} from 'angular2/src/core/debug'; import {Component, View, ViewMetadata} from 'angular2/src/core/metadata'; -import {DynamicComponentLoader} from 'angular2/src/core/compiler/dynamic_component_loader'; -import {ElementRef} from 'angular2/src/core/compiler/element_ref'; +import {DynamicComponentLoader} from 'angular2/src/core/linker/dynamic_component_loader'; +import {ElementRef} from 'angular2/src/core/linker/element_ref'; import {DOCUMENT} from 'angular2/src/core/render/render'; import {DOM} from 'angular2/src/core/dom/dom_adapter'; diff --git a/modules/angular2/test/core/linker/element_injector_spec.ts b/modules/angular2/test/core/linker/element_injector_spec.ts index 82c761295f..6f251c9a6d 100644 --- a/modules/angular2/test/core/linker/element_injector_spec.ts +++ b/modules/angular2/test/core/linker/element_injector_spec.ts @@ -29,7 +29,7 @@ import { PreBuiltObjects, DirectiveBinding, TreeNode -} from 'angular2/src/core/compiler/element_injector'; +} from 'angular2/src/core/linker/element_injector'; import { Attribute, Query, @@ -39,12 +39,12 @@ import { } from 'angular2/src/core/metadata'; import {OnDestroy} from 'angular2/lifecycle_hooks'; import {bind, Injector, Binding, Optional, Inject, Injectable, Self, SkipSelf, InjectMetadata, Host, HostMetadata, SkipSelfMetadata} from 'angular2/core'; -import {ViewContainerRef} from 'angular2/src/core/compiler/view_container_ref'; -import {TemplateRef} from 'angular2/src/core/compiler/template_ref'; -import {ElementRef} from 'angular2/src/core/compiler/element_ref'; +import {ViewContainerRef} from 'angular2/src/core/linker/view_container_ref'; +import {TemplateRef} from 'angular2/src/core/linker/template_ref'; +import {ElementRef} from 'angular2/src/core/linker/element_ref'; import {DynamicChangeDetector, ChangeDetectorRef, Parser, Lexer} from 'angular2/src/core/change_detection/change_detection'; -import {QueryList} from 'angular2/src/core/compiler/query_list'; -import {AppView, AppViewContainer} from "angular2/src/core/compiler/view"; +import {QueryList} from 'angular2/src/core/linker/query_list'; +import {AppView, AppViewContainer} from "angular2/src/core/linker/view"; function createDummyView(detector = null): AppView { var res = new SpyView(); diff --git a/modules/angular2/test/core/linker/integration_spec.ts b/modules/angular2/test/core/linker/integration_spec.ts index 9e51e3a566..5b400ae7f3 100644 --- a/modules/angular2/test/core/linker/integration_spec.ts +++ b/modules/angular2/test/core/linker/integration_spec.ts @@ -79,14 +79,14 @@ import { HostListener } from 'angular2/src/core/metadata'; -import {QueryList} from 'angular2/src/core/compiler/query_list'; +import {QueryList} from 'angular2/src/core/linker/query_list'; -import {ViewContainerRef} from 'angular2/src/core/compiler/view_container_ref'; -import {ViewRef} from 'angular2/src/core/compiler/view_ref'; +import {ViewContainerRef} from 'angular2/src/core/linker/view_container_ref'; +import {ViewRef} from 'angular2/src/core/linker/view_ref'; -import {Compiler} from 'angular2/src/core/compiler/compiler'; -import {ElementRef} from 'angular2/src/core/compiler/element_ref'; -import {TemplateRef} from 'angular2/src/core/compiler/template_ref'; +import {Compiler} from 'angular2/src/core/linker/compiler'; +import {ElementRef} from 'angular2/src/core/linker/element_ref'; +import {TemplateRef} from 'angular2/src/core/linker/template_ref'; import {DomRenderer} from 'angular2/src/core/render/dom/dom_renderer'; import {IS_DART} from '../../platform'; diff --git a/modules/angular2/test/core/linker/query_list_spec.ts b/modules/angular2/test/core/linker/query_list_spec.ts index 63c6abe4d9..8014122417 100644 --- a/modules/angular2/test/core/linker/query_list_spec.ts +++ b/modules/angular2/test/core/linker/query_list_spec.ts @@ -14,7 +14,7 @@ import { import {MapWrapper, ListWrapper, iterateListLike} from 'angular2/src/core/facade/collection'; import {StringWrapper} from 'angular2/src/core/facade/lang'; import {ObservableWrapper} from 'angular2/src/core/facade/async'; -import {QueryList} from 'angular2/src/core/compiler/query_list'; +import {QueryList} from 'angular2/src/core/linker/query_list'; import {DOM} from 'angular2/src/core/dom/dom_adapter'; diff --git a/modules/angular2/test/core/linker/view_container_ref_spec.ts b/modules/angular2/test/core/linker/view_container_ref_spec.ts index 37b18dd703..770b812ce6 100644 --- a/modules/angular2/test/core/linker/view_container_ref_spec.ts +++ b/modules/angular2/test/core/linker/view_container_ref_spec.ts @@ -15,10 +15,10 @@ import { } from 'angular2/test_lib'; import {SpyView, SpyAppViewManager} from '../spies'; -import {AppView, AppViewContainer} from 'angular2/src/core/compiler/view'; -import {ViewContainerRef} from 'angular2/src/core/compiler/view_container_ref'; -import {ElementRef} from 'angular2/src/core/compiler/element_ref'; -import {ViewRef} from 'angular2/src/core/compiler/view_ref'; +import {AppView, AppViewContainer} from 'angular2/src/core/linker/view'; +import {ViewContainerRef} from 'angular2/src/core/linker/view_container_ref'; +import {ElementRef} from 'angular2/src/core/linker/element_ref'; +import {ViewRef} from 'angular2/src/core/linker/view_ref'; export function main() { // TODO(tbosch): add missing tests @@ -57,4 +57,4 @@ export function main() { // TODO: add missing tests here! }); -} \ No newline at end of file +} diff --git a/modules/angular2/test/core/linker/view_manager_spec.ts b/modules/angular2/test/core/linker/view_manager_spec.ts index df098155b2..0a42b9426d 100644 --- a/modules/angular2/test/core/linker/view_manager_spec.ts +++ b/modules/angular2/test/core/linker/view_manager_spec.ts @@ -16,10 +16,10 @@ import { import {SpyRenderer, SpyAppViewPool, SpyAppViewListener, SpyProtoViewFactory} from '../spies'; import {Injector, bind} from 'angular2/core'; -import {AppProtoView, AppView, AppViewContainer} from 'angular2/src/core/compiler/view'; -import {ProtoViewRef, ViewRef, internalView} from 'angular2/src/core/compiler/view_ref'; -import {ElementRef} from 'angular2/src/core/compiler/element_ref'; -import {TemplateRef} from 'angular2/src/core/compiler/template_ref'; +import {AppProtoView, AppView, AppViewContainer} from 'angular2/src/core/linker/view'; +import {ProtoViewRef, ViewRef, internalView} from 'angular2/src/core/linker/view_ref'; +import {ElementRef} from 'angular2/src/core/linker/element_ref'; +import {TemplateRef} from 'angular2/src/core/linker/template_ref'; import { Renderer, RenderViewRef, @@ -28,8 +28,8 @@ import { ViewType, RenderViewWithFragments } from 'angular2/src/core/render/api'; -import {AppViewManager} from 'angular2/src/core/compiler/view_manager'; -import {AppViewManagerUtils} from 'angular2/src/core/compiler/view_manager_utils'; +import {AppViewManager} from 'angular2/src/core/linker/view_manager'; +import {AppViewManagerUtils} from 'angular2/src/core/linker/view_manager_utils'; import { createHostPv, diff --git a/modules/angular2/test/core/linker/view_manager_utils_spec.ts b/modules/angular2/test/core/linker/view_manager_utils_spec.ts index c59f1b3e38..23bf36dd3c 100644 --- a/modules/angular2/test/core/linker/view_manager_utils_spec.ts +++ b/modules/angular2/test/core/linker/view_manager_utils_spec.ts @@ -26,17 +26,17 @@ import { import {Injector, bind} from 'angular2/core'; import {isBlank, isPresent} from 'angular2/src/core/facade/lang'; -import {AppProtoView, AppView, AppProtoViewMergeInfo} from 'angular2/src/core/compiler/view'; -import {ElementBinder} from 'angular2/src/core/compiler/element_binder'; +import {AppProtoView, AppView, AppProtoViewMergeInfo} from 'angular2/src/core/linker/view'; +import {ElementBinder} from 'angular2/src/core/linker/element_binder'; import { DirectiveBinding, ElementInjector, PreBuiltObjects, ProtoElementInjector -} from 'angular2/src/core/compiler/element_injector'; -import {DirectiveResolver} from 'angular2/src/core/compiler/directive_resolver'; +} from 'angular2/src/core/linker/element_injector'; +import {DirectiveResolver} from 'angular2/src/core/linker/directive_resolver'; import {Component} from 'angular2/src/core/metadata'; -import {AppViewManagerUtils} from 'angular2/src/core/compiler/view_manager_utils'; +import {AppViewManagerUtils} from 'angular2/src/core/linker/view_manager_utils'; import {ViewType, RenderViewWithFragments} from 'angular2/src/core/render/render'; export function main() { diff --git a/modules/angular2/test/core/linker/view_pool_spec.ts b/modules/angular2/test/core/linker/view_pool_spec.ts index 63b8eeb9c6..581f61b7d6 100644 --- a/modules/angular2/test/core/linker/view_pool_spec.ts +++ b/modules/angular2/test/core/linker/view_pool_spec.ts @@ -15,8 +15,8 @@ import { SpyObject, proxy } from 'angular2/test_lib'; -import {AppViewPool} from 'angular2/src/core/compiler/view_pool'; -import {AppProtoView, AppView} from 'angular2/src/core/compiler/view'; +import {AppViewPool} from 'angular2/src/core/linker/view_pool'; +import {AppProtoView, AppView} from 'angular2/src/core/linker/view'; import {MapWrapper, Map} from 'angular2/src/core/facade/collection'; export function main() { diff --git a/modules/angular2/test/core/render/view_factory_spec.ts b/modules/angular2/test/core/render/view_factory_spec.ts index d62ab7a636..7fbfd0c658 100644 --- a/modules/angular2/test/core/render/view_factory_spec.ts +++ b/modules/angular2/test/core/render/view_factory_spec.ts @@ -13,7 +13,7 @@ import { import {isPresent} from 'angular2/src/core/facade/lang'; import {MapWrapper, ListWrapper} from 'angular2/src/core/facade/collection'; -import * as appCmds from 'angular2/src/core/compiler/template_commands'; +import * as appCmds from 'angular2/src/core/linker/template_commands'; import {createRenderView, NodeFactory} from 'angular2/src/core/render/view_factory'; import {RenderTemplateCmd, RenderBeginElementCmd} from 'angular2/src/core/render/api'; import {SpyRenderEventDispatcher} from '../spies'; diff --git a/modules/angular2/test/core/spies.dart b/modules/angular2/test/core/spies.dart index 2b3a5eb6f7..f42df83e57 100644 --- a/modules/angular2/test/core/spies.dart +++ b/modules/angular2/test/core/spies.dart @@ -4,14 +4,14 @@ import 'package:angular2/core.dart'; import 'package:angular2/src/core/di/injector.dart'; import 'package:angular2/src/core/change_detection/change_detection.dart'; import 'package:angular2/src/core/render/api.dart'; -import 'package:angular2/src/core/compiler/directive_resolver.dart'; -import 'package:angular2/src/core/compiler/view.dart'; -import 'package:angular2/src/core/compiler/element_ref.dart'; -import 'package:angular2/src/core/compiler/view_manager.dart'; -import 'package:angular2/src/core/compiler/proto_view_factory.dart'; -import 'package:angular2/src/core/compiler/view_pool.dart'; -import 'package:angular2/src/core/compiler/view_listener.dart'; -import 'package:angular2/src/core/compiler/element_injector.dart'; +import 'package:angular2/src/core/linker/directive_resolver.dart'; +import 'package:angular2/src/core/linker/view.dart'; +import 'package:angular2/src/core/linker/element_ref.dart'; +import 'package:angular2/src/core/linker/view_manager.dart'; +import 'package:angular2/src/core/linker/proto_view_factory.dart'; +import 'package:angular2/src/core/linker/view_pool.dart'; +import 'package:angular2/src/core/linker/view_listener.dart'; +import 'package:angular2/src/core/linker/element_injector.dart'; import 'package:angular2/src/core/dom/dom_adapter.dart'; import 'package:angular2/test_lib.dart'; import 'package:angular2/src/core/render/xhr.dart'; diff --git a/modules/angular2/test/core/spies.ts b/modules/angular2/test/core/spies.ts index d6bdf581b9..89dc779262 100644 --- a/modules/angular2/test/core/spies.ts +++ b/modules/angular2/test/core/spies.ts @@ -6,14 +6,14 @@ import { } from 'angular2/src/core/change_detection/change_detection'; import {Renderer, RenderEventDispatcher} from 'angular2/src/core/render/api'; -import {DirectiveResolver} from 'angular2/src/core/compiler/directive_resolver'; +import {DirectiveResolver} from 'angular2/src/core/linker/directive_resolver'; -import {AppView} from 'angular2/src/core/compiler/view'; -import {ElementRef} from 'angular2/src/core/compiler/element_ref'; -import {AppViewManager} from 'angular2/src/core/compiler/view_manager'; -import {AppViewPool} from 'angular2/src/core/compiler/view_pool'; -import {AppViewListener} from 'angular2/src/core/compiler/view_listener'; -import {ProtoViewFactory} from 'angular2/src/core/compiler/proto_view_factory'; +import {AppView} from 'angular2/src/core/linker/view'; +import {ElementRef} from 'angular2/src/core/linker/element_ref'; +import {AppViewManager} from 'angular2/src/core/linker/view_manager'; +import {AppViewPool} from 'angular2/src/core/linker/view_pool'; +import {AppViewListener} from 'angular2/src/core/linker/view_listener'; +import {ProtoViewFactory} from 'angular2/src/core/linker/proto_view_factory'; import {DomAdapter} from 'angular2/src/core/dom/dom_adapter'; import {ClientMessageBroker} from 'angular2/src/web_workers/shared/client_message_broker'; import {XHR} from 'angular2/src/core/render/xhr'; @@ -22,7 +22,7 @@ import { ElementInjector, PreBuiltObjects, ProtoElementInjector -} from 'angular2/src/core/compiler/element_injector'; +} from 'angular2/src/core/linker/element_injector'; import {SpyObject, proxy} from 'angular2/test_lib'; diff --git a/modules/angular2/test/router/integration/lifecycle_hook_spec.ts b/modules/angular2/test/router/integration/lifecycle_hook_spec.ts index 1b000ba935..b03e01a00b 100644 --- a/modules/angular2/test/router/integration/lifecycle_hook_spec.ts +++ b/modules/angular2/test/router/integration/lifecycle_hook_spec.ts @@ -47,7 +47,7 @@ import { } from 'angular2/src/router/interfaces'; import {CanActivate} from 'angular2/src/router/lifecycle_annotations'; import {ComponentInstruction} from 'angular2/src/router/instruction'; -import {DirectiveResolver} from 'angular2/src/core/compiler/directive_resolver'; +import {DirectiveResolver} from 'angular2/src/core/linker/directive_resolver'; var cmpInstanceCount; var log: string[]; diff --git a/modules/angular2/test/router/integration/navigation_spec.ts b/modules/angular2/test/router/integration/navigation_spec.ts index aec81392cf..b7021db0ee 100644 --- a/modules/angular2/test/router/integration/navigation_spec.ts +++ b/modules/angular2/test/router/integration/navigation_spec.ts @@ -32,7 +32,7 @@ import { import {SpyLocation} from 'angular2/src/mock/location_mock'; import {Location} from 'angular2/src/router/location'; import {RouteRegistry} from 'angular2/src/router/route_registry'; -import {DirectiveResolver} from 'angular2/src/core/compiler/directive_resolver'; +import {DirectiveResolver} from 'angular2/src/core/linker/directive_resolver'; var cmpInstanceCount; var childCmpInstanceCount; diff --git a/modules/angular2/test/router/router_spec.ts b/modules/angular2/test/router/router_spec.ts index 9351b91e62..5d6b2225e2 100644 --- a/modules/angular2/test/router/router_spec.ts +++ b/modules/angular2/test/router/router_spec.ts @@ -22,7 +22,7 @@ import {stringifyInstruction} from 'angular2/src/router/instruction'; import {RouteRegistry} from 'angular2/src/router/route_registry'; import {RouteConfig, AsyncRoute, Route} from 'angular2/src/router/route_config_decorator'; -import {DirectiveResolver} from 'angular2/src/core/compiler/directive_resolver'; +import {DirectiveResolver} from 'angular2/src/core/linker/directive_resolver'; import {bind} from 'angular2/core'; diff --git a/modules/angular2/test/tools/spies.dart b/modules/angular2/test/tools/spies.dart index 299dd29979..a1020e1c0e 100644 --- a/modules/angular2/test/tools/spies.dart +++ b/modules/angular2/test/tools/spies.dart @@ -1,6 +1,6 @@ import 'package:angular2/test_lib.dart' show SpyObject; import 'package:angular2/core.dart' show LifeCycle, Injector, bind; -import 'package:angular2/src/core/compiler/dynamic_component_loader.dart' +import 'package:angular2/src/core/linker/dynamic_component_loader.dart' show ComponentRef; import 'dart:js'; diff --git a/modules/angular2/test/tools/spies.ts b/modules/angular2/test/tools/spies.ts index f53e90f792..8e1859ab40 100644 --- a/modules/angular2/test/tools/spies.ts +++ b/modules/angular2/test/tools/spies.ts @@ -1,6 +1,6 @@ import {SpyObject} from 'angular2/test_lib'; import {LifeCycle, Injector, bind} from 'angular2/angular2'; -import {ComponentRef} from 'angular2/src/core/compiler/dynamic_component_loader'; +import {ComponentRef} from 'angular2/src/core/linker/dynamic_component_loader'; import {global} from 'angular2/src/core/facade/lang'; export class SpyComponentRef extends SpyObject { diff --git a/modules/angular2/web_worker/worker.ts b/modules/angular2/web_worker/worker.ts index f4c0bdbaaf..cf9be1c3c6 100644 --- a/modules/angular2/web_worker/worker.ts +++ b/modules/angular2/web_worker/worker.ts @@ -9,7 +9,7 @@ export * from '../src/core/facade'; // export * from '../src/core/application'; export * from '../src/core/application_ref'; export * from '../src/core/services'; -export * from '../src/core/compiler'; +export * from '../src/core/linker'; export * from '../src/core/lifecycle'; export * from '../src/core/zone'; // Do not export render in web_worker diff --git a/modules/benchmarks/src/compiler/compiler_benchmark.ts b/modules/benchmarks/src/compiler/compiler_benchmark.ts index df0c816d17..1a9590caf9 100644 --- a/modules/benchmarks/src/compiler/compiler_benchmark.ts +++ b/modules/benchmarks/src/compiler/compiler_benchmark.ts @@ -18,7 +18,7 @@ import { } from 'angular2/core'; import {ChangeDetectorGenConfig} from 'angular2/src/core/change_detection/change_detection'; -import {ViewResolver} from 'angular2/src/core/compiler/view_resolver'; +import {ViewResolver} from 'angular2/src/core/linker/view_resolver'; import {getIntParameter, bindAction} from 'angular2/src/test_lib/benchmark_util'; diff --git a/modules/benchmarks/src/element_injector/element_injector_benchmark.ts b/modules/benchmarks/src/element_injector/element_injector_benchmark.ts index c367be3f93..8ccf86d461 100644 --- a/modules/benchmarks/src/element_injector/element_injector_benchmark.ts +++ b/modules/benchmarks/src/element_injector/element_injector_benchmark.ts @@ -1,7 +1,7 @@ import {reflector} from 'angular2/src/core/reflection/reflection'; import {ReflectionCapabilities} from 'angular2/src/core/reflection/reflection_capabilities'; import {Injectable, Injector} from 'angular2/core'; -import {ProtoElementInjector, DirectiveBinding} from 'angular2/src/core/compiler/element_injector'; +import {ProtoElementInjector, DirectiveBinding} from 'angular2/src/core/linker/element_injector'; import {getIntParameter, bindAction, microBenchmark} from 'angular2/src/test_lib/benchmark_util'; import {BrowserDomAdapter} from 'angular2/src/core/dom/browser_adapter'; diff --git a/modules/benchmarks/src/largetable/largetable_benchmark.ts b/modules/benchmarks/src/largetable/largetable_benchmark.ts index b3a0f27324..0c335e69f8 100644 --- a/modules/benchmarks/src/largetable/largetable_benchmark.ts +++ b/modules/benchmarks/src/largetable/largetable_benchmark.ts @@ -20,7 +20,7 @@ import { LifeCycle } from 'angular2/core'; import {BrowserDomAdapter} from 'angular2/src/core/dom/browser_adapter'; -import {APP_VIEW_POOL_CAPACITY} from 'angular2/src/core/compiler/view_pool'; +import {APP_VIEW_POOL_CAPACITY} from 'angular2/src/core/linker/view_pool'; import {ListWrapper} from 'angular2/src/core/facade/collection'; diff --git a/modules/benchmarks/src/naive_infinite_scroll/index.ts b/modules/benchmarks/src/naive_infinite_scroll/index.ts index b339662a50..24fe46aced 100644 --- a/modules/benchmarks/src/naive_infinite_scroll/index.ts +++ b/modules/benchmarks/src/naive_infinite_scroll/index.ts @@ -2,7 +2,7 @@ import {bootstrap} from 'angular2/bootstrap'; import {App} from './app'; -import {APP_VIEW_POOL_CAPACITY} from 'angular2/src/core/compiler/view_pool'; +import {APP_VIEW_POOL_CAPACITY} from 'angular2/src/core/linker/view_pool'; import {bind} from 'angular2/core'; export function main() { diff --git a/modules/benchmarks/src/static_tree/tree_benchmark.ts b/modules/benchmarks/src/static_tree/tree_benchmark.ts index 3891179ae8..7fb358a623 100644 --- a/modules/benchmarks/src/static_tree/tree_benchmark.ts +++ b/modules/benchmarks/src/static_tree/tree_benchmark.ts @@ -23,7 +23,7 @@ import { windowProfileEnd } from 'angular2/src/test_lib/benchmark_util'; import {BrowserDomAdapter} from 'angular2/src/core/dom/browser_adapter'; -import {APP_VIEW_POOL_CAPACITY} from 'angular2/src/core/compiler/view_pool'; +import {APP_VIEW_POOL_CAPACITY} from 'angular2/src/core/linker/view_pool'; function createBindings(): Binding[] { var viewCacheCapacity = getStringParameter('viewcache') == 'true' ? 10000 : 0; diff --git a/modules/benchmarks/src/tree/tree_benchmark.ts b/modules/benchmarks/src/tree/tree_benchmark.ts index daa15b84fa..45662924b3 100644 --- a/modules/benchmarks/src/tree/tree_benchmark.ts +++ b/modules/benchmarks/src/tree/tree_benchmark.ts @@ -22,7 +22,7 @@ import { windowProfileEnd } from 'angular2/src/test_lib/benchmark_util'; import {BrowserDomAdapter} from 'angular2/src/core/dom/browser_adapter'; -import {APP_VIEW_POOL_CAPACITY} from 'angular2/src/core/compiler/view_pool'; +import {APP_VIEW_POOL_CAPACITY} from 'angular2/src/core/linker/view_pool'; function createBindings(): Binding[] { var viewCacheCapacity = getStringParameter('viewcache') == 'true' ? 10000 : 1; diff --git a/modules/examples/src/observable_models/index.dart b/modules/examples/src/observable_models/index.dart index fb73a4dd96..c7fe3ee29d 100644 --- a/modules/examples/src/observable_models/index.dart +++ b/modules/examples/src/observable_models/index.dart @@ -2,7 +2,7 @@ library benchmarks.src.naive_infinite_scroll.index; import "package:angular2/bootstrap.dart" show bootstrap; import "app.dart" show App; -import "package:angular2/src/core/compiler/view_pool.dart" +import "package:angular2/src/core/linker/view_pool.dart" show APP_VIEW_POOL_CAPACITY; import "package:angular2/core.dart" show bind; diff --git a/modules_dart/transform/lib/src/transform/common/directive_metadata_reader.dart b/modules_dart/transform/lib/src/transform/common/directive_metadata_reader.dart index 5d29cf1ed0..9a6d7f0c07 100644 --- a/modules_dart/transform/lib/src/transform/common/directive_metadata_reader.dart +++ b/modules_dart/transform/lib/src/transform/common/directive_metadata_reader.dart @@ -6,7 +6,7 @@ import 'package:analyzer/analyzer.dart'; import 'package:angular2/src/compiler/directive_metadata.dart'; import 'package:angular2/src/compiler/template_compiler.dart'; import 'package:angular2/src/core/change_detection/change_detection.dart'; -import 'package:angular2/src/core/compiler/interfaces.dart' show LifecycleHooks; +import 'package:angular2/src/core/linker/interfaces.dart' show LifecycleHooks; import 'package:angular2/src/core/render/api.dart' show ViewEncapsulation; import 'package:angular2/src/transform/common/annotation_matcher.dart'; import 'package:angular2/src/transform/common/interface_matcher.dart'; diff --git a/modules_dart/transform/lib/src/transform/common/interface_matcher.dart b/modules_dart/transform/lib/src/transform/common/interface_matcher.dart index 83b1bb572c..7d6e418733 100644 --- a/modules_dart/transform/lib/src/transform/common/interface_matcher.dart +++ b/modules_dart/transform/lib/src/transform/common/interface_matcher.dart @@ -12,66 +12,66 @@ export 'class_matcher_base.dart' show ClassDescriptor; const _ON_CHANGE_INTERFACES = const [ const ClassDescriptor('OnChanges', 'package:angular2/angular2.dart'), const ClassDescriptor('OnChanges', 'package:angular2/lifecycle_hooks.dart'), - const ClassDescriptor('OnChanges', 'package:angular2/src/core/compiler.dart'), + const ClassDescriptor('OnChanges', 'package:angular2/src/core/linker.dart'), const ClassDescriptor( - 'OnChanges', 'package:angular2/src/core/compiler/interfaces.dart'), + 'OnChanges', 'package:angular2/src/core/linker/interfaces.dart'), ]; const _ON_DESTROY_INTERFACES = const [ const ClassDescriptor('OnDestroy', 'package:angular2/angular2.dart'), const ClassDescriptor('OnDestroy', 'package:angular2/lifecycle_hooks.dart'), - const ClassDescriptor('OnDestroy', 'package:angular2/src/core/compiler.dart'), + const ClassDescriptor('OnDestroy', 'package:angular2/src/core/linker.dart'), const ClassDescriptor( - 'OnDestroy', 'package:angular2/src/core/compiler/interfaces.dart'), + 'OnDestroy', 'package:angular2/src/core/linker/interfaces.dart'), ]; const _DO_CHECK_INTERFACES = const [ const ClassDescriptor('DoCheck', 'package:angular2/angular2.dart'), const ClassDescriptor('DoCheck', 'package:angular2/lifecycle_hooks.dart'), - const ClassDescriptor('DoCheck', 'package:angular2/src/core/compiler.dart'), + const ClassDescriptor('DoCheck', 'package:angular2/src/core/linker.dart'), const ClassDescriptor( - 'DoCheck', 'package:angular2/src/core/compiler/interfaces.dart'), + 'DoCheck', 'package:angular2/src/core/linker/interfaces.dart'), ]; const _ON_INIT_INTERFACES = const [ const ClassDescriptor('OnInit', 'package:angular2/angular2.dart'), const ClassDescriptor('OnInit', 'package:angular2/lifecycle_hooks.dart'), - const ClassDescriptor('OnInit', 'package:angular2/src/core/compiler.dart'), + const ClassDescriptor('OnInit', 'package:angular2/src/core/linker.dart'), const ClassDescriptor( - 'OnInit', 'package:angular2/src/core/compiler/interfaces.dart'), + 'OnInit', 'package:angular2/src/core/linker/interfaces.dart'), ]; const _ON_AFTER_CONTENT_INIT_INTERFACES = const [ const ClassDescriptor('AfterContentInit', 'package:angular2/angular2.dart'), const ClassDescriptor( 'AfterContentInit', 'package:angular2/lifecycle_hooks.dart'), const ClassDescriptor( - 'AfterContentInit', 'package:angular2/src/core/compiler.dart'), + 'AfterContentInit', 'package:angular2/src/core/linker.dart'), const ClassDescriptor( - 'AfterContentInit', 'package:angular2/src/core/compiler/interfaces.dart') + 'AfterContentInit', 'package:angular2/src/core/linker/interfaces.dart') ]; const _ON_AFTER_CONTENT_CHECKED_INTERFACES = const [ const ClassDescriptor('AfterContentChecked', 'package:angular2/angular2.dart'), const ClassDescriptor( 'AfterContentChecked', 'package:angular2/lifecycle_hooks.dart'), const ClassDescriptor( - 'AfterContentChecked', 'package:angular2/src/core/compiler.dart'), + 'AfterContentChecked', 'package:angular2/src/core/linker.dart'), const ClassDescriptor( - 'AfterContentChecked', 'package:angular2/src/core/compiler/interfaces.dart') + 'AfterContentChecked', 'package:angular2/src/core/linker/interfaces.dart') ]; const _ON_AFTER_VIEW_INIT_INTERFACES = const [ const ClassDescriptor('AfterViewInit', 'package:angular2/angular2.dart'), const ClassDescriptor( 'AfterViewInit', 'package:angular2/lifecycle_hooks.dart'), const ClassDescriptor( - 'AfterViewInit', 'package:angular2/src/core/compiler.dart'), + 'AfterViewInit', 'package:angular2/src/core/linker.dart'), const ClassDescriptor( - 'AfterViewInit', 'package:angular2/src/core/compiler/interfaces.dart') + 'AfterViewInit', 'package:angular2/src/core/linker/interfaces.dart') ]; const _ON_AFTER_VIEW_CHECKED_INTERFACES = const [ const ClassDescriptor('AfterViewChecked', 'package:angular2/angular2.dart'), const ClassDescriptor( 'AfterViewChecked', 'package:angular2/lifecycle_hooks.dart'), const ClassDescriptor( - 'AfterViewChecked', 'package:angular2/src/core/compiler.dart'), + 'AfterViewChecked', 'package:angular2/src/core/linker.dart'), const ClassDescriptor( - 'AfterViewChecked', 'package:angular2/src/core/compiler/interfaces.dart') + 'AfterViewChecked', 'package:angular2/src/core/linker/interfaces.dart') ]; /// Checks if a given [Annotation] matches any of the given diff --git a/modules_dart/transform/test/transform/directive_processor/all_tests.dart b/modules_dart/transform/test/transform/directive_processor/all_tests.dart index a9bae585c6..214196dfc7 100644 --- a/modules_dart/transform/test/transform/directive_processor/all_tests.dart +++ b/modules_dart/transform/test/transform/directive_processor/all_tests.dart @@ -5,7 +5,7 @@ import 'dart:convert'; import 'package:barback/barback.dart'; import 'package:angular2/src/core/change_detection/change_detection.dart'; -import 'package:angular2/src/core/compiler/interfaces.dart' show LifecycleHooks; +import 'package:angular2/src/core/linker/interfaces.dart' show LifecycleHooks; import 'package:angular2/src/core/dom/html_adapter.dart'; import 'package:angular2/src/transform/directive_processor/rewriter.dart'; import 'package:angular2/src/transform/common/annotation_matcher.dart'; diff --git a/modules_dart/transform/test/transform/directive_processor/interfaces_files/soup.dart b/modules_dart/transform/test/transform/directive_processor/interfaces_files/soup.dart index 0d33fa9c6e..dc596b09a6 100644 --- a/modules_dart/transform/test/transform/directive_processor/interfaces_files/soup.dart +++ b/modules_dart/transform/test/transform/directive_processor/interfaces_files/soup.dart @@ -1,7 +1,7 @@ library dinner.soup; import 'package:angular2/src/core/metadata.dart'; -import 'package:angular2/src/core/compiler.dart'; +import 'package:angular2/src/core/linker.dart'; @Component(selector: '[soup]') @View(template: '') diff --git a/modules_dart/transform/test/transform/directive_processor/multiple_interface_lifecycle_files/soup.dart b/modules_dart/transform/test/transform/directive_processor/multiple_interface_lifecycle_files/soup.dart index f62ae29d9b..e569c10d83 100644 --- a/modules_dart/transform/test/transform/directive_processor/multiple_interface_lifecycle_files/soup.dart +++ b/modules_dart/transform/test/transform/directive_processor/multiple_interface_lifecycle_files/soup.dart @@ -1,7 +1,7 @@ library dinner.soup; import 'package:angular2/src/core/metadata.dart'; -import 'package:angular2/src/core/compiler.dart'; +import 'package:angular2/src/core/linker.dart'; @Component(selector: '[soup]') @View(template: '') diff --git a/modules_dart/transform/test/transform/directive_processor/prefixed_interface_lifecycle_files/soup.dart b/modules_dart/transform/test/transform/directive_processor/prefixed_interface_lifecycle_files/soup.dart index 4b79c94d56..66aa5e07e7 100644 --- a/modules_dart/transform/test/transform/directive_processor/prefixed_interface_lifecycle_files/soup.dart +++ b/modules_dart/transform/test/transform/directive_processor/prefixed_interface_lifecycle_files/soup.dart @@ -1,6 +1,6 @@ library dinner.soup; -import 'package:angular2/src/core/compiler.dart' as prefix; +import 'package:angular2/src/core/linker.dart' as prefix; import 'package:angular2/src/core/metadata.dart'; @Component(selector: '[soup]') diff --git a/modules_dart/transform/test/transform/directive_processor/superclass_lifecycle_files/soup.dart b/modules_dart/transform/test/transform/directive_processor/superclass_lifecycle_files/soup.dart index 707870b4f8..fd491c8d11 100644 --- a/modules_dart/transform/test/transform/directive_processor/superclass_lifecycle_files/soup.dart +++ b/modules_dart/transform/test/transform/directive_processor/superclass_lifecycle_files/soup.dart @@ -1,6 +1,6 @@ library dinner.soup; -import 'package:angular2/src/core/compiler.dart'; +import 'package:angular2/src/core/linker.dart'; import 'package:angular2/src/core/metadata.dart'; @Component(selector: '[soup]')