refactor(compiler): re-arrange files

modules/@angular/compiler/compiler.ts

@@ -14,5 +14,5 @@
 export {COMPILER_PROVIDERS, CompileDiDependencyMetadata, CompileDirectiveMetadata, CompileFactoryMetadata, CompileIdentifierMetadata, CompileMetadataWithIdentifier, CompilePipeMetadata, CompileProviderMetadata, CompileQueryMetadata, CompileTemplateMetadata, CompileTokenMetadata, CompileTypeMetadata, CompilerConfig, DEFAULT_PACKAGE_URL_PROVIDER, DirectiveResolver, NgModuleResolver, OfflineCompiler, PipeResolver, RenderTypes, RuntimeCompiler, SourceModule, TEMPLATE_TRANSFORMS, UrlResolver, XHR, analyzeAppProvidersForDeprecatedConfiguration, createOfflineCompileUrlResolver, platformCoreDynamic} from './src/compiler';
 export {ElementSchemaRegistry} from './src/schema/element_schema_registry';
 
-export * from './src/template_ast';
+export * from './src/template_parser/template_ast';
 export * from './private_export';

modules/@angular/compiler/private_export.ts

@@ -9,7 +9,7 @@
 import * as directive_normalizer from './src/directive_normalizer';
 import * as lexer from './src/expression_parser/lexer';
 import * as parser from './src/expression_parser/parser';
-import * as html_parser from './src/html_parser';
+import * as html_parser from './src/html_parser/html_parser';
 import * as i18n_html_parser from './src/i18n/i18n_html_parser';
 import * as i18n_message from './src/i18n/message';
 import * as i18n_extractor from './src/i18n/message_extractor';
@@ -22,7 +22,7 @@ import * as parse_util from './src/parse_util';
 import * as dom_element_schema_registry from './src/schema/dom_element_schema_registry';
 import * as selector from './src/selector';
 import * as style_compiler from './src/style_compiler';
-import * as template_parser from './src/template_parser';
+import * as template_parser from './src/template_parser/template_parser';
 import * as view_compiler from './src/view_compiler/view_compiler';
 
 export namespace __compiler_private__ {

modules/@angular/compiler/src/animation/animation_compiler.ts

@@ -15,7 +15,7 @@ import {BaseException} from '../facade/exceptions';
 import {isArray, isBlank, isPresent} from '../facade/lang';
 import {Identifiers} from '../identifiers';
 import * as o from '../output/output_ast';
-import * as t from '../template_ast';
+import * as t from '../template_parser/template_ast';
 
 import {AnimationAst, AnimationAstVisitor, AnimationEntryAst, AnimationGroupAst, AnimationKeyframeAst, AnimationSequenceAst, AnimationStateAst, AnimationStateDeclarationAst, AnimationStateTransitionAst, AnimationStepAst, AnimationStylesAst} from './animation_ast';
 import {AnimationParseError, ParsedAnimationResult, parseAnimationEntry} from './animation_parser';

modules/@angular/compiler/src/compiler.ts

@@ -8,8 +8,8 @@
 
 import {Compiler, CompilerFactory, CompilerOptions, Component, ComponentResolver, Inject, Injectable, NgModule, PLATFORM_DIRECTIVES, PLATFORM_INITIALIZER, PLATFORM_PIPES, PlatformRef, ReflectiveInjector, Type, ViewEncapsulation, createPlatformFactory, disposePlatform, isDevMode, platformCore} from '@angular/core';
 
-export * from './template_ast';
-export {TEMPLATE_TRANSFORMS} from './template_parser';
+export * from './template_parser/template_ast';
+export {TEMPLATE_TRANSFORMS} from './template_parser/template_parser';
 export {CompilerConfig, RenderTypes} from './config';
 export * from './compile_metadata';
 export * from './offline_compiler';
@@ -23,8 +23,8 @@ export {NgModuleResolver} from './ng_module_resolver';
 
 import {stringify} from './facade/lang';
 import {ListWrapper} from './facade/collection';
-import {TemplateParser} from './template_parser';
-import {HtmlParser} from './html_parser';
+import {TemplateParser} from './template_parser/template_parser';
+import {HtmlParser} from './html_parser/html_parser';
 import {DirectiveNormalizer} from './directive_normalizer';
 import {CompileMetadataResolver} from './metadata_resolver';
 import {StyleCompiler} from './style_compiler';

modules/@angular/compiler/src/css_parser/css_ast.ts

@@ -6,8 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {ParseLocation, ParseSourceSpan} from '../parse_util';
+
 import {CssToken, CssTokenType} from './css_lexer';
-import {ParseLocation, ParseSourceSpan} from './parse_util';
 
 export enum BlockType {
   Import,

modules/@angular/compiler/src/css_parser/css_lexer.ts

@@ -6,9 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import * as chars from './chars';
-import {BaseException} from './facade/exceptions';
-import {StringWrapper, isPresent, resolveEnumToken} from './facade/lang';
+import * as chars from '../chars';
+import {BaseException} from '../facade/exceptions';
+import {StringWrapper, isPresent, resolveEnumToken} from '../facade/lang';
 
 export enum CssTokenType {
   EOF,

modules/@angular/compiler/src/css_parser/css_parser.ts

@@ -6,11 +6,12 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import * as chars from './chars';
+import * as chars from '../chars';
+import {isPresent} from '../facade/lang';
+import {ParseError, ParseLocation, ParseSourceFile, ParseSourceSpan} from '../parse_util';
+
 import {BlockType, CssAst, CssAtRulePredicateAst, CssBlockAst, CssBlockDefinitionRuleAst, CssBlockRuleAst, CssDefinitionAst, CssInlineRuleAst, CssKeyframeDefinitionAst, CssKeyframeRuleAst, CssMediaQueryRuleAst, CssPseudoSelectorAst, CssRuleAst, CssSelectorAst, CssSelectorRuleAst, CssSimpleSelectorAst, CssStyleSheetAst, CssStyleValueAst, CssStylesBlockAst, CssUnknownRuleAst, CssUnknownTokenListAst, mergeTokens} from './css_ast';
 import {CssLexer, CssLexerMode, CssScanner, CssToken, CssTokenType, generateErrorMessage, isNewline} from './css_lexer';
-import {isPresent} from './facade/lang';
-import {ParseError, ParseLocation, ParseSourceFile, ParseSourceSpan} from './parse_util';
 
 const SPACE_OPERATOR = ' ';
 
@@ -49,10 +50,6 @@ function isSelectorOperatorCharacter(code: number): boolean {
   }
 }
 
-function getDelimFromToken(token: CssToken): number {
-  return getDelimFromCharacter(token.numValue);
-}
-
 function getDelimFromCharacter(code: number): number {
   switch (code) {
     case chars.$EOF:

modules/@angular/compiler/src/directive_normalizer.ts

@@ -12,11 +12,11 @@ import {BaseException} from '../src/facade/exceptions';
 import {isBlank, isPresent} from '../src/facade/lang';
 import {CompileDirectiveMetadata, CompileStylesheetMetadata, CompileTemplateMetadata, CompileTypeMetadata} from './compile_metadata';
 import {CompilerConfig} from './config';
-import {HtmlAstVisitor, HtmlAttrAst, HtmlCommentAst, HtmlElementAst, HtmlExpansionAst, HtmlExpansionCaseAst, HtmlTextAst, htmlVisitAll} from './html_ast';
-import {HtmlParser} from './html_parser';
-import {InterpolationConfig} from './interpolation_config';
+import {HtmlAstVisitor, HtmlAttrAst, HtmlCommentAst, HtmlElementAst, HtmlExpansionAst, HtmlExpansionCaseAst, HtmlTextAst, htmlVisitAll} from './html_parser/html_ast';
+import {HtmlParser} from './html_parser/html_parser';
+import {InterpolationConfig} from './html_parser/interpolation_config';
 import {extractStyleUrls, isStyleUrlResolvable} from './style_url_resolver';
-import {PreparsedElementType, preparseElement} from './template_preparser';
+import {PreparsedElementType, preparseElement} from './template_parser/template_preparser';
 import {UrlResolver} from './url_resolver';
 import {SyncAsyncResult} from './util';
 import {XHR} from './xhr';

modules/@angular/compiler/src/expression_parser/parser.ts

@@ -12,7 +12,7 @@ import * as chars from '../chars';
 import {ListWrapper} from '../facade/collection';
 import {BaseException} from '../facade/exceptions';
 import {RegExpWrapper, StringWrapper, escapeRegExp, isBlank, isPresent} from '../facade/lang';
-import {DEFAULT_INTERPOLATION_CONFIG, InterpolationConfig} from '../interpolation_config';
+import {DEFAULT_INTERPOLATION_CONFIG, InterpolationConfig} from '../html_parser/interpolation_config';
 
 import {AST, ASTWithSource, AstVisitor, Binary, BindingPipe, Chain, Conditional, EmptyExpr, FunctionCall, ImplicitReceiver, Interpolation, KeyedRead, KeyedWrite, LiteralArray, LiteralMap, LiteralPrimitive, MethodCall, ParseSpan, ParserError, PrefixNot, PropertyRead, PropertyWrite, Quote, SafeMethodCall, SafePropertyRead, TemplateBinding} from './ast';
 import {EOF, Lexer, Token, TokenType, isIdentifier, isQuote} from './lexer';

modules/@angular/compiler/src/html_parser/expander.ts

@@ -6,8 +6,10 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {ParseError, ParseSourceSpan} from '../parse_util';
+
 import {HtmlAst, HtmlAstVisitor, HtmlAttrAst, HtmlCommentAst, HtmlElementAst, HtmlExpansionAst, HtmlExpansionCaseAst, HtmlTextAst, htmlVisitAll} from './html_ast';
-import {ParseError, ParseSourceSpan} from './parse_util';
+
 
 // http://cldr.unicode.org/index/cldr-spec/plural-rules
 const PLURAL_CASES: string[] = ['zero', 'one', 'two', 'few', 'many', 'other'];

modules/@angular/compiler/src/html_parser/html_ast.ts

@@ -6,9 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {isPresent} from '../src/facade/lang';
+import {isPresent} from '../facade/lang';
 
-import {ParseSourceSpan} from './parse_util';
+import {ParseSourceSpan} from '../parse_util';
 
 export interface HtmlAst {
   sourceSpan: ParseSourceSpan;

modules/@angular/compiler/src/html_parser/html_lexer.ts

@@ -6,11 +6,12 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import * as chars from './chars';
-import {isBlank, isPresent} from './facade/lang';
+import * as chars from '../chars';
+import {isBlank, isPresent} from '../facade/lang';
+import {ParseError, ParseLocation, ParseSourceFile, ParseSourceSpan} from '../parse_util';
+
 import {HtmlTagContentType, NAMED_ENTITIES, getHtmlTagDefinition} from './html_tags';
 import {DEFAULT_INTERPOLATION_CONFIG, InterpolationConfig} from './interpolation_config';
-import {ParseError, ParseLocation, ParseSourceFile, ParseSourceSpan} from './parse_util';
 
 export enum HtmlTokenType {
   TAG_OPEN_START,

modules/@angular/compiler/src/html_parser/html_parser.ts

@@ -6,12 +6,12 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Injectable} from '@angular/core';
-import {isPresent, isBlank,} from '../src/facade/lang';
-import {ListWrapper} from '../src/facade/collection';
+import {Injectable} from '../../../core/index';
+import {isPresent, isBlank,} from '../facade/lang';
+import {ListWrapper} from '../facade/collection';
 import {HtmlAst, HtmlAttrAst, HtmlTextAst, HtmlCommentAst, HtmlElementAst, HtmlExpansionAst, HtmlExpansionCaseAst} from './html_ast';
 import {HtmlToken, HtmlTokenType, tokenizeHtml} from './html_lexer';
-import {ParseError, ParseSourceSpan} from './parse_util';
+import {ParseError, ParseSourceSpan} from '../parse_util';
 import {getHtmlTagDefinition, getNsPrefix, mergeNsAndName} from './html_tags';
 import {DEFAULT_INTERPOLATION_CONFIG, InterpolationConfig} from './interpolation_config';
 

modules/@angular/compiler/src/html_parser/html_tags.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {normalizeBool, RegExpWrapper,} from '../src/facade/lang';
+import {normalizeBool, RegExpWrapper,} from '../facade/lang';
 
 // see http://www.w3.org/TR/html51/syntax.html#named-character-references
 // see https://html.spec.whatwg.org/multipage/entities.json

modules/@angular/compiler/src/html_parser/interpolation_config.ts

@@ -6,8 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {assertInterpolationSymbols} from './assertions';
-import {isBlank} from './facade/lang';
+import {assertInterpolationSymbols} from '../assertions';
 
 export class InterpolationConfig {
   static fromArray(markers: [string, string]): InterpolationConfig {

modules/@angular/compiler/src/i18n/catalog.ts

@@ -6,8 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {HtmlParser} from '../html_parser';
-import {InterpolationConfig} from '../interpolation_config';
+import {HtmlParser} from '../html_parser/html_parser';
+import {InterpolationConfig} from '../html_parser/interpolation_config';
 
 import * as i18nAst from './i18n_ast';
 import {extractI18nMessages} from './i18n_parser';

modules/@angular/compiler/src/i18n/extractor.ts

@@ -6,9 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {HtmlAst, HtmlAstVisitor, HtmlAttrAst, HtmlCommentAst, HtmlElementAst, HtmlExpansionAst, HtmlExpansionCaseAst, HtmlTextAst} from '../html_ast';
+import {HtmlAst, HtmlAstVisitor, HtmlAttrAst, HtmlCommentAst, HtmlElementAst, HtmlExpansionAst, HtmlExpansionCaseAst, HtmlTextAst} from '../html_parser/html_ast';
 import {I18nError, I18N_ATTR_PREFIX, getI18nAttr, meaning, description, isOpeningComment, isClosingComment,} from './shared';
-import {htmlVisitAll} from '@angular/compiler/src/html_ast';
+import {htmlVisitAll} from '../html_parser/html_ast';
 
 export function extractAstMessages(
     sourceAst: HtmlAst[], implicitTags: string[],

modules/@angular/compiler/src/i18n/i18n_html_parser.ts

@@ -10,9 +10,9 @@ import {Parser as ExpressionParser} from '../expression_parser/parser';
 import {ListWrapper, StringMapWrapper} from '../facade/collection';
 import {BaseException} from '../facade/exceptions';
 import {NumberWrapper, RegExpWrapper, isPresent} from '../facade/lang';
-import {HtmlAst, HtmlAstVisitor, HtmlAttrAst, HtmlCommentAst, HtmlElementAst, HtmlExpansionAst, HtmlExpansionCaseAst, HtmlTextAst, htmlVisitAll} from '../html_ast';
-import {HtmlParseTreeResult, HtmlParser} from '../html_parser';
-import {DEFAULT_INTERPOLATION_CONFIG, InterpolationConfig} from '../interpolation_config';
+import {HtmlAst, HtmlAstVisitor, HtmlAttrAst, HtmlCommentAst, HtmlElementAst, HtmlExpansionAst, HtmlExpansionCaseAst, HtmlTextAst, htmlVisitAll} from '../html_parser/html_ast';
+import {HtmlParseTreeResult, HtmlParser} from '../html_parser/html_parser';
+import {DEFAULT_INTERPOLATION_CONFIG, InterpolationConfig} from '../html_parser/interpolation_config';
 import {ParseError, ParseSourceSpan} from '../parse_util';
 import {Message, id} from './message';
 import {I18N_ATTR, I18N_ATTR_PREFIX, I18nError, Part, dedupePhName, extractPhNameFromInterpolation, messageFromAttribute, messageFromI18nAttribute, partition} from './shared';

modules/@angular/compiler/src/i18n/i18n_parser.ts

@@ -8,9 +8,9 @@
 
 import {Lexer as ExpressionLexer} from '../expression_parser/lexer';
 import {Parser as ExpressionParser} from '../expression_parser/parser';
-import * as hAst from '../html_ast';
-import {getHtmlTagDefinition} from '../html_tags';
-import {InterpolationConfig} from '../interpolation_config';
+import * as hAst from '../html_parser/html_ast';
+import {getHtmlTagDefinition} from '../html_parser/html_tags';
+import {InterpolationConfig} from '../html_parser/interpolation_config';
 import {ParseSourceSpan} from '../parse_util';
 
 import {extractAstMessages} from './extractor';

modules/@angular/compiler/src/i18n/message_extractor.ts

@@ -9,9 +9,9 @@
 import {Parser as ExpressionParser} from '../expression_parser/parser';
 import {StringMapWrapper} from '../facade/collection';
 import {isPresent} from '../facade/lang';
-import {HtmlAst, HtmlElementAst} from '../html_ast';
-import {HtmlParser} from '../html_parser';
-import {DEFAULT_INTERPOLATION_CONFIG, InterpolationConfig} from '../interpolation_config';
+import {HtmlAst, HtmlElementAst} from '../html_parser/html_ast';
+import {HtmlParser} from '../html_parser/html_parser';
+import {DEFAULT_INTERPOLATION_CONFIG, InterpolationConfig} from '../html_parser/interpolation_config';
 import {ParseError} from '../parse_util';
 
 import {Message, id} from './message';

modules/@angular/compiler/src/i18n/shared.ts

@@ -9,8 +9,8 @@
 import {normalizeBlank} from '../../../router-deprecated/src/facade/lang';
 import {Parser as ExpressionParser} from '../expression_parser/parser';
 import {StringWrapper, isBlank, isPresent} from '../facade/lang';
-import {HtmlAst, HtmlAstVisitor, HtmlAttrAst, HtmlCommentAst, HtmlElementAst, HtmlExpansionAst, HtmlExpansionCaseAst, HtmlTextAst, htmlVisitAll} from '../html_ast';
-import {InterpolationConfig} from '../interpolation_config';
+import {HtmlAst, HtmlAstVisitor, HtmlAttrAst, HtmlCommentAst, HtmlElementAst, HtmlExpansionAst, HtmlExpansionCaseAst, HtmlTextAst, htmlVisitAll} from '../html_parser/html_ast';
+import {InterpolationConfig} from '../html_parser/interpolation_config';
 import {ParseError, ParseSourceSpan} from '../parse_util';
 
 import {Message} from './message';

modules/@angular/compiler/src/i18n/xmb_serializer.ts

@@ -7,8 +7,8 @@
  */
 
 import {RegExpWrapper, isPresent} from '../facade/lang';
-import {HtmlAst, HtmlElementAst} from '../html_ast';
-import {HtmlParser} from '../html_parser';
+import {HtmlAst, HtmlElementAst} from '../html_parser/html_ast';
+import {HtmlParser} from '../html_parser/html_parser';
 import {ParseError, ParseSourceSpan} from '../parse_util';
 
 import {Message, id} from './message';

modules/@angular/compiler/src/metadata_resolver.ts

@@ -11,7 +11,7 @@ import {AnimationAnimateMetadata, AnimationEntryMetadata, AnimationGroupMetadata
 import {Console, LIFECYCLE_HOOKS_VALUES, ReflectorReader, createProvider, isProviderLiteral, reflector} from '../core_private';
 import {MapWrapper, StringMapWrapper} from '../src/facade/collection';
 import {BaseException} from '../src/facade/exceptions';
-import {Type, isArray, isBlank, isPresent, isString, isStringMap, stringify} from '../src/facade/lang';
+import {Type, isArray, isBlank, isPresent, isString, stringify} from '../src/facade/lang';
 
 import {assertArrayOfStrings, assertInterpolationSymbols} from './assertions';
 import * as cpl from './compile_metadata';

modules/@angular/compiler/src/ng_module_compiler.ts

@@ -15,7 +15,7 @@ import * as o from './output/output_ast';
 import {convertValueToOutputAst} from './output/value_util';
 import {ParseLocation, ParseSourceFile, ParseSourceSpan} from './parse_util';
 import {NgModuleProviderAnalyzer} from './provider_analyzer';
-import {ProviderAst, ProviderAstType} from './template_ast';
+import {ProviderAst} from './template_parser/template_ast';
 import {createDiTokenExpression} from './util';
 
 export class ComponentFactoryDependency {

modules/@angular/compiler/src/offline_compiler.ts

@@ -17,7 +17,7 @@ import {NgModuleCompiler} from './ng_module_compiler';
 import {OutputEmitter} from './output/abstract_emitter';
 import * as o from './output/output_ast';
 import {CompiledStylesheet, StyleCompiler} from './style_compiler';
-import {TemplateParser} from './template_parser';
+import {TemplateParser} from './template_parser/template_parser';
 import {ComponentFactoryDependency, ViewCompileResult, ViewCompiler, ViewFactoryDependency} from './view_compiler/view_compiler';
 
 export class SourceModule {

modules/@angular/compiler/src/provider_analyzer.ts

@@ -13,7 +13,7 @@ import {isArray, isBlank, isPresent, normalizeBlank} from '../src/facade/lang';
 import {CompileDiDependencyMetadata, CompileDirectiveMetadata, CompileIdentifierMap, CompileNgModuleMetadata, CompileProviderMetadata, CompileQueryMetadata, CompileTokenMetadata, CompileTypeMetadata} from './compile_metadata';
 import {Identifiers, identifierToken} from './identifiers';
 import {ParseError, ParseSourceSpan} from './parse_util';
-import {AttrAst, DirectiveAst, ProviderAst, ProviderAstType, ReferenceAst, VariableAst} from './template_ast';
+import {AttrAst, DirectiveAst, ProviderAst, ProviderAstType, ReferenceAst, VariableAst} from './template_parser/template_ast';
 
 export class ProviderError extends ParseError {
   constructor(message: string, span: ParseSourceSpan) { super(span, message); }

modules/@angular/compiler/src/runtime_compiler.ts

@@ -12,14 +12,12 @@ import {Console} from '../core_private';
 import {BaseException} from '../src/facade/exceptions';
 import {ConcreteType, IS_DART, Type, isBlank, isString, stringify} from '../src/facade/lang';
 
-import {ListWrapper,} from '../src/facade/collection';
 import {PromiseWrapper} from '../src/facade/async';
 import {createHostComponentMeta, CompileDirectiveMetadata, CompilePipeMetadata, CompileIdentifierMetadata, CompileNgModuleMetadata} from './compile_metadata';
-import {TemplateAst,} from './template_ast';
-import {StyleCompiler, StylesCompileDependency, CompiledStylesheet} from './style_compiler';
-import {ViewCompiler, ViewCompileResult, ViewFactoryDependency, ComponentFactoryDependency} from './view_compiler/view_compiler';
+import {StyleCompiler, CompiledStylesheet} from './style_compiler';
+import {ViewCompiler, ViewFactoryDependency, ComponentFactoryDependency} from './view_compiler/view_compiler';
 import {NgModuleCompiler} from './ng_module_compiler';
-import {TemplateParser} from './template_parser';
+import {TemplateParser} from './template_parser/template_parser';
 import {DirectiveNormalizer} from './directive_normalizer';
 import {CompileMetadataResolver} from './metadata_resolver';
 import {CompilerConfig} from './config';

modules/@angular/compiler/src/template_parser/template_ast.ts

@@ -6,11 +6,12 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {isPresent} from '../src/facade/lang';
-import {AST} from './expression_parser/ast';
-import {CompileDirectiveMetadata, CompileTokenMetadata, CompileProviderMetadata,} from './compile_metadata';
-import {ParseSourceSpan} from './parse_util';
-import {SecurityContext} from '@angular/core';
+import {AST} from '../expression_parser/ast';
+import {isPresent} from '../facade/lang';
+
+import {CompileDirectiveMetadata, CompileTokenMetadata, CompileProviderMetadata,} from '../compile_metadata';
+import {ParseSourceSpan} from '../parse_util';
+import {SecurityContext} from '../../../core/index';
 
 /**
  * An Abstract Syntax Tree node representing part of a parsed Angular template.

modules/@angular/compiler/src/template_parser/template_parser.ts

@@ -6,30 +6,31 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Inject, Injectable, OpaqueToken, Optional, SchemaMetadata, SecurityContext} from '@angular/core';
-
-import {Console, MAX_INTERPOLATION_VALUES} from '../core_private';
-
-import {ListWrapper, StringMapWrapper, SetWrapper,} from '../src/facade/collection';
-import {RegExpWrapper, isPresent, StringWrapper, isBlank} from '../src/facade/lang';
-import {BaseException} from '../src/facade/exceptions';
-import {AST, Interpolation, ASTWithSource, TemplateBinding, RecursiveAstVisitor, BindingPipe, ParserError} from './expression_parser/ast';
-import {Parser} from './expression_parser/parser';
-import {CompileDirectiveMetadata, CompilePipeMetadata, CompileMetadataWithIdentifier, CompileTokenMetadata, CompileIdentifierMap, removeIdentifierDuplicates} from './compile_metadata';
-import {HtmlParser, HtmlParseTreeResult} from './html_parser';
-import {splitNsName, mergeNsAndName} from './html_tags';
-import {ParseSourceSpan, ParseError, ParseErrorLevel} from './parse_util';
-import {InterpolationConfig} from './interpolation_config';
+import {Inject, Injectable, OpaqueToken, Optional, SecurityContext, SchemaMetadata} from '../../../core/index';
+import {Console, MAX_INTERPOLATION_VALUES} from '../../core_private';
+import {ListWrapper, StringMapWrapper, SetWrapper,} from '../facade/collection';
+import {RegExpWrapper, isPresent, StringWrapper, isBlank} from '../facade/lang';
+import {BaseException} from '../facade/exceptions';
+import {AST, Interpolation, ASTWithSource, TemplateBinding, RecursiveAstVisitor, BindingPipe, ParserError} from '../expression_parser/ast';
+import {Parser} from '../expression_parser/parser';
+import {
+  CompileDirectiveMetadata, CompilePipeMetadata, CompileTokenMetadata,
+  removeIdentifierDuplicates,
+} from '../compile_metadata';
+import {HtmlParser, HtmlParseTreeResult} from '../html_parser/html_parser';
+import {splitNsName, mergeNsAndName} from '../html_parser/html_tags';
+import {ParseSourceSpan, ParseError, ParseErrorLevel} from '../parse_util';
+import {InterpolationConfig} from '../html_parser/interpolation_config';
 import {ElementAst, BoundElementPropertyAst, BoundEventAst, ReferenceAst, TemplateAst, TemplateAstVisitor, templateVisitAll, TextAst, BoundTextAst, EmbeddedTemplateAst, AttrAst, NgContentAst, PropertyBindingType, DirectiveAst, BoundDirectivePropertyAst, ProviderAst, ProviderAstType, VariableAst} from './template_ast';
-import {CssSelector, SelectorMatcher} from './selector';
-import {ElementSchemaRegistry} from './schema/element_schema_registry';
+import {CssSelector, SelectorMatcher} from '../selector';
+import {ElementSchemaRegistry} from '../schema/element_schema_registry';
 import {preparseElement, PreparsedElementType} from './template_preparser';
-import {isStyleUrlResolvable} from './style_url_resolver';
-import {HtmlAstVisitor, HtmlElementAst, HtmlAttrAst, HtmlTextAst, HtmlCommentAst, HtmlExpansionAst, HtmlExpansionCaseAst, htmlVisitAll} from './html_ast';
-import {splitAtColon} from './util';
-import {identifierToken, Identifiers} from './identifiers';
-import {expandNodes} from './expander';
-import {ProviderElementContext, ProviderViewContext} from './provider_analyzer';
+import {isStyleUrlResolvable} from '../style_url_resolver';
+import {HtmlAstVisitor, HtmlElementAst, HtmlAttrAst, HtmlTextAst, HtmlCommentAst, HtmlExpansionAst, HtmlExpansionCaseAst, htmlVisitAll} from '../html_parser/html_ast';
+import {splitAtColon} from '../util';
+import {identifierToken, Identifiers} from '../identifiers';
+import {expandNodes} from '../html_parser/expander';
+import {ProviderElementContext, ProviderViewContext} from '../provider_analyzer';
 
 // Group 1 = "bind-"
 // Group 2 = "var-"

modules/@angular/compiler/src/template_parser/template_preparser.ts

@@ -6,10 +6,10 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {isBlank} from '../src/facade/lang';
+import {isBlank} from '../facade/lang';
 
-import {HtmlElementAst} from './html_ast';
-import {splitNsName} from './html_tags';
+import {HtmlElementAst} from '../html_parser/html_ast';
+import {splitNsName} from '../html_parser/html_tags';
 
 const NG_CONTENT_SELECT_ATTR = 'select';
 const NG_CONTENT_ELEMENT = 'ng-content';