From d10df7de44471a9d12901096910c6e9a6e0b9e06 Mon Sep 17 00:00:00 2001 From: Tim Blasi Date: Mon, 16 Mar 2015 13:32:29 -0700 Subject: [PATCH] style(dart/transform): Rename .ngDeps.dart => .ng_deps.dart Update to conform with file naming conventions. Closes #975 --- .../transform/bind_generator/transformer.dart | 2 +- .../angular2/src/transform/common/names.dart | 2 +- .../angular2/src/transform/common/parser.dart | 4 ++-- .../directive_linker/transformer.dart | 2 +- .../directive_processor/rewriter.dart | 2 +- .../directive_processor/transformer.dart | 4 ++-- .../reflection_remover/transformer.dart | 4 ++-- .../transform/bind_generator/all_tests.dart | 9 ++++---- .../{bar.ngDeps.dart => bar.ng_deps.dart} | 0 .../{bar.ngDeps.dart => bar.ng_deps.dart} | 0 .../{soup.ngDeps.dart => soup.ng_deps.dart} | 0 .../{soup.ngDeps.dart => soup.ng_deps.dart} | 0 .../directive_processor/all_tests.dart | 2 +- .../{soup.ngDeps.dart => soup.ng_deps.dart} | 0 .../test/transform/integration/all_tests.dart | 21 ++++++++++--------- .../{bar.ngDeps.dart => bar.ng_deps.dart} | 2 +- .../{foo.ngDeps.dart => foo.ng_deps.dart} | 0 .../{index.ngDeps.dart => index.ng_deps.dart} | 2 +- .../{bar.ngDeps.dart => bar.ng_deps.dart} | 0 .../{bar.ngDeps.dart => bar.ng_deps.dart} | 0 .../{index.ngDeps.dart => index.ng_deps.dart} | 2 +- .../{bar.ngDeps.dart => bar.ng_deps.dart} | 0 .../{bar.ngDeps.dart => bar.ng_deps.dart} | 0 .../{bar.ngDeps.dart => bar.ng_deps.dart} | 0 .../reflection_remover/all_tests.dart | 2 +- .../expected/index.dart | 2 +- 26 files changed, 32 insertions(+), 30 deletions(-) rename modules/angular2/test/transform/bind_generator/basic_bind_files/{bar.ngDeps.dart => bar.ng_deps.dart} (100%) rename modules/angular2/test/transform/bind_generator/basic_bind_files/expected/{bar.ngDeps.dart => bar.ng_deps.dart} (100%) rename modules/angular2/test/transform/bind_generator/duplicate_bind_name_files/expected/{soup.ngDeps.dart => soup.ng_deps.dart} (100%) rename modules/angular2/test/transform/bind_generator/duplicate_bind_name_files/{soup.ngDeps.dart => soup.ng_deps.dart} (100%) rename modules/angular2/test/transform/directive_processor/parameter_metadata/expected/{soup.ngDeps.dart => soup.ng_deps.dart} (100%) rename modules/angular2/test/transform/integration/chained_deps_files/expected/{bar.ngDeps.dart => bar.ng_deps.dart} (94%) rename modules/angular2/test/transform/integration/chained_deps_files/expected/{foo.ngDeps.dart => foo.ng_deps.dart} (100%) rename modules/angular2/test/transform/integration/chained_deps_files/expected/{index.ngDeps.dart => index.ng_deps.dart} (88%) rename modules/angular2/test/transform/integration/list_of_types_files/expected/{bar.ngDeps.dart => bar.ng_deps.dart} (100%) rename modules/angular2/test/transform/integration/simple_annotation_files/expected/{bar.ngDeps.dart => bar.ng_deps.dart} (100%) rename modules/angular2/test/transform/integration/simple_annotation_files/expected/{index.ngDeps.dart => index.ng_deps.dart} (91%) rename modules/angular2/test/transform/integration/synthetic_ctor_files/expected/{bar.ngDeps.dart => bar.ng_deps.dart} (100%) rename modules/angular2/test/transform/integration/two_annotations_files/expected/{bar.ngDeps.dart => bar.ng_deps.dart} (100%) rename modules/angular2/test/transform/integration/two_deps_files/expected/{bar.ngDeps.dart => bar.ng_deps.dart} (100%) diff --git a/modules/angular2/src/transform/bind_generator/transformer.dart b/modules/angular2/src/transform/bind_generator/transformer.dart index f95b77e1c7..deaf352e5e 100644 --- a/modules/angular2/src/transform/bind_generator/transformer.dart +++ b/modules/angular2/src/transform/bind_generator/transformer.dart @@ -10,7 +10,7 @@ import 'package:barback/barback.dart'; import 'generator.dart'; -/// Transformer responsible for reading .ngDeps.dart files and generating +/// Transformer responsible for reading .ng_deps.dart files and generating /// setters from the "annotations" information in the generated /// `registerType` calls. /// diff --git a/modules/angular2/src/transform/common/names.dart b/modules/angular2/src/transform/common/names.dart index 8c2f44461d..c0592d157f 100644 --- a/modules/angular2/src/transform/common/names.dart +++ b/modules/angular2/src/transform/common/names.dart @@ -2,6 +2,6 @@ library angular2.src.transform.common.names; const SETUP_METHOD_NAME = 'setupReflection'; const REFLECTOR_VAR_NAME = 'reflector'; -const DEPS_EXTENSION = '.ngDeps.dart'; +const DEPS_EXTENSION = '.ng_deps.dart'; const REGISTER_TYPE_METHOD_NAME = 'registerType'; const REGISTER_SETTERS_METHOD_NAME = 'registerSetters'; diff --git a/modules/angular2/src/transform/common/parser.dart b/modules/angular2/src/transform/common/parser.dart index 0f03e58392..38e85287f7 100644 --- a/modules/angular2/src/transform/common/parser.dart +++ b/modules/angular2/src/transform/common/parser.dart @@ -37,8 +37,8 @@ class Parser { return ngDeps; } - /// Parses the `.ngDeps.dart` file represented by [id] into an [NgDeps] - /// object. All `.ngDeps.dart` files imported by [id] are then parsed. The + /// Parses the `.ng_deps.dart` file represented by [id] into an [NgDeps] + /// object. All `.ng_deps.dart` files imported by [id] are then parsed. The /// results are added to [allDeps]. Future> _recurse(AssetId id, [List allDeps, Set seen]) async { diff --git a/modules/angular2/src/transform/directive_linker/transformer.dart b/modules/angular2/src/transform/directive_linker/transformer.dart index ea37b0c7c5..89d0c053c5 100644 --- a/modules/angular2/src/transform/directive_linker/transformer.dart +++ b/modules/angular2/src/transform/directive_linker/transformer.dart @@ -10,7 +10,7 @@ import 'package:barback/barback.dart'; import 'linker.dart'; -/// Transformer responsible for processing .ngDeps.dart files created by +/// Transformer responsible for processing .ng_deps.dart files created by /// [DirectiveProcessor] and ensuring that the generated calls to /// `setupReflection` call the necessary `setupReflection` method in all /// dependencies. diff --git a/modules/angular2/src/transform/directive_processor/rewriter.dart b/modules/angular2/src/transform/directive_processor/rewriter.dart index 4fa12ac795..0b991a7fa5 100644 --- a/modules/angular2/src/transform/directive_processor/rewriter.dart +++ b/modules/angular2/src/transform/directive_processor/rewriter.dart @@ -31,7 +31,7 @@ String createNgDeps(String code, String path, {bool forceGenerate: false}) { } /// Visitor responsible for processing [CompilationUnit] and creating an -/// associated .ngDeps.dart file. +/// associated .ng_deps.dart file. class CreateNgDepsVisitor extends Object with SimpleAstVisitor, VisitorMixin { final PrintWriter writer; diff --git a/modules/angular2/src/transform/directive_processor/transformer.dart b/modules/angular2/src/transform/directive_processor/transformer.dart index 08950e04e5..04ed44c2ea 100644 --- a/modules/angular2/src/transform/directive_processor/transformer.dart +++ b/modules/angular2/src/transform/directive_processor/transformer.dart @@ -11,10 +11,10 @@ import 'package:barback/barback.dart'; import 'rewriter.dart'; /// Transformer responsible for processing all .dart assets and creating -/// .ngDeps.dart files which register @Injectable annotated classes with the +/// .ng_deps.dart files which register @Injectable annotated classes with the /// reflector. /// -/// This will also create .ngDeps.dart files for classes annotated +/// This will also create .ng_deps.dart files for classes annotated /// with @Component, @Template, @Decorator, etc. /// /// This transformer is the first phase in a two-phase transform. It should diff --git a/modules/angular2/src/transform/reflection_remover/transformer.dart b/modules/angular2/src/transform/reflection_remover/transformer.dart index 5bbcce31f0..d7810e8838 100644 --- a/modules/angular2/src/transform/reflection_remover/transformer.dart +++ b/modules/angular2/src/transform/reflection_remover/transformer.dart @@ -14,9 +14,9 @@ import 'remove_reflection_capabilities.dart'; /// The goal of this is to break the app's dependency on dart:mirrors. /// /// This transformer assumes that [DirectiveProcessor] and [DirectiveLinker] -/// have already been run and that a .ngDeps.dart file has been generated for +/// have already been run and that a .ng_deps.dart file has been generated for /// [options.entryPoint]. The instantiation of [ReflectionCapabilities] is -/// replaced by calling `setupReflection` in that .ngDeps.dart file. +/// replaced by calling `setupReflection` in that .ng_deps.dart file. class ReflectionRemover extends Transformer { final TransformerOptions options; diff --git a/modules/angular2/test/transform/bind_generator/all_tests.dart b/modules/angular2/test/transform/bind_generator/all_tests.dart index 40e8991247..da1beb4694 100644 --- a/modules/angular2/test/transform/bind_generator/all_tests.dart +++ b/modules/angular2/test/transform/bind_generator/all_tests.dart @@ -19,9 +19,9 @@ void allTests() { test('should generate a setter for a `bind` property in an annotation.', () async { - var inputPath = 'bind_generator/basic_bind_files/bar.ngDeps.dart'; + var inputPath = 'bind_generator/basic_bind_files/bar.ng_deps.dart'; var expected = formatter.format( - readFile('bind_generator/basic_bind_files/expected/bar.ngDeps.dart')); + readFile('bind_generator/basic_bind_files/expected/bar.ng_deps.dart')); var output = formatter .format(await createNgSetters(reader, new AssetId('a', inputPath))); @@ -30,9 +30,10 @@ void allTests() { test('should generate a single setter when multiple annotations bind to the ' 'same property.', () async { - var inputPath = 'bind_generator/duplicate_bind_name_files/soup.ngDeps.dart'; + var inputPath = + 'bind_generator/duplicate_bind_name_files/soup.ng_deps.dart'; var expected = formatter.format(readFile( - 'bind_generator/duplicate_bind_name_files/expected/soup.ngDeps.dart')); + 'bind_generator/duplicate_bind_name_files/expected/soup.ng_deps.dart')); var output = formatter .format(await createNgSetters(reader, new AssetId('a', inputPath))); diff --git a/modules/angular2/test/transform/bind_generator/basic_bind_files/bar.ngDeps.dart b/modules/angular2/test/transform/bind_generator/basic_bind_files/bar.ng_deps.dart similarity index 100% rename from modules/angular2/test/transform/bind_generator/basic_bind_files/bar.ngDeps.dart rename to modules/angular2/test/transform/bind_generator/basic_bind_files/bar.ng_deps.dart diff --git a/modules/angular2/test/transform/bind_generator/basic_bind_files/expected/bar.ngDeps.dart b/modules/angular2/test/transform/bind_generator/basic_bind_files/expected/bar.ng_deps.dart similarity index 100% rename from modules/angular2/test/transform/bind_generator/basic_bind_files/expected/bar.ngDeps.dart rename to modules/angular2/test/transform/bind_generator/basic_bind_files/expected/bar.ng_deps.dart diff --git a/modules/angular2/test/transform/bind_generator/duplicate_bind_name_files/expected/soup.ngDeps.dart b/modules/angular2/test/transform/bind_generator/duplicate_bind_name_files/expected/soup.ng_deps.dart similarity index 100% rename from modules/angular2/test/transform/bind_generator/duplicate_bind_name_files/expected/soup.ngDeps.dart rename to modules/angular2/test/transform/bind_generator/duplicate_bind_name_files/expected/soup.ng_deps.dart diff --git a/modules/angular2/test/transform/bind_generator/duplicate_bind_name_files/soup.ngDeps.dart b/modules/angular2/test/transform/bind_generator/duplicate_bind_name_files/soup.ng_deps.dart similarity index 100% rename from modules/angular2/test/transform/bind_generator/duplicate_bind_name_files/soup.ngDeps.dart rename to modules/angular2/test/transform/bind_generator/duplicate_bind_name_files/soup.ng_deps.dart diff --git a/modules/angular2/test/transform/directive_processor/all_tests.dart b/modules/angular2/test/transform/directive_processor/all_tests.dart index 6080226265..b7b90657f6 100644 --- a/modules/angular2/test/transform/directive_processor/all_tests.dart +++ b/modules/angular2/test/transform/directive_processor/all_tests.dart @@ -17,7 +17,7 @@ var formatter = new DartFormatter(); void allTests() { test('should preserve parameter annotations as const instances.', () { var inputPath = 'parameter_metadata/soup.dart'; - var expected = _readFile('parameter_metadata/expected/soup.ngDeps.dart'); + var expected = _readFile('parameter_metadata/expected/soup.ng_deps.dart'); var output = formatter.format(createNgDeps(_readFile(inputPath), inputPath)); expect(output, equals(expected)); diff --git a/modules/angular2/test/transform/directive_processor/parameter_metadata/expected/soup.ngDeps.dart b/modules/angular2/test/transform/directive_processor/parameter_metadata/expected/soup.ng_deps.dart similarity index 100% rename from modules/angular2/test/transform/directive_processor/parameter_metadata/expected/soup.ngDeps.dart rename to modules/angular2/test/transform/directive_processor/parameter_metadata/expected/soup.ng_deps.dart diff --git a/modules/angular2/test/transform/integration/all_tests.dart b/modules/angular2/test/transform/integration/all_tests.dart index 292bdff352..b3d0d3b45e 100644 --- a/modules/angular2/test/transform/integration/all_tests.dart +++ b/modules/angular2/test/transform/integration/all_tests.dart @@ -47,10 +47,10 @@ void allTests() { 'a|web/bar.dart': 'simple_annotation_files/bar.dart' }, outputs: { - 'a|web/bar.ngDeps.dart': - 'simple_annotation_files/expected/bar.ngDeps.dart', - 'a|web/index.ngDeps.dart': - 'simple_annotation_files/expected/index.ngDeps.dart' + 'a|web/bar.ng_deps.dart': + 'simple_annotation_files/expected/bar.ng_deps.dart', + 'a|web/index.ng_deps.dart': + 'simple_annotation_files/expected/index.ng_deps.dart' }), new IntegrationTestConfig( 'should generate proper code for a Component using a selector defined ' @@ -61,7 +61,7 @@ void allTests() { 'a|web/bar.dart': 'two_deps_files/bar.dart' }, outputs: { - 'a|web/bar.ngDeps.dart': 'two_deps_files/expected/bar.ngDeps.dart' + 'a|web/bar.ng_deps.dart': 'two_deps_files/expected/bar.ng_deps.dart' }), new IntegrationTestConfig( 'should generate proper code for a Component declaring a ' @@ -72,7 +72,7 @@ void allTests() { 'a|web/bar.dart': 'list_of_types_files/bar.dart' }, outputs: { - 'a|web/bar.ngDeps.dart': 'list_of_types_files/expected/bar.ngDeps.dart' + 'a|web/bar.ng_deps.dart': 'list_of_types_files/expected/bar.ng_deps.dart' }), new IntegrationTestConfig( 'should generate a factory for a class with no declared ctor.', @@ -81,7 +81,7 @@ void allTests() { 'a|web/bar.dart': 'synthetic_ctor_files/bar.dart' }, outputs: { - 'a|web/bar.ngDeps.dart': 'synthetic_ctor_files/expected/bar.ngDeps.dart' + 'a|web/bar.ng_deps.dart': 'synthetic_ctor_files/expected/bar.ng_deps.dart' }), new IntegrationTestConfig('should preserve multiple annotations.', inputs: { @@ -91,7 +91,8 @@ void allTests() { '../../../lib/src/core/annotations/template.dart' }, outputs: { - 'a|web/bar.ngDeps.dart': 'two_annotations_files/expected/bar.ngDeps.dart' + 'a|web/bar.ng_deps.dart': + 'two_annotations_files/expected/bar.ng_deps.dart' }), new IntegrationTestConfig( 'should ensure that dependencies are property chained.', @@ -101,8 +102,8 @@ void allTests() { 'a|web/bar.dart': 'chained_deps_files/bar.dart' }, outputs: { - 'a|web/bar.ngDeps.dart': 'chained_deps_files/expected/bar.ngDeps.dart', - 'a|web/foo.ngDeps.dart': 'chained_deps_files/expected/foo.ngDeps.dart' + 'a|web/bar.ng_deps.dart': 'chained_deps_files/expected/bar.ng_deps.dart', + 'a|web/foo.ng_deps.dart': 'chained_deps_files/expected/foo.ng_deps.dart' }) ]; diff --git a/modules/angular2/test/transform/integration/chained_deps_files/expected/bar.ngDeps.dart b/modules/angular2/test/transform/integration/chained_deps_files/expected/bar.ng_deps.dart similarity index 94% rename from modules/angular2/test/transform/integration/chained_deps_files/expected/bar.ngDeps.dart rename to modules/angular2/test/transform/integration/chained_deps_files/expected/bar.ng_deps.dart index b907cafd31..baffcad961 100644 --- a/modules/angular2/test/transform/integration/chained_deps_files/expected/bar.ngDeps.dart +++ b/modules/angular2/test/transform/integration/chained_deps_files/expected/bar.ng_deps.dart @@ -3,7 +3,7 @@ library bar; import 'bar.dart'; import 'package:angular2/src/core/annotations/annotations.dart'; import 'foo.dart' as dep; -import 'foo.ngDeps.dart' as i0; +import 'foo.ng_deps.dart' as i0; bool _visited = false; void setupReflection(reflector) { diff --git a/modules/angular2/test/transform/integration/chained_deps_files/expected/foo.ngDeps.dart b/modules/angular2/test/transform/integration/chained_deps_files/expected/foo.ng_deps.dart similarity index 100% rename from modules/angular2/test/transform/integration/chained_deps_files/expected/foo.ngDeps.dart rename to modules/angular2/test/transform/integration/chained_deps_files/expected/foo.ng_deps.dart diff --git a/modules/angular2/test/transform/integration/chained_deps_files/expected/index.ngDeps.dart b/modules/angular2/test/transform/integration/chained_deps_files/expected/index.ng_deps.dart similarity index 88% rename from modules/angular2/test/transform/integration/chained_deps_files/expected/index.ngDeps.dart rename to modules/angular2/test/transform/integration/chained_deps_files/expected/index.ng_deps.dart index e46871eb48..b4c8d7c607 100644 --- a/modules/angular2/test/transform/integration/chained_deps_files/expected/index.ngDeps.dart +++ b/modules/angular2/test/transform/integration/chained_deps_files/expected/index.ng_deps.dart @@ -3,7 +3,7 @@ library web_foo; import 'package:angular2/src/core/application.dart'; import 'package:angular2/src/reflection/reflection_capabilities.dart'; import 'bar.dart'; -import 'a:web/bar.ngDeps.dart' as i0; +import 'a:web/bar.ng_deps.dart' as i0; bool _visited = false; void setupReflection(reflector) { diff --git a/modules/angular2/test/transform/integration/list_of_types_files/expected/bar.ngDeps.dart b/modules/angular2/test/transform/integration/list_of_types_files/expected/bar.ng_deps.dart similarity index 100% rename from modules/angular2/test/transform/integration/list_of_types_files/expected/bar.ngDeps.dart rename to modules/angular2/test/transform/integration/list_of_types_files/expected/bar.ng_deps.dart diff --git a/modules/angular2/test/transform/integration/simple_annotation_files/expected/bar.ngDeps.dart b/modules/angular2/test/transform/integration/simple_annotation_files/expected/bar.ng_deps.dart similarity index 100% rename from modules/angular2/test/transform/integration/simple_annotation_files/expected/bar.ngDeps.dart rename to modules/angular2/test/transform/integration/simple_annotation_files/expected/bar.ng_deps.dart diff --git a/modules/angular2/test/transform/integration/simple_annotation_files/expected/index.ngDeps.dart b/modules/angular2/test/transform/integration/simple_annotation_files/expected/index.ng_deps.dart similarity index 91% rename from modules/angular2/test/transform/integration/simple_annotation_files/expected/index.ngDeps.dart rename to modules/angular2/test/transform/integration/simple_annotation_files/expected/index.ng_deps.dart index b3d077b62d..97710dd5c1 100644 --- a/modules/angular2/test/transform/integration/simple_annotation_files/expected/index.ngDeps.dart +++ b/modules/angular2/test/transform/integration/simple_annotation_files/expected/index.ng_deps.dart @@ -5,7 +5,7 @@ import 'package:angular2/src/core/application.dart'; import 'package:angular2/src/reflection/reflection.dart'; import 'package:angular2/src/reflection/reflection_capabilities.dart'; import 'bar.dart'; -import 'bar.ngDeps.dart' as i0; +import 'bar.ng_deps.dart' as i0; bool _visited = false; void setupReflection(reflector) { diff --git a/modules/angular2/test/transform/integration/synthetic_ctor_files/expected/bar.ngDeps.dart b/modules/angular2/test/transform/integration/synthetic_ctor_files/expected/bar.ng_deps.dart similarity index 100% rename from modules/angular2/test/transform/integration/synthetic_ctor_files/expected/bar.ngDeps.dart rename to modules/angular2/test/transform/integration/synthetic_ctor_files/expected/bar.ng_deps.dart diff --git a/modules/angular2/test/transform/integration/two_annotations_files/expected/bar.ngDeps.dart b/modules/angular2/test/transform/integration/two_annotations_files/expected/bar.ng_deps.dart similarity index 100% rename from modules/angular2/test/transform/integration/two_annotations_files/expected/bar.ngDeps.dart rename to modules/angular2/test/transform/integration/two_annotations_files/expected/bar.ng_deps.dart diff --git a/modules/angular2/test/transform/integration/two_deps_files/expected/bar.ngDeps.dart b/modules/angular2/test/transform/integration/two_deps_files/expected/bar.ng_deps.dart similarity index 100% rename from modules/angular2/test/transform/integration/two_deps_files/expected/bar.ngDeps.dart rename to modules/angular2/test/transform/integration/two_deps_files/expected/bar.ng_deps.dart diff --git a/modules/angular2/test/transform/reflection_remover/all_tests.dart b/modules/angular2/test/transform/reflection_remover/all_tests.dart index 69228f8e60..e5b65c7ae0 100644 --- a/modules/angular2/test/transform/reflection_remover/all_tests.dart +++ b/modules/angular2/test/transform/reflection_remover/all_tests.dart @@ -9,7 +9,7 @@ import 'reflection_remover_files/expected/index.dart' as expected; import '../common/read_file.dart'; void allTests() { - var codegen = new Codegen('web/index.dart', 'web/index.ngDeps.dart'); + var codegen = new Codegen('web/index.dart', 'web/index.ng_deps.dart'); test('should remove uses of mirrors & insert calls to generated code.', () { var code = diff --git a/modules/angular2/test/transform/reflection_remover/reflection_remover_files/expected/index.dart b/modules/angular2/test/transform/reflection_remover/reflection_remover_files/expected/index.dart index 4603c6adb2..eea63dadc9 100644 --- a/modules/angular2/test/transform/reflection_remover/reflection_remover_files/expected/index.dart +++ b/modules/angular2/test/transform/reflection_remover/reflection_remover_files/expected/index.dart @@ -13,7 +13,7 @@ library web_foo; import 'package:angular2/src/core/application.dart'; import 'package:angular2/src/reflection/reflection.dart'; -import 'package:angular2/src/reflection/reflection_capabilities.dart';import 'index.ngDeps.dart' as ngStaticInit; +import 'package:angular2/src/reflection/reflection_capabilities.dart';import 'index.ng_deps.dart' as ngStaticInit; void main() { reflector.reflectionCapabilities = new ReflectionCapabilities();ngStaticInit.setupReflection(reflector);