diff --git a/modules/angular2/compiler.ts b/modules/angular2/compiler.ts new file mode 100644 index 0000000000..1d4eb68690 --- /dev/null +++ b/modules/angular2/compiler.ts @@ -0,0 +1,7 @@ +/** + * @module + * @description + * Starting point to import all compiler APIs. + */ +export * from './src/compiler/url_resolver'; +export * from './src/compiler/xhr'; \ No newline at end of file diff --git a/modules/angular2/core.ts b/modules/angular2/core.ts index 7a8efa80e3..a97c5db627 100644 --- a/modules/angular2/core.ts +++ b/modules/angular2/core.ts @@ -19,4 +19,4 @@ export * from './src/core/directives'; export * from './src/core/forms'; export * from './src/core/debug'; export * from './src/core/change_detection'; -export * from './src/core/compiler/ambient'; +export * from './src/core/ambient'; diff --git a/modules/angular2/mock.ts b/modules/angular2/mock.ts index 1f497f73ea..ac75a45b90 100644 --- a/modules/angular2/mock.ts +++ b/modules/angular2/mock.ts @@ -2,4 +2,4 @@ export * from './src/mock/mock_location_strategy'; export {LocationStrategy} from './src/router/location_strategy'; export {MockViewResolver} from 'angular2/src/mock/view_resolver_mock'; -export {MockXHR} from 'angular2/src/core/compiler/xhr_mock'; +export {MockXHR} from 'angular2/src/compiler/xhr_mock'; diff --git a/modules/angular2/src/core/compiler/anchor_based_app_root_url.ts b/modules/angular2/src/compiler/anchor_based_app_root_url.ts similarity index 87% rename from modules/angular2/src/core/compiler/anchor_based_app_root_url.ts rename to modules/angular2/src/compiler/anchor_based_app_root_url.ts index 8881f62623..8e9e4963a1 100644 --- a/modules/angular2/src/core/compiler/anchor_based_app_root_url.ts +++ b/modules/angular2/src/compiler/anchor_based_app_root_url.ts @@ -1,4 +1,4 @@ -import {AppRootUrl} from "angular2/src/core/compiler/app_root_url"; +import {AppRootUrl} from "angular2/src/compiler/app_root_url"; import {DOM} from "angular2/src/core/dom/dom_adapter"; import {Injectable} from "angular2/src/core/di"; diff --git a/modules/angular2/src/core/compiler/app_root_url.ts b/modules/angular2/src/compiler/app_root_url.ts similarity index 100% rename from modules/angular2/src/core/compiler/app_root_url.ts rename to modules/angular2/src/compiler/app_root_url.ts diff --git a/modules/angular2/src/core/compiler/change_definition_factory.ts b/modules/angular2/src/compiler/change_definition_factory.ts similarity index 100% rename from modules/angular2/src/core/compiler/change_definition_factory.ts rename to modules/angular2/src/compiler/change_definition_factory.ts diff --git a/modules/angular2/src/core/compiler/change_detector_compiler.ts b/modules/angular2/src/compiler/change_detector_compiler.ts similarity index 97% rename from modules/angular2/src/core/compiler/change_detector_compiler.ts rename to modules/angular2/src/compiler/change_detector_compiler.ts index 41c6bf0123..30583e7297 100644 --- a/modules/angular2/src/core/compiler/change_detector_compiler.ts +++ b/modules/angular2/src/compiler/change_detector_compiler.ts @@ -5,7 +5,7 @@ import { } from 'angular2/src/core/change_detection/change_detection_jit_generator'; import {createChangeDetectorDefinitions} from './change_definition_factory'; -import {isJsObject, CONST_EXPR} from 'angular2/src/core/facade/lang'; +import {IS_DART, isJsObject, CONST_EXPR} from 'angular2/src/core/facade/lang'; import { ChangeDetectorGenConfig, @@ -16,7 +16,7 @@ import { import {TemplateAst} from './template_ast'; import {Codegen} from 'angular2/src/transform/template_compiler/change_detector_codegen'; -import {IS_DART, MODULE_SUFFIX} from './util'; +import {MODULE_SUFFIX} from './util'; import {Injectable} from 'angular2/src/core/di'; const ABSTRACT_CHANGE_DETECTOR = "AbstractChangeDetector"; diff --git a/modules/angular2/src/core/compiler/command_compiler.ts b/modules/angular2/src/compiler/command_compiler.ts similarity index 100% rename from modules/angular2/src/core/compiler/command_compiler.ts rename to modules/angular2/src/compiler/command_compiler.ts diff --git a/modules/angular2/src/core/compiler/compiler.ts b/modules/angular2/src/compiler/compiler.ts similarity index 55% rename from modules/angular2/src/core/compiler/compiler.ts rename to modules/angular2/src/compiler/compiler.ts index a87cfec5f5..25fb3e12b5 100644 --- a/modules/angular2/src/core/compiler/compiler.ts +++ b/modules/angular2/src/compiler/compiler.ts @@ -6,28 +6,26 @@ export { CompileTemplateMetadata } from './directive_metadata'; export {SourceModule, SourceWithImports} from './source_module'; -export {AMBIENT_DIRECTIVES, AMBIENT_PIPES} from './ambient'; +export {AMBIENT_DIRECTIVES, AMBIENT_PIPES} from 'angular2/src/core/ambient'; import {assertionsEnabled, Type} from 'angular2/src/core/facade/lang'; import {provide, Provider} from 'angular2/src/core/di'; -import {TemplateParser} from 'angular2/src/core/compiler/template_parser'; -import {HtmlParser} from 'angular2/src/core/compiler/html_parser'; -import {TemplateNormalizer} from 'angular2/src/core/compiler/template_normalizer'; -import {RuntimeMetadataResolver} from 'angular2/src/core/compiler/runtime_metadata'; -import {ChangeDetectionCompiler} from 'angular2/src/core/compiler/change_detector_compiler'; -import {StyleCompiler} from 'angular2/src/core/compiler/style_compiler'; -import {CommandCompiler} from 'angular2/src/core/compiler/command_compiler'; -import {TemplateCompiler} from 'angular2/src/core/compiler/template_compiler'; +import {TemplateParser} from 'angular2/src/compiler/template_parser'; +import {HtmlParser} from 'angular2/src/compiler/html_parser'; +import {TemplateNormalizer} from 'angular2/src/compiler/template_normalizer'; +import {RuntimeMetadataResolver} from 'angular2/src/compiler/runtime_metadata'; +import {ChangeDetectionCompiler} from 'angular2/src/compiler/change_detector_compiler'; +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/linker/compiler'; -import {RuntimeCompiler} from 'angular2/src/core/compiler/runtime_compiler'; -import {ElementSchemaRegistry} from 'angular2/src/core/compiler/schema/element_schema_registry'; -import { - DomElementSchemaRegistry -} from 'angular2/src/core/compiler/schema/dom_element_schema_registry'; -import {UrlResolver} from 'angular2/src/core/compiler/url_resolver'; -import {AppRootUrl} from 'angular2/src/core/compiler/app_root_url'; -import {AnchorBasedAppRootUrl} from 'angular2/src/core/compiler/anchor_based_app_root_url'; +import {RuntimeCompiler} from 'angular2/src/compiler/runtime_compiler'; +import {ElementSchemaRegistry} from 'angular2/src/compiler/schema/element_schema_registry'; +import {DomElementSchemaRegistry} from 'angular2/src/compiler/schema/dom_element_schema_registry'; +import {UrlResolver} from 'angular2/src/compiler/url_resolver'; +import {AppRootUrl} from 'angular2/src/compiler/app_root_url'; +import {AnchorBasedAppRootUrl} from 'angular2/src/compiler/anchor_based_app_root_url'; import {Parser, Lexer} from 'angular2/src/core/change_detection/change_detection'; export function compilerProviders(): Array { diff --git a/modules/angular2/src/core/compiler/directive_metadata.ts b/modules/angular2/src/compiler/directive_metadata.ts similarity index 99% rename from modules/angular2/src/core/compiler/directive_metadata.ts rename to modules/angular2/src/compiler/directive_metadata.ts index e56293ce82..48fe545c2d 100644 --- a/modules/angular2/src/core/compiler/directive_metadata.ts +++ b/modules/angular2/src/compiler/directive_metadata.ts @@ -13,7 +13,7 @@ import { CHANGE_DETECTION_STRATEGY_VALUES } from 'angular2/src/core/change_detection/change_detection'; import {ViewEncapsulation, VIEW_ENCAPSULATION_VALUES} from 'angular2/src/core/metadata/view'; -import {CssSelector} from 'angular2/src/core/compiler/selector'; +import {CssSelector} from 'angular2/src/compiler/selector'; import {splitAtColon} from './util'; import {LifecycleHooks, LIFECYCLE_HOOKS_VALUES} from 'angular2/src/core/linker/interfaces'; diff --git a/modules/angular2/src/core/compiler/html_ast.ts b/modules/angular2/src/compiler/html_ast.ts similarity index 100% rename from modules/angular2/src/core/compiler/html_ast.ts rename to modules/angular2/src/compiler/html_ast.ts diff --git a/modules/angular2/src/core/compiler/html_parser.ts b/modules/angular2/src/compiler/html_parser.ts similarity index 100% rename from modules/angular2/src/core/compiler/html_parser.ts rename to modules/angular2/src/compiler/html_parser.ts diff --git a/modules/angular2/src/core/compiler/runtime_compiler.ts b/modules/angular2/src/compiler/runtime_compiler.ts similarity index 100% rename from modules/angular2/src/core/compiler/runtime_compiler.ts rename to modules/angular2/src/compiler/runtime_compiler.ts diff --git a/modules/angular2/src/core/compiler/runtime_metadata.ts b/modules/angular2/src/compiler/runtime_metadata.ts similarity index 98% rename from modules/angular2/src/core/compiler/runtime_metadata.ts rename to modules/angular2/src/compiler/runtime_metadata.ts index 9baa736be9..074c78cf63 100644 --- a/modules/angular2/src/core/compiler/runtime_metadata.ts +++ b/modules/angular2/src/compiler/runtime_metadata.ts @@ -18,7 +18,7 @@ import {hasLifecycleHook} from 'angular2/src/core/linker/directive_lifecycle_ref import {LifecycleHooks, LIFECYCLE_HOOKS_VALUES} from 'angular2/src/core/linker/interfaces'; import {reflector} from 'angular2/src/core/reflection/reflection'; import {Injectable, Inject, Optional} from 'angular2/src/core/di'; -import {AMBIENT_DIRECTIVES} from 'angular2/src/core/compiler/ambient'; +import {AMBIENT_DIRECTIVES} from 'angular2/src/core/ambient'; import {MODULE_SUFFIX} from './util'; @Injectable() diff --git a/modules/angular2/src/core/compiler/schema/dom_element_schema_registry.ts b/modules/angular2/src/compiler/schema/dom_element_schema_registry.ts similarity index 100% rename from modules/angular2/src/core/compiler/schema/dom_element_schema_registry.ts rename to modules/angular2/src/compiler/schema/dom_element_schema_registry.ts diff --git a/modules/angular2/src/core/compiler/schema/element_schema_registry.ts b/modules/angular2/src/compiler/schema/element_schema_registry.ts similarity index 100% rename from modules/angular2/src/core/compiler/schema/element_schema_registry.ts rename to modules/angular2/src/compiler/schema/element_schema_registry.ts diff --git a/modules/angular2/src/core/compiler/selector.ts b/modules/angular2/src/compiler/selector.ts similarity index 100% rename from modules/angular2/src/core/compiler/selector.ts rename to modules/angular2/src/compiler/selector.ts diff --git a/modules/angular2/src/core/compiler/shadow_css.ts b/modules/angular2/src/compiler/shadow_css.ts similarity index 100% rename from modules/angular2/src/core/compiler/shadow_css.ts rename to modules/angular2/src/compiler/shadow_css.ts diff --git a/modules/angular2/src/core/compiler/source_module.ts b/modules/angular2/src/compiler/source_module.ts similarity index 100% rename from modules/angular2/src/core/compiler/source_module.ts rename to modules/angular2/src/compiler/source_module.ts diff --git a/modules/angular2/src/core/compiler/style_compiler.ts b/modules/angular2/src/compiler/style_compiler.ts similarity index 95% rename from modules/angular2/src/core/compiler/style_compiler.ts rename to modules/angular2/src/compiler/style_compiler.ts index 3b89379013..c71e64a0d2 100644 --- a/modules/angular2/src/core/compiler/style_compiler.ts +++ b/modules/angular2/src/compiler/style_compiler.ts @@ -1,15 +1,14 @@ import {CompileTypeMetadata, CompileTemplateMetadata} from './directive_metadata'; import {SourceModule, SourceExpression, moduleRef} from './source_module'; import {ViewEncapsulation} from 'angular2/src/core/metadata/view'; -import {XHR} from 'angular2/src/core/compiler/xhr'; -import {StringWrapper, isBlank} from 'angular2/src/core/facade/lang'; +import {XHR} from 'angular2/src/compiler/xhr'; +import {IS_DART, StringWrapper, isBlank} from 'angular2/src/core/facade/lang'; import {PromiseWrapper, Promise} from 'angular2/src/core/facade/async'; -import {ShadowCss} from 'angular2/src/core/compiler/shadow_css'; -import {UrlResolver} from 'angular2/src/core/compiler/url_resolver'; +import {ShadowCss} from 'angular2/src/compiler/shadow_css'; +import {UrlResolver} from 'angular2/src/compiler/url_resolver'; import {extractStyleUrls} from './style_url_resolver'; import { escapeSingleQuoteString, - IS_DART, codeGenConcatArray, codeGenMapArray, codeGenReplaceAll, diff --git a/modules/angular2/src/core/compiler/style_url_resolver.ts b/modules/angular2/src/compiler/style_url_resolver.ts similarity index 95% rename from modules/angular2/src/core/compiler/style_url_resolver.ts rename to modules/angular2/src/compiler/style_url_resolver.ts index b1ea62cfbe..674d7d0b38 100644 --- a/modules/angular2/src/core/compiler/style_url_resolver.ts +++ b/modules/angular2/src/compiler/style_url_resolver.ts @@ -8,7 +8,7 @@ import { isPresent, isBlank } from 'angular2/src/core/facade/lang'; -import {UrlResolver} from 'angular2/src/core/compiler/url_resolver'; +import {UrlResolver} from 'angular2/src/compiler/url_resolver'; export class StyleWithImports { constructor(public style: string, public styleUrls: string[]) {} diff --git a/modules/angular2/src/core/compiler/template_ast.ts b/modules/angular2/src/compiler/template_ast.ts similarity index 100% rename from modules/angular2/src/core/compiler/template_ast.ts rename to modules/angular2/src/compiler/template_ast.ts diff --git a/modules/angular2/src/core/compiler/template_compiler.ts b/modules/angular2/src/compiler/template_compiler.ts similarity index 99% rename from modules/angular2/src/core/compiler/template_compiler.ts rename to modules/angular2/src/compiler/template_compiler.ts index 6dd9ee511d..46a4c8bb89 100644 --- a/modules/angular2/src/core/compiler/template_compiler.ts +++ b/modules/angular2/src/compiler/template_compiler.ts @@ -1,4 +1,4 @@ -import {Type, Json, isBlank, stringify} from 'angular2/src/core/facade/lang'; +import {IS_DART, Type, Json, isBlank, stringify} from 'angular2/src/core/facade/lang'; import {BaseException} from 'angular2/src/core/facade/exceptions'; import {ListWrapper, SetWrapper} from 'angular2/src/core/facade/collection'; import {PromiseWrapper, Promise} from 'angular2/src/core/facade/async'; @@ -27,7 +27,6 @@ import {APP_ID} from 'angular2/src/core/application_tokens'; import {TEMPLATE_COMMANDS_MODULE_REF} from './command_compiler'; import { - IS_DART, codeGenExportVariable, escapeSingleQuoteString, codeGenValueFn, diff --git a/modules/angular2/src/core/compiler/template_normalizer.ts b/modules/angular2/src/compiler/template_normalizer.ts similarity index 97% rename from modules/angular2/src/core/compiler/template_normalizer.ts rename to modules/angular2/src/compiler/template_normalizer.ts index 6f8a36d67b..93b8f42bea 100644 --- a/modules/angular2/src/core/compiler/template_normalizer.ts +++ b/modules/angular2/src/compiler/template_normalizer.ts @@ -8,8 +8,8 @@ import {ListWrapper} from 'angular2/src/core/facade/collection'; import {BaseException} from 'angular2/src/core/facade/exceptions'; import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async'; -import {XHR} from 'angular2/src/core/compiler/xhr'; -import {UrlResolver} from 'angular2/src/core/compiler/url_resolver'; +import {XHR} from 'angular2/src/compiler/xhr'; +import {UrlResolver} from 'angular2/src/compiler/url_resolver'; import {extractStyleUrls, isStyleUrlResolvable} from './style_url_resolver'; import {Injectable} from 'angular2/src/core/di'; import {ViewEncapsulation} from 'angular2/src/core/metadata/view'; diff --git a/modules/angular2/src/core/compiler/template_parser.ts b/modules/angular2/src/compiler/template_parser.ts similarity index 99% rename from modules/angular2/src/core/compiler/template_parser.ts rename to modules/angular2/src/compiler/template_parser.ts index 8553e3e182..38fb2cd1c5 100644 --- a/modules/angular2/src/core/compiler/template_parser.ts +++ b/modules/angular2/src/compiler/template_parser.ts @@ -35,9 +35,9 @@ import { DirectiveAst, BoundDirectivePropertyAst } from './template_ast'; -import {CssSelector, SelectorMatcher} from 'angular2/src/core/compiler/selector'; +import {CssSelector, SelectorMatcher} from 'angular2/src/compiler/selector'; -import {ElementSchemaRegistry} from 'angular2/src/core/compiler/schema/element_schema_registry'; +import {ElementSchemaRegistry} from 'angular2/src/compiler/schema/element_schema_registry'; import {preparseElement, PreparsedElement, PreparsedElementType} from './template_preparser'; import {isStyleUrlResolvable} from './style_url_resolver'; diff --git a/modules/angular2/src/core/compiler/template_preparser.ts b/modules/angular2/src/compiler/template_preparser.ts similarity index 100% rename from modules/angular2/src/core/compiler/template_preparser.ts rename to modules/angular2/src/compiler/template_preparser.ts diff --git a/modules/angular2/src/core/compiler/url_resolver.dart b/modules/angular2/src/compiler/url_resolver.dart similarity index 100% rename from modules/angular2/src/core/compiler/url_resolver.dart rename to modules/angular2/src/compiler/url_resolver.dart diff --git a/modules/angular2/src/core/compiler/url_resolver.ts b/modules/angular2/src/compiler/url_resolver.ts similarity index 100% rename from modules/angular2/src/core/compiler/url_resolver.ts rename to modules/angular2/src/compiler/url_resolver.ts diff --git a/modules/angular2/src/core/compiler/util.ts b/modules/angular2/src/compiler/util.ts similarity index 95% rename from modules/angular2/src/core/compiler/util.ts rename to modules/angular2/src/compiler/util.ts index 1ad6c34bbb..427035296c 100644 --- a/modules/angular2/src/core/compiler/util.ts +++ b/modules/angular2/src/compiler/util.ts @@ -1,12 +1,10 @@ -import {StringWrapper, isBlank, isJsObject} from 'angular2/src/core/facade/lang'; +import {IS_DART, StringWrapper, isBlank} from 'angular2/src/core/facade/lang'; var CAMEL_CASE_REGEXP = /([A-Z])/g; var DASH_CASE_REGEXP = /-([a-z])/g; var SINGLE_QUOTE_ESCAPE_STRING_RE = /'|\\|\n|\$/g; var DOUBLE_QUOTE_ESCAPE_STRING_RE = /"|\\|\n|\$/g; -export var IS_DART = !isJsObject({}); - export var MODULE_SUFFIX = IS_DART ? '.dart' : '.js'; export function camelCaseToDashCase(input: string): string { diff --git a/modules/angular2/src/core/compiler/xhr.ts b/modules/angular2/src/compiler/xhr.ts similarity index 60% rename from modules/angular2/src/core/compiler/xhr.ts rename to modules/angular2/src/compiler/xhr.ts index 0efb301636..5963a9e35a 100644 --- a/modules/angular2/src/core/compiler/xhr.ts +++ b/modules/angular2/src/compiler/xhr.ts @@ -1,5 +1,6 @@ import {Promise} from 'angular2/src/core/facade/async'; +// TODO: vsavkin rename it into TemplateLoader and do not reexport it via DomAdapter export class XHR { get(url: string): Promise { return null; } } diff --git a/modules/angular2/src/core/compiler/xhr_impl.dart b/modules/angular2/src/compiler/xhr_impl.dart similarity index 100% rename from modules/angular2/src/core/compiler/xhr_impl.dart rename to modules/angular2/src/compiler/xhr_impl.dart diff --git a/modules/angular2/src/core/compiler/xhr_impl.ts b/modules/angular2/src/compiler/xhr_impl.ts similarity index 100% rename from modules/angular2/src/core/compiler/xhr_impl.ts rename to modules/angular2/src/compiler/xhr_impl.ts diff --git a/modules/angular2/src/core/compiler/xhr_mock.ts b/modules/angular2/src/compiler/xhr_mock.ts similarity index 98% rename from modules/angular2/src/core/compiler/xhr_mock.ts rename to modules/angular2/src/compiler/xhr_mock.ts index ce8619c696..0089fb6068 100644 --- a/modules/angular2/src/core/compiler/xhr_mock.ts +++ b/modules/angular2/src/compiler/xhr_mock.ts @@ -1,4 +1,4 @@ -import {XHR} from 'angular2/src/core/compiler/xhr'; +import {XHR} from 'angular2/src/compiler/xhr'; import {ListWrapper, Map, MapWrapper} from 'angular2/src/core/facade/collection'; import {isBlank, isPresent, normalizeBlank} from 'angular2/src/core/facade/lang'; import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions'; diff --git a/modules/angular2/src/core/compiler/ambient.ts b/modules/angular2/src/core/ambient.ts similarity index 100% rename from modules/angular2/src/core/compiler/ambient.ts rename to modules/angular2/src/core/ambient.ts diff --git a/modules/angular2/src/core/application.dart b/modules/angular2/src/core/application.dart index e0bf2835cb..3cee988d86 100644 --- a/modules/angular2/src/core/application.dart +++ b/modules/angular2/src/core/application.dart @@ -7,7 +7,7 @@ import 'package:angular2/src/core/reflection/reflection_capabilities.dart' show ReflectionCapabilities; import 'application_common.dart'; -import 'package:angular2/src/core/compiler/compiler.dart'; +import 'package:angular2/src/compiler/compiler.dart'; import 'package:angular2/src/core/linker/dynamic_component_loader.dart'; export 'package:angular2/src/core/linker/dynamic_component_loader.dart' show ComponentRef; diff --git a/modules/angular2/src/core/application.ts b/modules/angular2/src/core/application.ts index dcc6c1b054..62ef38d746 100644 --- a/modules/angular2/src/core/application.ts +++ b/modules/angular2/src/core/application.ts @@ -2,7 +2,7 @@ import {Provider} from './di'; import {Type, isPresent} from 'angular2/src/core/facade/lang'; import {Promise} from 'angular2/src/core/facade/async'; -import {compilerProviders} from 'angular2/src/core/compiler/compiler'; +import {compilerProviders} from 'angular2/src/compiler/compiler'; import {commonBootstrap} from './application_common'; import {ComponentRef} from './linker/dynamic_component_loader'; diff --git a/modules/angular2/src/core/application_common.ts b/modules/angular2/src/core/application_common.ts index ada1139f0d..548a244e7a 100644 --- a/modules/angular2/src/core/application_common.ts +++ b/modules/angular2/src/core/application_common.ts @@ -5,8 +5,8 @@ import {BrowserDomAdapter} from 'angular2/src/core/dom/browser_adapter'; import {BrowserGetTestability} from 'angular2/src/core/testability/browser_testability'; import {DOM} from 'angular2/src/core/dom/dom_adapter'; import {Promise} from 'angular2/src/core/facade/async'; -import {XHR} from 'angular2/src/core/compiler/xhr'; -import {XHRImpl} from 'angular2/src/core/compiler/xhr_impl'; +import {XHR} from 'angular2/src/compiler/xhr'; +import {XHRImpl} from 'angular2/src/compiler/xhr_impl'; import { EventManager, diff --git a/modules/angular2/src/core/application_ref.ts b/modules/angular2/src/core/application_ref.ts index b74f089982..c0ef8483c3 100644 --- a/modules/angular2/src/core/application_ref.ts +++ b/modules/angular2/src/core/application_ref.ts @@ -47,7 +47,7 @@ import {AppViewManager_} from "./linker/view_manager"; import {Compiler_} from "./linker/compiler"; import {wtfLeave, wtfCreateScope, WtfScopeFn} from './profile/profile'; import {ChangeDetectorRef} from 'angular2/src/core/change_detection/change_detector_ref'; -import {AMBIENT_DIRECTIVES, AMBIENT_PIPES} from "angular2/src/core/compiler/ambient"; +import {AMBIENT_DIRECTIVES, AMBIENT_PIPES} from "angular2/src/core/ambient"; import {COMMON_DIRECTIVES, COMMON_PIPES} from "angular2/common"; /** diff --git a/modules/angular2/src/core/change_detection/codegen_logic_util.ts b/modules/angular2/src/core/change_detection/codegen_logic_util.ts index 2cd3990a35..f2359c8cdd 100644 --- a/modules/angular2/src/core/change_detection/codegen_logic_util.ts +++ b/modules/angular2/src/core/change_detection/codegen_logic_util.ts @@ -1,4 +1,4 @@ -import {Json, StringWrapper, isPresent, isBlank} from 'angular2/src/core/facade/lang'; +import {IS_DART, Json, StringWrapper, isPresent, isBlank} from 'angular2/src/core/facade/lang'; import {CodegenNameUtil} from './codegen_name_util'; import {codify, combineGeneratedStrings, rawString} from './codegen_facade'; import {ProtoRecord, RecordType} from './proto_record'; @@ -6,7 +6,6 @@ import {BindingTarget} from './binding_record'; import {DirectiveRecord} from './directive_record'; import {ChangeDetectionStrategy} from './constants'; import {BaseException} from 'angular2/src/core/facade/exceptions'; -import {IS_DART} from 'angular2/src/core/compiler/util'; /** * Class responsible for providing change detection logic for change detector classes. diff --git a/modules/angular2/src/core/dom/abstract_html_adapter.dart b/modules/angular2/src/core/dom/abstract_html_adapter.dart index feea49fc33..aefd31c5e6 100644 --- a/modules/angular2/src/core/dom/abstract_html_adapter.dart +++ b/modules/angular2/src/core/dom/abstract_html_adapter.dart @@ -4,7 +4,7 @@ import 'package:html/parser.dart' as parser; import 'package:html/dom.dart'; import 'dom_adapter.dart'; -import '../compiler/xhr.dart'; +import 'package:angular2/src/compiler/xhr.dart'; const _attrToPropMap = const { 'innerHtml': 'innerHTML', diff --git a/modules/angular2/src/core/dom/generic_browser_adapter.ts b/modules/angular2/src/core/dom/generic_browser_adapter.ts index 7336385341..d1b7fe78fa 100644 --- a/modules/angular2/src/core/dom/generic_browser_adapter.ts +++ b/modules/angular2/src/core/dom/generic_browser_adapter.ts @@ -1,7 +1,7 @@ import {ListWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection'; import {isPresent, isFunction, StringWrapper, Type} from 'angular2/src/core/facade/lang'; import {DomAdapter} from './dom_adapter'; -import {XHRImpl} from 'angular2/src/core/compiler/xhr_impl'; +import {XHRImpl} from 'angular2/src/compiler/xhr_impl'; /** diff --git a/modules/angular2/src/core/dom/parse5_adapter.ts b/modules/angular2/src/core/dom/parse5_adapter.ts index 2f0e524313..341617a109 100644 --- a/modules/angular2/src/core/dom/parse5_adapter.ts +++ b/modules/angular2/src/core/dom/parse5_adapter.ts @@ -14,8 +14,8 @@ import { DateWrapper } from 'angular2/src/core/facade/lang'; import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions'; -import {SelectorMatcher, CssSelector} from 'angular2/src/core/compiler/selector'; -import {XHR} from 'angular2/src/core/compiler/xhr'; +import {SelectorMatcher, CssSelector} from 'angular2/src/compiler/selector'; +import {XHR} from 'angular2/src/compiler/xhr'; var _attrToPropMap: {[key: string]: string} = { 'class': 'className', diff --git a/modules/angular2/src/core/facade/lang.dart b/modules/angular2/src/core/facade/lang.dart index 4c2e0f2c8d..6f0887deaf 100644 --- a/modules/angular2/src/core/facade/lang.dart +++ b/modules/angular2/src/core/facade/lang.dart @@ -17,6 +17,8 @@ class CONST { const CONST(); } +const IS_DART = true; + bool isPresent(obj) => obj != null; bool isBlank(obj) => obj == null; bool isString(obj) => obj is String; diff --git a/modules/angular2/src/core/facade/lang.ts b/modules/angular2/src/core/facade/lang.ts index 6feebba0cd..96c5b8393d 100644 --- a/modules/angular2/src/core/facade/lang.ts +++ b/modules/angular2/src/core/facade/lang.ts @@ -12,6 +12,8 @@ if (typeof window === 'undefined') { globalScope = window; }; +export const IS_DART = false; + // Need to declare a new variable for global here since TypeScript // exports the original value of the symbol. var _global: BrowserNodeGlobal = globalScope; diff --git a/modules/angular2/src/core/linker/proto_view_factory.ts b/modules/angular2/src/core/linker/proto_view_factory.ts index c6ab82fe81..286f5106ba 100644 --- a/modules/angular2/src/core/linker/proto_view_factory.ts +++ b/modules/angular2/src/core/linker/proto_view_factory.ts @@ -14,7 +14,7 @@ import {DirectiveResolver} from './directive_resolver'; import {ViewResolver} from './view_resolver'; import {PipeResolver} from './pipe_resolver'; import {ViewMetadata} from '../metadata/view'; -import {AMBIENT_PIPES} from 'angular2/src/core/compiler/ambient'; +import {AMBIENT_PIPES} from 'angular2/src/core/ambient'; import { visitAllCommands, diff --git a/modules/angular2/src/core/services.ts b/modules/angular2/src/core/services.ts index 09dbf9eedf..ab85513b48 100644 --- a/modules/angular2/src/core/services.ts +++ b/modules/angular2/src/core/services.ts @@ -1,4 +1,4 @@ // Public API for Services -export {AppRootUrl} from 'angular2/src/core/compiler/app_root_url'; -export {UrlResolver} from 'angular2/src/core/compiler/url_resolver'; +export {AppRootUrl} from 'angular2/src/compiler/app_root_url'; +export {UrlResolver} from 'angular2/src/compiler/url_resolver'; export {Title} from 'angular2/src/core/services/title'; diff --git a/modules/angular2/src/testing/test_injector.ts b/modules/angular2/src/testing/test_injector.ts index eb3554b524..5fd40ed333 100644 --- a/modules/angular2/src/testing/test_injector.ts +++ b/modules/angular2/src/testing/test_injector.ts @@ -16,7 +16,7 @@ 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/compiler/xhr'; +import {XHR} from 'angular2/src/compiler/xhr'; import {NgZone} from 'angular2/src/core/zone/ng_zone'; import {DOM} from 'angular2/src/core/dom/dom_adapter'; @@ -54,7 +54,7 @@ import { import {APP_ID} from 'angular2/src/core/application_tokens'; import {Serializer} from "angular2/src/web_workers/shared/serializer"; import {Log} from './utils'; -import {compilerProviders} from 'angular2/src/core/compiler/compiler'; +import {compilerProviders} from 'angular2/src/compiler/compiler'; import {DomRenderer_} from "angular2/src/core/render/dom/dom_renderer"; import {DynamicComponentLoader_} from "angular2/src/core/linker/dynamic_component_loader"; import {AppViewManager_} from "angular2/src/core/linker/view_manager"; diff --git a/modules/angular2/src/transform/template_compiler/change_detector_codegen.ts b/modules/angular2/src/transform/template_compiler/change_detector_codegen.ts index daf4cbc9c1..300ac316ab 100644 --- a/modules/angular2/src/transform/template_compiler/change_detector_codegen.ts +++ b/modules/angular2/src/transform/template_compiler/change_detector_codegen.ts @@ -4,7 +4,7 @@ import { // Note: This class is only here so that we can reference it from TypeScript code. // The actual implementation lives under modules_dart. -// TODO(tbosch): Move the corresponding code into angular2/src/core/compiler once +// TODO(tbosch): Move the corresponding code into angular2/src/compiler once // the new compiler is done. export class Codegen { constructor(moduleAlias: string) {} diff --git a/modules/angular2/src/upgrade/upgrade_adapter.ts b/modules/angular2/src/upgrade/upgrade_adapter.ts index 0d704da133..cc812d536a 100644 --- a/modules/angular2/src/upgrade/upgrade_adapter.ts +++ b/modules/angular2/src/upgrade/upgrade_adapter.ts @@ -15,7 +15,7 @@ import { } from 'angular2/angular2'; import {applicationDomProviders} from 'angular2/src/core/application_common'; import {applicationCommonProviders} from 'angular2/src/core/application_ref'; -import {compilerProviders} from 'angular2/src/core/compiler/compiler'; +import {compilerProviders} from 'angular2/src/compiler/compiler'; import {ObservableWrapper} from 'angular2/src/core/facade/async'; import {getComponentInfo, ComponentInfo} from './metadata'; diff --git a/modules/angular2/src/web_workers/ui/di_bindings.ts b/modules/angular2/src/web_workers/ui/di_bindings.ts index 9ce2bf54d1..382a5ae46b 100644 --- a/modules/angular2/src/web_workers/ui/di_bindings.ts +++ b/modules/angular2/src/web_workers/ui/di_bindings.ts @@ -16,13 +16,11 @@ 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/linker/view_pool'; import {Renderer} from 'angular2/src/core/render/api'; -import {AppRootUrl} from 'angular2/src/core/compiler/app_root_url'; +import {AppRootUrl} from 'angular2/src/compiler/app_root_url'; import {DomRenderer, DomRenderer_, DOCUMENT} from 'angular2/src/core/render/render'; import {APP_ID_RANDOM_PROVIDER} from 'angular2/src/core/application_tokens'; -import {ElementSchemaRegistry} from 'angular2/src/core/compiler/schema/element_schema_registry'; -import { - DomElementSchemaRegistry -} from 'angular2/src/core/compiler/schema/dom_element_schema_registry'; +import {ElementSchemaRegistry} from 'angular2/src/compiler/schema/element_schema_registry'; +import {DomElementSchemaRegistry} from 'angular2/src/compiler/schema/dom_element_schema_registry'; import { SharedStylesHost, DomSharedStylesHost @@ -39,17 +37,17 @@ import { DynamicComponentLoader, DynamicComponentLoader_ } from 'angular2/src/core/linker/dynamic_component_loader'; -import {UrlResolver} from 'angular2/src/core/compiler/url_resolver'; +import {UrlResolver} from 'angular2/src/compiler/url_resolver'; import {Testability} from 'angular2/src/core/testability/testability'; -import {XHR} from 'angular2/src/core/compiler/xhr'; -import {XHRImpl} from 'angular2/src/core/compiler/xhr_impl'; +import {XHR} from 'angular2/src/compiler/xhr'; +import {XHRImpl} from 'angular2/src/compiler/xhr_impl'; import {Serializer} from 'angular2/src/web_workers/shared/serializer'; import {ON_WEB_WORKER} from 'angular2/src/web_workers/shared/api'; import {RenderProtoViewRefStore} from 'angular2/src/web_workers/shared/render_proto_view_ref_store'; import { RenderViewWithFragmentsStore } from 'angular2/src/web_workers/shared/render_view_with_fragments_store'; -import {AnchorBasedAppRootUrl} from 'angular2/src/core/compiler/anchor_based_app_root_url'; +import {AnchorBasedAppRootUrl} from 'angular2/src/compiler/anchor_based_app_root_url'; import {WebWorkerApplication} from 'angular2/src/web_workers/ui/impl'; import {MessageBus} from 'angular2/src/web_workers/shared/message_bus'; import {MessageBasedRenderer} from 'angular2/src/web_workers/ui/renderer'; @@ -63,7 +61,7 @@ import { ClientMessageBrokerFactory, ClientMessageBrokerFactory_ } from 'angular2/src/web_workers/shared/client_message_broker'; -import {AMBIENT_DIRECTIVES, AMBIENT_PIPES} from "angular2/src/core/compiler/ambient"; +import {AMBIENT_DIRECTIVES, AMBIENT_PIPES} from "angular2/src/core/ambient"; import {COMMON_DIRECTIVES, COMMON_PIPES} from "angular2/common"; var _rootInjector: Injector; diff --git a/modules/angular2/src/web_workers/ui/setup.ts b/modules/angular2/src/web_workers/ui/setup.ts index d75f30f8d2..6e7535055c 100644 --- a/modules/angular2/src/web_workers/ui/setup.ts +++ b/modules/angular2/src/web_workers/ui/setup.ts @@ -1,7 +1,7 @@ import {SETUP_CHANNEL} from 'angular2/src/web_workers/shared/messaging_api'; import {EventEmitter, ObservableWrapper} from 'angular2/src/core/facade/async'; import {MessageBus} from 'angular2/src/web_workers/shared/message_bus'; -import {AnchorBasedAppRootUrl} from 'angular2/src/core/compiler/anchor_based_app_root_url'; +import {AnchorBasedAppRootUrl} from 'angular2/src/compiler/anchor_based_app_root_url'; import {StringWrapper} from 'angular2/src/core/facade/lang'; import {Injectable} from 'angular2/src/core/di'; diff --git a/modules/angular2/src/web_workers/ui/xhr_impl.ts b/modules/angular2/src/web_workers/ui/xhr_impl.ts index e8e210b03c..1d4d346c72 100644 --- a/modules/angular2/src/web_workers/ui/xhr_impl.ts +++ b/modules/angular2/src/web_workers/ui/xhr_impl.ts @@ -1,7 +1,7 @@ import {Injectable} from 'angular2/src/core/di'; import {PRIMITIVE} from 'angular2/src/web_workers/shared/serializer'; import {XHR_CHANNEL} from 'angular2/src/web_workers/shared/messaging_api'; -import {XHR} from 'angular2/src/core/compiler/xhr'; +import {XHR} from 'angular2/src/compiler/xhr'; import {ServiceMessageBrokerFactory} from 'angular2/src/web_workers/shared/service_message_broker'; import {bind} from './bind'; diff --git a/modules/angular2/src/web_workers/worker/application_common.ts b/modules/angular2/src/web_workers/worker/application_common.ts index 14e41ba38a..e2835f9a1b 100644 --- a/modules/angular2/src/web_workers/worker/application_common.ts +++ b/modules/angular2/src/web_workers/worker/application_common.ts @@ -11,9 +11,9 @@ import { } from 'angular2/src/core/facade/lang'; import {ExceptionHandler} from 'angular2/src/core/facade/exceptions'; import {Promise, PromiseWrapper, PromiseCompleter} from 'angular2/src/core/facade/async'; -import {XHR} from 'angular2/src/core/compiler/xhr'; +import {XHR} from 'angular2/src/compiler/xhr'; import {WebWorkerXHRImpl} from 'angular2/src/web_workers/worker/xhr_impl'; -import {AppRootUrl} from 'angular2/src/core/compiler/app_root_url'; +import {AppRootUrl} from 'angular2/src/compiler/app_root_url'; import {WebWorkerRenderer} from './renderer'; import {Renderer} from 'angular2/src/core/render/api'; import { @@ -42,7 +42,7 @@ 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/linker/dynamic_component_loader'; import {NgZone} from 'angular2/src/core/zone/ng_zone'; -import {compilerProviders} from 'angular2/src/core/compiler/compiler'; +import {compilerProviders} from 'angular2/src/compiler/compiler'; /** * Initialize the Angular 'platform' on the page in a manner suitable for applications diff --git a/modules/angular2/src/web_workers/worker/xhr_impl.ts b/modules/angular2/src/web_workers/worker/xhr_impl.ts index c5a97d23e6..5f1b5ababc 100644 --- a/modules/angular2/src/web_workers/worker/xhr_impl.ts +++ b/modules/angular2/src/web_workers/worker/xhr_impl.ts @@ -1,6 +1,6 @@ import {Injectable} from 'angular2/src/core/di'; import {Promise} from 'angular2/src/core/facade/async'; -import {XHR} from 'angular2/src/core/compiler/xhr'; +import {XHR} from 'angular2/src/compiler/xhr'; import { FnArg, UiArguments, diff --git a/modules/angular2/test/core/compiler/change_definition_factory_spec.ts b/modules/angular2/test/compiler/change_definition_factory_spec.ts similarity index 96% rename from modules/angular2/test/core/compiler/change_definition_factory_spec.ts rename to modules/angular2/test/compiler/change_definition_factory_spec.ts index 0aeb2f0e88..d4f635c8c9 100644 --- a/modules/angular2/test/core/compiler/change_definition_factory_spec.ts +++ b/modules/angular2/test/compiler/change_definition_factory_spec.ts @@ -16,8 +16,8 @@ import {MapWrapper} from 'angular2/src/core/facade/collection'; import { CompileDirectiveMetadata, CompileTypeMetadata -} from 'angular2/src/core/compiler/directive_metadata'; -import {TemplateParser} from 'angular2/src/core/compiler/template_parser'; +} from 'angular2/src/compiler/directive_metadata'; +import {TemplateParser} from 'angular2/src/compiler/template_parser'; import { Parser, Lexer, @@ -32,9 +32,7 @@ import { ChangeDetector } from 'angular2/src/core/change_detection/change_detection'; import {Pipes} from 'angular2/src/core/change_detection/pipes'; -import { - createChangeDetectorDefinitions -} from 'angular2/src/core/compiler/change_definition_factory'; +import {createChangeDetectorDefinitions} from 'angular2/src/compiler/change_definition_factory'; import {TestDirective, TestDispatcher, TestPipes} from './change_detector_mocks'; import {TEST_PROVIDERS} from './test_bindings'; diff --git a/modules/angular2/test/core/compiler/change_detector_compiler_spec.ts b/modules/angular2/test/compiler/change_detector_compiler_spec.ts similarity index 91% rename from modules/angular2/test/core/compiler/change_detector_compiler_spec.ts rename to modules/angular2/test/compiler/change_detector_compiler_spec.ts index bf3632e08d..499425d482 100644 --- a/modules/angular2/test/core/compiler/change_detector_compiler_spec.ts +++ b/modules/angular2/test/compiler/change_detector_compiler_spec.ts @@ -18,20 +18,20 @@ import {CONST_EXPR, stringify} from 'angular2/src/core/facade/lang'; import {MapWrapper} from 'angular2/src/core/facade/collection'; import {Promise} from 'angular2/src/core/facade/async'; -import {ChangeDetectionCompiler} from 'angular2/src/core/compiler/change_detector_compiler'; +import {ChangeDetectionCompiler} from 'angular2/src/compiler/change_detector_compiler'; import { CompileDirectiveMetadata, CompileTypeMetadata -} from 'angular2/src/core/compiler/directive_metadata'; +} from 'angular2/src/compiler/directive_metadata'; import { SourceModule, SourceExpression, SourceExpressions, moduleRef -} from 'angular2/src/core/compiler/source_module'; +} from 'angular2/src/compiler/source_module'; -import {TemplateParser} from 'angular2/src/core/compiler/template_parser'; +import {TemplateParser} from 'angular2/src/compiler/template_parser'; import { ChangeDetectorGenConfig, @@ -47,14 +47,10 @@ import {evalModule} from './eval_module'; import {TEST_PROVIDERS} from './test_bindings'; import {TestDispatcher, TestPipes} from './change_detector_mocks'; -import { - codeGenValueFn, - codeGenExportVariable, - MODULE_SUFFIX -} from 'angular2/src/core/compiler/util'; +import {codeGenValueFn, codeGenExportVariable, MODULE_SUFFIX} from 'angular2/src/compiler/util'; // Attention: These module names have to correspond to real modules! -var THIS_MODULE_ID = 'angular2/test/core/compiler/change_detector_compiler_spec'; +var THIS_MODULE_ID = 'angular2/test/compiler/change_detector_compiler_spec'; var THIS_MODULE_URL = `package:${THIS_MODULE_ID}${MODULE_SUFFIX}`; var THIS_MODULE_REF = moduleRef(THIS_MODULE_URL); diff --git a/modules/angular2/test/core/compiler/change_detector_mocks.ts b/modules/angular2/test/compiler/change_detector_mocks.ts similarity index 100% rename from modules/angular2/test/core/compiler/change_detector_mocks.ts rename to modules/angular2/test/compiler/change_detector_mocks.ts diff --git a/modules/angular2/test/core/compiler/command_compiler_spec.ts b/modules/angular2/test/compiler/command_compiler_spec.ts similarity index 98% rename from modules/angular2/test/core/compiler/command_compiler_spec.ts rename to modules/angular2/test/compiler/command_compiler_spec.ts index 8173b2ab13..8575af1e6f 100644 --- a/modules/angular2/test/core/compiler/command_compiler_spec.ts +++ b/modules/angular2/test/compiler/command_compiler_spec.ts @@ -16,7 +16,7 @@ import { import {CONST_EXPR, stringify, isType, Type, isBlank} from 'angular2/src/core/facade/lang'; import {MapWrapper} from 'angular2/src/core/facade/collection'; import {PromiseWrapper, Promise} from 'angular2/src/core/facade/async'; -import {TemplateParser} from 'angular2/src/core/compiler/template_parser'; +import {TemplateParser} from 'angular2/src/compiler/template_parser'; import { CommandVisitor, TextCmd, @@ -28,13 +28,13 @@ import { visitAllCommands, CompiledTemplate } from 'angular2/src/core/linker/template_commands'; -import {CommandCompiler} from 'angular2/src/core/compiler/command_compiler'; +import {CommandCompiler} from 'angular2/src/compiler/command_compiler'; import { CompileDirectiveMetadata, CompileTypeMetadata, CompileTemplateMetadata -} from 'angular2/src/core/compiler/directive_metadata'; -import {SourceModule, SourceExpression, moduleRef} from 'angular2/src/core/compiler/source_module'; +} from 'angular2/src/compiler/directive_metadata'; +import {SourceModule, SourceExpression, moduleRef} from 'angular2/src/compiler/source_module'; import {ViewEncapsulation} from 'angular2/src/core/metadata/view'; import {evalModule} from './eval_module'; import { @@ -42,7 +42,7 @@ import { codeGenValueFn, codeGenExportVariable, MODULE_SUFFIX -} from 'angular2/src/core/compiler/util'; +} from 'angular2/src/compiler/util'; import {TEST_PROVIDERS} from './test_bindings'; const BEGIN_ELEMENT = 'BEGIN_ELEMENT'; @@ -54,7 +54,7 @@ const NG_CONTENT = 'NG_CONTENT'; const EMBEDDED_TEMPLATE = 'EMBEDDED_TEMPLATE'; // Attention: These module names have to correspond to real modules! -var THIS_MODULE_URL = `package:angular2/test/core/compiler/command_compiler_spec${MODULE_SUFFIX}`; +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/linker/template_commands${MODULE_SUFFIX}`); diff --git a/modules/angular2/test/core/compiler/directive_metadata_spec.ts b/modules/angular2/test/compiler/directive_metadata_spec.ts similarity index 98% rename from modules/angular2/test/core/compiler/directive_metadata_spec.ts rename to modules/angular2/test/compiler/directive_metadata_spec.ts index 3d333e6a8f..a801aa73b5 100644 --- a/modules/angular2/test/core/compiler/directive_metadata_spec.ts +++ b/modules/angular2/test/compiler/directive_metadata_spec.ts @@ -16,7 +16,7 @@ import { CompileDirectiveMetadata, CompileTypeMetadata, CompileTemplateMetadata -} from 'angular2/src/core/compiler/directive_metadata'; +} from 'angular2/src/compiler/directive_metadata'; import {ViewEncapsulation} from 'angular2/src/core/metadata/view'; import {ChangeDetectionStrategy} from 'angular2/src/core/change_detection'; import {LifecycleHooks} from 'angular2/src/core/linker/interfaces'; diff --git a/modules/angular2/test/core/compiler/eval_module.dart b/modules/angular2/test/compiler/eval_module.dart similarity index 100% rename from modules/angular2/test/core/compiler/eval_module.dart rename to modules/angular2/test/compiler/eval_module.dart diff --git a/modules/angular2/test/core/compiler/eval_module.ts b/modules/angular2/test/compiler/eval_module.ts similarity index 100% rename from modules/angular2/test/core/compiler/eval_module.ts rename to modules/angular2/test/compiler/eval_module.ts diff --git a/modules/angular2/test/core/compiler/eval_module_spec.ts b/modules/angular2/test/compiler/eval_module_spec.ts similarity index 86% rename from modules/angular2/test/core/compiler/eval_module_spec.ts rename to modules/angular2/test/compiler/eval_module_spec.ts index 6a7530089a..13752a9784 100644 --- a/modules/angular2/test/core/compiler/eval_module_spec.ts +++ b/modules/angular2/test/compiler/eval_module_spec.ts @@ -11,7 +11,7 @@ import { AsyncTestCompleter, inject } from 'angular2/testing_internal'; -import {IS_DART} from '../../platform'; +import {IS_DART} from 'angular2/src/core/facade/lang'; import {evalModule} from './eval_module'; @@ -19,8 +19,7 @@ import {evalModule} from './eval_module'; // when evaling the test module! export var TEST_VALUE = 23; -const THIS_MODULE_URL = - `package:angular2/test/core/compiler/eval_module_spec${IS_DART?'.dart':'.js'}`; +const THIS_MODULE_URL = `package:angular2/test/compiler/eval_module_spec${IS_DART?'.dart':'.js'}`; export function main() { describe('evalModule', () => { diff --git a/modules/angular2/test/core/compiler/html_parser_spec.ts b/modules/angular2/test/compiler/html_parser_spec.ts similarity index 97% rename from modules/angular2/test/core/compiler/html_parser_spec.ts rename to modules/angular2/test/compiler/html_parser_spec.ts index e539010ed1..4bb5e16375 100644 --- a/modules/angular2/test/core/compiler/html_parser_spec.ts +++ b/modules/angular2/test/compiler/html_parser_spec.ts @@ -9,7 +9,7 @@ import { afterEach } from 'angular2/testing_internal'; -import {HtmlParser} from 'angular2/src/core/compiler/html_parser'; +import {HtmlParser} from 'angular2/src/compiler/html_parser'; import { HtmlAst, HtmlAstVisitor, @@ -17,7 +17,7 @@ import { HtmlAttrAst, HtmlTextAst, htmlVisitAll -} from 'angular2/src/core/compiler/html_ast'; +} from 'angular2/src/compiler/html_ast'; export function main() { describe('DomParser', () => { diff --git a/modules/angular2/test/core/compiler/runtime_compiler_spec.ts b/modules/angular2/test/compiler/runtime_compiler_spec.ts similarity index 96% rename from modules/angular2/test/core/compiler/runtime_compiler_spec.ts rename to modules/angular2/test/compiler/runtime_compiler_spec.ts index 454ced4bfa..d0a012cf04 100644 --- a/modules/angular2/test/core/compiler/runtime_compiler_spec.ts +++ b/modules/angular2/test/compiler/runtime_compiler_spec.ts @@ -15,13 +15,13 @@ import { import {Component, View, provide} from 'angular2/core'; import {PromiseWrapper} from 'angular2/src/core/facade/async'; -import {SpyProtoViewFactory} from '../spies'; +import {SpyProtoViewFactory} from '../core/spies'; import { CompiledHostTemplate, CompiledTemplate, BeginComponentCmd } from 'angular2/src/core/linker/template_commands'; -import {RuntimeCompiler} from 'angular2/src/core/compiler/runtime_compiler'; +import {RuntimeCompiler} from 'angular2/src/compiler/runtime_compiler'; import {ProtoViewFactory} from 'angular2/src/core/linker/proto_view_factory'; import {AppProtoView} from 'angular2/src/core/linker/view'; diff --git a/modules/angular2/test/core/compiler/runtime_metadata_spec.ts b/modules/angular2/test/compiler/runtime_metadata_spec.ts similarity index 93% rename from modules/angular2/test/core/compiler/runtime_metadata_spec.ts rename to modules/angular2/test/compiler/runtime_metadata_spec.ts index 17965066c8..a9060674be 100644 --- a/modules/angular2/test/core/compiler/runtime_metadata_spec.ts +++ b/modules/angular2/test/compiler/runtime_metadata_spec.ts @@ -14,7 +14,7 @@ import { } from 'angular2/testing_internal'; import {stringify} from 'angular2/src/core/facade/lang'; -import {RuntimeMetadataResolver} from 'angular2/src/core/compiler/runtime_metadata'; +import {RuntimeMetadataResolver} from 'angular2/src/compiler/runtime_metadata'; import {LifecycleHooks, LIFECYCLE_HOOKS_VALUES} from 'angular2/src/core/linker/interfaces'; import { Component, @@ -35,8 +35,9 @@ import { } from 'angular2/core'; import {TEST_PROVIDERS} from './test_bindings'; -import {MODULE_SUFFIX, IS_DART} from 'angular2/src/core/compiler/util'; -import {AMBIENT_DIRECTIVES} from 'angular2/src/core/compiler/ambient'; +import {MODULE_SUFFIX} from 'angular2/src/compiler/util'; +import {IS_DART} from 'angular2/src/core/facade/lang'; +import {AMBIENT_DIRECTIVES} from 'angular2/src/core/ambient'; export function main() { describe('RuntimeMetadataResolver', () => { @@ -71,8 +72,7 @@ export function main() { inject([RuntimeMetadataResolver], (resolver: RuntimeMetadataResolver) => { var value: string = resolver.getMetadata(DirectiveWithoutModuleId).type.moduleUrl; var expectedEndValue = - IS_DART ? 'base/dist/dart/angular2/test/core/compiler/runtime_metadata_spec.dart' : - './'; + IS_DART ? 'base/dist/dart/angular2/test/compiler/runtime_metadata_spec.dart' : './'; expect((value).endsWith(expectedEndValue)).toBe(true); })); }); diff --git a/modules/angular2/test/core/compiler/schema/dom_element_schema_registry_spec.ts b/modules/angular2/test/compiler/schema/dom_element_schema_registry_spec.ts similarity index 89% rename from modules/angular2/test/core/compiler/schema/dom_element_schema_registry_spec.ts rename to modules/angular2/test/compiler/schema/dom_element_schema_registry_spec.ts index 252860da72..3ef4ea8ce0 100644 --- a/modules/angular2/test/core/compiler/schema/dom_element_schema_registry_spec.ts +++ b/modules/angular2/test/compiler/schema/dom_element_schema_registry_spec.ts @@ -9,11 +9,9 @@ import { it, xit } from 'angular2/testing_internal'; -import {IS_DART} from '../../../platform'; +import {IS_DART} from 'angular2/src/core/facade/lang'; -import { - DomElementSchemaRegistry -} from 'angular2/src/core/compiler/schema/dom_element_schema_registry'; +import {DomElementSchemaRegistry} from 'angular2/src/compiler/schema/dom_element_schema_registry'; export function main() { // DOMElementSchema can only be used on the JS side where we can safely diff --git a/modules/angular2/test/core/compiler/schema_registry_mock.ts b/modules/angular2/test/compiler/schema_registry_mock.ts similarity index 85% rename from modules/angular2/test/core/compiler/schema_registry_mock.ts rename to modules/angular2/test/compiler/schema_registry_mock.ts index 4b7bc9ad95..e0acab67b9 100644 --- a/modules/angular2/test/core/compiler/schema_registry_mock.ts +++ b/modules/angular2/test/compiler/schema_registry_mock.ts @@ -1,4 +1,4 @@ -import {ElementSchemaRegistry} from 'angular2/src/core/compiler/schema/element_schema_registry'; +import {ElementSchemaRegistry} from 'angular2/src/compiler/schema/element_schema_registry'; import {isPresent} from 'angular2/src/core/facade/lang'; export class MockSchemaRegistry implements ElementSchemaRegistry { diff --git a/modules/angular2/test/core/compiler/selector_spec.ts b/modules/angular2/test/compiler/selector_spec.ts similarity index 99% rename from modules/angular2/test/core/compiler/selector_spec.ts rename to modules/angular2/test/compiler/selector_spec.ts index 9fbbd4b755..e442566b7c 100644 --- a/modules/angular2/test/core/compiler/selector_spec.ts +++ b/modules/angular2/test/compiler/selector_spec.ts @@ -1,7 +1,7 @@ import {describe, it, expect, beforeEach, ddescribe, iit, xit, el} from 'angular2/testing_internal'; import {DOM} from 'angular2/src/core/dom/dom_adapter'; -import {SelectorMatcher} from 'angular2/src/core/compiler/selector'; -import {CssSelector} from 'angular2/src/core/compiler/selector'; +import {SelectorMatcher} from 'angular2/src/compiler/selector'; +import {CssSelector} from 'angular2/src/compiler/selector'; import {ListWrapper, MapWrapper} from 'angular2/src/core/facade/collection'; export function main() { diff --git a/modules/angular2/test/core/compiler/shadow_css_spec.ts b/modules/angular2/test/compiler/shadow_css_spec.ts similarity index 99% rename from modules/angular2/test/core/compiler/shadow_css_spec.ts rename to modules/angular2/test/compiler/shadow_css_spec.ts index 941def6968..f3fb35a355 100644 --- a/modules/angular2/test/core/compiler/shadow_css_spec.ts +++ b/modules/angular2/test/compiler/shadow_css_spec.ts @@ -9,7 +9,7 @@ import { el, normalizeCSS } from 'angular2/testing_internal'; -import {ShadowCss, processRules, CssRule} from 'angular2/src/core/compiler/shadow_css'; +import {ShadowCss, processRules, CssRule} from 'angular2/src/compiler/shadow_css'; import {RegExpWrapper, StringWrapper, isPresent} from 'angular2/src/core/facade/lang'; diff --git a/modules/angular2/test/core/compiler/source_module_spec.ts b/modules/angular2/test/compiler/source_module_spec.ts similarity index 94% rename from modules/angular2/test/core/compiler/source_module_spec.ts rename to modules/angular2/test/compiler/source_module_spec.ts index 8c5f1555ef..b554ee38f2 100644 --- a/modules/angular2/test/core/compiler/source_module_spec.ts +++ b/modules/angular2/test/compiler/source_module_spec.ts @@ -12,7 +12,7 @@ import { TestComponentBuilder } from 'angular2/testing_internal'; -import {SourceModule, moduleRef} from 'angular2/src/core/compiler/source_module'; +import {SourceModule, moduleRef} from 'angular2/src/compiler/source_module'; export function main() { describe('SourceModule', () => { diff --git a/modules/angular2/test/compiler/spies.dart b/modules/angular2/test/compiler/spies.dart new file mode 100644 index 0000000000..b40d1859d0 --- /dev/null +++ b/modules/angular2/test/compiler/spies.dart @@ -0,0 +1,9 @@ +library core.spies; + +import 'package:angular2/src/compiler/xhr.dart'; +import 'package:angular2/testing_internal.dart'; + +@proxy +class SpyXHR extends SpyObject implements XHR { + noSuchMethod(m) => super.noSuchMethod(m); +} \ No newline at end of file diff --git a/modules/angular2/test/compiler/spies.ts b/modules/angular2/test/compiler/spies.ts new file mode 100644 index 0000000000..e58df9f7ad --- /dev/null +++ b/modules/angular2/test/compiler/spies.ts @@ -0,0 +1,7 @@ +import {XHR} from 'angular2/src/compiler/xhr'; + +import {SpyObject, proxy} from 'angular2/testing_internal'; + +export class SpyXHR extends SpyObject { + constructor() { super(XHR); } +} \ No newline at end of file diff --git a/modules/angular2/test/core/compiler/style_compiler_import.css.shim.ts b/modules/angular2/test/compiler/style_compiler_import.css.shim.ts similarity index 100% rename from modules/angular2/test/core/compiler/style_compiler_import.css.shim.ts rename to modules/angular2/test/compiler/style_compiler_import.css.shim.ts diff --git a/modules/angular2/test/core/compiler/style_compiler_import.css.ts b/modules/angular2/test/compiler/style_compiler_import.css.ts similarity index 100% rename from modules/angular2/test/core/compiler/style_compiler_import.css.ts rename to modules/angular2/test/compiler/style_compiler_import.css.ts diff --git a/modules/angular2/test/core/compiler/style_compiler_spec.ts b/modules/angular2/test/compiler/style_compiler_spec.ts similarity index 94% rename from modules/angular2/test/core/compiler/style_compiler_spec.ts rename to modules/angular2/test/compiler/style_compiler_spec.ts index 191d311ca9..70ca28e6d5 100644 --- a/modules/angular2/test/core/compiler/style_compiler_spec.ts +++ b/modules/angular2/test/compiler/style_compiler_spec.ts @@ -13,35 +13,31 @@ import { beforeEachBindings } from 'angular2/testing_internal'; import {provide} from 'angular2/src/core/di'; -import {SpyXHR} from '../spies'; -import {XHR} from 'angular2/src/core/compiler/xhr'; +import {SpyXHR} from './spies'; +import {XHR} from 'angular2/src/compiler/xhr'; import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions'; import {CONST_EXPR, isPresent, isBlank, StringWrapper} from 'angular2/src/core/facade/lang'; import {PromiseWrapper, Promise} from 'angular2/src/core/facade/async'; import {evalModule} from './eval_module'; -import {StyleCompiler} from 'angular2/src/core/compiler/style_compiler'; +import {StyleCompiler} from 'angular2/src/compiler/style_compiler'; import { CompileDirectiveMetadata, CompileTemplateMetadata, CompileTypeMetadata -} from 'angular2/src/core/compiler/directive_metadata'; -import {SourceExpression, SourceModule} from 'angular2/src/core/compiler/source_module'; +} from 'angular2/src/compiler/directive_metadata'; +import {SourceExpression, SourceModule} from 'angular2/src/compiler/source_module'; import {ViewEncapsulation} from 'angular2/src/core/metadata/view'; import {TEST_PROVIDERS} from './test_bindings'; -import { - codeGenValueFn, - codeGenExportVariable, - MODULE_SUFFIX -} from 'angular2/src/core/compiler/util'; +import {codeGenValueFn, codeGenExportVariable, MODULE_SUFFIX} from 'angular2/src/compiler/util'; // Attention: These module names have to correspond to real modules! -var MODULE_URL = `package:angular2/test/core/compiler/style_compiler_spec${MODULE_SUFFIX}`; -var IMPORT_ABS_STYLESHEET_URL = `package:angular2/test/core/compiler/style_compiler_import.css`; +var MODULE_URL = `package:angular2/test/compiler/style_compiler_spec${MODULE_SUFFIX}`; +var IMPORT_ABS_STYLESHEET_URL = `package:angular2/test/compiler/style_compiler_import.css`; var IMPORT_REL_STYLESHEET_URL = './style_compiler_import.css'; // Note: Not a real module, only used via mocks. var IMPORT_ABS_STYLESHEET_URL_WITH_IMPORT = - `package:angular2/test/core/compiler/style_compiler_transitive_import.css`; + `package:angular2/test/compiler/style_compiler_transitive_import.css`; export function main() { describe('StyleCompiler', () => { diff --git a/modules/angular2/test/core/compiler/style_url_resolver_spec.ts b/modules/angular2/test/compiler/style_url_resolver_spec.ts similarity index 95% rename from modules/angular2/test/core/compiler/style_url_resolver_spec.ts rename to modules/angular2/test/compiler/style_url_resolver_spec.ts index 9edf03a422..413d51a8b9 100644 --- a/modules/angular2/test/core/compiler/style_url_resolver_spec.ts +++ b/modules/angular2/test/compiler/style_url_resolver_spec.ts @@ -1,10 +1,7 @@ import {describe, it, expect, beforeEach, ddescribe, iit, xit, el} from 'angular2/testing_internal'; -import { - extractStyleUrls, - isStyleUrlResolvable -} from 'angular2/src/core/compiler/style_url_resolver'; +import {extractStyleUrls, isStyleUrlResolvable} from 'angular2/src/compiler/style_url_resolver'; -import {UrlResolver} from 'angular2/src/core/compiler/url_resolver'; +import {UrlResolver} from 'angular2/src/compiler/url_resolver'; export function main() { describe('extractStyleUrls', () => { diff --git a/modules/angular2/test/core/compiler/template_compiler_spec.ts b/modules/angular2/test/compiler/template_compiler_spec.ts similarity index 93% rename from modules/angular2/test/core/compiler/template_compiler_spec.ts rename to modules/angular2/test/compiler/template_compiler_spec.ts index 59a6b71b3b..b47ac923d0 100644 --- a/modules/angular2/test/core/compiler/template_compiler_spec.ts +++ b/modules/angular2/test/compiler/template_compiler_spec.ts @@ -16,16 +16,16 @@ import { import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async'; import {Type, isPresent, isBlank, stringify, isString} from 'angular2/src/core/facade/lang'; import {MapWrapper, SetWrapper, ListWrapper} from 'angular2/src/core/facade/collection'; -import {RuntimeMetadataResolver} from 'angular2/src/core/compiler/runtime_metadata'; +import {RuntimeMetadataResolver} from 'angular2/src/compiler/runtime_metadata'; import { TemplateCompiler, NormalizedComponentWithViewDirectives -} from 'angular2/src/core/compiler/template_compiler'; -import {CompileDirectiveMetadata} from 'angular2/src/core/compiler/directive_metadata'; +} from 'angular2/src/compiler/template_compiler'; +import {CompileDirectiveMetadata} from 'angular2/src/compiler/directive_metadata'; import {evalModule} from './eval_module'; -import {SourceModule, moduleRef} from 'angular2/src/core/compiler/source_module'; -import {XHR} from 'angular2/src/core/compiler/xhr'; -import {MockXHR} from 'angular2/src/core/compiler/xhr_mock'; +import {SourceModule, moduleRef} from 'angular2/src/compiler/source_module'; +import {XHR} from 'angular2/src/compiler/xhr'; +import {MockXHR} from 'angular2/src/compiler/xhr_mock'; import {ViewEncapsulation} from 'angular2/src/core/metadata/view'; import {Locals} from 'angular2/src/core/change_detection/change_detection'; @@ -46,15 +46,11 @@ import {Component, View, Directive, provide} from 'angular2/core'; import {TEST_PROVIDERS} from './test_bindings'; import {TestDispatcher, TestPipes} from './change_detector_mocks'; -import { - codeGenValueFn, - codeGenExportVariable, - MODULE_SUFFIX -} from 'angular2/src/core/compiler/util'; +import {codeGenValueFn, codeGenExportVariable, MODULE_SUFFIX} from 'angular2/src/compiler/util'; import {APP_ID} from 'angular2/src/core/application_tokens'; // Attention: This path has to point to this test file! -const THIS_MODULE_ID = 'angular2/test/core/compiler/template_compiler_spec'; +const THIS_MODULE_ID = 'angular2/test/compiler/template_compiler_spec'; var THIS_MODULE_REF = moduleRef(`package:${THIS_MODULE_ID}${MODULE_SUFFIX}`); const APP_ID_VALUE = 'app1'; @@ -141,7 +137,7 @@ export function main() { it('should cache components for parallel requests', inject([AsyncTestCompleter, XHR], (async, xhr: MockXHR) => { - xhr.expect('package:angular2/test/core/compiler/compUrl.html', 'a'); + xhr.expect('package:angular2/test/compiler/compUrl.html', 'a'); PromiseWrapper.all([compile([CompWithTemplateUrl]), compile([CompWithTemplateUrl])]) .then((humanizedTemplates) => { expect(humanizedTemplates[0]['commands'][1]['commands']).toEqual(['#text(a)']); @@ -154,7 +150,7 @@ export function main() { it('should cache components for sequential requests', inject([AsyncTestCompleter, XHR], (async, xhr: MockXHR) => { - xhr.expect('package:angular2/test/core/compiler/compUrl.html', 'a'); + xhr.expect('package:angular2/test/compiler/compUrl.html', 'a'); compile([CompWithTemplateUrl]) .then((humanizedTemplate0) => { return compile([CompWithTemplateUrl]) @@ -171,11 +167,11 @@ export function main() { it('should allow to clear the cache', inject([AsyncTestCompleter, XHR], (async, xhr: MockXHR) => { - xhr.expect('package:angular2/test/core/compiler/compUrl.html', 'a'); + xhr.expect('package:angular2/test/compiler/compUrl.html', 'a'); compile([CompWithTemplateUrl]) .then((humanizedTemplate) => { compiler.clearCache(); - xhr.expect('package:angular2/test/core/compiler/compUrl.html', 'b'); + xhr.expect('package:angular2/test/compiler/compUrl.html', 'b'); var result = compile([CompWithTemplateUrl]); xhr.flush(); return result; @@ -231,7 +227,7 @@ export function main() { it('should normalize the template', inject([AsyncTestCompleter, XHR], (async, xhr: MockXHR) => { - xhr.expect('package:angular2/test/core/compiler/compUrl.html', 'loadedTemplate'); + xhr.expect('package:angular2/test/compiler/compUrl.html', 'loadedTemplate'); compiler.normalizeDirectiveMetadata( runtimeMetadataResolver.getMetadata(CompWithTemplateUrl)) .then((meta: CompileDirectiveMetadata) => { diff --git a/modules/angular2/test/core/compiler/template_normalizer_spec.ts b/modules/angular2/test/compiler/template_normalizer_spec.ts similarity index 98% rename from modules/angular2/test/core/compiler/template_normalizer_spec.ts rename to modules/angular2/test/compiler/template_normalizer_spec.ts index ceb14fa99d..c8aa0a4a8f 100644 --- a/modules/angular2/test/core/compiler/template_normalizer_spec.ts +++ b/modules/angular2/test/compiler/template_normalizer_spec.ts @@ -16,12 +16,12 @@ import { import { CompileTypeMetadata, CompileTemplateMetadata -} from 'angular2/src/core/compiler/directive_metadata'; +} from 'angular2/src/compiler/directive_metadata'; import {ViewEncapsulation} from 'angular2/src/core/metadata/view'; -import {TemplateNormalizer} from 'angular2/src/core/compiler/template_normalizer'; -import {XHR} from 'angular2/src/core/compiler/xhr'; -import {MockXHR} from 'angular2/src/core/compiler/xhr_mock'; +import {TemplateNormalizer} from 'angular2/src/compiler/template_normalizer'; +import {XHR} from 'angular2/src/compiler/xhr'; +import {MockXHR} from 'angular2/src/compiler/xhr_mock'; import {TEST_PROVIDERS} from './test_bindings'; export function main() { diff --git a/modules/angular2/test/core/compiler/template_parser_spec.ts b/modules/angular2/test/compiler/template_parser_spec.ts similarity index 99% rename from modules/angular2/test/core/compiler/template_parser_spec.ts rename to modules/angular2/test/compiler/template_parser_spec.ts index 02ddefdf3b..b4451b5b7a 100644 --- a/modules/angular2/test/core/compiler/template_parser_spec.ts +++ b/modules/angular2/test/compiler/template_parser_spec.ts @@ -14,12 +14,12 @@ import {provide} from 'angular2/src/core/di'; import {TEST_PROVIDERS} from './test_bindings'; import {isPresent} from 'angular2/src/core/facade/lang'; -import {TemplateParser, splitClasses} from 'angular2/src/core/compiler/template_parser'; +import {TemplateParser, splitClasses} from 'angular2/src/compiler/template_parser'; import { CompileDirectiveMetadata, CompileTypeMetadata, CompileTemplateMetadata -} from 'angular2/src/core/compiler/directive_metadata'; +} from 'angular2/src/compiler/directive_metadata'; import { templateVisitAll, TemplateAstVisitor, @@ -36,12 +36,12 @@ import { TextAst, PropertyBindingType, DirectiveAst -} from 'angular2/src/core/compiler/template_ast'; +} from 'angular2/src/compiler/template_ast'; -import {ElementSchemaRegistry} from 'angular2/src/core/compiler/schema/element_schema_registry'; +import {ElementSchemaRegistry} from 'angular2/src/compiler/schema/element_schema_registry'; import {MockSchemaRegistry} from './schema_registry_mock'; -import {Unparser} from '../change_detection/parser/unparser'; +import {Unparser} from '../core/change_detection/parser/unparser'; var expressionUnparser = new Unparser(); diff --git a/modules/angular2/test/core/compiler/template_preparser_spec.ts b/modules/angular2/test/compiler/template_preparser_spec.ts similarity index 93% rename from modules/angular2/test/core/compiler/template_preparser_spec.ts rename to modules/angular2/test/compiler/template_preparser_spec.ts index 18106018c0..d09b16b365 100644 --- a/modules/angular2/test/core/compiler/template_preparser_spec.ts +++ b/modules/angular2/test/compiler/template_preparser_spec.ts @@ -13,12 +13,12 @@ import { beforeEachBindings } from 'angular2/testing_internal'; -import {HtmlParser} from 'angular2/src/core/compiler/html_parser'; +import {HtmlParser} from 'angular2/src/compiler/html_parser'; import { preparseElement, PreparsedElementType, PreparsedElement -} from 'angular2/src/core/compiler/template_preparser'; +} from 'angular2/src/compiler/template_preparser'; export function main() { describe('preparseElement', () => { diff --git a/modules/angular2/test/core/compiler/test_bindings.ts b/modules/angular2/test/compiler/test_bindings.ts similarity index 61% rename from modules/angular2/test/core/compiler/test_bindings.ts rename to modules/angular2/test/compiler/test_bindings.ts index 64db80d7d8..187a513ba6 100644 --- a/modules/angular2/test/core/compiler/test_bindings.ts +++ b/modules/angular2/test/compiler/test_bindings.ts @@ -1,9 +1,9 @@ import {provide, Provider} from 'angular2/src/core/di'; import {MockSchemaRegistry} from './schema_registry_mock'; -import {ElementSchemaRegistry} from 'angular2/src/core/compiler/schema/element_schema_registry'; -import {MockXHR} from 'angular2/src/core/compiler/xhr_mock'; -import {XHR} from 'angular2/src/core/compiler/xhr'; -import {UrlResolver, createWithoutPackagePrefix} from 'angular2/src/core/compiler/url_resolver'; +import {ElementSchemaRegistry} from 'angular2/src/compiler/schema/element_schema_registry'; +import {MockXHR} from 'angular2/src/compiler/xhr_mock'; +import {XHR} from 'angular2/src/compiler/xhr'; +import {UrlResolver, createWithoutPackagePrefix} from 'angular2/src/compiler/url_resolver'; export var TEST_PROVIDERS = [ provide(ElementSchemaRegistry, {useValue: new MockSchemaRegistry({}, {})}), diff --git a/modules/angular2/test/core/compiler/url_resolver_spec.ts b/modules/angular2/test/compiler/url_resolver_spec.ts similarity index 98% rename from modules/angular2/test/core/compiler/url_resolver_spec.ts rename to modules/angular2/test/compiler/url_resolver_spec.ts index 43d60df2ea..acaa5ae10c 100644 --- a/modules/angular2/test/core/compiler/url_resolver_spec.ts +++ b/modules/angular2/test/compiler/url_resolver_spec.ts @@ -1,5 +1,5 @@ import {describe, it, expect, beforeEach, ddescribe, iit, xit, el} from 'angular2/testing_internal'; -import {UrlResolver} from 'angular2/src/core/compiler/url_resolver'; +import {UrlResolver} from 'angular2/src/compiler/url_resolver'; export function main() { describe('UrlResolver', () => { diff --git a/modules/angular2/test/core/compiler/util_spec.ts b/modules/angular2/test/compiler/util_spec.ts similarity index 94% rename from modules/angular2/test/core/compiler/util_spec.ts rename to modules/angular2/test/compiler/util_spec.ts index 897a4edbc5..51f47db52e 100644 --- a/modules/angular2/test/core/compiler/util_spec.ts +++ b/modules/angular2/test/compiler/util_spec.ts @@ -12,8 +12,8 @@ import { TestComponentBuilder } from 'angular2/testing_internal'; -import {IS_DART} from '../../platform'; -import {escapeSingleQuoteString, escapeDoubleQuoteString} from 'angular2/src/core/compiler/util'; +import {IS_DART} from 'angular2/src/core/facade/lang'; +import {escapeSingleQuoteString, escapeDoubleQuoteString} from 'angular2/src/compiler/util'; export function main() { describe('util', () => { diff --git a/modules/angular2/test/core/compiler/xhr_impl_spec.ts b/modules/angular2/test/compiler/xhr_impl_spec.ts similarity index 94% rename from modules/angular2/test/core/compiler/xhr_impl_spec.ts rename to modules/angular2/test/compiler/xhr_impl_spec.ts index ea4ec46834..ee05dcb0f4 100644 --- a/modules/angular2/test/core/compiler/xhr_impl_spec.ts +++ b/modules/angular2/test/compiler/xhr_impl_spec.ts @@ -10,7 +10,7 @@ import { xit } from 'angular2/testing_internal'; -import {XHRImpl} from 'angular2/src/core/compiler/xhr_impl'; +import {XHRImpl} from 'angular2/src/compiler/xhr_impl'; import {PromiseWrapper} from 'angular2/src/core/facade/async'; export function main() { diff --git a/modules/angular2/test/core/compiler/xhr_mock_spec.ts b/modules/angular2/test/compiler/xhr_mock_spec.ts similarity index 98% rename from modules/angular2/test/core/compiler/xhr_mock_spec.ts rename to modules/angular2/test/compiler/xhr_mock_spec.ts index c69bd794da..590b0aea66 100644 --- a/modules/angular2/test/core/compiler/xhr_mock_spec.ts +++ b/modules/angular2/test/compiler/xhr_mock_spec.ts @@ -9,7 +9,7 @@ import { inject, it, } from 'angular2/testing_internal'; -import {MockXHR} from 'angular2/src/core/compiler/xhr_mock'; +import {MockXHR} from 'angular2/src/compiler/xhr_mock'; import {PromiseWrapper, Promise} from 'angular2/src/core/facade/async'; import {isPresent} from 'angular2/src/core/facade/lang'; diff --git a/modules/angular2/test/core/application_spec.ts b/modules/angular2/test/core/application_spec.ts index cb88fc2a2b..57ec5cede5 100644 --- a/modules/angular2/test/core/application_spec.ts +++ b/modules/angular2/test/core/application_spec.ts @@ -10,7 +10,7 @@ import { xdescribe, xit } from 'angular2/testing_internal'; -import {isPresent, stringify} from 'angular2/src/core/facade/lang'; +import {IS_DART, isPresent, stringify} from 'angular2/src/core/facade/lang'; import {bootstrap} from 'angular2/bootstrap'; import {ApplicationRef} from 'angular2/src/core/application_ref'; import {Component, Directive, View} from 'angular2/core'; @@ -20,7 +20,6 @@ import {PromiseWrapper} from 'angular2/src/core/facade/async'; import {provide, Inject, Injector} from 'angular2/core'; import {ExceptionHandler} from 'angular2/src/core/facade/exceptions'; import {Testability, TestabilityRegistry} from 'angular2/src/core/testability/testability'; -import {IS_DART} from '../platform'; import {ComponentRef_} from "angular2/src/core/linker/dynamic_component_loader"; @Component({selector: 'hello-app'}) diff --git a/modules/angular2/test/core/change_detection/change_detector_spec.ts b/modules/angular2/test/core/change_detection/change_detector_spec.ts index ee509bc677..56bc4c2ca0 100644 --- a/modules/angular2/test/core/change_detection/change_detector_spec.ts +++ b/modules/angular2/test/core/change_detection/change_detector_spec.ts @@ -52,7 +52,7 @@ import {JitProtoChangeDetector} from 'angular2/src/core/change_detection/jit_pro import {getDefinition} from './change_detector_config'; import {createObservableModel} from './change_detector_spec_util'; import {getFactoryById} from './generated/change_detector_classes'; -import {IS_DART} from '../../platform'; +import {IS_DART} from 'angular2/src/core/facade/lang'; const _DEFAULT_CONTEXT = CONST_EXPR(new Object()); 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 f06d879827..de4303e533 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 @@ -17,7 +17,7 @@ import {global} from 'angular2/src/core/facade/lang'; import {APP_VIEW_POOL_CAPACITY} from 'angular2/src/core/linker/view_pool'; import {provide, Component, Directive, Injectable, View} from 'angular2/core'; import {inspectNativeElement} from 'angular2/src/core/debug'; -import {IS_DART} from '../../platform'; +import {IS_DART} from 'angular2/src/core/facade/lang'; @Component({selector: 'my-comp'}) @View({directives: []}) diff --git a/modules/angular2/test/core/directives/ng_if_spec.ts b/modules/angular2/test/core/directives/ng_if_spec.ts index e2fa702c80..26bb967e31 100644 --- a/modules/angular2/test/core/directives/ng_if_spec.ts +++ b/modules/angular2/test/core/directives/ng_if_spec.ts @@ -16,7 +16,7 @@ import {DOM} from 'angular2/src/core/dom/dom_adapter'; import {Component, View, NgIf} from 'angular2/core'; -import {IS_DART} from '../../platform'; +import {IS_DART} from 'angular2/src/core/facade/lang'; export function main() { describe('ng-if directive', () => { diff --git a/modules/angular2/test/core/forms/model_spec.ts b/modules/angular2/test/core/forms/model_spec.ts index 500d84f814..add4c878e6 100644 --- a/modules/angular2/test/core/forms/model_spec.ts +++ b/modules/angular2/test/core/forms/model_spec.ts @@ -17,7 +17,7 @@ import {ControlGroup, Control, ControlArray, Validators} from 'angular2/core'; import {isPresent, CONST_EXPR} from 'angular2/src/core/facade/lang'; import {PromiseWrapper} from 'angular2/src/core/facade/promise'; import {TimerWrapper, ObservableWrapper} from 'angular2/src/core/facade/async'; -import {IS_DART} from '../../platform'; +import {IS_DART} from 'angular2/src/core/facade/lang'; export function main() { function asyncValidator(expected, timeouts = CONST_EXPR({})) { diff --git a/modules/angular2/test/core/linker/integration_spec.ts b/modules/angular2/test/core/linker/integration_spec.ts index 3274432085..96907f7b48 100644 --- a/modules/angular2/test/core/linker/integration_spec.ts +++ b/modules/angular2/test/core/linker/integration_spec.ts @@ -92,7 +92,7 @@ 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'; +import {IS_DART} from 'angular2/src/core/facade/lang'; const ANCHOR_ELEMENT = CONST_EXPR(new OpaqueToken('AnchorElement')); diff --git a/modules/angular2/test/core/linker/query_list_spec.ts b/modules/angular2/test/core/linker/query_list_spec.ts index b6d46b9917..f1de91ae27 100644 --- a/modules/angular2/test/core/linker/query_list_spec.ts +++ b/modules/angular2/test/core/linker/query_list_spec.ts @@ -10,10 +10,8 @@ import { fakeAsync, tick } from 'angular2/testing_internal'; -import {IS_DART} from '../../platform'; - import {MapWrapper, ListWrapper, iterateListLike} from 'angular2/src/core/facade/collection'; -import {StringWrapper} from 'angular2/src/core/facade/lang'; +import {IS_DART, StringWrapper} from 'angular2/src/core/facade/lang'; import {ObservableWrapper} from 'angular2/src/core/facade/async'; 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/reflection/reflector_spec.ts b/modules/angular2/test/core/reflection/reflector_spec.ts index 45c2cc5daa..89125c10c4 100644 --- a/modules/angular2/test/core/reflection/reflector_spec.ts +++ b/modules/angular2/test/core/reflection/reflector_spec.ts @@ -18,7 +18,7 @@ import { propDecorator, HasGetterAndSetterDecorators } from './reflector_common'; -import {IS_DART} from '../../platform'; +import {IS_DART} from 'angular2/src/core/facade/lang'; class AType { value; diff --git a/modules/angular2/test/core/spies.dart b/modules/angular2/test/core/spies.dart index caa9706c12..e7f4852cb4 100644 --- a/modules/angular2/test/core/spies.dart +++ b/modules/angular2/test/core/spies.dart @@ -14,7 +14,6 @@ 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/testing_internal.dart'; -import 'package:angular2/src/core/compiler/xhr.dart'; @proxy class SpyDependencyProvider extends SpyObject implements DependencyProvider { @@ -103,11 +102,6 @@ class SpyDomAdapter extends SpyObject implements DomAdapter { noSuchMethod(m) => super.noSuchMethod(m); } -@proxy -class SpyXHR extends SpyObject implements XHR { - noSuchMethod(m) => super.noSuchMethod(m); -} - @proxy class SpyRenderEventDispatcher extends SpyObject implements RenderEventDispatcher { diff --git a/modules/angular2/test/core/spies.ts b/modules/angular2/test/core/spies.ts index 163ad1bc2e..baea3c17f1 100644 --- a/modules/angular2/test/core/spies.ts +++ b/modules/angular2/test/core/spies.ts @@ -16,7 +16,6 @@ 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/compiler/xhr'; import { ElementInjector, @@ -98,10 +97,6 @@ export class SpyDomAdapter extends SpyObject { constructor() { super(DomAdapter); } } -export class SpyXHR extends SpyObject { - constructor() { super(XHR); } -} - export class SpyRenderEventDispatcher extends SpyObject { constructor() { // Note: RenderEventDispatcher is an interface, diff --git a/modules/angular2/test/platform.dart b/modules/angular2/test/platform.dart deleted file mode 100644 index 0f2dd598d0..0000000000 --- a/modules/angular2/test/platform.dart +++ /dev/null @@ -1,3 +0,0 @@ -library angular2.test.platform; - -const IS_DART = true; diff --git a/modules/angular2/test/platform.ts b/modules/angular2/test/platform.ts deleted file mode 100644 index f4af29fa63..0000000000 --- a/modules/angular2/test/platform.ts +++ /dev/null @@ -1 +0,0 @@ -export const IS_DART = false; diff --git a/modules/angular2/test/router/route_registry_spec.ts b/modules/angular2/test/router/route_registry_spec.ts index 8421694607..3a764c51fa 100644 --- a/modules/angular2/test/router/route_registry_spec.ts +++ b/modules/angular2/test/router/route_registry_spec.ts @@ -22,7 +22,7 @@ import { AsyncRoute } from 'angular2/src/router/route_config_decorator'; import {stringifyInstruction} from 'angular2/src/router/instruction'; -import {IS_DART} from '../platform'; +import {IS_DART} from 'angular2/src/core/facade/lang'; export function main() { describe('RouteRegistry', () => { diff --git a/modules/angular2/test/testing/testing_public_spec.ts b/modules/angular2/test/testing/testing_public_spec.ts index e35e5af0a3..3d5ca49552 100644 --- a/modules/angular2/test/testing/testing_public_spec.ts +++ b/modules/angular2/test/testing/testing_public_spec.ts @@ -16,8 +16,8 @@ import { import {Injectable, NgIf, bind} from 'angular2/core'; import {Directive, Component, View, ViewMetadata} from 'angular2/angular2'; -import {XHR} from 'angular2/src/core/compiler/xhr'; -import {XHRImpl} from 'angular2/src/core/compiler/xhr_impl'; +import {XHR} from 'angular2/src/compiler/xhr'; +import {XHRImpl} from 'angular2/src/compiler/xhr_impl'; // Services, and components for the tests. diff --git a/modules/angular2_material/test/test_url_resolver.dart b/modules/angular2_material/test/test_url_resolver.dart index cf9bc0c292..cbc582def7 100644 --- a/modules/angular2_material/test/test_url_resolver.dart +++ b/modules/angular2_material/test/test_url_resolver.dart @@ -1,7 +1,7 @@ library ng_material.test_url_resolver; import 'package:angular2/src/core/dom/browser_adapter.dart'; -import 'package:angular2/src/core/compiler/url_resolver.dart'; +import 'package:angular2/src/compiler/url_resolver.dart'; void commonDemoSetup() { BrowserDomAdapter.makeCurrent(); diff --git a/modules/angular2_material/test/test_url_resolver.ts b/modules/angular2_material/test/test_url_resolver.ts index 4e9f7044fb..bab5e695d8 100644 --- a/modules/angular2_material/test/test_url_resolver.ts +++ b/modules/angular2_material/test/test_url_resolver.ts @@ -1,4 +1,4 @@ -import {UrlResolver} from 'angular2/src/core/compiler/url_resolver'; +import {UrlResolver} from 'angular2/src/compiler/url_resolver'; export class TestUrlResolver extends UrlResolver { constructor() { diff --git a/modules/benchmarks/src/compiler/selector_benchmark.ts b/modules/benchmarks/src/compiler/selector_benchmark.ts index b6513b9b89..f0b42f1dea 100644 --- a/modules/benchmarks/src/compiler/selector_benchmark.ts +++ b/modules/benchmarks/src/compiler/selector_benchmark.ts @@ -1,5 +1,5 @@ -import {SelectorMatcher} from "angular2/src/core/compiler/selector"; -import {CssSelector} from "angular2/src/core/compiler/selector"; +import {SelectorMatcher} from "angular2/src/compiler/selector"; +import {CssSelector} from "angular2/src/compiler/selector"; import {StringWrapper, Math} from 'angular2/src/core/facade/lang'; import {getIntParameter, bindAction} from 'angular2/src/testing/benchmark_util'; import {BrowserDomAdapter} from 'angular2/src/core/dom/browser_adapter'; diff --git a/modules/playground/src/material/demo_common.dart b/modules/playground/src/material/demo_common.dart index e97107257b..7101fd5a3a 100644 --- a/modules/playground/src/material/demo_common.dart +++ b/modules/playground/src/material/demo_common.dart @@ -1,7 +1,7 @@ library angular2_examples.material.demo_common; import 'package:angular2/src/core/dom/browser_adapter.dart'; -import 'package:angular2/src/core/compiler/url_resolver.dart'; +import 'package:angular2/src/compiler/url_resolver.dart'; void commonDemoSetup() { BrowserDomAdapter.makeCurrent(); diff --git a/modules/playground/src/material/demo_common.ts b/modules/playground/src/material/demo_common.ts index cef5c2cd12..cade834674 100644 --- a/modules/playground/src/material/demo_common.ts +++ b/modules/playground/src/material/demo_common.ts @@ -1,5 +1,5 @@ import {print} from 'angular2/src/core/facade/lang'; -import {UrlResolver} from 'angular2/src/core/compiler/url_resolver'; +import {UrlResolver} from 'angular2/src/compiler/url_resolver'; import {isPresent, isBlank, RegExpWrapper, StringWrapper} from 'angular2/src/core/facade/lang'; import {DOM} from 'angular2/src/core/dom/dom_adapter'; import {Injectable} from 'angular2/core'; diff --git a/modules/playground/src/material/progress-linear/index.ts b/modules/playground/src/material/progress-linear/index.ts index 7f9efed3f6..c6673a7b3c 100644 --- a/modules/playground/src/material/progress-linear/index.ts +++ b/modules/playground/src/material/progress-linear/index.ts @@ -1,7 +1,7 @@ import {bootstrap} from 'angular2/bootstrap'; import {bind, provide, Component, View, ViewEncapsulation} from 'angular2/core'; import {MdProgressLinear} from 'angular2_material/src/components/progress-linear/progress_linear'; -import {UrlResolver} from 'angular2/src/core/compiler/url_resolver'; +import {UrlResolver} from 'angular2/src/compiler/url_resolver'; import {commonDemoSetup, DemoUrlResolver} from '../demo_common'; @Component({ diff --git a/modules/playground/src/material/switcher/index.ts b/modules/playground/src/material/switcher/index.ts index 4d5ae84fb9..759c5156df 100644 --- a/modules/playground/src/material/switcher/index.ts +++ b/modules/playground/src/material/switcher/index.ts @@ -1,7 +1,7 @@ import {bootstrap} from 'angular2/bootstrap'; import {bind, provide, Component, View, ViewEncapsulation} from 'angular2/core'; import {MdSwitch} from 'angular2_material/src/components/switcher/switch'; -import {UrlResolver} from 'angular2/src/core/compiler/url_resolver'; +import {UrlResolver} from 'angular2/src/compiler/url_resolver'; import {commonDemoSetup, DemoUrlResolver} from '../demo_common'; @Component({ diff --git a/modules_dart/transform/lib/src/transform/common/code/source_module.dart b/modules_dart/transform/lib/src/transform/common/code/source_module.dart index d98358e19e..55fb3c82be 100644 --- a/modules_dart/transform/lib/src/transform/common/code/source_module.dart +++ b/modules_dart/transform/lib/src/transform/common/code/source_module.dart @@ -1,7 +1,7 @@ library angular2.transform.common.code.source_module; import 'package:analyzer/src/generated/scanner.dart' show Keyword; -import 'package:angular2/src/core/compiler/source_module.dart'; +import 'package:angular2/src/compiler/source_module.dart'; import 'uri.dart'; 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 cb24cf1ec8..bdddc5c519 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 @@ -3,8 +3,10 @@ library angular2.transform.common.directive_metadata_reader; import 'dart:async'; import 'package:analyzer/analyzer.dart'; -import 'package:angular2/src/core/compiler/directive_metadata.dart'; -import 'package:angular2/src/core/compiler/template_compiler.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/linker/interfaces.dart' show LifecycleHooks; import 'package:angular2/src/core/metadata/view.dart' show ViewEncapsulation; diff --git a/modules_dart/transform/lib/src/transform/common/ng_compiler.dart b/modules_dart/transform/lib/src/transform/common/ng_compiler.dart index e46af9c6c1..3fe80e1995 100644 --- a/modules_dart/transform/lib/src/transform/common/ng_compiler.dart +++ b/modules_dart/transform/lib/src/transform/common/ng_compiler.dart @@ -1,17 +1,17 @@ library angular2.transform.template_compiler.ng_compiler; -import 'package:angular2/src/core/compiler/command_compiler.dart'; -import 'package:angular2/src/core/compiler/html_parser.dart'; -import 'package:angular2/src/core/compiler/style_compiler.dart'; -import 'package:angular2/src/core/compiler/template_compiler.dart'; -import 'package:angular2/src/core/compiler/template_normalizer.dart'; -import 'package:angular2/src/core/compiler/template_parser.dart'; +import 'package:angular2/src/compiler/command_compiler.dart'; +import 'package:angular2/src/compiler/html_parser.dart'; +import 'package:angular2/src/compiler/style_compiler.dart'; +import 'package:angular2/src/compiler/template_compiler.dart'; +import 'package:angular2/src/compiler/template_normalizer.dart'; +import 'package:angular2/src/compiler/template_parser.dart'; import 'package:angular2/src/core/change_detection/parser/lexer.dart' as ng; import 'package:angular2/src/core/change_detection/parser/parser.dart' as ng; -import 'package:angular2/src/core/compiler/schema/dom_element_schema_registry.dart'; +import 'package:angular2/src/compiler/schema/dom_element_schema_registry.dart'; import 'package:angular2/src/transform/common/asset_reader.dart'; import 'package:angular2/src/core/change_detection/interfaces.dart'; -import 'package:angular2/src/core/compiler/change_detector_compiler.dart'; +import 'package:angular2/src/compiler/change_detector_compiler.dart'; import 'xhr_impl.dart'; import 'url_resolver.dart'; diff --git a/modules_dart/transform/lib/src/transform/common/ng_meta.dart b/modules_dart/transform/lib/src/transform/common/ng_meta.dart index ac543fe153..0ba3fa2310 100644 --- a/modules_dart/transform/lib/src/transform/common/ng_meta.dart +++ b/modules_dart/transform/lib/src/transform/common/ng_meta.dart @@ -1,6 +1,6 @@ library angular2.transform.common.ng_meta; -import 'package:angular2/src/core/compiler/directive_metadata.dart'; +import 'package:angular2/src/compiler/directive_metadata.dart'; import 'logging.dart'; import 'model/ng_deps_model.pb.dart'; import 'url_resolver.dart' show isDartCoreUri; diff --git a/modules_dart/transform/lib/src/transform/common/xhr_impl.dart b/modules_dart/transform/lib/src/transform/common/xhr_impl.dart index bf9c5aed6f..6b39efa364 100644 --- a/modules_dart/transform/lib/src/transform/common/xhr_impl.dart +++ b/modules_dart/transform/lib/src/transform/common/xhr_impl.dart @@ -1,7 +1,7 @@ library angular2.transform.template_compiler.xhr_impl; import 'dart:async'; -import 'package:angular2/src/core/compiler/xhr.dart' show XHR; +import 'package:angular2/src/compiler/xhr.dart' show XHR; import 'package:angular2/src/transform/common/asset_reader.dart'; import 'package:angular2/src/transform/common/logging.dart'; import 'package:angular2/src/transform/common/url_resolver.dart'; diff --git a/modules_dart/transform/lib/src/transform/common/zone.dart b/modules_dart/transform/lib/src/transform/common/zone.dart index af215168d8..c6d16ec155 100644 --- a/modules_dart/transform/lib/src/transform/common/zone.dart +++ b/modules_dart/transform/lib/src/transform/common/zone.dart @@ -6,7 +6,7 @@ import 'package:analyzer/analyzer.dart'; import 'package:barback/barback.dart'; import 'package:source_span/source_span.dart'; -import 'package:angular2/src/core/compiler/template_compiler.dart'; +import 'package:angular2/src/compiler/template_compiler.dart'; typedef _SimpleCallback(); diff --git a/modules_dart/transform/lib/src/transform/directive_processor/rewriter.dart b/modules_dart/transform/lib/src/transform/directive_processor/rewriter.dart index f6f6b51474..4dfd584b76 100644 --- a/modules_dart/transform/lib/src/transform/directive_processor/rewriter.dart +++ b/modules_dart/transform/lib/src/transform/directive_processor/rewriter.dart @@ -5,7 +5,7 @@ import 'dart:async'; import 'package:analyzer/analyzer.dart'; import 'package:barback/barback.dart' show AssetId; -import 'package:angular2/src/core/compiler/template_compiler.dart'; +import 'package:angular2/src/compiler/template_compiler.dart'; import 'package:angular2/src/transform/common/annotation_matcher.dart'; import 'package:angular2/src/transform/common/asset_reader.dart'; import 'package:angular2/src/transform/common/code/ng_deps_code.dart'; diff --git a/modules_dart/transform/lib/src/transform/inliner_for_test/transformer.dart b/modules_dart/transform/lib/src/transform/inliner_for_test/transformer.dart index dc5fdf94ab..034a3057f4 100644 --- a/modules_dart/transform/lib/src/transform/inliner_for_test/transformer.dart +++ b/modules_dart/transform/lib/src/transform/inliner_for_test/transformer.dart @@ -7,7 +7,7 @@ import 'package:analyzer/src/generated/ast.dart'; import 'package:barback/barback.dart'; import 'package:dart_style/dart_style.dart'; -import 'package:angular2/src/core/compiler/xhr.dart' show XHR; +import 'package:angular2/src/compiler/xhr.dart' show XHR; import 'package:angular2/src/transform/common/annotation_matcher.dart'; import 'package:angular2/src/transform/common/asset_reader.dart'; import 'package:angular2/src/transform/common/naive_eval.dart'; diff --git a/modules_dart/transform/lib/src/transform/stylesheet_compiler/processor.dart b/modules_dart/transform/lib/src/transform/stylesheet_compiler/processor.dart index 41d7ba77cc..80d2cdc90a 100644 --- a/modules_dart/transform/lib/src/transform/stylesheet_compiler/processor.dart +++ b/modules_dart/transform/lib/src/transform/stylesheet_compiler/processor.dart @@ -2,7 +2,7 @@ library angular2.transform.stylesheet_compiler.processor; import 'dart:async'; -import 'package:angular2/src/core/compiler/source_module.dart'; +import 'package:angular2/src/compiler/source_module.dart'; import 'package:angular2/src/transform/common/asset_reader.dart'; import 'package:angular2/src/transform/common/code/source_module.dart'; import 'package:angular2/src/transform/common/logging.dart'; diff --git a/modules_dart/transform/lib/src/transform/template_compiler/compile_data_creator.dart b/modules_dart/transform/lib/src/transform/template_compiler/compile_data_creator.dart index 06eb09727c..07f5de84c5 100644 --- a/modules_dart/transform/lib/src/transform/template_compiler/compile_data_creator.dart +++ b/modules_dart/transform/lib/src/transform/template_compiler/compile_data_creator.dart @@ -3,8 +3,8 @@ library angular2.transform.template_compiler.compile_data_creator; import 'dart:async'; import 'dart:convert'; -import 'package:angular2/src/core/compiler/directive_metadata.dart'; -import 'package:angular2/src/core/compiler/template_compiler.dart'; +import 'package:angular2/src/compiler/directive_metadata.dart'; +import 'package:angular2/src/compiler/template_compiler.dart'; import 'package:angular2/src/transform/common/asset_reader.dart'; import 'package:angular2/src/transform/common/logging.dart'; import 'package:angular2/src/transform/common/model/ng_deps_model.pb.dart'; diff --git a/modules_dart/transform/lib/src/transform/template_compiler/reflection/model.dart b/modules_dart/transform/lib/src/transform/template_compiler/reflection/model.dart index 80b68d1167..c590be9f3e 100644 --- a/modules_dart/transform/lib/src/transform/template_compiler/reflection/model.dart +++ b/modules_dart/transform/lib/src/transform/template_compiler/reflection/model.dart @@ -1,6 +1,6 @@ library angular2.transform.template_compiler.reflection.model; -import 'package:angular2/src/core/compiler/util.dart'; +import 'package:angular2/src/compiler/util.dart'; import 'package:angular2/src/core/linker/event_config.dart'; /// Defines the names of getters, setters, and methods which need to be diff --git a/modules_dart/transform/lib/src/transform/template_compiler/reflection/processor.dart b/modules_dart/transform/lib/src/transform/template_compiler/reflection/processor.dart index 48c8bcaceb..d51157ebe7 100644 --- a/modules_dart/transform/lib/src/transform/template_compiler/reflection/processor.dart +++ b/modules_dart/transform/lib/src/transform/template_compiler/reflection/processor.dart @@ -1,6 +1,6 @@ library angular2.transform.template_compiler.reflection.processor; -import 'package:angular2/src/core/compiler/directive_metadata.dart'; +import 'package:angular2/src/compiler/directive_metadata.dart'; import 'model.dart'; diff --git a/modules_dart/transform/test/transform/common/ng_meta_helper.dart b/modules_dart/transform/test/transform/common/ng_meta_helper.dart index 0debc4c34a..cbc7475b08 100644 --- a/modules_dart/transform/test/transform/common/ng_meta_helper.dart +++ b/modules_dart/transform/test/transform/common/ng_meta_helper.dart @@ -1,10 +1,10 @@ library angular2.test.transform.common.ng_meta_helper; -import 'package:angular2/src/core/compiler/directive_metadata.dart'; +import 'package:angular2/src/compiler/directive_metadata.dart'; import 'package:angular2/src/core/change_detection/change_detection.dart'; import 'package:angular2/src/core/metadata/view.dart' show ViewEncapsulation; -export 'package:angular2/src/core/compiler/directive_metadata.dart'; +export 'package:angular2/src/compiler/directive_metadata.dart'; export 'package:angular2/src/core/change_detection/change_detection.dart'; export 'package:angular2/src/core/metadata/view.dart' show ViewEncapsulation; export 'package:angular2/src/transform/common/model/annotation_model.pb.dart'; diff --git a/modules_dart/transform/test/transform/common/ng_meta_test.dart b/modules_dart/transform/test/transform/common/ng_meta_test.dart index f8d6b11664..d7f5c1051f 100644 --- a/modules_dart/transform/test/transform/common/ng_meta_test.dart +++ b/modules_dart/transform/test/transform/common/ng_meta_test.dart @@ -1,7 +1,7 @@ library angular2.test.transform.common.annotation_matcher_test; import 'package:angular2/src/core/render/api.dart'; -import 'package:angular2/src/core/compiler/directive_metadata.dart'; +import 'package:angular2/src/compiler/directive_metadata.dart'; import 'package:angular2/src/transform/common/ng_meta.dart'; import 'package:guinness/guinness.dart'; diff --git a/tools/broccoli/trees/node_tree.ts b/tools/broccoli/trees/node_tree.ts index c45f914ea6..fde5e89a43 100644 --- a/tools/broccoli/trees/node_tree.ts +++ b/tools/broccoli/trees/node_tree.ts @@ -24,7 +24,7 @@ module.exports = function makeNodeTree(destinationPath) { 'angular2/test/core/zone/**', 'angular2/test/testing/fake_async_spec.ts', 'angular2/test/testing/testing_public_spec.ts', - 'angular2/test/core/compiler/xhr_impl_spec.ts', + 'angular2/test/compiler/xhr_impl_spec.ts', 'angular2/test/core/forms/**', 'angular2/test/tools/tools_spec.ts', 'angular1_router/**',