cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(core): adjust imports for rename angular2/src/compiler -> angular2/src/core/compiler

Browse Source
This commit is contained in:
Tobias Bosch
2015-10-02 07:57:29 -07:00
parent aa3d94149f
commit e8e57cdd73
33 changed files with 112 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/angular2/test/core/compiler/change_definition_factory_spec.ts
View File

@ -16,8 +16,8 @@ import {MapWrapper} from 'angular2/src/core/facade/collection';
import {
CompileDirectiveMetadata,
CompileTypeMetadata
} from 'angular2/src/compiler/directive_metadata';
import {TemplateParser} from 'angular2/src/compiler/template_parser';
} from 'angular2/src/core/compiler/directive_metadata';
import {TemplateParser} from 'angular2/src/core/compiler/template_parser';
import {
Parser,
Lexer,
@ -32,7 +32,9 @@ import {
ChangeDetector
} from 'angular2/src/core/change_detection/change_detection';
import {Pipes} from 'angular2/src/core/change_detection/pipes';
import {createChangeDetectorDefinitions} from 'angular2/src/compiler/change_definition_factory';
import {
createChangeDetectorDefinitions
} from 'angular2/src/core/compiler/change_definition_factory';
import {TestDirective, TestDispatcher, TestPipes} from './change_detector_mocks';
import {TEST_BINDINGS} from './test_bindings';

18
modules/angular2/test/core/compiler/change_detector_compiler_spec.ts
View File

@ -18,20 +18,20 @@ import {CONST_EXPR, stringify} from 'angular2/src/core/facade/lang';
import {MapWrapper} from 'angular2/src/core/facade/collection';
import {Promise} from 'angular2/src/core/facade/async';
import {ChangeDetectionCompiler} from 'angular2/src/compiler/change_detector_compiler';
import {ChangeDetectionCompiler} from 'angular2/src/core/compiler/change_detector_compiler';
import {
CompileDirectiveMetadata,
CompileTypeMetadata
} from 'angular2/src/compiler/directive_metadata';
} from 'angular2/src/core/compiler/directive_metadata';
import {
SourceModule,
SourceExpression,
SourceExpressions,
moduleRef
} from 'angular2/src/compiler/source_module';
} from 'angular2/src/core/compiler/source_module';
import {TemplateParser} from 'angular2/src/compiler/template_parser';
import {TemplateParser} from 'angular2/src/core/compiler/template_parser';
import {
ChangeDetectorGenConfig,
@ -47,10 +47,14 @@ import {evalModule} from './eval_module';
import {TEST_BINDINGS} from './test_bindings';
import {TestDispatcher, TestPipes} from './change_detector_mocks';
import {codeGenValueFn, codeGenExportVariable, MODULE_SUFFIX} from 'angular2/src/compiler/util';
import {
codeGenValueFn,
codeGenExportVariable,
MODULE_SUFFIX
} from 'angular2/src/core/compiler/util';
// Attention: These module names have to correspond to real modules!
var THIS_MODULE_ID = 'angular2/test/compiler/change_detector_compiler_spec';
var THIS_MODULE_ID = 'angular2/test/core/compiler/change_detector_compiler_spec';
var THIS_MODULE_URL = `package:${THIS_MODULE_ID}${MODULE_SUFFIX}`;
var THIS_MODULE_REF = moduleRef(THIS_MODULE_URL);
@ -151,4 +155,4 @@ export function testChangeDetector(changeDetectorFactory: Function): string[] {
class SomeComponent {
someProp: string;
}
}

12
modules/angular2/test/core/compiler/command_compiler_spec.ts
View File

@ -16,7 +16,7 @@ import {
import {CONST_EXPR, stringify, isType, Type, isBlank} from 'angular2/src/core/facade/lang';
import {MapWrapper} from 'angular2/src/core/facade/collection';
import {PromiseWrapper, Promise} from 'angular2/src/core/facade/async';
import {TemplateParser} from 'angular2/src/compiler/template_parser';
import {TemplateParser} from 'angular2/src/core/compiler/template_parser';
import {
CommandVisitor,
TextCmd,
@ -28,13 +28,13 @@ import {
visitAllCommands,
CompiledTemplate
} from 'angular2/src/core/linker/template_commands';
import {CommandCompiler} from 'angular2/src/compiler/command_compiler';
import {CommandCompiler} from 'angular2/src/core/compiler/command_compiler';
import {
CompileDirectiveMetadata,
CompileTypeMetadata,
CompileTemplateMetadata
} from 'angular2/src/compiler/directive_metadata';
import {SourceModule, SourceExpression, moduleRef} from 'angular2/src/compiler/source_module';
} from 'angular2/src/core/compiler/directive_metadata';
import {SourceModule, SourceExpression, moduleRef} from 'angular2/src/core/compiler/source_module';
import {ViewEncapsulation} from 'angular2/src/core/render/api';
import {evalModule} from './eval_module';
import {
@ -42,7 +42,7 @@ import {
codeGenValueFn,
codeGenExportVariable,
MODULE_SUFFIX
} from 'angular2/src/compiler/util';
} from 'angular2/src/core/compiler/util';
import {TEST_BINDINGS} from './test_bindings';
const BEGIN_ELEMENT = 'BEGIN_ELEMENT';
@ -54,7 +54,7 @@ const NG_CONTENT = 'NG_CONTENT';
const EMBEDDED_TEMPLATE = 'EMBEDDED_TEMPLATE';
// Attention: These module names have to correspond to real modules!
var THIS_MODULE_URL = `package:angular2/test/compiler/command_compiler_spec${MODULE_SUFFIX}`;
var THIS_MODULE_URL = `package:angular2/test/core/compiler/command_compiler_spec${MODULE_SUFFIX}`;
var THIS_MODULE_REF = moduleRef(THIS_MODULE_URL);
var TEMPLATE_COMMANDS_MODULE_REF =
moduleRef(`package:angular2/src/core/linker/template_commands${MODULE_SUFFIX}`);

2
modules/angular2/test/core/compiler/directive_metadata_spec.ts
View File

@ -16,7 +16,7 @@ import {
CompileDirectiveMetadata,
CompileTypeMetadata,
CompileTemplateMetadata
} from 'angular2/src/compiler/directive_metadata';
} from 'angular2/src/core/compiler/directive_metadata';
import {ViewEncapsulation} from 'angular2/src/core/render/api';
import {ChangeDetectionStrategy} from 'angular2/src/core/change_detection';
import {LifecycleHooks} from 'angular2/src/core/linker/interfaces';

7
modules/angular2/test/core/compiler/eval_module_spec.ts
View File

@ -11,7 +11,7 @@ import {
AsyncTestCompleter,
inject
} from 'angular2/test_lib';
import {IS_DART} from '../platform';
import {IS_DART} from '../../platform';
import {evalModule} from './eval_module';
@ -19,7 +19,8 @@ import {evalModule} from './eval_module';
// when evaling the test module!
export var TEST_VALUE = 23;
const THIS_MODULE_URL = `package:angular2/test/compiler/eval_module_spec${IS_DART?'.dart':'.js'}`;
const THIS_MODULE_URL =
`package:angular2/test/core/compiler/eval_module_spec${IS_DART?'.dart':'.js'}`;
export function main() {
describe('evalModule', () => {
@ -47,4 +48,4 @@ var testJsModule = `
data.push(tst.TEST_VALUE);
return data;
}
`;
`;

6
modules/angular2/test/core/compiler/html_parser_spec.ts
View File

@ -1,6 +1,6 @@
import {ddescribe, describe, it, iit, xit, expect, beforeEach, afterEach} from 'angular2/test_lib';
import {HtmlParser} from 'angular2/src/compiler/html_parser';
import {HtmlParser} from 'angular2/src/core/compiler/html_parser';
import {
HtmlAst,
HtmlAstVisitor,
@ -8,7 +8,7 @@ import {
HtmlAttrAst,
HtmlTextAst,
htmlVisitAll
} from 'angular2/src/compiler/html_ast';
} from 'angular2/src/core/compiler/html_ast';
export function main() {
describe('DomParser', () => {
@ -128,4 +128,4 @@ class Humanizer implements HtmlAstVisitor {
this.result.push([HtmlTextAst, ast.value, ast.sourceInfo]);
return null;
}
}
}

4
modules/angular2/test/core/compiler/runtime_compiler_spec.ts
View File

@ -15,13 +15,13 @@ import {
import {Component, View, bind} from 'angular2/core';
import {PromiseWrapper} from 'angular2/src/core/facade/async';
import {SpyProtoViewFactory} from '../core/spies';
import {SpyProtoViewFactory} from '../spies';
import {
CompiledHostTemplate,
CompiledTemplate,
BeginComponentCmd
} from 'angular2/src/core/linker/template_commands';
import {RuntimeCompiler} from 'angular2/src/compiler/runtime_compiler';
import {RuntimeCompiler} from 'angular2/src/core/compiler/runtime_compiler';
import {ProtoViewFactory} from 'angular2/src/core/linker/proto_view_factory';
import {AppProtoView} from 'angular2/src/core/linker/view';

7
modules/angular2/test/core/compiler/runtime_metadata_spec.ts
View File

@ -14,7 +14,7 @@ import {
} from 'angular2/test_lib';
import {stringify} from 'angular2/src/core/facade/lang';
import {RuntimeMetadataResolver} from 'angular2/src/compiler/runtime_metadata';
import {RuntimeMetadataResolver} from 'angular2/src/core/compiler/runtime_metadata';
import {LifecycleHooks, LIFECYCLE_HOOKS_VALUES} from 'angular2/src/core/linker/interfaces';
import {
Component,
@ -34,7 +34,7 @@ import {
} from 'angular2/core';
import {TEST_BINDINGS} from './test_bindings';
import {MODULE_SUFFIX, IS_DART} from 'angular2/src/compiler/util';
import {MODULE_SUFFIX, IS_DART} from 'angular2/src/core/compiler/util';
export function main() {
describe('RuntimeMetadataResolver', () => {
@ -69,7 +69,8 @@ export function main() {
inject([RuntimeMetadataResolver], (resolver: RuntimeMetadataResolver) => {
var value: string = resolver.getMetadata(DirectiveWithoutModuleId).type.moduleUrl;
var expectedEndValue =
IS_DART ? 'base/dist/dart/angular2/test/compiler/runtime_metadata_spec.dart' : './';
IS_DART ? 'base/dist/dart/angular2/test/core/compiler/runtime_metadata_spec.dart' :
'./';
expect((<any>value).endsWith(expectedEndValue)).toBe(true);
}));
});

2
modules/angular2/test/core/compiler/source_module_spec.ts
View File

@ -12,7 +12,7 @@ import {
TestComponentBuilder
} from 'angular2/test_lib';
import {SourceModule, moduleRef} from 'angular2/src/compiler/source_module';
import {SourceModule, moduleRef} from 'angular2/src/core/compiler/source_module';
export function main() {
describe('SourceModule', () => {

20
modules/angular2/test/core/compiler/style_compiler_spec.ts
View File

@ -13,31 +13,35 @@ import {
beforeEachBindings
} from 'angular2/test_lib';
import {bind} from 'angular2/src/core/di';
import {SpyXHR} from '../core/spies';
import {SpyXHR} from '../spies';
import {XHR} from 'angular2/src/core/render/xhr';
import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions';
import {CONST_EXPR, isPresent, isBlank, StringWrapper} from 'angular2/src/core/facade/lang';
import {PromiseWrapper, Promise} from 'angular2/src/core/facade/async';
import {evalModule} from './eval_module';
import {StyleCompiler} from 'angular2/src/compiler/style_compiler';
import {StyleCompiler} from 'angular2/src/core/compiler/style_compiler';
import {
CompileDirectiveMetadata,
CompileTemplateMetadata,
CompileTypeMetadata
} from 'angular2/src/compiler/directive_metadata';
import {SourceExpression, SourceModule} from 'angular2/src/compiler/source_module';
} from 'angular2/src/core/compiler/directive_metadata';
import {SourceExpression, SourceModule} from 'angular2/src/core/compiler/source_module';
import {ViewEncapsulation} from 'angular2/src/core/render/api';
import {TEST_BINDINGS} from './test_bindings';
import {codeGenValueFn, codeGenExportVariable, MODULE_SUFFIX} from 'angular2/src/compiler/util';
import {
codeGenValueFn,
codeGenExportVariable,
MODULE_SUFFIX
} from 'angular2/src/core/compiler/util';
// Attention: These module names have to correspond to real modules!
var MODULE_URL = `package:angular2/test/compiler/style_compiler_spec${MODULE_SUFFIX}`;
var IMPORT_ABS_STYLESHEET_URL = `package:angular2/test/compiler/style_compiler_import.css`;
var MODULE_URL = `package:angular2/test/core/compiler/style_compiler_spec${MODULE_SUFFIX}`;
var IMPORT_ABS_STYLESHEET_URL = `package:angular2/test/core/compiler/style_compiler_import.css`;
var IMPORT_REL_STYLESHEET_URL = './style_compiler_import.css';
// Note: Not a real module, only used via mocks.
var IMPORT_ABS_STYLESHEET_URL_WITH_IMPORT =
`package:angular2/test/compiler/style_compiler_transitive_import.css`;
`package:angular2/test/core/compiler/style_compiler_transitive_import.css`;
export function main() {
describe('StyleCompiler', () => {

2
modules/angular2/test/core/compiler/style_url_resolver_spec.ts
View File

@ -1,5 +1,5 @@
import {describe, it, expect, beforeEach, ddescribe, iit, xit, el} from 'angular2/test_lib';
import {resolveStyleUrls} from 'angular2/src/compiler/style_url_resolver';
import {resolveStyleUrls} from 'angular2/src/core/compiler/style_url_resolver';
import {UrlResolver} from 'angular2/src/core/services/url_resolver';

26
modules/angular2/test/core/compiler/template_compiler_spec.ts
View File

@ -16,14 +16,14 @@ import {
import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async';
import {Type, isPresent, isBlank, stringify, isString} from 'angular2/src/core/facade/lang';
import {MapWrapper, SetWrapper, ListWrapper} from 'angular2/src/core/facade/collection';
import {RuntimeMetadataResolver} from 'angular2/src/compiler/runtime_metadata';
import {RuntimeMetadataResolver} from 'angular2/src/core/compiler/runtime_metadata';
import {
TemplateCompiler,
NormalizedComponentWithViewDirectives
} from 'angular2/src/compiler/template_compiler';
import {CompileDirectiveMetadata} from 'angular2/src/compiler/directive_metadata';
} from 'angular2/src/core/compiler/template_compiler';
import {CompileDirectiveMetadata} from 'angular2/src/core/compiler/directive_metadata';
import {evalModule} from './eval_module';
import {SourceModule, moduleRef} from 'angular2/src/compiler/source_module';
import {SourceModule, moduleRef} from 'angular2/src/core/compiler/source_module';
import {XHR} from 'angular2/src/core/render/xhr';
import {MockXHR} from 'angular2/src/core/render/xhr_mock';
@ -45,11 +45,15 @@ import {Component, View, Directive, bind} from 'angular2/core';
import {TEST_BINDINGS} from './test_bindings';
import {TestDispatcher, TestPipes} from './change_detector_mocks';
import {codeGenValueFn, codeGenExportVariable, MODULE_SUFFIX} from 'angular2/src/compiler/util';
import {
codeGenValueFn,
codeGenExportVariable,
MODULE_SUFFIX
} from 'angular2/src/core/compiler/util';
import {APP_ID} from 'angular2/src/core/render/dom/dom_tokens';
// Attention: This path has to point to this test file!
const THIS_MODULE_ID = 'angular2/test/compiler/template_compiler_spec';
const THIS_MODULE_ID = 'angular2/test/core/compiler/template_compiler_spec';
var THIS_MODULE_REF = moduleRef(`package:${THIS_MODULE_ID}${MODULE_SUFFIX}`);
const APP_ID_VALUE = 'app1';
@ -136,7 +140,7 @@ export function main() {
it('should cache components for parallel requests',
inject([AsyncTestCompleter, XHR], (async, xhr: MockXHR) => {
xhr.expect('package:angular2/test/compiler/compUrl.html', 'a');
xhr.expect('package:angular2/test/core/compiler/compUrl.html', 'a');
PromiseWrapper.all([compile([CompWithTemplateUrl]), compile([CompWithTemplateUrl])])
.then((humanizedTemplates) => {
expect(humanizedTemplates[0]['commands'][1]['commands']).toEqual(['#text(a)']);
@ -149,7 +153,7 @@ export function main() {
it('should cache components for sequential requests',
inject([AsyncTestCompleter, XHR], (async, xhr: MockXHR) => {
xhr.expect('package:angular2/test/compiler/compUrl.html', 'a');
xhr.expect('package:angular2/test/core/compiler/compUrl.html', 'a');
compile([CompWithTemplateUrl])
.then((humanizedTemplate0) => {
return compile([CompWithTemplateUrl])
@ -166,11 +170,11 @@ export function main() {
it('should allow to clear the cache',
inject([AsyncTestCompleter, XHR], (async, xhr: MockXHR) => {
xhr.expect('package:angular2/test/compiler/compUrl.html', 'a');
xhr.expect('package:angular2/test/core/compiler/compUrl.html', 'a');
compile([CompWithTemplateUrl])
.then((humanizedTemplate) => {
compiler.clearCache();
xhr.expect('package:angular2/test/compiler/compUrl.html', 'b');
xhr.expect('package:angular2/test/core/compiler/compUrl.html', 'b');
var result = compile([CompWithTemplateUrl]);
xhr.flush();
return result;
@ -226,7 +230,7 @@ export function main() {
it('should normalize the template',
inject([AsyncTestCompleter, XHR], (async, xhr: MockXHR) => {
xhr.expect('package:angular2/test/compiler/compUrl.html', 'loadedTemplate');
xhr.expect('package:angular2/test/core/compiler/compUrl.html', 'loadedTemplate');
compiler.normalizeDirectiveMetadata(
runtimeMetadataResolver.getMetadata(CompWithTemplateUrl))
.then((meta: CompileDirectiveMetadata) => {

4
modules/angular2/test/core/compiler/template_normalizer_spec.ts
View File

@ -16,10 +16,10 @@ import {
import {
CompileTypeMetadata,
CompileTemplateMetadata
} from 'angular2/src/compiler/directive_metadata';
} from 'angular2/src/core/compiler/directive_metadata';
import {ViewEncapsulation} from 'angular2/src/core/render/api';
import {TemplateNormalizer} from 'angular2/src/compiler/template_normalizer';
import {TemplateNormalizer} from 'angular2/src/core/compiler/template_normalizer';
import {XHR} from 'angular2/src/core/render/xhr';
import {MockXHR} from 'angular2/src/core/render/xhr_mock';
import {TEST_BINDINGS} from './test_bindings';

8
modules/angular2/test/core/compiler/template_parser_spec.ts
View File

@ -14,12 +14,12 @@ import {bind} from 'angular2/src/core/di';
import {TEST_BINDINGS} from './test_bindings';
import {isPresent} from 'angular2/src/core/facade/lang';
import {TemplateParser, splitClasses} from 'angular2/src/compiler/template_parser';
import {TemplateParser, splitClasses} from 'angular2/src/core/compiler/template_parser';
import {
CompileDirectiveMetadata,
CompileTypeMetadata,
CompileTemplateMetadata
} from 'angular2/src/compiler/directive_metadata';
} from 'angular2/src/core/compiler/directive_metadata';
import {
templateVisitAll,
TemplateAstVisitor,
@ -36,12 +36,12 @@ import {
TextAst,
PropertyBindingType,
DirectiveAst
} from 'angular2/src/compiler/template_ast';
} from 'angular2/src/core/compiler/template_ast';
import {ElementSchemaRegistry} from 'angular2/src/core/render/dom/schema/element_schema_registry';
import {MockSchemaRegistry} from './schema_registry_mock';
import {Unparser} from '../core/change_detection/parser/unparser';
import {Unparser} from '../change_detection/parser/unparser';
var expressionUnparser = new Unparser();

6
modules/angular2/test/core/compiler/template_preparser_spec.ts
View File

@ -13,12 +13,12 @@ import {
beforeEachBindings
} from 'angular2/test_lib';
import {HtmlParser} from 'angular2/src/compiler/html_parser';
import {HtmlParser} from 'angular2/src/core/compiler/html_parser';
import {
preparseElement,
PreparsedElementType,
PreparsedElement
} from 'angular2/src/compiler/template_preparser';
} from 'angular2/src/core/compiler/template_preparser';
export function main() {
describe('preparseElement', () => {
@ -55,4 +55,4 @@ export function main() {
}));
});
}
}

6
modules/angular2/test/core/compiler/util_spec.ts
View File

@ -12,8 +12,8 @@ import {
TestComponentBuilder
} from 'angular2/test_lib';
import {IS_DART} from '../platform';
import {escapeSingleQuoteString, escapeDoubleQuoteString} from 'angular2/src/compiler/util';
import {IS_DART} from '../../platform';
import {escapeSingleQuoteString, escapeDoubleQuoteString} from 'angular2/src/core/compiler/util';
export function main() {
describe('util', () => {
@ -52,4 +52,4 @@ export function main() {
});
});
}
}