From 1b77604ee2dc0da78276a27d5611fccbfa4aa4e3 Mon Sep 17 00:00:00 2001 From: Victor Berchet Date: Thu, 21 Jul 2016 11:41:25 -0700 Subject: [PATCH] refactor(compiler): re-arrange files --- modules/@angular/compiler/compiler.ts | 2 +- modules/@angular/compiler/private_export.ts | 4 +- .../src/animation/animation_compiler.ts | 2 +- modules/@angular/compiler/src/compiler.ts | 8 ++-- .../compiler/src/{ => css_parser}/css_ast.ts | 3 +- .../src/{ => css_parser}/css_lexer.ts | 6 +-- .../src/{ => css_parser}/css_parser.ts | 11 ++--- .../compiler/src/directive_normalizer.ts | 8 ++-- .../compiler/src/expression_parser/parser.ts | 2 +- .../src/{ => html_parser}/expander.ts | 4 +- .../src/{ => html_parser}/html_ast.ts | 4 +- .../src/{ => html_parser}/html_lexer.ts | 7 +-- .../src/{ => html_parser}/html_parser.ts | 8 ++-- .../src/{ => html_parser}/html_tags.ts | 2 +- .../{ => html_parser}/interpolation_config.ts | 3 +- modules/@angular/compiler/src/i18n/catalog.ts | 4 +- .../@angular/compiler/src/i18n/extractor.ts | 4 +- .../compiler/src/i18n/i18n_html_parser.ts | 6 +-- .../@angular/compiler/src/i18n/i18n_parser.ts | 6 +-- .../compiler/src/i18n/message_extractor.ts | 6 +-- modules/@angular/compiler/src/i18n/shared.ts | 4 +- .../compiler/src/i18n/xmb_serializer.ts | 4 +- .../compiler/src/metadata_resolver.ts | 2 +- .../compiler/src/ng_module_compiler.ts | 2 +- .../@angular/compiler/src/offline_compiler.ts | 2 +- .../compiler/src/provider_analyzer.ts | 2 +- .../@angular/compiler/src/runtime_compiler.ts | 8 ++-- .../src/{ => template_parser}/template_ast.ts | 11 ++--- .../{ => template_parser}/template_parser.ts | 45 ++++++++++--------- .../template_preparser.ts | 6 +-- .../src/view_compiler/compile_binding.ts | 2 +- .../src/view_compiler/compile_element.ts | 2 +- .../src/view_compiler/compile_method.ts | 2 +- .../src/view_compiler/event_binder.ts | 2 +- .../src/view_compiler/lifecycle_binder.ts | 2 +- .../src/view_compiler/property_binder.ts | 2 +- .../compiler/src/view_compiler/view_binder.ts | 2 +- .../src/view_compiler/view_builder.ts | 2 +- .../src/view_compiler/view_compiler.ts | 2 +- .../test/{ => css_parser}/css_lexer_spec.ts | 16 +++---- .../test/{ => css_parser}/css_parser_spec.ts | 10 ++--- .../test/{ => css_parser}/css_visitor_spec.ts | 10 ++--- .../test/expression_parser/unparser.ts | 2 +- .../test/{ => html_parser}/expander_spec.ts | 10 ++--- .../html_ast_serializer_spec.ts | 6 +-- .../{ => html_parser}/html_ast_spec_utils.ts | 9 ++-- .../test/{ => html_parser}/html_lexer_spec.ts | 8 ++-- .../{ => html_parser}/html_parser_spec.ts | 10 ++--- .../compiler/test/i18n/catalog_spec.ts | 5 ++- .../compiler/test/i18n/extractor_spec.ts | 4 +- .../test/i18n/i18n_html_parser_spec.ts | 8 ++-- .../compiler/test/i18n/i18n_parser_spec.ts | 5 ++- .../test/i18n/message_extractor_spec.ts | 3 +- .../test/i18n/serializers/xmb_spec.ts | 5 ++- .../compiler/test/i18n/xmb_serializer_spec.ts | 3 +- .../dom_element_schema_registry_spec.ts | 5 ++- .../template_parser_spec.ts | 12 ++--- .../template_preparser_spec.ts | 11 ++--- 58 files changed, 176 insertions(+), 170 deletions(-) rename modules/@angular/compiler/src/{ => css_parser}/css_ast.ts (99%) rename modules/@angular/compiler/src/{ => css_parser}/css_lexer.ts (99%) rename modules/@angular/compiler/src/{ => css_parser}/css_parser.ts (99%) rename modules/@angular/compiler/src/{ => html_parser}/expander.ts (98%) rename modules/@angular/compiler/src/{ => html_parser}/html_ast.ts (96%) rename modules/@angular/compiler/src/{ => html_parser}/html_lexer.ts (99%) rename modules/@angular/compiler/src/{ => html_parser}/html_parser.ts (98%) rename modules/@angular/compiler/src/{ => html_parser}/html_tags.ts (99%) rename modules/@angular/compiler/src/{ => html_parser}/interpolation_config.ts (87%) rename modules/@angular/compiler/src/{ => template_parser}/template_ast.ts (97%) rename modules/@angular/compiler/src/{ => template_parser}/template_parser.ts (96%) rename modules/@angular/compiler/src/{ => template_parser}/template_preparser.ts (94%) rename modules/@angular/compiler/test/{ => css_parser}/css_lexer_spec.ts (96%) rename modules/@angular/compiler/test/{ => css_parser}/css_parser_spec.ts (98%) rename modules/@angular/compiler/test/{ => css_parser}/css_visitor_spec.ts (97%) rename modules/@angular/compiler/test/{ => html_parser}/expander_spec.ts (90%) rename modules/@angular/compiler/test/{ => html_parser}/html_ast_serializer_spec.ts (92%) rename modules/@angular/compiler/test/{ => html_parser}/html_ast_spec_utils.ts (91%) rename modules/@angular/compiler/test/{ => html_parser}/html_lexer_spec.ts (99%) rename modules/@angular/compiler/test/{ => html_parser}/html_parser_spec.ts (97%) rename modules/@angular/compiler/test/{ => template_parser}/template_parser_spec.ts (99%) rename modules/@angular/compiler/test/{ => template_parser}/template_preparser_spec.ts (87%) diff --git a/modules/@angular/compiler/compiler.ts b/modules/@angular/compiler/compiler.ts index 68ad7a5c98..51bf2aafe4 100644 --- a/modules/@angular/compiler/compiler.ts +++ b/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'; diff --git a/modules/@angular/compiler/private_export.ts b/modules/@angular/compiler/private_export.ts index 73ee0575e7..0cfe8a429a 100644 --- a/modules/@angular/compiler/private_export.ts +++ b/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__ { diff --git a/modules/@angular/compiler/src/animation/animation_compiler.ts b/modules/@angular/compiler/src/animation/animation_compiler.ts index 695eaba38a..144129914e 100644 --- a/modules/@angular/compiler/src/animation/animation_compiler.ts +++ b/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'; diff --git a/modules/@angular/compiler/src/compiler.ts b/modules/@angular/compiler/src/compiler.ts index e4d593c3dc..c37018d74d 100644 --- a/modules/@angular/compiler/src/compiler.ts +++ b/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'; diff --git a/modules/@angular/compiler/src/css_ast.ts b/modules/@angular/compiler/src/css_parser/css_ast.ts similarity index 99% rename from modules/@angular/compiler/src/css_ast.ts rename to modules/@angular/compiler/src/css_parser/css_ast.ts index 7e2b1a135a..adbd5acf66 100644 --- a/modules/@angular/compiler/src/css_ast.ts +++ b/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, diff --git a/modules/@angular/compiler/src/css_lexer.ts b/modules/@angular/compiler/src/css_parser/css_lexer.ts similarity index 99% rename from modules/@angular/compiler/src/css_lexer.ts rename to modules/@angular/compiler/src/css_parser/css_lexer.ts index 86c3f7e7a6..1ba42bb615 100644 --- a/modules/@angular/compiler/src/css_lexer.ts +++ b/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, diff --git a/modules/@angular/compiler/src/css_parser.ts b/modules/@angular/compiler/src/css_parser/css_parser.ts similarity index 99% rename from modules/@angular/compiler/src/css_parser.ts rename to modules/@angular/compiler/src/css_parser/css_parser.ts index e1d8030da2..3388e6ac27 100644 --- a/modules/@angular/compiler/src/css_parser.ts +++ b/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: diff --git a/modules/@angular/compiler/src/directive_normalizer.ts b/modules/@angular/compiler/src/directive_normalizer.ts index d6edaf65d0..6f4840632d 100644 --- a/modules/@angular/compiler/src/directive_normalizer.ts +++ b/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'; diff --git a/modules/@angular/compiler/src/expression_parser/parser.ts b/modules/@angular/compiler/src/expression_parser/parser.ts index 930330e4a7..4bbc4a400e 100644 --- a/modules/@angular/compiler/src/expression_parser/parser.ts +++ b/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'; diff --git a/modules/@angular/compiler/src/expander.ts b/modules/@angular/compiler/src/html_parser/expander.ts similarity index 98% rename from modules/@angular/compiler/src/expander.ts rename to modules/@angular/compiler/src/html_parser/expander.ts index cd7046350a..d480f63c92 100644 --- a/modules/@angular/compiler/src/expander.ts +++ b/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']; diff --git a/modules/@angular/compiler/src/html_ast.ts b/modules/@angular/compiler/src/html_parser/html_ast.ts similarity index 96% rename from modules/@angular/compiler/src/html_ast.ts rename to modules/@angular/compiler/src/html_parser/html_ast.ts index 98e1705e14..a9f0d02c8f 100644 --- a/modules/@angular/compiler/src/html_ast.ts +++ b/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; diff --git a/modules/@angular/compiler/src/html_lexer.ts b/modules/@angular/compiler/src/html_parser/html_lexer.ts similarity index 99% rename from modules/@angular/compiler/src/html_lexer.ts rename to modules/@angular/compiler/src/html_parser/html_lexer.ts index 8a2d96bcb5..c11e0a7e05 100644 --- a/modules/@angular/compiler/src/html_lexer.ts +++ b/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, diff --git a/modules/@angular/compiler/src/html_parser.ts b/modules/@angular/compiler/src/html_parser/html_parser.ts similarity index 98% rename from modules/@angular/compiler/src/html_parser.ts rename to modules/@angular/compiler/src/html_parser/html_parser.ts index 95ee1f7893..157ec68ece 100644 --- a/modules/@angular/compiler/src/html_parser.ts +++ b/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'; diff --git a/modules/@angular/compiler/src/html_tags.ts b/modules/@angular/compiler/src/html_parser/html_tags.ts similarity index 99% rename from modules/@angular/compiler/src/html_tags.ts rename to modules/@angular/compiler/src/html_parser/html_tags.ts index 3129e6d680..5c94804c9e 100644 --- a/modules/@angular/compiler/src/html_tags.ts +++ b/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 diff --git a/modules/@angular/compiler/src/interpolation_config.ts b/modules/@angular/compiler/src/html_parser/interpolation_config.ts similarity index 87% rename from modules/@angular/compiler/src/interpolation_config.ts rename to modules/@angular/compiler/src/html_parser/interpolation_config.ts index bdfdb229df..4d90317dae 100644 --- a/modules/@angular/compiler/src/interpolation_config.ts +++ b/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 { diff --git a/modules/@angular/compiler/src/i18n/catalog.ts b/modules/@angular/compiler/src/i18n/catalog.ts index 6cbf998284..47bfb4b69f 100644 --- a/modules/@angular/compiler/src/i18n/catalog.ts +++ b/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'; diff --git a/modules/@angular/compiler/src/i18n/extractor.ts b/modules/@angular/compiler/src/i18n/extractor.ts index 3d43250be7..9b0daef93b 100644 --- a/modules/@angular/compiler/src/i18n/extractor.ts +++ b/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[], diff --git a/modules/@angular/compiler/src/i18n/i18n_html_parser.ts b/modules/@angular/compiler/src/i18n/i18n_html_parser.ts index c27e3eddd3..3f6983298a 100644 --- a/modules/@angular/compiler/src/i18n/i18n_html_parser.ts +++ b/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'; diff --git a/modules/@angular/compiler/src/i18n/i18n_parser.ts b/modules/@angular/compiler/src/i18n/i18n_parser.ts index 9ec7947c53..29311cab6c 100644 --- a/modules/@angular/compiler/src/i18n/i18n_parser.ts +++ b/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'; diff --git a/modules/@angular/compiler/src/i18n/message_extractor.ts b/modules/@angular/compiler/src/i18n/message_extractor.ts index 79cb204673..ecdc1eddd2 100644 --- a/modules/@angular/compiler/src/i18n/message_extractor.ts +++ b/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'; diff --git a/modules/@angular/compiler/src/i18n/shared.ts b/modules/@angular/compiler/src/i18n/shared.ts index 534a0e57eb..6b60422edc 100644 --- a/modules/@angular/compiler/src/i18n/shared.ts +++ b/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'; diff --git a/modules/@angular/compiler/src/i18n/xmb_serializer.ts b/modules/@angular/compiler/src/i18n/xmb_serializer.ts index d0fd9944c2..c80ba202f9 100644 --- a/modules/@angular/compiler/src/i18n/xmb_serializer.ts +++ b/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'; diff --git a/modules/@angular/compiler/src/metadata_resolver.ts b/modules/@angular/compiler/src/metadata_resolver.ts index 4ced8d405c..67b58a3e1b 100644 --- a/modules/@angular/compiler/src/metadata_resolver.ts +++ b/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'; diff --git a/modules/@angular/compiler/src/ng_module_compiler.ts b/modules/@angular/compiler/src/ng_module_compiler.ts index 71663862f0..38f1f71227 100644 --- a/modules/@angular/compiler/src/ng_module_compiler.ts +++ b/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 { diff --git a/modules/@angular/compiler/src/offline_compiler.ts b/modules/@angular/compiler/src/offline_compiler.ts index 03d387bd07..4a059c8da7 100644 --- a/modules/@angular/compiler/src/offline_compiler.ts +++ b/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 { diff --git a/modules/@angular/compiler/src/provider_analyzer.ts b/modules/@angular/compiler/src/provider_analyzer.ts index d54b4e9c13..ab4cc33ae1 100644 --- a/modules/@angular/compiler/src/provider_analyzer.ts +++ b/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); } diff --git a/modules/@angular/compiler/src/runtime_compiler.ts b/modules/@angular/compiler/src/runtime_compiler.ts index 09bf8fc01f..75d2f28619 100644 --- a/modules/@angular/compiler/src/runtime_compiler.ts +++ b/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'; diff --git a/modules/@angular/compiler/src/template_ast.ts b/modules/@angular/compiler/src/template_parser/template_ast.ts similarity index 97% rename from modules/@angular/compiler/src/template_ast.ts rename to modules/@angular/compiler/src/template_parser/template_ast.ts index 2962bcc09a..fc7a813a6a 100644 --- a/modules/@angular/compiler/src/template_ast.ts +++ b/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. diff --git a/modules/@angular/compiler/src/template_parser.ts b/modules/@angular/compiler/src/template_parser/template_parser.ts similarity index 96% rename from modules/@angular/compiler/src/template_parser.ts rename to modules/@angular/compiler/src/template_parser/template_parser.ts index fdae70f235..0d2fe57f69 100644 --- a/modules/@angular/compiler/src/template_parser.ts +++ b/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-" diff --git a/modules/@angular/compiler/src/template_preparser.ts b/modules/@angular/compiler/src/template_parser/template_preparser.ts similarity index 94% rename from modules/@angular/compiler/src/template_preparser.ts rename to modules/@angular/compiler/src/template_parser/template_preparser.ts index 4528a80ca1..e516999817 100644 --- a/modules/@angular/compiler/src/template_preparser.ts +++ b/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'; diff --git a/modules/@angular/compiler/src/view_compiler/compile_binding.ts b/modules/@angular/compiler/src/view_compiler/compile_binding.ts index de5b7b615d..53633a47cb 100644 --- a/modules/@angular/compiler/src/view_compiler/compile_binding.ts +++ b/modules/@angular/compiler/src/view_compiler/compile_binding.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {TemplateAst} from '../template_ast'; +import {TemplateAst} from '../template_parser/template_ast'; import {CompileNode} from './compile_element'; diff --git a/modules/@angular/compiler/src/view_compiler/compile_element.ts b/modules/@angular/compiler/src/view_compiler/compile_element.ts index db983faae6..631ccc0809 100644 --- a/modules/@angular/compiler/src/view_compiler/compile_element.ts +++ b/modules/@angular/compiler/src/view_compiler/compile_element.ts @@ -13,7 +13,7 @@ import {isBlank, isPresent} from '../facade/lang'; import {Identifiers, identifierToken} from '../identifiers'; import * as o from '../output/output_ast'; import {convertValueToOutputAst} from '../output/value_util'; -import {ProviderAst, ProviderAstType, ReferenceAst, TemplateAst} from '../template_ast'; +import {ProviderAst, ProviderAstType, ReferenceAst, TemplateAst} from '../template_parser/template_ast'; import {CompileView} from './compile_view'; import {InjectMethodVars} from './constants'; diff --git a/modules/@angular/compiler/src/view_compiler/compile_method.ts b/modules/@angular/compiler/src/view_compiler/compile_method.ts index 4f70095333..992107e6be 100644 --- a/modules/@angular/compiler/src/view_compiler/compile_method.ts +++ b/modules/@angular/compiler/src/view_compiler/compile_method.ts @@ -9,7 +9,7 @@ import {ListWrapper} from '../facade/collection'; import {isPresent} from '../facade/lang'; import * as o from '../output/output_ast'; -import {TemplateAst} from '../template_ast'; +import {TemplateAst} from '../template_parser/template_ast'; import {CompileView} from './compile_view'; diff --git a/modules/@angular/compiler/src/view_compiler/event_binder.ts b/modules/@angular/compiler/src/view_compiler/event_binder.ts index f3d8c0af9e..cb6d7a0f59 100644 --- a/modules/@angular/compiler/src/view_compiler/event_binder.ts +++ b/modules/@angular/compiler/src/view_compiler/event_binder.ts @@ -10,7 +10,7 @@ import {CompileDirectiveMetadata} from '../compile_metadata'; import {ListWrapper, StringMapWrapper} from '../facade/collection'; import {StringWrapper, isBlank, isPresent} from '../facade/lang'; import * as o from '../output/output_ast'; -import {BoundEventAst, DirectiveAst} from '../template_ast'; +import {BoundEventAst, DirectiveAst} from '../template_parser/template_ast'; import {CompileBinding} from './compile_binding'; import {CompileElement} from './compile_element'; diff --git a/modules/@angular/compiler/src/view_compiler/lifecycle_binder.ts b/modules/@angular/compiler/src/view_compiler/lifecycle_binder.ts index 58c87d600f..0a7c33ac3c 100644 --- a/modules/@angular/compiler/src/view_compiler/lifecycle_binder.ts +++ b/modules/@angular/compiler/src/view_compiler/lifecycle_binder.ts @@ -9,7 +9,7 @@ import {LifecycleHooks} from '../../core_private'; import {CompileDirectiveMetadata, CompilePipeMetadata} from '../compile_metadata'; import * as o from '../output/output_ast'; -import {DirectiveAst} from '../template_ast'; +import {DirectiveAst} from '../template_parser/template_ast'; import {CompileElement} from './compile_element'; import {CompileView} from './compile_view'; diff --git a/modules/@angular/compiler/src/view_compiler/property_binder.ts b/modules/@angular/compiler/src/view_compiler/property_binder.ts index 869349738e..a03155a8a3 100644 --- a/modules/@angular/compiler/src/view_compiler/property_binder.ts +++ b/modules/@angular/compiler/src/view_compiler/property_binder.ts @@ -12,7 +12,7 @@ import {isBlank, isPresent} from '../facade/lang'; import {Identifiers} from '../identifiers'; import * as o from '../output/output_ast'; import {DetectChangesVars, ViewProperties} from './constants'; -import {BoundTextAst, BoundElementPropertyAst, DirectiveAst, PropertyBindingType,} from '../template_ast'; +import {BoundTextAst, BoundElementPropertyAst, DirectiveAst, PropertyBindingType,} from '../template_parser/template_ast'; import {CompileView} from './compile_view'; import {CompileElement, CompileNode} from './compile_element'; import {CompileMethod} from './compile_method'; diff --git a/modules/@angular/compiler/src/view_compiler/view_binder.ts b/modules/@angular/compiler/src/view_compiler/view_binder.ts index 5a6acc8325..f83b3c3da6 100644 --- a/modules/@angular/compiler/src/view_compiler/view_binder.ts +++ b/modules/@angular/compiler/src/view_compiler/view_binder.ts @@ -7,7 +7,7 @@ */ import {ListWrapper,} from '../facade/collection'; -import {TemplateAst, TemplateAstVisitor, NgContentAst, EmbeddedTemplateAst, ElementAst, ReferenceAst, VariableAst, BoundEventAst, BoundElementPropertyAst, AttrAst, BoundTextAst, TextAst, DirectiveAst, BoundDirectivePropertyAst, templateVisitAll,} from '../template_ast'; +import {TemplateAst, TemplateAstVisitor, NgContentAst, EmbeddedTemplateAst, ElementAst, ReferenceAst, VariableAst, BoundEventAst, BoundElementPropertyAst, AttrAst, BoundTextAst, TextAst, DirectiveAst, BoundDirectivePropertyAst, templateVisitAll,} from '../template_parser/template_ast'; import {bindRenderText, bindRenderInputs, bindDirectiveInputs, bindDirectiveHostProps} from './property_binder'; import {bindRenderOutputs, collectEventListeners, bindDirectiveOutputs} from './event_binder'; import {bindDirectiveAfterContentLifecycleCallbacks, bindDirectiveAfterViewLifecycleCallbacks, bindDirectiveDestroyLifecycleCallbacks, bindPipeDestroyLifecycleCallbacks, bindDirectiveDetectChangesLifecycleCallbacks} from './lifecycle_binder'; diff --git a/modules/@angular/compiler/src/view_compiler/view_builder.ts b/modules/@angular/compiler/src/view_compiler/view_builder.ts index b94b6f1ae1..0bf82d14d1 100644 --- a/modules/@angular/compiler/src/view_compiler/view_builder.ts +++ b/modules/@angular/compiler/src/view_compiler/view_builder.ts @@ -15,7 +15,7 @@ import {ListWrapper, SetWrapper, StringMapWrapper} from '../facade/collection'; import {StringWrapper, isPresent} from '../facade/lang'; import {Identifiers, identifierToken} from '../identifiers'; import * as o from '../output/output_ast'; -import {AttrAst, BoundDirectivePropertyAst, BoundElementPropertyAst, BoundEventAst, BoundTextAst, DirectiveAst, ElementAst, EmbeddedTemplateAst, NgContentAst, ProviderAst, ReferenceAst, TemplateAst, TemplateAstVisitor, TextAst, VariableAst, templateVisitAll} from '../template_ast'; +import {AttrAst, BoundDirectivePropertyAst, BoundElementPropertyAst, BoundEventAst, BoundTextAst, DirectiveAst, ElementAst, EmbeddedTemplateAst, NgContentAst, ProviderAst, ReferenceAst, TemplateAst, TemplateAstVisitor, TextAst, VariableAst, templateVisitAll} from '../template_parser/template_ast'; import {createDiTokenExpression} from '../util'; import {CompileElement, CompileNode} from './compile_element'; diff --git a/modules/@angular/compiler/src/view_compiler/view_compiler.ts b/modules/@angular/compiler/src/view_compiler/view_compiler.ts index 2ba1c11942..6331819fbb 100644 --- a/modules/@angular/compiler/src/view_compiler/view_compiler.ts +++ b/modules/@angular/compiler/src/view_compiler/view_compiler.ts @@ -12,7 +12,7 @@ import {AnimationCompiler} from '../animation/animation_compiler'; import {CompileDirectiveMetadata, CompilePipeMetadata} from '../compile_metadata'; import {CompilerConfig} from '../config'; import * as o from '../output/output_ast'; -import {TemplateAst} from '../template_ast'; +import {TemplateAst} from '../template_parser/template_ast'; import {CompileElement} from './compile_element'; import {CompileView} from './compile_view'; diff --git a/modules/@angular/compiler/test/css_lexer_spec.ts b/modules/@angular/compiler/test/css_parser/css_lexer_spec.ts similarity index 96% rename from modules/@angular/compiler/test/css_lexer_spec.ts rename to modules/@angular/compiler/test/css_parser/css_lexer_spec.ts index 3d302f4b37..04539fbdde 100644 --- a/modules/@angular/compiler/test/css_lexer_spec.ts +++ b/modules/@angular/compiler/test/css_parser/css_lexer_spec.ts @@ -6,18 +6,18 @@ * found in the LICENSE file at https://angular.io/license */ -import {afterEach, beforeEach, ddescribe, describe, expect, iit, it, xit} from '../../core/testing/testing_internal'; -import {CssLexer, CssLexerMode, CssScannerError, CssToken, CssTokenType} from '../src/css_lexer'; -import {isPresent} from '../src/facade/lang'; +import {afterEach, beforeEach, ddescribe, describe, expect, iit, it, xit} from '../../../core/testing/testing_internal'; +import {CssLexer, CssLexerMode, CssScannerError, CssToken, CssTokenType} from '../../src/css_parser/css_lexer'; +import {isPresent} from '../../src/facade/lang'; export function main() { function tokenize( - code: any /** TODO #9100 */, trackComments: boolean = false, + code: string, trackComments: boolean = false, mode: CssLexerMode = CssLexerMode.ALL): CssToken[] { - var scanner = new CssLexer().scan(code, trackComments); + const scanner = new CssLexer().scan(code, trackComments); scanner.setMode(mode); - var tokens: any[] /** TODO #9100 */ = []; + var tokens: CssToken[] = []; var output = scanner.scan(); while (output != null) { var error = output.error; @@ -316,7 +316,7 @@ export function main() { describe('Media Query Mode', () => { it('should validate media queries with a reduced subset of valid characters', () => { - function tokenizeQuery(code: any /** TODO #9100 */) { + function tokenizeQuery(code: string) { return tokenize(code, false, CssLexerMode.MEDIA_QUERY); } @@ -357,7 +357,7 @@ export function main() { 'Style Block Mode', () => { it('should style blocks with a reduced subset of valid characters', () => { - function tokenizeStyles(code: any /** TODO #9100 */) { + function tokenizeStyles(code: string) { return tokenize(code, false, CssLexerMode.STYLE_BLOCK); } diff --git a/modules/@angular/compiler/test/css_parser_spec.ts b/modules/@angular/compiler/test/css_parser/css_parser_spec.ts similarity index 98% rename from modules/@angular/compiler/test/css_parser_spec.ts rename to modules/@angular/compiler/test/css_parser/css_parser_spec.ts index 1dc15fa2cf..80b0763ada 100644 --- a/modules/@angular/compiler/test/css_parser_spec.ts +++ b/modules/@angular/compiler/test/css_parser/css_parser_spec.ts @@ -6,11 +6,11 @@ * found in the LICENSE file at https://angular.io/license */ -import {afterEach, beforeEach, ddescribe, describe, expect, iit, it, xit} from '../../core/testing/testing_internal'; -import {CssBlockAst, CssBlockDefinitionRuleAst, CssBlockRuleAst, CssDefinitionAst, CssInlineRuleAst, CssKeyframeDefinitionAst, CssKeyframeRuleAst, CssMediaQueryRuleAst, CssRuleAst, CssSelectorAst, CssSelectorRuleAst, CssStyleSheetAst, CssStyleValueAst} from '../src/css_ast'; -import {BlockType, CssParseError, CssParser, CssToken, ParsedCssResult} from '../src/css_parser'; -import {BaseException} from '../src/facade/exceptions'; -import {ParseLocation} from '../src/parse_util'; +import {afterEach, beforeEach, ddescribe, describe, expect, iit, it, xit} from '../../../core/testing/testing_internal'; +import {CssBlockAst, CssBlockDefinitionRuleAst, CssBlockRuleAst, CssDefinitionAst, CssInlineRuleAst, CssKeyframeDefinitionAst, CssKeyframeRuleAst, CssMediaQueryRuleAst, CssSelectorRuleAst, CssStyleSheetAst, CssStyleValueAst} from '../../src/css_parser/css_ast'; +import {BlockType, CssParseError, CssParser, CssToken, ParsedCssResult} from '../../src/css_parser/css_parser'; +import {BaseException} from '../../src/facade/exceptions'; +import {ParseLocation} from '../../src/parse_util'; export function assertTokens(tokens: CssToken[], valuesArr: string[]) { for (var i = 0; i < tokens.length; i++) { diff --git a/modules/@angular/compiler/test/css_visitor_spec.ts b/modules/@angular/compiler/test/css_parser/css_visitor_spec.ts similarity index 97% rename from modules/@angular/compiler/test/css_visitor_spec.ts rename to modules/@angular/compiler/test/css_parser/css_visitor_spec.ts index 75e2ad6b76..171d19e080 100644 --- a/modules/@angular/compiler/test/css_visitor_spec.ts +++ b/modules/@angular/compiler/test/css_parser/css_visitor_spec.ts @@ -6,11 +6,11 @@ * found in the LICENSE file at https://angular.io/license */ -import {afterEach, beforeEach, ddescribe, describe, expect, iit, it, xit} from '../../core/testing/testing_internal'; -import {CssAst, CssAstVisitor, CssAtRulePredicateAst, CssBlockAst, CssBlockDefinitionRuleAst, CssBlockRuleAst, CssDefinitionAst, CssInlineRuleAst, CssKeyframeDefinitionAst, CssKeyframeRuleAst, CssMediaQueryRuleAst, CssPseudoSelectorAst, CssRuleAst, CssSelectorAst, CssSelectorRuleAst, CssSimpleSelectorAst, CssStyleSheetAst, CssStyleValueAst, CssStylesBlockAst, CssUnknownRuleAst, CssUnknownTokenListAst} from '../src/css_ast'; -import {BlockType, CssParseError, CssParser, CssToken} from '../src/css_parser'; -import {BaseException} from '../src/facade/exceptions'; -import {isPresent} from '../src/facade/lang'; +import {afterEach, beforeEach, ddescribe, describe, expect, iit, it, xit} from '../../../core/testing/testing_internal'; +import {CssAst, CssAstVisitor, CssAtRulePredicateAst, CssBlockAst, CssBlockDefinitionRuleAst, CssBlockRuleAst, CssDefinitionAst, CssInlineRuleAst, CssKeyframeDefinitionAst, CssKeyframeRuleAst, CssMediaQueryRuleAst, CssPseudoSelectorAst, CssRuleAst, CssSelectorAst, CssSelectorRuleAst, CssSimpleSelectorAst, CssStyleSheetAst, CssStyleValueAst, CssStylesBlockAst, CssUnknownRuleAst, CssUnknownTokenListAst} from '../../src/css_parser/css_ast'; +import {BlockType, CssParseError, CssParser, CssToken} from '../../src/css_parser/css_parser'; +import {BaseException} from '../../src/facade/exceptions'; +import {isPresent} from '../../src/facade/lang'; function _assertTokens(tokens: CssToken[], valuesArr: string[]): void { expect(tokens.length).toEqual(valuesArr.length); diff --git a/modules/@angular/compiler/test/expression_parser/unparser.ts b/modules/@angular/compiler/test/expression_parser/unparser.ts index c598baf2d5..75380252dc 100644 --- a/modules/@angular/compiler/test/expression_parser/unparser.ts +++ b/modules/@angular/compiler/test/expression_parser/unparser.ts @@ -8,7 +8,7 @@ import {AST, AstVisitor, Binary, BindingPipe, Chain, Conditional, EmptyExpr, FunctionCall, ImplicitReceiver, Interpolation, KeyedRead, KeyedWrite, LiteralArray, LiteralMap, LiteralPrimitive, MethodCall, PrefixNot, PropertyRead, PropertyWrite, Quote, SafeMethodCall, SafePropertyRead} from '../../src/expression_parser/ast'; import {StringWrapper, isPresent, isString} from '../../src/facade/lang'; -import {DEFAULT_INTERPOLATION_CONFIG, InterpolationConfig} from '../../src/interpolation_config'; +import {DEFAULT_INTERPOLATION_CONFIG, InterpolationConfig} from '../../src/html_parser/interpolation_config'; class Unparser implements AstVisitor { private static _quoteRegExp = /"/g; diff --git a/modules/@angular/compiler/test/expander_spec.ts b/modules/@angular/compiler/test/html_parser/expander_spec.ts similarity index 90% rename from modules/@angular/compiler/test/expander_spec.ts rename to modules/@angular/compiler/test/html_parser/expander_spec.ts index 25fa4c2350..4e1f4376a5 100644 --- a/modules/@angular/compiler/test/expander_spec.ts +++ b/modules/@angular/compiler/test/html_parser/expander_spec.ts @@ -6,11 +6,11 @@ * found in the LICENSE file at https://angular.io/license */ -import {ddescribe, describe, expect, iit, it} from '../../core/testing/testing_internal'; -import {ExpansionResult, expandNodes} from '../src/expander'; -import {HtmlAttrAst, HtmlElementAst, HtmlTextAst} from '../src/html_ast'; -import {HtmlParser} from '../src/html_parser'; -import {ParseError} from '../src/parse_util'; +import {ddescribe, describe, expect, iit, it} from '../../../core/testing/testing_internal'; +import {ExpansionResult, expandNodes} from '../../src/html_parser/expander'; +import {HtmlAttrAst, HtmlElementAst, HtmlTextAst} from '../../src/html_parser/html_ast'; +import {HtmlParser} from '../../src/html_parser/html_parser'; +import {ParseError} from '../../src/parse_util'; import {humanizeNodes} from './html_ast_spec_utils'; diff --git a/modules/@angular/compiler/test/html_ast_serializer_spec.ts b/modules/@angular/compiler/test/html_parser/html_ast_serializer_spec.ts similarity index 92% rename from modules/@angular/compiler/test/html_ast_serializer_spec.ts rename to modules/@angular/compiler/test/html_parser/html_ast_serializer_spec.ts index d3fee4b0d1..6e17d3054d 100644 --- a/modules/@angular/compiler/test/html_ast_serializer_spec.ts +++ b/modules/@angular/compiler/test/html_parser/html_ast_serializer_spec.ts @@ -1,6 +1,6 @@ -import {HtmlAst, HtmlAstVisitor, HtmlAttrAst, HtmlCommentAst, HtmlElementAst, HtmlExpansionAst, HtmlExpansionCaseAst, HtmlTextAst, htmlVisitAll} from '@angular/compiler/src/html_ast'; -import {HtmlParser} from '@angular/compiler/src/html_parser'; -import {beforeEach, ddescribe, describe, expect, it} from '@angular/core/testing/testing_internal'; +import {beforeEach, ddescribe, describe, expect, it} from '../../../core/testing/testing_internal'; +import {HtmlAst, HtmlAstVisitor, HtmlAttrAst, HtmlCommentAst, HtmlElementAst, HtmlExpansionAst, HtmlExpansionCaseAst, HtmlTextAst, htmlVisitAll} from '../../src/html_parser/html_ast'; +import {HtmlParser} from '../../src/html_parser/html_parser'; export function main() { describe('HtmlAst serilaizer', () => { diff --git a/modules/@angular/compiler/test/html_ast_spec_utils.ts b/modules/@angular/compiler/test/html_parser/html_ast_spec_utils.ts similarity index 91% rename from modules/@angular/compiler/test/html_ast_spec_utils.ts rename to modules/@angular/compiler/test/html_parser/html_ast_spec_utils.ts index 1df5042691..8f9691476e 100644 --- a/modules/@angular/compiler/test/html_ast_spec_utils.ts +++ b/modules/@angular/compiler/test/html_parser/html_ast_spec_utils.ts @@ -6,11 +6,10 @@ * found in the LICENSE file at https://angular.io/license */ -import {HtmlAst, HtmlAstVisitor, HtmlAttrAst, HtmlCommentAst, HtmlElementAst, HtmlExpansionAst, HtmlExpansionCaseAst, HtmlTextAst, htmlVisitAll} from '@angular/compiler/src/html_ast'; -import {HtmlParseTreeResult} from '@angular/compiler/src/html_parser'; -import {ParseLocation} from '@angular/compiler/src/parse_util'; - -import {BaseException} from '../src/facade/exceptions'; +import {BaseException} from '../../src/facade/exceptions'; +import {HtmlAst, HtmlAstVisitor, HtmlAttrAst, HtmlCommentAst, HtmlElementAst, HtmlExpansionAst, HtmlExpansionCaseAst, HtmlTextAst, htmlVisitAll} from '../../src/html_parser/html_ast'; +import {HtmlParseTreeResult} from '../../src/html_parser/html_parser'; +import {ParseLocation} from '../../src/parse_util'; export function humanizeDom( parseResult: HtmlParseTreeResult, addSourceSpan: boolean = false): any[] { diff --git a/modules/@angular/compiler/test/html_lexer_spec.ts b/modules/@angular/compiler/test/html_parser/html_lexer_spec.ts similarity index 99% rename from modules/@angular/compiler/test/html_lexer_spec.ts rename to modules/@angular/compiler/test/html_parser/html_lexer_spec.ts index c40dfe34ed..dd1b9b82d0 100644 --- a/modules/@angular/compiler/test/html_lexer_spec.ts +++ b/modules/@angular/compiler/test/html_parser/html_lexer_spec.ts @@ -6,10 +6,10 @@ * found in the LICENSE file at https://angular.io/license */ -import {HtmlToken, HtmlTokenError, HtmlTokenType, tokenizeHtml} from '@angular/compiler/src/html_lexer'; -import {InterpolationConfig} from '@angular/compiler/src/interpolation_config'; -import {ParseLocation, ParseSourceFile, ParseSourceSpan} from '@angular/compiler/src/parse_util'; -import {afterEach, beforeEach, ddescribe, describe, expect, iit, it, xit} from '@angular/core/testing/testing_internal'; +import {afterEach, beforeEach, ddescribe, describe, expect, iit, it, xit} from '../../../core/testing/testing_internal'; +import {HtmlToken, HtmlTokenError, HtmlTokenType, tokenizeHtml} from '../../src/html_parser/html_lexer'; +import {InterpolationConfig} from '../../src/html_parser/interpolation_config'; +import {ParseLocation, ParseSourceFile, ParseSourceSpan} from '../../src/parse_util'; export function main() { describe('HtmlLexer', () => { diff --git a/modules/@angular/compiler/test/html_parser_spec.ts b/modules/@angular/compiler/test/html_parser/html_parser_spec.ts similarity index 97% rename from modules/@angular/compiler/test/html_parser_spec.ts rename to modules/@angular/compiler/test/html_parser/html_parser_spec.ts index ea0ed88b5b..e6665d5e20 100644 --- a/modules/@angular/compiler/test/html_parser_spec.ts +++ b/modules/@angular/compiler/test/html_parser/html_parser_spec.ts @@ -6,11 +6,11 @@ * found in the LICENSE file at https://angular.io/license */ -import {HtmlAttrAst, HtmlCommentAst, HtmlElementAst, HtmlExpansionAst, HtmlExpansionCaseAst, HtmlTextAst} from '@angular/compiler/src/html_ast'; -import {HtmlTokenType} from '@angular/compiler/src/html_lexer'; -import {HtmlParseTreeResult, HtmlParser, HtmlTreeError} from '@angular/compiler/src/html_parser'; -import {ParseError} from '@angular/compiler/src/parse_util'; -import {afterEach, beforeEach, ddescribe, describe, expect, iit, it, xit} from '@angular/core/testing/testing_internal'; +import {afterEach, beforeEach, ddescribe, describe, expect, iit, it, xit} from '../../../core/testing/testing_internal'; +import {HtmlAttrAst, HtmlCommentAst, HtmlElementAst, HtmlExpansionAst, HtmlExpansionCaseAst, HtmlTextAst} from '../../src/html_parser/html_ast'; +import {HtmlTokenType} from '../../src/html_parser/html_lexer'; +import {HtmlParseTreeResult, HtmlParser, HtmlTreeError} from '../../src/html_parser/html_parser'; +import {ParseError} from '../../src/parse_util'; import {humanizeDom, humanizeDomSourceSpans, humanizeLineColumn} from './html_ast_spec_utils'; diff --git a/modules/@angular/compiler/test/i18n/catalog_spec.ts b/modules/@angular/compiler/test/i18n/catalog_spec.ts index 3d43d3db49..4af9e7c390 100644 --- a/modules/@angular/compiler/test/i18n/catalog_spec.ts +++ b/modules/@angular/compiler/test/i18n/catalog_spec.ts @@ -6,11 +6,12 @@ * found in the LICENSE file at https://angular.io/license */ -import {HtmlParser} from '@angular/compiler/src/html_parser'; import {Catalog, strHash} from '@angular/compiler/src/i18n/catalog'; -import {DEFAULT_INTERPOLATION_CONFIG} from '@angular/compiler/src/interpolation_config'; import {beforeEach, ddescribe, describe, expect, iit, inject, it, xdescribe, xit} from '@angular/core/testing/testing_internal'; +import {HtmlParser} from '../../src/html_parser/html_parser'; +import {DEFAULT_INTERPOLATION_CONFIG} from '../../src/html_parser/interpolation_config'; + import Serializable = webdriver.Serializable; import {Serializer} from '@angular/compiler/src/i18n/serializers/serializer'; import {serializeAst} from '@angular/compiler/src/i18n/catalog'; diff --git a/modules/@angular/compiler/test/i18n/extractor_spec.ts b/modules/@angular/compiler/test/i18n/extractor_spec.ts index 8196c2cf50..624c2c0dd4 100644 --- a/modules/@angular/compiler/test/i18n/extractor_spec.ts +++ b/modules/@angular/compiler/test/i18n/extractor_spec.ts @@ -6,11 +6,11 @@ * found in the LICENSE file at https://angular.io/license */ -import {HtmlParser} from '@angular/compiler/src/html_parser'; import {ExtractionResult, extractAstMessages} from '@angular/compiler/src/i18n/extractor'; import {beforeEach, ddescribe, describe, expect, iit, inject, it, xdescribe, xit} from '@angular/core/testing/testing_internal'; -import {serializeAst} from '../html_ast_serializer_spec' +import {HtmlParser} from '../../src/html_parser/html_parser'; +import {serializeAst} from '../html_parser/html_ast_serializer_spec' export function main() { ddescribe( diff --git a/modules/@angular/compiler/test/i18n/i18n_html_parser_spec.ts b/modules/@angular/compiler/test/i18n/i18n_html_parser_spec.ts index 1649295c29..8646bcbb87 100644 --- a/modules/@angular/compiler/test/i18n/i18n_html_parser_spec.ts +++ b/modules/@angular/compiler/test/i18n/i18n_html_parser_spec.ts @@ -8,17 +8,17 @@ import {Lexer as ExpressionLexer} from '@angular/compiler/src/expression_parser/lexer'; import {Parser as ExpressionParser} from '@angular/compiler/src/expression_parser/parser'; -import {HtmlAttrAst, HtmlElementAst, HtmlTextAst} from '@angular/compiler/src/html_ast'; -import {HtmlParseTreeResult, HtmlParser} from '@angular/compiler/src/html_parser'; import {I18nHtmlParser} from '@angular/compiler/src/i18n/i18n_html_parser'; import {Message, id} from '@angular/compiler/src/i18n/message'; import {deserializeXmb} from '@angular/compiler/src/i18n/xmb_serializer'; -import {InterpolationConfig} from '@angular/compiler/src/interpolation_config'; import {ParseError} from '@angular/compiler/src/parse_util'; -import {humanizeDom} from '@angular/compiler/test/html_ast_spec_utils'; import {ddescribe, describe, expect, iit, it} from '@angular/core/testing/testing_internal'; import {StringMapWrapper} from '../../src/facade/collection'; +import {HtmlAttrAst, HtmlElementAst, HtmlTextAst} from '../../src/html_parser/html_ast'; +import {HtmlParseTreeResult, HtmlParser} from '../../src/html_parser/html_parser'; +import {InterpolationConfig} from '../../src/html_parser/interpolation_config'; +import {humanizeDom} from '../html_parser/html_ast_spec_utils'; export function main() { describe('I18nHtmlParser', () => { diff --git a/modules/@angular/compiler/test/i18n/i18n_parser_spec.ts b/modules/@angular/compiler/test/i18n/i18n_parser_spec.ts index 7a5087d1d5..13c658a5bf 100644 --- a/modules/@angular/compiler/test/i18n/i18n_parser_spec.ts +++ b/modules/@angular/compiler/test/i18n/i18n_parser_spec.ts @@ -6,12 +6,13 @@ * found in the LICENSE file at https://angular.io/license */ -import {HtmlParser} from '@angular/compiler/src/html_parser'; import {serializeAst} from '@angular/compiler/src/i18n/catalog'; import {extractI18nMessages} from '@angular/compiler/src/i18n/i18n_parser'; -import {DEFAULT_INTERPOLATION_CONFIG} from '@angular/compiler/src/interpolation_config'; import {ddescribe, describe, expect, it} from '@angular/core/testing/testing_internal'; +import {HtmlParser} from '../../src/html_parser/html_parser'; +import {DEFAULT_INTERPOLATION_CONFIG} from '../../src/html_parser/interpolation_config'; + export function main() { ddescribe('I18nParser', () => { diff --git a/modules/@angular/compiler/test/i18n/message_extractor_spec.ts b/modules/@angular/compiler/test/i18n/message_extractor_spec.ts index 5ea37684d9..ade2e93c4b 100644 --- a/modules/@angular/compiler/test/i18n/message_extractor_spec.ts +++ b/modules/@angular/compiler/test/i18n/message_extractor_spec.ts @@ -8,11 +8,12 @@ import {Lexer as ExpressionLexer} from '@angular/compiler/src/expression_parser/lexer'; import {Parser as ExpressionParser} from '@angular/compiler/src/expression_parser/parser'; -import {HtmlParser} from '@angular/compiler/src/html_parser'; import {Message} from '@angular/compiler/src/i18n/message'; import {MessageExtractor, removeDuplicates} from '@angular/compiler/src/i18n/message_extractor'; import {beforeEach, ddescribe, describe, expect, iit, inject, it, xdescribe, xit} from '@angular/core/testing/testing_internal'; +import {HtmlParser} from '../../src/html_parser/html_parser'; + export function main() { describe('MessageExtractor', () => { diff --git a/modules/@angular/compiler/test/i18n/serializers/xmb_spec.ts b/modules/@angular/compiler/test/i18n/serializers/xmb_spec.ts index c0c2a3d7e5..d9108e7892 100644 --- a/modules/@angular/compiler/test/i18n/serializers/xmb_spec.ts +++ b/modules/@angular/compiler/test/i18n/serializers/xmb_spec.ts @@ -6,12 +6,13 @@ * found in the LICENSE file at https://angular.io/license */ -import {HtmlParser} from '@angular/compiler/src/html_parser'; import {Catalog} from '@angular/compiler/src/i18n/catalog'; import {XmbSerializer} from '@angular/compiler/src/i18n/serializers/xmb'; -import {DEFAULT_INTERPOLATION_CONFIG} from '@angular/compiler/src/interpolation_config'; import {beforeEach, ddescribe, describe, expect, iit, inject, it, xdescribe, xit} from '@angular/core/testing/testing_internal'; +import {HtmlParser} from '../../../src/html_parser/html_parser'; +import {DEFAULT_INTERPOLATION_CONFIG} from '../../../src/html_parser/interpolation_config'; + export function main(): void { ddescribe('XMB serializer', () => { diff --git a/modules/@angular/compiler/test/i18n/xmb_serializer_spec.ts b/modules/@angular/compiler/test/i18n/xmb_serializer_spec.ts index 1aad51e2eb..29d91e57c8 100644 --- a/modules/@angular/compiler/test/i18n/xmb_serializer_spec.ts +++ b/modules/@angular/compiler/test/i18n/xmb_serializer_spec.ts @@ -6,12 +6,13 @@ * found in the LICENSE file at https://angular.io/license */ -import {HtmlAst} from '@angular/compiler/src/html_ast'; import {Message, id} from '@angular/compiler/src/i18n/message'; import {deserializeXmb, serializeXmb} from '@angular/compiler/src/i18n/xmb_serializer'; import {ParseError, ParseSourceSpan} from '@angular/compiler/src/parse_util'; import {beforeEach, ddescribe, describe, expect, iit, inject, it, xdescribe, xit} from '@angular/core/testing/testing_internal'; +import {HtmlAst} from '../../src/html_parser/html_ast'; + export function main() { describe('Xmb', () => { describe('Xmb Serialization', () => { diff --git a/modules/@angular/compiler/test/schema/dom_element_schema_registry_spec.ts b/modules/@angular/compiler/test/schema/dom_element_schema_registry_spec.ts index 3efe5e4709..138a51759f 100644 --- a/modules/@angular/compiler/test/schema/dom_element_schema_registry_spec.ts +++ b/modules/@angular/compiler/test/schema/dom_element_schema_registry_spec.ts @@ -6,13 +6,14 @@ * found in the LICENSE file at https://angular.io/license */ -import {HtmlElementAst} from '@angular/compiler/src/html_ast'; -import {HtmlParser} from '@angular/compiler/src/html_parser'; import {DomElementSchemaRegistry} from '@angular/compiler/src/schema/dom_element_schema_registry'; import {CUSTOM_ELEMENTS_SCHEMA, SecurityContext} from '@angular/core'; import {beforeEach, ddescribe, describe, expect, iit, inject, it, xdescribe, xit} from '@angular/core/testing/testing_internal'; import {browserDetection} from '@angular/platform-browser/testing/browser_util'; +import {HtmlElementAst} from '../../src/html_parser/html_ast'; +import {HtmlParser} from '../../src/html_parser/html_parser'; + import {extractSchema} from './schema_extractor'; export function main() { diff --git a/modules/@angular/compiler/test/template_parser_spec.ts b/modules/@angular/compiler/test/template_parser/template_parser_spec.ts similarity index 99% rename from modules/@angular/compiler/test/template_parser_spec.ts rename to modules/@angular/compiler/test/template_parser/template_parser_spec.ts index e720bc1d14..44a79eb881 100644 --- a/modules/@angular/compiler/test/template_parser_spec.ts +++ b/modules/@angular/compiler/test/template_parser/template_parser_spec.ts @@ -9,19 +9,19 @@ import {CompileDiDependencyMetadata, CompileDirectiveMetadata, CompilePipeMetadata, CompileProviderMetadata, CompileQueryMetadata, CompileTemplateMetadata, CompileTokenMetadata, CompileTypeMetadata} from '@angular/compiler/src/compile_metadata'; import {DomElementSchemaRegistry} from '@angular/compiler/src/schema/dom_element_schema_registry'; import {ElementSchemaRegistry} from '@angular/compiler/src/schema/element_schema_registry'; -import {AttrAst, BoundDirectivePropertyAst, BoundElementPropertyAst, BoundEventAst, BoundTextAst, DirectiveAst, ElementAst, EmbeddedTemplateAst, NgContentAst, PropertyBindingType, ProviderAstType, ReferenceAst, TemplateAst, TemplateAstVisitor, TextAst, VariableAst, templateVisitAll} from '@angular/compiler/src/template_ast'; -import {TEMPLATE_TRANSFORMS, TemplateParser, splitClasses} from '@angular/compiler/src/template_parser'; +import {AttrAst, BoundDirectivePropertyAst, BoundElementPropertyAst, BoundEventAst, BoundTextAst, DirectiveAst, ElementAst, EmbeddedTemplateAst, NgContentAst, PropertyBindingType, ProviderAstType, ReferenceAst, TemplateAst, TemplateAstVisitor, TextAst, VariableAst, templateVisitAll} from '@angular/compiler/src/template_parser/template_ast'; +import {TEMPLATE_TRANSFORMS, TemplateParser, splitClasses} from '@angular/compiler/src/template_parser/template_parser'; import {MockSchemaRegistry} from '@angular/compiler/testing'; import {SchemaMetadata, SecurityContext} from '@angular/core'; import {Console} from '@angular/core/src/console'; import {TestBed} from '@angular/core/testing'; import {afterEach, beforeEach, beforeEachProviders, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal'; -import {Identifiers, identifierToken} from '../src/identifiers'; -import {DEFAULT_INTERPOLATION_CONFIG, InterpolationConfig} from '../src/interpolation_config'; +import {Identifiers, identifierToken} from '../../src/identifiers'; +import {DEFAULT_INTERPOLATION_CONFIG, InterpolationConfig} from '../../src/html_parser/interpolation_config'; -import {unparse} from './expression_parser/unparser'; -import {TEST_COMPILER_PROVIDERS} from './test_bindings'; +import {unparse} from '../expression_parser/unparser'; +import {TEST_COMPILER_PROVIDERS} from '../test_bindings'; var someModuleUrl = 'package:someModule'; diff --git a/modules/@angular/compiler/test/template_preparser_spec.ts b/modules/@angular/compiler/test/template_parser/template_preparser_spec.ts similarity index 87% rename from modules/@angular/compiler/test/template_preparser_spec.ts rename to modules/@angular/compiler/test/template_parser/template_preparser_spec.ts index a64ad1ae73..dd76f5a0da 100644 --- a/modules/@angular/compiler/test/template_preparser_spec.ts +++ b/modules/@angular/compiler/test/template_parser/template_preparser_spec.ts @@ -6,17 +6,18 @@ * found in the LICENSE file at https://angular.io/license */ -import {HtmlParser} from '@angular/compiler/src/html_parser'; -import {PreparsedElement, PreparsedElementType, preparseElement} from '@angular/compiler/src/template_preparser'; -import {afterEach, beforeEach, beforeEachProviders, ddescribe, describe, expect, iit, inject, it, xdescribe, xit} from '@angular/core/testing/testing_internal'; +import {afterEach, beforeEach, beforeEachProviders, ddescribe, describe, expect, iit, inject, it, xdescribe, xit} from '../../../core/testing/testing_internal'; +import {HtmlElementAst} from '../../src/html_parser/html_ast'; +import {HtmlParser} from '../../src/html_parser/html_parser'; +import {PreparsedElement, PreparsedElementType, preparseElement} from '../../src/template_parser/template_preparser'; export function main() { describe('preparseElement', () => { - var htmlParser: any /** TODO #9100 */; + var htmlParser: HtmlParser; beforeEach(inject([HtmlParser], (_htmlParser: HtmlParser) => { htmlParser = _htmlParser; })); function preparse(html: string): PreparsedElement { - return preparseElement(htmlParser.parse(html, 'TestComp').rootNodes[0]); + return preparseElement(htmlParser.parse(html, 'TestComp').rootNodes[0] as HtmlElementAst); } it('should detect script elements', inject([HtmlParser], (htmlParser: HtmlParser) => {