From 8ed22ce6e7ce0e00c12b036d02627424c6b4ff35 Mon Sep 17 00:00:00 2001 From: Jeff Cross Date: Thu, 20 Aug 2015 14:28:25 -0700 Subject: [PATCH] chore: update all import paths --- docs/public-docs-package/index.js | 2 +- docs/typescript-definition-package/index.js | 6 +-- gulpfile.js | 20 +++----- karma-dart.conf.js | 1 + modules/angular1_router/build.js | 2 +- modules/angular2/change_detection.ts | 2 +- modules/angular2/core.dart | 6 +-- modules/angular2/core.ts | 13 +++-- modules/angular2/debug.ts | 4 +- modules/angular2/di.ts | 16 +++--- modules/angular2/directives.ts | 24 ++++----- modules/angular2/forms.ts | 2 +- modules/angular2/http.ts | 38 +++++++------- modules/angular2/metadata.ts | 2 +- modules/angular2/mock.ts | 2 +- modules/angular2/pipes.ts | 16 +++--- modules/angular2/profile.ts | 2 +- modules/angular2/render.ts | 2 +- modules/angular2/router.ts | 4 +- modules/angular2/src/core/application.dart | 4 +- .../angular2/src/core/application_common.ts | 50 ++++++++++--------- modules/angular2/src/core/application_ref.ts | 2 +- .../angular2/src/core/application_tokens.ts | 2 +- .../abstract_change_detector.ts | 4 +- .../core/change_detection/binding_record.ts | 4 +- .../core/change_detection/change_detection.ts | 4 +- .../change_detection_jit_generator.ts | 4 +- .../change_detection/change_detection_util.ts | 4 +- .../src/core/change_detection/coalesce.ts | 4 +- .../core/change_detection/codegen_facade.ts | 2 +- .../change_detection/codegen_logic_util.ts | 10 +++- .../change_detection/codegen_name_util.ts | 4 +- .../src/core/change_detection/constants.ts | 2 +- .../differs/default_iterable_differ.ts | 6 +-- .../differs/default_keyvalue_differ.ts | 4 +- .../differs/iterable_differs.ts | 4 +- .../differs/keyvalue_differs.ts | 4 +- .../core/change_detection/directive_record.ts | 2 +- .../dynamic_change_detector.ts | 4 +- .../src/core/change_detection/exceptions.ts | 2 +- .../src/core/change_detection/interfaces.ts | 4 +- .../jit_proto_change_detector.ts | 4 +- .../src/core/change_detection/parser/ast.ts | 4 +- .../src/core/change_detection/parser/lexer.ts | 6 +-- .../core/change_detection/parser/locals.ts | 4 +- .../core/change_detection/parser/parser.ts | 8 +-- .../pipe_lifecycle_reflector.dart | 2 +- .../core/change_detection/pipe_transform.ts | 2 +- .../pregen_proto_change_detector.dart | 20 ++++---- .../pregen_proto_change_detector.ts | 2 +- .../change_detection/proto_change_detector.ts | 4 +- .../src/core/change_detection/proto_record.ts | 2 +- .../angular2/src/core/compiler/compiler.ts | 14 +++--- .../src/core/compiler/component_url_mapper.ts | 4 +- .../directive_lifecycle_reflector.dart | 2 +- .../compiler/directive_lifecycle_reflector.ts | 2 +- .../src/core/compiler/directive_resolver.ts | 4 +- .../core/compiler/dynamic_component_loader.ts | 4 +- .../src/core/compiler/element_binder.ts | 2 +- .../src/core/compiler/element_injector.ts | 19 ++++--- .../angular2/src/core/compiler/element_ref.ts | 4 +- .../angular2/src/core/compiler/interfaces.ts | 4 +- .../src/core/compiler/pipe_resolver.ts | 4 +- .../src/core/compiler/proto_view_factory.ts | 10 ++-- .../angular2/src/core/compiler/query_list.ts | 2 +- modules/angular2/src/core/compiler/view.ts | 16 +++--- .../src/core/compiler/view_container_ref.ts | 4 +- .../src/core/compiler/view_manager.ts | 6 +-- .../src/core/compiler/view_manager_utils.ts | 16 ++++-- .../angular2/src/core/compiler/view_pool.ts | 4 +- .../angular2/src/core/compiler/view_ref.ts | 4 +- .../src/core/compiler/view_resolver.ts | 6 +-- .../angular2/src/core/debug/debug_element.ts | 6 +-- .../core/debug/debug_element_view_listener.ts | 8 +-- modules/angular2/src/core/di/binding.ts | 6 +-- modules/angular2/src/core/di/exceptions.ts | 4 +- modules/angular2/src/core/di/forward_ref.ts | 2 +- modules/angular2/src/core/di/injector.ts | 4 +- modules/angular2/src/core/di/key.ts | 4 +- modules/angular2/src/core/di/metadata.ts | 2 +- modules/angular2/src/core/di/opaque_token.ts | 2 +- .../angular2/src/core/directives/ng_class.ts | 10 ++-- .../angular2/src/core/directives/ng_for.ts | 2 +- modules/angular2/src/core/directives/ng_if.ts | 2 +- .../angular2/src/core/directives/ng_style.ts | 4 +- .../angular2/src/core/directives/ng_switch.ts | 4 +- .../core/directives/observable_list_diff.dart | 2 +- .../angular2/src/core/dom/browser_adapter.ts | 4 +- modules/angular2/src/core/dom/dom_adapter.ts | 4 +- .../src/core/dom/generic_browser_adapter.ts | 4 +- .../angular2/src/core/dom/parse5_adapter.ts | 6 +-- .../angular2/src/core/exception_handler.ts | 4 +- modules/angular2/src/core/facade/async.ts | 6 +-- .../angular2/src/core/facade/collection.ts | 2 +- modules/angular2/src/core/facade/lang.ts | 2 +- modules/angular2/src/core/facade/math.ts | 2 +- .../src/core/life_cycle/life_cycle.ts | 6 +-- modules/angular2/src/core/metadata.dart | 2 +- modules/angular2/src/core/metadata.ts | 4 +- modules/angular2/src/core/metadata/di.ts | 11 +++- .../angular2/src/core/metadata/directives.ts | 6 +-- modules/angular2/src/core/metadata/view.ts | 6 +-- modules/angular2/src/core/pipes/async_pipe.ts | 6 +-- modules/angular2/src/core/pipes/date_pipe.ts | 8 +-- .../angular2/src/core/pipes/default_pipes.ts | 2 +- .../pipes/invalid_pipe_argument_exception.ts | 2 +- modules/angular2/src/core/pipes/json_pipe.ts | 4 +- .../angular2/src/core/pipes/limit_to_pipe.ts | 8 +-- .../angular2/src/core/pipes/lowercase_pipe.ts | 4 +- .../angular2/src/core/pipes/number_pipe.ts | 8 +-- .../angular2/src/core/pipes/pipe_binding.ts | 2 +- modules/angular2/src/core/pipes/pipes.ts | 4 +- .../angular2/src/core/pipes/uppercase_pipe.ts | 4 +- .../angular2/src/core/platform_bindings.dart | 2 +- .../angular2/src/core/platform_bindings.ts | 2 +- .../platform_reflection_capabilities.ts | 4 +- .../src/core/reflection/reflection.dart | 2 +- .../src/core/reflection/reflection.ts | 4 +- .../reflection/reflection_capabilities.dart | 2 +- .../reflection/reflection_capabilities.ts | 4 +- .../angular2/src/core/reflection/reflector.ts | 4 +- modules/angular2/src/core/reflection/types.ts | 4 +- modules/angular2/src/core/render/api.ts | 14 ++++-- .../render/dom/compiler/compile_control.ts | 4 +- .../render/dom/compiler/compile_element.ts | 12 +++-- .../render/dom/compiler/compile_pipeline.ts | 6 +-- .../dom/compiler/compile_step_factory.ts | 4 +- .../src/core/render/dom/compiler/compiler.ts | 10 ++-- .../render/dom/compiler/directive_parser.ts | 10 ++-- .../dom/compiler/property_binding_parser.ts | 6 +-- .../src/core/render/dom/compiler/selector.ts | 4 +- .../core/render/dom/compiler/shadow_css.ts | 6 +-- .../render/dom/compiler/style_encapsulator.ts | 4 +- .../core/render/dom/compiler/style_inliner.ts | 10 ++-- .../render/dom/compiler/style_url_resolver.ts | 4 +- .../dom/compiler/text_interpolation_parser.ts | 6 +-- .../core/render/dom/compiler/view_loader.ts | 10 ++-- .../core/render/dom/compiler/view_splitter.ts | 8 +-- .../angular2/src/core/render/dom/convert.ts | 6 +-- .../src/core/render/dom/dom_renderer.ts | 12 +++-- .../src/core/render/dom/dom_tokens.ts | 2 +- .../core/render/dom/events/event_manager.ts | 6 +-- .../core/render/dom/events/hammer_common.ts | 2 +- .../render/dom/events/hammer_gestures.dart | 2 +- .../core/render/dom/events/hammer_gestures.ts | 4 +- .../src/core/render/dom/events/key_events.ts | 6 +-- .../dom/schema/dom_element_schema_registry.ts | 6 +-- .../src/core/render/dom/template_cloner.ts | 4 +- modules/angular2/src/core/render/dom/util.ts | 6 +-- .../core/render/dom/view/element_binder.ts | 6 +-- .../src/core/render/dom/view/proto_view.ts | 4 +- .../render/dom/view/proto_view_builder.ts | 8 +-- .../core/render/dom/view/proto_view_merger.ts | 6 +-- .../render/dom/view/shared_styles_host.ts | 4 +- .../angular2/src/core/render/dom/view/view.ts | 12 +++-- .../core/render/dom/view/view_container.ts | 2 +- modules/angular2/src/core/render/xhr.ts | 2 +- modules/angular2/src/core/render/xhr_impl.ts | 4 +- modules/angular2/src/core/render/xhr_mock.ts | 8 +-- .../services/anchor_based_app_root_url.ts | 4 +- .../src/core/services/app_root_url.ts | 2 +- modules/angular2/src/core/services/ruler.ts | 4 +- modules/angular2/src/core/services/title.ts | 2 +- .../src/core/services/url_resolver.ts | 4 +- .../src/core/testability/get_testability.ts | 2 +- .../src/core/testability/testability.ts | 8 +-- modules/angular2/src/core/util/decorators.ts | 2 +- modules/angular2/src/core/zone/ng_zone.ts | 6 +-- modules/angular2/src/forms/directives.ts | 2 +- .../directives/checkbox_value_accessor.ts | 2 +- .../src/forms/directives/control_container.ts | 2 +- .../directives/default_value_accessor.ts | 2 +- .../src/forms/directives/ng_control_group.ts | 4 +- .../src/forms/directives/ng_control_name.ts | 6 +-- .../angular2/src/forms/directives/ng_form.ts | 6 +-- .../src/forms/directives/ng_form_control.ts | 4 +- .../src/forms/directives/ng_form_model.ts | 6 +-- .../angular2/src/forms/directives/ng_model.ts | 4 +- .../select_control_value_accessor.ts | 2 +- .../angular2/src/forms/directives/shared.ts | 4 +- .../src/forms/directives/validators.ts | 2 +- modules/angular2/src/forms/form_builder.ts | 4 +- modules/angular2/src/forms/model.ts | 6 +-- modules/angular2/src/forms/validators.ts | 4 +- .../src/http/backends/browser_jsonp.ts | 2 +- .../src/http/backends/jsonp_backend.ts | 4 +- .../src/http/backends/mock_backend.ts | 10 ++-- .../angular2/src/http/backends/xhr_backend.ts | 8 +-- .../angular2/src/http/base_request_options.ts | 2 +- .../src/http/base_response_options.ts | 2 +- modules/angular2/src/http/enums.ts | 2 +- modules/angular2/src/http/headers.ts | 4 +- modules/angular2/src/http/http.ts | 6 +-- modules/angular2/src/http/http_utils.ts | 2 +- modules/angular2/src/http/index.ts | 23 +++++---- modules/angular2/src/http/interfaces.ts | 6 +-- modules/angular2/src/http/static_request.ts | 2 +- modules/angular2/src/http/static_response.ts | 2 +- .../angular2/src/http/url_search_params.ts | 4 +- modules/angular2/src/mock/location_mock.ts | 6 +-- .../src/mock/mock_location_strategy.ts | 4 +- .../angular2/src/mock/view_resolver_mock.ts | 4 +- .../src/router/async_route_handler.ts | 4 +- .../src/router/hash_location_strategy.ts | 4 +- modules/angular2/src/router/instruction.ts | 6 +-- modules/angular2/src/router/interfaces.ts | 2 +- .../src/router/lifecycle_annotations.ts | 4 +- .../src/router/lifecycle_annotations_impl.ts | 2 +- modules/angular2/src/router/location.ts | 6 +-- .../angular2/src/router/location_strategy.ts | 2 +- .../src/router/path_location_strategy.ts | 4 +- .../angular2/src/router/path_recognizer.ts | 6 +-- modules/angular2/src/router/pipeline.ts | 4 +- .../src/router/route_config_decorator.ts | 4 +- .../angular2/src/router/route_config_impl.ts | 4 +- .../src/router/route_config_nomalizer.ts | 2 +- modules/angular2/src/router/route_data.ts | 2 +- .../angular2/src/router/route_definition.ts | 2 +- modules/angular2/src/router/route_handler.ts | 4 +- .../src/router/route_lifecycle_reflector.dart | 2 +- .../src/router/route_lifecycle_reflector.ts | 4 +- .../angular2/src/router/route_recognizer.ts | 4 +- modules/angular2/src/router/route_registry.ts | 8 +-- modules/angular2/src/router/router.ts | 17 +++++-- modules/angular2/src/router/router_link.ts | 2 +- modules/angular2/src/router/router_outlet.ts | 6 +-- .../angular2/src/router/sync_route_handler.ts | 4 +- modules/angular2/src/router/url_parser.ts | 4 +- .../angular2/src/test_lib/benchmark_util.ts | 6 +-- modules/angular2/src/test_lib/fake_async.dart | 2 +- modules/angular2/src/test_lib/fake_async.ts | 4 +- modules/angular2/src/test_lib/spies.dart | 2 +- modules/angular2/src/test_lib/spies.ts | 2 +- .../src/test_lib/test_component_builder.ts | 12 ++--- .../angular2/src/test_lib/test_injector.ts | 38 +++++++------- modules/angular2/src/test_lib/test_lib.dart | 12 ++--- modules/angular2/src/test_lib/test_lib.ts | 6 +-- modules/angular2/src/test_lib/utils.ts | 12 +++-- .../angular2/src/web_workers/shared/api.ts | 4 +- .../shared/client_message_broker.ts | 8 +-- .../shared/isolate_message_bus.dart | 2 +- .../src/web_workers/shared/message_bus.ts | 4 +- .../web_workers/shared/post_message_bus.ts | 4 +- .../shared/render_proto_view_ref_store.ts | 2 +- .../render_view_with_fragments_store.ts | 8 ++- .../src/web_workers/shared/serializer.ts | 10 ++-- .../shared/service_message_broker.ts | 11 ++-- .../src/web_workers/ui/application.ts | 2 +- .../src/web_workers/ui/di_bindings.ts | 44 ++++++++-------- .../src/web_workers/ui/event_dispatcher.ts | 8 +-- .../src/web_workers/ui/event_serializer.dart | 2 +- .../src/web_workers/ui/event_serializer.ts | 4 +- modules/angular2/src/web_workers/ui/impl.ts | 4 +- .../src/web_workers/ui/render_compiler.ts | 4 +- .../angular2/src/web_workers/ui/renderer.ts | 4 +- modules/angular2/src/web_workers/ui/setup.ts | 4 +- .../angular2/src/web_workers/ui/xhr_impl.ts | 2 +- .../src/web_workers/worker/application.dart | 4 +- .../src/web_workers/worker/application.ts | 6 +-- .../web_workers/worker/application_common.ts | 22 ++++---- .../web_workers/worker/event_deserializer.ts | 2 +- .../web_workers/worker/event_dispatcher.ts | 6 +-- .../src/web_workers/worker/renderer.ts | 6 +-- .../src/web_workers/worker/xhr_impl.ts | 4 +- .../transform/directive_linker/simple.dart | 2 +- .../transform/integration/hello_world.dart | 4 +- .../transform/reflection_remover/simple.dart | 4 +- .../angular2/test/core/application_spec.ts | 8 +-- .../change_detection/change_detection_spec.ts | 2 +- .../change_detector_config.ts | 12 ++--- .../change_detection/change_detector_spec.ts | 14 +++--- .../core/change_detection/coalesce_spec.ts | 8 +-- .../differs/default_iterable_differ_spec.ts | 10 ++-- .../differs/default_keyvalue_differ_spec.ts | 8 +-- .../differs/iterable_differs_spec.ts | 2 +- .../test/core/change_detection/iterable.ts | 2 +- .../change_detection/parser/lexer_spec.ts | 6 +-- .../change_detection/parser/locals_spec.ts | 4 +- .../change_detection/parser/parser_spec.ts | 12 ++--- .../core/change_detection/parser/unparser.ts | 4 +- .../proto_record_builder_spec.ts | 6 +-- .../change_detection/proto_record_spec.ts | 4 +- .../test/core/change_detection/util.ts | 2 +- .../test/core/compiler/compiler_spec.ts | 27 +++++++--- .../core/compiler/directive_lifecycle_spec.ts | 2 +- .../compiler/dynamic_component_loader_spec.ts | 4 +- .../core/compiler/element_injector_spec.ts | 6 +-- .../core/compiler/integration_dart_spec.dart | 4 +- .../test/core/compiler/integration_spec.ts | 14 +++--- .../compiler/projection_integration_spec.ts | 4 +- .../core/compiler/proto_view_factory_spec.ts | 8 +-- .../core/compiler/query_integration_spec.ts | 2 +- .../test/core/compiler/query_list_spec.ts | 4 +- .../core/compiler/view_container_ref_spec.ts | 2 +- .../test/core/compiler/view_manager_spec.ts | 4 +- .../core/compiler/view_manager_utils_spec.ts | 6 +-- .../test/core/compiler/view_pool_spec.ts | 2 +- .../test/core/debug/debug_element_spec.ts | 8 +-- .../debug/debug_element_view_listener_spec.ts | 4 +- .../angular2/test/core/di/forward_ref_spec.ts | 2 +- .../angular2/test/core/di/injector_spec.ts | 4 +- .../test/core/directives/ng_class_spec.ts | 4 +- .../test/core/directives/ng_for_spec.ts | 4 +- .../test/core/directives/ng_if_spec.ts | 6 +-- .../test/core/directives/ng_style_spec.ts | 6 +-- .../test/core/directives/ng_switch_spec.ts | 2 +- .../test/core/directives/non_bindable_spec.ts | 4 +- .../directives/observable_list_diff_spec.dart | 2 +- .../test/core/dom/dom_adapter_spec.ts | 2 +- .../dom/html5lib_adapter.server.spec.dart | 2 +- .../test/core/exception_handler_spec.ts | 2 +- .../test/core/facade/async_dart_spec.dart | 2 +- .../angular2/test/core/facade/async_spec.ts | 4 +- .../test/core/facade/collection_spec.ts | 2 +- .../angular2/test/core/facade/lang_spec.ts | 2 +- .../test/core/forward_ref_integration_spec.ts | 2 +- .../test/core/life_cycle/life_cycle_spec.ts | 2 +- .../test/core/metadata/decorators_spec.ts | 2 +- .../test/core/profile/wtf_impl_spec.dart | 2 +- .../test/core/reflection/reflector_common.ts | 2 +- .../test/core/reflection/reflector_spec.ts | 8 +-- modules/angular2/test/core/render/api_spec.ts | 4 +- .../dom/compiler/compiler_common_tests.ts | 32 +++++++----- .../compiler_html5lib.server.spec.dart | 2 +- .../dom/compiler/directive_parser_spec.ts | 16 +++--- .../core/render/dom/compiler/pipeline_spec.ts | 23 +++++---- .../compiler/property_binding_parser_spec.ts | 14 +++--- .../core/render/dom/compiler/selector_spec.ts | 8 +-- .../render/dom/compiler/shadow_css_spec.ts | 6 +-- .../dom/compiler/style_encapsulator_spec.ts | 12 ++--- .../render/dom/compiler/style_inliner_spec.ts | 10 ++-- .../dom/compiler/style_url_resolver_spec.ts | 4 +- .../text_interpolation_parser_spec.ts | 16 +++--- .../render/dom/compiler/view_loader_spec.ts | 18 +++---- .../render/dom/compiler/view_splitter_spec.ts | 14 +++--- .../test/core/render/dom/convert_spec.ts | 9 ++-- .../dom/dom_renderer_integration_spec.ts | 6 +-- .../test/core/render/dom/dom_testbed.ts | 20 ++++---- .../render/dom/events/event_manager_spec.ts | 6 +-- .../core/render/dom/events/key_events_spec.ts | 2 +- .../dom_element_schema_registry_spec.ts | 8 +-- .../core/render/dom/template_cloner_spec.ts | 4 +- .../test/core/render/dom/util_spec.ts | 2 +- .../dom/view/proto_view_builder_spec.ts | 16 +++--- .../proto_view_merger_integration_spec.ts | 21 ++++---- .../dom/view/shared_styles_host_spec.ts | 4 +- .../test/core/render/dom/view/view_spec.ts | 14 +++--- .../test/core/render/xhr_impl_spec.ts | 8 +-- .../test/core/render/xhr_mock_spec.ts | 6 +-- .../angular2/test/core/services/ruler_spec.ts | 6 +-- .../angular2/test/core/services/title_spec.ts | 4 +- .../test/core/services/url_resolver_spec.ts | 2 +- .../test/core/testability/testability_spec.ts | 4 +- .../test/core/util/decorators_spec.ts | 6 +-- .../angular2/test/core/zone/ng_zone_spec.ts | 4 +- .../angular2/test/forms/integration_spec.ts | 2 +- modules/angular2/test/forms/model_spec.ts | 2 +- .../test/http/backends/jsonp_backend_spec.ts | 22 ++++---- .../test/http/backends/xhr_backend_spec.ts | 20 ++++---- .../test/http/base_request_options_spec.ts | 4 +- modules/angular2/test/http/headers_spec.ts | 4 +- modules/angular2/test/http/http_spec.ts | 6 +-- .../test/http/url_search_params_spec.ts | 2 +- .../test/mock/view_resolver_mock_spec.ts | 4 +- .../angular2/test/pipes/async_pipe_spec.ts | 6 +-- modules/angular2/test/pipes/date_pipe_spec.ts | 2 +- modules/angular2/test/pipes/json_pipe_spec.ts | 2 +- .../router/integration/lifecycle_hook_spec.ts | 4 +- .../test/router/integration/outlet_spec.ts | 4 +- .../integration/router_integration_spec.ts | 8 +-- .../router/integration/router_link_spec.ts | 4 +- modules/angular2/test/router/location_spec.ts | 2 +- .../angular2/test/router/route_config_spec.ts | 6 +-- .../test/router/route_recognizer_spec.ts | 2 +- .../test/router/route_registry_spec.ts | 4 +- .../angular2/test/router/router_link_spec.ts | 4 +- modules/angular2/test/router/router_spec.ts | 6 +-- .../angular2/test/test_lib/fake_async_spec.ts | 6 +-- .../test_lib/test_component_builder_spec.ts | 2 +- .../angular2/test/test_lib/test_lib_spec.ts | 6 +-- .../web_workers/shared/message_bus_spec.ts | 2 +- .../shared/mock_event_emitter.dart | 2 +- .../web_workers/shared/mock_event_emitter.ts | 4 +- .../render_proto_view_ref_store_spec.ts | 2 +- .../render_view_with_fragments_store_spec.ts | 8 ++- .../shared/service_message_broker_spec.ts | 2 +- .../shared/web_worker_test_util.ts | 2 +- .../worker/event_dispatcher_spec.ts | 6 +-- .../worker/renderer_integration_spec.ts | 17 ++++--- .../test/web_workers/worker/xhr_impl_spec.ts | 4 +- .../src/components/button/button.ts | 4 +- .../src/components/checkbox/checkbox.ts | 6 +-- .../src/components/dialog/dialog.ts | 8 +-- .../src/components/grid_list/grid_list.ts | 6 +-- .../src/components/input/input.ts | 2 +- .../progress-linear/progress_linear.ts | 6 +-- .../src/components/radio/radio_button.ts | 8 +-- .../src/components/radio/radio_dispatcher.ts | 2 +- .../angular2_material/src/core/key_codes.ts | 2 +- .../change_detection_benchmark.ts | 8 +-- .../src/compiler/compiler_benchmark.ts | 24 +++++---- .../src/compiler/selector_benchmark.ts | 8 +-- modules/benchmarks/src/costs/index.ts | 2 +- modules/benchmarks/src/di/di_benchmark.ts | 6 +-- .../element_injector_benchmark.ts | 6 +-- .../src/largetable/largetable_benchmark.ts | 12 ++--- .../src/naive_infinite_scroll/app.ts | 10 ++-- .../src/naive_infinite_scroll/cells.ts | 2 +- .../src/naive_infinite_scroll/common.ts | 6 +-- .../src/naive_infinite_scroll/random_data.ts | 4 +- .../src/naive_infinite_scroll/scroll_area.ts | 4 +- .../src/static_tree/tree_benchmark.ts | 12 ++--- modules/benchmarks/src/tree/tree_benchmark.ts | 10 ++-- modules/benchpress/src/common_options.ts | 2 +- modules/benchpress/src/measure_values.ts | 4 +- modules/benchpress/src/metric.ts | 6 +-- modules/benchpress/src/metric/multi_metric.ts | 4 +- .../benchpress/src/metric/perflog_metric.ts | 6 +-- modules/benchpress/src/reporter.ts | 6 +-- .../src/reporter/console_reporter.ts | 8 +-- .../src/reporter/json_file_reporter.ts | 6 +-- .../benchpress/src/reporter/multi_reporter.ts | 4 +- modules/benchpress/src/runner.ts | 6 +-- modules/benchpress/src/sample_description.ts | 2 +- modules/benchpress/src/sampler.ts | 6 +-- modules/benchpress/src/statistic.ts | 4 +- modules/benchpress/src/validator.ts | 4 +- .../validator/regression_slope_validator.ts | 2 +- .../src/validator/size_validator.ts | 2 +- modules/benchpress/src/web_driver_adapter.ts | 6 +-- .../benchpress/src/web_driver_extension.ts | 6 +-- .../webdriver/async_webdriver_adapter.dart | 2 +- .../src/webdriver/chrome_driver_extension.ts | 6 +-- .../src/webdriver/firefox_driver_extension.ts | 4 +- .../src/webdriver/ios_driver_extension.ts | 6 +-- .../webdriver/selenium_webdriver_adapter.ts | 2 +- .../test/metric/multi_metric_spec.ts | 4 +- .../test/metric/perflog_metric_spec.ts | 6 +-- .../test/reporter/console_reporter_spec.ts | 4 +- .../test/reporter/json_file_reporter_spec.ts | 4 +- .../test/reporter/multi_reporter_spec.ts | 6 +-- modules/benchpress/test/runner_spec.ts | 4 +- modules/benchpress/test/sampler_spec.ts | 6 +-- modules/benchpress/test/statistic_spec.ts | 2 +- .../benchpress/test/trace_event_factory.ts | 2 +- .../regression_slope_validator_spec.ts | 4 +- .../test/validator/size_validator_spec.ts | 4 +- .../test/web_driver_extension_spec.ts | 6 +-- .../webdriver/chrome_driver_extension_spec.ts | 4 +- .../webdriver/ios_driver_extension_spec.ts | 4 +- modules/examples/e2e_test/http/http_spec.ts | 2 +- modules/examples/e2e_test/jsonp/jsonp_spec.ts | 2 +- .../message_broker/message_broker_spec.ts | 2 +- .../examples/e2e_test/routing/routing_spec.ts | 2 +- .../kitchen_sink/kitchen_sink_spec.ts | 2 +- .../e2e_test/web_workers/todo/todo_spec.ts | 2 +- modules/examples/src/async/index.ts | 2 +- modules/examples/src/http/http_comp.ts | 4 +- modules/examples/src/http/index.ts | 2 +- modules/examples/src/http/index_dynamic.ts | 2 +- modules/examples/src/jsonp/index.ts | 2 +- modules/examples/src/jsonp/index_dynamic.ts | 2 +- modules/examples/src/jsonp/jsonp_comp.ts | 4 +- modules/examples/src/key_events/index.ts | 2 +- modules/examples/src/material/button/index.ts | 2 +- .../examples/src/material/checkbox/index.ts | 2 +- .../examples/src/material/demo_common.dart | 4 +- modules/examples/src/material/demo_common.ts | 10 ++-- modules/examples/src/material/dialog/index.ts | 4 +- .../examples/src/material/grid_list/index.ts | 2 +- modules/examples/src/material/input/index.ts | 2 +- .../src/material/progress-linear/index.ts | 2 +- modules/examples/src/material/radio/index.ts | 2 +- .../examples/src/material/switcher/index.ts | 2 +- .../src/message_broker/background_index.dart | 2 +- .../src/message_broker/background_index.ts | 2 +- .../examples/src/message_broker/index.dart | 2 +- modules/examples/src/message_broker/index.ts | 2 +- .../examples/src/model_driven_forms/index.ts | 2 +- .../examples/src/observable_models/app.dart | 4 +- .../examples/src/observable_models/cells.dart | 2 +- .../src/observable_models/common.dart | 4 +- .../src/observable_models/random_data.dart | 4 +- .../src/observable_models/scroll_area.dart | 4 +- .../examples/src/order_management/index.ts | 2 +- .../examples/src/person_management/index.ts | 2 +- modules/examples/src/routing/inbox-app.ts | 6 +-- modules/examples/src/routing/index.ts | 4 +- modules/examples/src/sourcemap/index.ts | 2 +- .../src/template_driven_forms/index.ts | 2 +- .../examples/src/todo/services/TodoStore.ts | 2 +- .../web_workers/images/background_index.dart | 4 +- .../src/web_workers/images/index.dart | 4 +- .../src/web_workers/images/index_common.ts | 4 +- .../kitchen_sink/background_index.dart | 4 +- .../src/web_workers/kitchen_sink/index.dart | 4 +- .../web_workers/kitchen_sink/index_common.ts | 2 +- .../web_workers/todo/background_index.dart | 4 +- .../examples/src/web_workers/todo/index.dart | 4 +- .../web_workers/todo/services/TodoStore.ts | 2 +- modules/examples/src/zippy_component/zippy.ts | 2 +- .../analyzer_plugin/lib/src/tasks.dart | 2 +- .../test/tasks_test.server.spec.dart | 2 +- .../transform/common/annotation_matcher.dart | 2 +- .../common/directive_metadata_reader.dart | 2 +- .../lib/src/transform/common/ng_meta.dart | 4 +- .../src/transform/common/registered_type.dart | 2 +- .../lib/src/transform/common/xhr_impl.dart | 2 +- .../directive_processor/rewriter.dart | 4 +- .../directive_processor/visitors.dart | 2 +- .../reflection_remover/ast_tester.dart | 2 +- .../change_detector_codegen.dart | 26 +++++----- .../compile_step_factory.dart | 16 +++--- .../template_compiler/generator.dart | 32 ++++++------ .../template_compiler/reflection/model.dart | 2 +- .../reflection/processor.dart | 4 +- .../reflection/reflection_capabilities.dart | 4 +- .../template_compiler/transformer.dart | 2 +- .../view_definition_creator.dart | 2 +- .../test/transform/common/ng_meta_test.dart | 2 +- .../common/reflection_capabilities.dart | 2 +- .../expected/index.dart | 4 +- .../hello.ng_deps.dart | 2 +- .../complex_deferred_example/index.dart | 4 +- .../deferred_example_no_ng_deps/index.dart | 4 +- .../no_deferred_libraries/index.dart | 4 +- .../no_ng_deps_libraries/index.dart | 4 +- .../expected/index.dart | 4 +- .../hello.ng_deps.dart | 2 +- .../simple_deferred_example/index.dart | 4 +- .../simple_export_files/bar.ng_deps.dart | 2 +- .../expected/bar.ng_deps.dart | 2 +- .../expected/foo.ng_deps.dart | 2 +- .../expected/index.ng_deps.dart | 4 +- .../simple_export_files/foo.ng_deps.dart | 2 +- .../simple_export_files/index.ng_deps.dart | 4 +- .../simple_files/bar.ng_deps.dart | 2 +- .../simple_files/expected/bar.ng_deps.dart | 2 +- .../simple_files/expected/foo.ng_deps.dart | 2 +- .../simple_files/expected/index.ng_deps.dart | 4 +- .../simple_files/foo.ng_deps.dart | 2 +- .../simple_files/index.ng_deps.dart | 4 +- .../all_tests.dart | 4 +- .../expected/hello.ng_deps.dart | 2 +- .../expected/package_soup.ng_deps.dart | 2 +- .../expected/relative_soup.ng_deps.dart | 2 +- .../expected/hello.ng_deps.dart | 2 +- .../expected/hello.ng_deps.dart | 2 +- .../expected/soup.ng_deps.dart | 2 +- .../expected/soup.ng_deps.dart | 2 +- .../expected/soup.ng_deps.dart | 2 +- .../expected/hello.ng_deps.dart | 2 +- .../expected/soup.ng_deps.dart | 2 +- .../expected/main.ng_deps.dart | 2 +- .../expected/hello.ng_deps.dart | 2 +- .../expected/hello.ng_deps.dart | 2 +- .../expected/soup.ng_deps.dart | 2 +- .../part_files/expected/main.ng_deps.dart | 2 +- .../expected/soup.ng_deps.dart | 2 +- .../expected/hello.ng_deps.dart | 2 +- .../expected/hello.ng_deps.dart | 2 +- .../expected/soup.ng_deps.dart | 2 +- .../expected/soup.ng_deps.dart | 2 +- .../expected/hello.ng_deps.dart | 2 +- .../test/transform/integration/all_tests.dart | 8 +-- .../expected/bar.ng_deps.dart | 2 +- .../list_of_types_files/index.dart | 2 +- .../expected/bar.ng_deps.dart | 2 +- .../expected/index.ng_deps.dart | 4 +- .../simple_annotation_files/index.dart | 4 +- .../expected/bar.ng_deps.dart | 2 +- .../synthetic_ctor_files/index.dart | 2 +- .../expected/bar.ng_deps.dart | 4 +- .../two_annotations_files/index.dart | 2 +- .../two_deps_files/expected/bar.ng_deps.dart | 2 +- .../integration/two_deps_files/index.dart | 2 +- .../debug_files/expected/index.dart | 4 +- .../reflection_remover/debug_files/index.dart | 4 +- .../debug_mirrors_files/expected/index.dart | 4 +- .../debug_mirrors_files/index.dart | 4 +- .../transform/reflection_remover/index.dart | 4 +- .../log_mirrors_files/expected/index.dart | 4 +- .../log_mirrors_files/index.dart | 4 +- .../expected/index.dart | 4 +- .../reflection_remover_files/index.dart | 4 +- .../verbose_files/expected/index.dart | 4 +- .../template_compiler/all_tests.dart | 2 +- test-init.dart | 2 +- test-main.js | 3 +- tools/broccoli/trees/dart_tree.ts | 7 ++- tools/broccoli/trees/node_tree.ts | 18 +++---- tools/transpiler/spec/annotations_spec.js | 2 +- 592 files changed, 1616 insertions(+), 1486 deletions(-) diff --git a/docs/public-docs-package/index.js b/docs/public-docs-package/index.js index 3ebb3c2571..6a4782d6d1 100644 --- a/docs/public-docs-package/index.js +++ b/docs/public-docs-package/index.js @@ -10,7 +10,7 @@ module.exports = new Package('angular-v2-public-docs', [basePackage]) 'angular2/core.ts', 'angular2/di.ts', 'angular2/directives.ts', - 'http/http.ts', + 'angular2/http.ts', 'angular2/forms.ts', 'angular2/router.ts', 'angular2/test.ts', diff --git a/docs/typescript-definition-package/index.js b/docs/typescript-definition-package/index.js index 7073ddccf0..a299d1d0cb 100644 --- a/docs/typescript-definition-package/index.js +++ b/docs/typescript-definition-package/index.js @@ -40,7 +40,7 @@ module.exports = new Package('angular-v2-docs', [jsdocPackage, nunjucksPackage, readTypeScriptModules.sourceFiles = [ 'angular2/angular2.ts', 'angular2/router.ts', - 'http/http.ts' + 'angular2/http.ts' ]; readTypeScriptModules.basePath = path.resolve(path.resolve(__dirname, '../../modules')); @@ -62,10 +62,10 @@ module.exports = new Package('angular-v2-docs', [jsdocPackage, nunjucksPackage, } }, { - id: 'http/http', + id: 'angular2/http', namespace: 'ngHttp', modules: { - 'http/http':'http/http' + 'angular2/http':'angular2/http' } } ]; diff --git a/gulpfile.js b/gulpfile.js index 0cb1baed69..706ecd5f4b 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -699,7 +699,7 @@ gulp.task('test.unit.dart/ci', function (done) { gulp.task('test.unit.cjs/ci', function(done) { - runJasmineTests(['dist/js/cjs/{angular2,benchpress,http}/test/**/*_spec.js'], done); + runJasmineTests(['dist/js/cjs/{angular2,benchpress}/test/**/*_spec.js'], done); }); @@ -1020,7 +1020,7 @@ gulp.task('!bundle.js.prod', ['build.js.prod'], function() { then(function(){ return bundler.bundle( bundleConfig, - 'http/http', + 'angular2/http', './dist/build/http.js', { sourceMaps: true @@ -1042,7 +1042,7 @@ gulp.task('!bundle.js.min', ['build.js.prod'], function() { then(function(){ return bundler.bundle( bundleConfig, - 'http/http', + 'angular2/http', './dist/build/http.min.js', { sourceMaps: true, @@ -1067,7 +1067,7 @@ gulp.task('!bundle.js.dev', ['build.js.dev'], function() { then(function() { return bundler.bundle( devBundleConfig, - 'http/http', + 'angular2/http', './dist/build/http.dev.js', { sourceMaps: true }); }); @@ -1115,15 +1115,7 @@ gulp.task('!bundle.js.sfx.dev', ['build.js.dev'], function() { 'angular2/angular2_sfx', './dist/build/angular2.sfx.dev.js', { sourceMaps: true }, - /* self-executing */ true). - then(function() { - return bundler.bundle( - devBundleConfig, - 'http/http_sfx', - './dist/build/http.sfx.dev.js', - { sourceMaps: true }, - true) - }); + /* self-executing */ true); }); gulp.task('!bundle.js.prod.deps', ['!bundle.js.prod'], function() { @@ -1221,7 +1213,7 @@ gulp.task('build.change_detect.dart', function(done) { gulp.task('!build/change_detect.dart', function(done) { var fs = require('fs'); - var changeDetectDir = path.join(CONFIG.dest.dart, 'angular2/test/change_detection/'); + var changeDetectDir = path.join(CONFIG.dest.dart, 'angular2/test/core/change_detection/'); var srcDir = path.join(changeDetectDir, 'generator'); var destDir = path.join(changeDetectDir, 'generated'); diff --git a/karma-dart.conf.js b/karma-dart.conf.js index c3e42ea5c7..dd72ddf51e 100644 --- a/karma-dart.conf.js +++ b/karma-dart.conf.js @@ -45,6 +45,7 @@ module.exports = function(config) { '/packages/path': '/base/packages/path', // Local dependencies, transpiled from the source. + '/packages/angular2/test/': '/base/dist/dart/angular2/test/', '/packages/angular2': '/base/dist/dart/angular2/lib', '/packages/http': '/base/dist/dart/http/lib', '/packages/angular2_material': '/base/dist/dart/angular2_material/lib', diff --git a/modules/angular1_router/build.js b/modules/angular1_router/build.js index cacaf86320..dada30707a 100644 --- a/modules/angular1_router/build.js +++ b/modules/angular1_router/build.js @@ -121,7 +121,7 @@ function angularFactory(name, deps, body) { function isFacadeModule(modulePath) { return modulePath.indexOf('facade') > -1 || - modulePath === 'angular2/src/reflection/reflection'; + modulePath === 'angular2/src/core/reflection/reflection'; } module.exports = function () { diff --git a/modules/angular2/change_detection.ts b/modules/angular2/change_detection.ts index 17f490204e..c01d7d7f1c 100644 --- a/modules/angular2/change_detection.ts +++ b/modules/angular2/change_detection.ts @@ -29,4 +29,4 @@ export { KeyValueDiffer, KeyValueDifferFactory -} from 'angular2/src/change_detection/change_detection'; +} from 'angular2/src/core/change_detection/change_detection'; diff --git a/modules/angular2/core.dart b/modules/angular2/core.dart index 6ce0036978..3522b1b37f 100644 --- a/modules/angular2/core.dart +++ b/modules/angular2/core.dart @@ -4,8 +4,8 @@ export 'package:angular2/src/core/application_tokens.dart' show APP_COMPONENT; export 'package:angular2/src/core/application_ref.dart' show ApplicationRef; // Compiler Related Dependencies. -export 'package:angular2/src/services/app_root_url.dart' show AppRootUrl; -export 'package:angular2/src/services/url_resolver.dart' show UrlResolver; +export 'package:angular2/src/core/services/app_root_url.dart' show AppRootUrl; +export 'package:angular2/src/core/services/url_resolver.dart' show UrlResolver; export 'package:angular2/src/core/compiler/component_url_mapper.dart' show ComponentUrlMapper; export 'package:angular2/src/core/compiler/directive_resolver.dart' @@ -28,4 +28,4 @@ export 'package:angular2/src/core/compiler/dynamic_component_loader.dart' show ComponentRef; export 'package:angular2/src/core/zone/ng_zone.dart' show NgZone; -export 'package:angular2/src/facade/async.dart' show Stream, EventEmitter; +export 'package:angular2/src/core/facade/async.dart' show Stream, EventEmitter; diff --git a/modules/angular2/core.ts b/modules/angular2/core.ts index 9d50ec8bb0..b9706b9ae4 100644 --- a/modules/angular2/core.ts +++ b/modules/angular2/core.ts @@ -5,13 +5,13 @@ */ export {APP_COMPONENT} from 'angular2/src/core/application_tokens'; export {commonBootstrap as bootstrap} from 'angular2/src/core/application_common'; -export {Type} from 'angular2/src/facade/lang'; +export {Type} from 'angular2/src/core/facade/lang'; export {ApplicationRef} from 'angular2/src/core/application_ref'; // Compiler Related Dependencies. -export {AppRootUrl} from 'angular2/src/services/app_root_url'; -export {UrlResolver} from 'angular2/src/services/url_resolver'; +export {AppRootUrl} from 'angular2/src/core/services/app_root_url'; +export {UrlResolver} from 'angular2/src/core/services/url_resolver'; export {ComponentUrlMapper} from 'angular2/src/core/compiler/component_url_mapper'; export {DirectiveResolver} from 'angular2/src/core/compiler/directive_resolver'; export {Compiler} from 'angular2/src/core/compiler/compiler'; @@ -28,4 +28,9 @@ export {ViewContainerRef} from 'angular2/src/core/compiler/view_container_ref'; export {ComponentRef} from 'angular2/src/core/compiler/dynamic_component_loader'; export {NgZone} from 'angular2/src/core/zone/ng_zone'; -export {Observable, EventEmitter} from 'angular2/src/facade/async'; +export {Observable, EventEmitter} from 'angular2/src/core/facade/async'; + +// DI +export {Injector} from 'angular2/src/core/di/injector'; +export {bind} from 'angular2/src/core/di/binding'; +export {Inject} from 'angular2/src/core/di/decorators'; diff --git a/modules/angular2/debug.ts b/modules/angular2/debug.ts index 1add8b72ac..883be0dbed 100644 --- a/modules/angular2/debug.ts +++ b/modules/angular2/debug.ts @@ -1,5 +1,5 @@ -export * from './src/debug/debug_element'; +export * from './src/core/debug/debug_element'; export { inspectNativeElement, ELEMENT_PROBE_BINDINGS -} from './src/debug/debug_element_view_listener'; +} from './src/core/debug/debug_element_view_listener'; diff --git a/modules/angular2/di.ts b/modules/angular2/di.ts index 7536d536db..6d99f42667 100644 --- a/modules/angular2/di.ts +++ b/modules/angular2/di.ts @@ -12,12 +12,12 @@ export { HostMetadata, SkipSelfMetadata, DependencyMetadata -} from './src/di/metadata'; +} from './src/core/di/metadata'; // we have to reexport * because Dart and TS export two different sets of types -export * from './src/di/decorators'; +export * from './src/core/di/decorators'; -export {forwardRef, resolveForwardRef, ForwardRefFn} from './src/di/forward_ref'; +export {forwardRef, resolveForwardRef, ForwardRefFn} from './src/core/di/forward_ref'; export { Injector, ProtoInjector, @@ -25,9 +25,9 @@ export { DependencyProvider, Visibility, UNDEFINED -} from './src/di/injector'; -export {Binding, BindingBuilder, ResolvedBinding, Dependency, bind} from './src/di/binding'; -export {Key, KeyRegistry, TypeLiteral} from './src/di/key'; +} from './src/core/di/injector'; +export {Binding, BindingBuilder, ResolvedBinding, Dependency, bind} from './src/core/di/binding'; +export {Key, KeyRegistry, TypeLiteral} from './src/core/di/key'; export { NoBindingError, AbstractBindingError, @@ -36,5 +36,5 @@ export { InvalidBindingError, NoAnnotationError, OutOfBoundsError -} from './src/di/exceptions'; -export {OpaqueToken} from './src/di/opaque_token'; +} from './src/core/di/exceptions'; +export {OpaqueToken} from './src/core/di/opaque_token'; diff --git a/modules/angular2/directives.ts b/modules/angular2/directives.ts index 9c970bd87e..0206a2daf4 100644 --- a/modules/angular2/directives.ts +++ b/modules/angular2/directives.ts @@ -4,19 +4,19 @@ * Common directives shipped with Angular. */ -import {CONST_EXPR, Type} from './src/facade/lang'; -import {NgClass} from './src/directives/ng_class'; -import {NgFor} from './src/directives/ng_for'; -import {NgIf} from './src/directives/ng_if'; -import {NgNonBindable} from './src/directives/ng_non_bindable'; -import {NgSwitch, NgSwitchWhen, NgSwitchDefault} from './src/directives/ng_switch'; +import {CONST_EXPR, Type} from './src/core/facade/lang'; +import {NgClass} from './src/core/directives/ng_class'; +import {NgFor} from './src/core/directives/ng_for'; +import {NgIf} from './src/core/directives/ng_if'; +import {NgNonBindable} from './src/core/directives/ng_non_bindable'; +import {NgSwitch, NgSwitchWhen, NgSwitchDefault} from './src/core/directives/ng_switch'; -export * from './src/directives/ng_class'; -export * from './src/directives/ng_for'; -export * from './src/directives/ng_if'; -export * from './src/directives/ng_non_bindable'; -export * from './src/directives/ng_style'; -export * from './src/directives/ng_switch'; +export * from './src/core/directives/ng_class'; +export * from './src/core/directives/ng_for'; +export * from './src/core/directives/ng_if'; +export * from './src/core/directives/ng_non_bindable'; +export * from './src/core/directives/ng_style'; +export * from './src/core/directives/ng_switch'; /** * A collection of the Angular core directives that are likely to be used in each and every Angular diff --git a/modules/angular2/forms.ts b/modules/angular2/forms.ts index 723f9ff1a3..238df34a15 100644 --- a/modules/angular2/forms.ts +++ b/modules/angular2/forms.ts @@ -37,6 +37,6 @@ export {NgValidator, NgRequiredValidator} from './src/forms/directives/validator export {FormBuilder} from './src/forms/form_builder'; import {FormBuilder} from './src/forms/form_builder'; -import {CONST_EXPR, Type} from './src/facade/lang'; +import {CONST_EXPR, Type} from './src/core/facade/lang'; export const FORM_BINDINGS: List = CONST_EXPR([FormBuilder]); diff --git a/modules/angular2/http.ts b/modules/angular2/http.ts index 326c307faa..d0c7673ef6 100644 --- a/modules/angular2/http.ts +++ b/modules/angular2/http.ts @@ -5,34 +5,34 @@ * class. */ import {bind, Binding} from 'angular2/di'; -import {Http, Jsonp} from './src/http'; -import {XHRBackend, XHRConnection} from './src/backends/xhr_backend'; -import {JSONPBackend, JSONPConnection} from './src/backends/jsonp_backend'; -import {BrowserXhr} from './src/backends/browser_xhr'; -import {BrowserJsonp} from './src/backends/browser_jsonp'; -import {BaseRequestOptions, RequestOptions} from './src/base_request_options'; -import {ConnectionBackend} from './src/interfaces'; -import {BaseResponseOptions, ResponseOptions} from './src/base_response_options'; +import {Http, Jsonp} from './src/http/http'; +import {XHRBackend, XHRConnection} from './src/http/backends/xhr_backend'; +import {JSONPBackend, JSONPConnection} from './src/http/backends/jsonp_backend'; +import {BrowserXhr} from './src/http/backends/browser_xhr'; +import {BrowserJsonp} from './src/http/backends/browser_jsonp'; +import {BaseRequestOptions, RequestOptions} from './src/http/base_request_options'; +import {ConnectionBackend} from './src/http/interfaces'; +import {BaseResponseOptions, ResponseOptions} from './src/http/base_response_options'; -export {MockConnection, MockBackend} from './src/backends/mock_backend'; -export {Request} from './src/static_request'; -export {Response} from './src/static_response'; +export {MockConnection, MockBackend} from './src/http/backends/mock_backend'; +export {Request} from './src/http/static_request'; +export {Response} from './src/http/static_response'; export { RequestOptionsArgs, ResponseOptionsArgs, Connection, ConnectionBackend -} from './src/interfaces'; +} from './src/http/interfaces'; -export {BrowserXhr} from './src/backends/browser_xhr'; -export {BaseRequestOptions, RequestOptions} from './src/base_request_options'; -export {BaseResponseOptions, ResponseOptions} from './src/base_response_options'; -export {XHRBackend, XHRConnection} from './src/backends/xhr_backend'; -export {JSONPBackend, JSONPConnection} from './src/backends/jsonp_backend'; -export {Http, Jsonp} from './src/http'; +export {BrowserXhr} from './src/http/backends/browser_xhr'; +export {BaseRequestOptions, RequestOptions} from './src/http/base_request_options'; +export {BaseResponseOptions, ResponseOptions} from './src/http/base_response_options'; +export {XHRBackend, XHRConnection} from './src/http/backends/xhr_backend'; +export {JSONPBackend, JSONPConnection} from './src/http/backends/jsonp_backend'; +export {Http, Jsonp} from './src/http/http'; -export {Headers} from './src/headers'; +export {Headers} from './src/http/headers'; export { ResponseTypes, diff --git a/modules/angular2/metadata.ts b/modules/angular2/metadata.ts index 7223a51b10..1ac5872c1e 100644 --- a/modules/angular2/metadata.ts +++ b/modules/angular2/metadata.ts @@ -45,4 +45,4 @@ export { OnCheck } from './src/core/compiler/interfaces'; -export {Class, ClassDefinition, TypeDecorator} from './src/util/decorators'; +export {Class, ClassDefinition, TypeDecorator} from './src/core/util/decorators'; diff --git a/modules/angular2/mock.ts b/modules/angular2/mock.ts index 4d186a4576..4f86236141 100644 --- a/modules/angular2/mock.ts +++ b/modules/angular2/mock.ts @@ -2,4 +2,4 @@ export * from './src/mock/mock_location_strategy'; export {LocationStrategy} from './src/router/location_strategy'; export {MockViewResolver} from 'angular2/src/mock/view_resolver_mock'; -export {MockXHR} from 'angular2/src/render/xhr_mock'; +export {MockXHR} from 'angular2/src/core/render/xhr_mock'; diff --git a/modules/angular2/pipes.ts b/modules/angular2/pipes.ts index 5bf87b165b..2cdd08f106 100644 --- a/modules/angular2/pipes.ts +++ b/modules/angular2/pipes.ts @@ -4,11 +4,11 @@ * This module provides advanced support for extending change detection. */ -export {UpperCasePipe} from './src/pipes/uppercase_pipe'; -export {LowerCasePipe} from './src/pipes/lowercase_pipe'; -export {AsyncPipe} from './src/pipes/async_pipe'; -export {JsonPipe} from './src/pipes/json_pipe'; -export {DatePipe} from './src/pipes/date_pipe'; -export {DecimalPipe, PercentPipe, CurrencyPipe} from './src/pipes/number_pipe'; -export {LimitToPipe} from './src/pipes/limit_to_pipe'; -export {DEFAULT_PIPES_TOKEN, DEFAULT_PIPES} from './src/pipes/default_pipes'; +export {UpperCasePipe} from './src/core/pipes/uppercase_pipe'; +export {LowerCasePipe} from './src/core/pipes/lowercase_pipe'; +export {AsyncPipe} from './src/core/pipes/async_pipe'; +export {JsonPipe} from './src/core/pipes/json_pipe'; +export {DatePipe} from './src/core/pipes/date_pipe'; +export {DecimalPipe, PercentPipe, CurrencyPipe} from './src/core/pipes/number_pipe'; +export {LimitToPipe} from './src/core/pipes/limit_to_pipe'; +export {DEFAULT_PIPES_TOKEN, DEFAULT_PIPES} from './src/core/pipes/default_pipes'; diff --git a/modules/angular2/profile.ts b/modules/angular2/profile.ts index f1ad6ec768..67049babaf 100644 --- a/modules/angular2/profile.ts +++ b/modules/angular2/profile.ts @@ -4,4 +4,4 @@ export { wtfStartTimeRange, wtfEndTimeRange, WtfScopeFn -} from './src/profile/profile'; +} from './src/core/profile/profile'; diff --git a/modules/angular2/render.ts b/modules/angular2/render.ts index ceb3a8be4c..7165218ebe 100644 --- a/modules/angular2/render.ts +++ b/modules/angular2/render.ts @@ -18,4 +18,4 @@ export { DOCUMENT, APP_ID, MAX_IN_MEMORY_ELEMENTS_PER_TEMPLATE -} from './src/render/render'; +} from './src/core/render/render'; diff --git a/modules/angular2/router.ts b/modules/angular2/router.ts index e42d1d3db6..5399e740b4 100644 --- a/modules/angular2/router.ts +++ b/modules/angular2/router.ts @@ -34,8 +34,8 @@ import {Pipeline} from './src/router/pipeline'; import {Location} from './src/router/location'; import {APP_COMPONENT} from './src/core/application_tokens'; import {Binding} from './di'; -import {CONST_EXPR} from './src/facade/lang'; -import {List} from './src/facade/collection'; +import {CONST_EXPR} from './src/core/facade/lang'; +import {List} from './src/core/facade/collection'; export const ROUTER_DIRECTIVES: List = CONST_EXPR([RouterOutlet, RouterLink]); diff --git a/modules/angular2/src/core/application.dart b/modules/angular2/src/core/application.dart index 5c9a1806f2..96c4a1694b 100644 --- a/modules/angular2/src/core/application.dart +++ b/modules/angular2/src/core/application.dart @@ -2,8 +2,8 @@ library angular2.application; import 'dart:async'; -import 'package:angular2/src/reflection/reflection.dart' show reflector; -import 'package:angular2/src/reflection/reflection_capabilities.dart' +import 'package:angular2/src/core/reflection/reflection.dart' show reflector; +import 'package:angular2/src/core/reflection/reflection_capabilities.dart' show ReflectionCapabilities; import 'application_common.dart'; import 'application_ref.dart'; diff --git a/modules/angular2/src/core/application_common.ts b/modules/angular2/src/core/application_common.ts index 324ef742c0..74816e7cf4 100644 --- a/modules/angular2/src/core/application_common.ts +++ b/modules/angular2/src/core/application_common.ts @@ -8,11 +8,11 @@ import { assertionsEnabled, print, stringify -} from 'angular2/src/facade/lang'; -import {BrowserDomAdapter} from 'angular2/src/dom/browser_adapter'; -import {DOM} from 'angular2/src/dom/dom_adapter'; +} from 'angular2/src/core/facade/lang'; +import {BrowserDomAdapter} from 'angular2/src/core/dom/browser_adapter'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; import {Compiler, CompilerCache} from './compiler/compiler'; -import {Reflector, reflector} from 'angular2/src/reflection/reflection'; +import {Reflector, reflector} from 'angular2/src/core/reflection/reflection'; import { Parser, Lexer, @@ -24,28 +24,28 @@ import { defaultIterableDiffers, KeyValueDiffers, defaultKeyValueDiffers -} from 'angular2/src/change_detection/change_detection'; +} from 'angular2/src/core/change_detection/change_detection'; import {DEFAULT_PIPES} from 'angular2/pipes'; import {ExceptionHandler} from './exception_handler'; -import {ViewLoader} from 'angular2/src/render/dom/compiler/view_loader'; -import {StyleUrlResolver} from 'angular2/src/render/dom/compiler/style_url_resolver'; -import {StyleInliner} from 'angular2/src/render/dom/compiler/style_inliner'; +import {ViewLoader} from 'angular2/src/core/render/dom/compiler/view_loader'; +import {StyleUrlResolver} from 'angular2/src/core/render/dom/compiler/style_url_resolver'; +import {StyleInliner} from 'angular2/src/core/render/dom/compiler/style_inliner'; import {ViewResolver} from './compiler/view_resolver'; import {DirectiveResolver} from './compiler/directive_resolver'; import {PipeResolver} from './compiler/pipe_resolver'; -import {List, ListWrapper} from 'angular2/src/facade/collection'; -import {Promise, PromiseWrapper, PromiseCompleter} from 'angular2/src/facade/async'; +import {List, ListWrapper} from 'angular2/src/core/facade/collection'; +import {Promise, PromiseWrapper, PromiseCompleter} from 'angular2/src/core/facade/async'; import {NgZone} from 'angular2/src/core/zone/ng_zone'; import {LifeCycle} from 'angular2/src/core/life_cycle/life_cycle'; -import {XHR} from 'angular2/src/render/xhr'; -import {XHRImpl} from 'angular2/src/render/xhr_impl'; -import {EventManager, DomEventsPlugin} from 'angular2/src/render/dom/events/event_manager'; -import {KeyEventsPlugin} from 'angular2/src/render/dom/events/key_events'; -import {HammerGesturesPlugin} from 'angular2/src/render/dom/events/hammer_gestures'; +import {XHR} from 'angular2/src/core/render/xhr'; +import {XHRImpl} from 'angular2/src/core/render/xhr_impl'; +import {EventManager, DomEventsPlugin} from 'angular2/src/core/render/dom/events/event_manager'; +import {KeyEventsPlugin} from 'angular2/src/core/render/dom/events/key_events'; +import {HammerGesturesPlugin} from 'angular2/src/core/render/dom/events/hammer_gestures'; import {ComponentUrlMapper} from 'angular2/src/core/compiler/component_url_mapper'; -import {UrlResolver} from 'angular2/src/services/url_resolver'; -import {AppRootUrl} from 'angular2/src/services/app_root_url'; -import {AnchorBasedAppRootUrl} from 'angular2/src/services/anchor_based_app_root_url'; +import {UrlResolver} from 'angular2/src/core/services/url_resolver'; +import {AppRootUrl} from 'angular2/src/core/services/app_root_url'; +import {AnchorBasedAppRootUrl} from 'angular2/src/core/services/anchor_based_app_root_url'; import { ComponentRef, DynamicComponentLoader @@ -56,7 +56,7 @@ import {AppViewManager} from 'angular2/src/core/compiler/view_manager'; import {AppViewManagerUtils} from 'angular2/src/core/compiler/view_manager_utils'; import {AppViewListener} from 'angular2/src/core/compiler/view_listener'; import {ProtoViewFactory} from 'angular2/src/core/compiler/proto_view_factory'; -import {Renderer, RenderCompiler} from 'angular2/src/render/api'; +import {Renderer, RenderCompiler} from 'angular2/src/core/render/api'; import { DomRenderer, DOCUMENT, @@ -64,16 +64,18 @@ import { APP_ID_RANDOM_BINDING, MAX_IN_MEMORY_ELEMENTS_PER_TEMPLATE, TemplateCloner -} from 'angular2/src/render/render'; -import {ElementSchemaRegistry} from 'angular2/src/render/dom/schema/element_schema_registry'; -import {DomElementSchemaRegistry} from 'angular2/src/render/dom/schema/dom_element_schema_registry'; +} from 'angular2/src/core/render/render'; +import {ElementSchemaRegistry} from 'angular2/src/core/render/dom/schema/element_schema_registry'; +import { + DomElementSchemaRegistry +} from 'angular2/src/core/render/dom/schema/dom_element_schema_registry'; import { SharedStylesHost, DomSharedStylesHost -} from 'angular2/src/render/dom/view/shared_styles_host'; +} from 'angular2/src/core/render/dom/view/shared_styles_host'; import {internalView} from 'angular2/src/core/compiler/view_ref'; import {APP_COMPONENT_REF_PROMISE, APP_COMPONENT} from './application_tokens'; -import {wtfInit} from '../profile/wtf_init'; +import {wtfInit} from './profile/wtf_init'; import {EXCEPTION_BINDING} from './platform_bindings'; import {ApplicationRef} from './application_ref'; diff --git a/modules/angular2/src/core/application_ref.ts b/modules/angular2/src/core/application_ref.ts index 9fcefcee50..1550dc4a4c 100644 --- a/modules/angular2/src/core/application_ref.ts +++ b/modules/angular2/src/core/application_ref.ts @@ -1,6 +1,6 @@ import {ComponentRef} from 'angular2/src/core/compiler/dynamic_component_loader'; import {Injector} from 'angular2/di'; -import {Type} from 'angular2/src/facade/lang'; +import {Type} from 'angular2/src/core/facade/lang'; /** * Represents a Angular's representation of an Application. * diff --git a/modules/angular2/src/core/application_tokens.ts b/modules/angular2/src/core/application_tokens.ts index 9a35c8d66f..98cc09c041 100644 --- a/modules/angular2/src/core/application_tokens.ts +++ b/modules/angular2/src/core/application_tokens.ts @@ -1,5 +1,5 @@ import {OpaqueToken} from 'angular2/di'; -import {CONST_EXPR} from 'angular2/src/facade/lang'; +import {CONST_EXPR} from 'angular2/src/core/facade/lang'; /** * @private diff --git a/modules/angular2/src/core/change_detection/abstract_change_detector.ts b/modules/angular2/src/core/change_detection/abstract_change_detector.ts index c51c1a0250..40ed585a90 100644 --- a/modules/angular2/src/core/change_detection/abstract_change_detector.ts +++ b/modules/angular2/src/core/change_detection/abstract_change_detector.ts @@ -1,5 +1,5 @@ -import {isPresent, isBlank, BaseException, StringWrapper} from 'angular2/src/facade/lang'; -import {List, ListWrapper} from 'angular2/src/facade/collection'; +import {isPresent, isBlank, BaseException, StringWrapper} from 'angular2/src/core/facade/lang'; +import {List, ListWrapper} from 'angular2/src/core/facade/collection'; import {ChangeDetectionUtil} from './change_detection_util'; import {ChangeDetectorRef} from './change_detector_ref'; import {DirectiveIndex} from './directive_record'; diff --git a/modules/angular2/src/core/change_detection/binding_record.ts b/modules/angular2/src/core/change_detection/binding_record.ts index 7723c224f5..12c34e7947 100644 --- a/modules/angular2/src/core/change_detection/binding_record.ts +++ b/modules/angular2/src/core/change_detection/binding_record.ts @@ -1,5 +1,5 @@ -import {isPresent, isBlank} from 'angular2/src/facade/lang'; -import {SetterFn} from 'angular2/src/reflection/types'; +import {isPresent, isBlank} from 'angular2/src/core/facade/lang'; +import {SetterFn} from 'angular2/src/core/reflection/types'; import {AST} from './parser/ast'; import {DirectiveIndex, DirectiveRecord} from './directive_record'; diff --git a/modules/angular2/src/core/change_detection/change_detection.ts b/modules/angular2/src/core/change_detection/change_detection.ts index df20cf3d9c..5f46222c08 100644 --- a/modules/angular2/src/core/change_detection/change_detection.ts +++ b/modules/angular2/src/core/change_detection/change_detection.ts @@ -12,14 +12,14 @@ import { ChangeDetectorGenConfig } from './interfaces'; import {Injector, Inject, Injectable, OpaqueToken, Optional, Binding} from 'angular2/di'; -import {List, StringMap, StringMapWrapper} from 'angular2/src/facade/collection'; +import {List, StringMap, StringMapWrapper} from 'angular2/src/core/facade/collection'; import { CONST, CONST_EXPR, isPresent, BaseException, assertionsEnabled -} from 'angular2/src/facade/lang'; +} from 'angular2/src/core/facade/lang'; export { ASTWithSource, diff --git a/modules/angular2/src/core/change_detection/change_detection_jit_generator.ts b/modules/angular2/src/core/change_detection/change_detection_jit_generator.ts index aac2740549..dbb4e086d6 100644 --- a/modules/angular2/src/core/change_detection/change_detection_jit_generator.ts +++ b/modules/angular2/src/core/change_detection/change_detection_jit_generator.ts @@ -1,5 +1,5 @@ -import {BaseException, Type, isBlank, isPresent} from 'angular2/src/facade/lang'; -import {List, ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/facade/collection'; +import {BaseException, Type, isBlank, isPresent} from 'angular2/src/core/facade/lang'; +import {List, ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection'; import {AbstractChangeDetector} from './abstract_change_detector'; import {ChangeDetectionUtil} from './change_detection_util'; diff --git a/modules/angular2/src/core/change_detection/change_detection_util.ts b/modules/angular2/src/core/change_detection/change_detection_util.ts index d8784ecb26..ef6bd1c650 100644 --- a/modules/angular2/src/core/change_detection/change_detection_util.ts +++ b/modules/angular2/src/core/change_detection/change_detection_util.ts @@ -5,8 +5,8 @@ import { BaseException, Type, StringWrapper -} from 'angular2/src/facade/lang'; -import {List, ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/facade/collection'; +} from 'angular2/src/core/facade/lang'; +import {List, ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection'; import {ProtoRecord} from './proto_record'; import { CHECK_ALWAYS, diff --git a/modules/angular2/src/core/change_detection/coalesce.ts b/modules/angular2/src/core/change_detection/coalesce.ts index d5353a1506..0ab84320dc 100644 --- a/modules/angular2/src/core/change_detection/coalesce.ts +++ b/modules/angular2/src/core/change_detection/coalesce.ts @@ -1,5 +1,5 @@ -import {isPresent, isBlank, looseIdentical} from 'angular2/src/facade/lang'; -import {List, ListWrapper, Map} from 'angular2/src/facade/collection'; +import {isPresent, isBlank, looseIdentical} from 'angular2/src/core/facade/lang'; +import {List, ListWrapper, Map} from 'angular2/src/core/facade/collection'; import {RecordType, ProtoRecord} from './proto_record'; /** diff --git a/modules/angular2/src/core/change_detection/codegen_facade.ts b/modules/angular2/src/core/change_detection/codegen_facade.ts index 5f50350efe..d593e11daa 100644 --- a/modules/angular2/src/core/change_detection/codegen_facade.ts +++ b/modules/angular2/src/core/change_detection/codegen_facade.ts @@ -1,4 +1,4 @@ -import {List} from 'angular2/src/facade/collection'; +import {List} from 'angular2/src/core/facade/collection'; /** * Converts `funcOrValue` to a string which can be used in generated code. diff --git a/modules/angular2/src/core/change_detection/codegen_logic_util.ts b/modules/angular2/src/core/change_detection/codegen_logic_util.ts index 83690713e4..efeeb88967 100644 --- a/modules/angular2/src/core/change_detection/codegen_logic_util.ts +++ b/modules/angular2/src/core/change_detection/codegen_logic_util.ts @@ -1,5 +1,11 @@ -import {ListWrapper} from 'angular2/src/facade/collection'; -import {BaseException, Json, StringWrapper, isPresent, isBlank} from 'angular2/src/facade/lang'; +import {ListWrapper} from 'angular2/src/core/facade/collection'; +import { + BaseException, + Json, + StringWrapper, + isPresent, + isBlank +} from 'angular2/src/core/facade/lang'; import {CodegenNameUtil} from './codegen_name_util'; import {codify, combineGeneratedStrings, rawString} from './codegen_facade'; import {ProtoRecord, RecordType} from './proto_record'; diff --git a/modules/angular2/src/core/change_detection/codegen_name_util.ts b/modules/angular2/src/core/change_detection/codegen_name_util.ts index 6d86e3894c..ca352501b9 100644 --- a/modules/angular2/src/core/change_detection/codegen_name_util.ts +++ b/modules/angular2/src/core/change_detection/codegen_name_util.ts @@ -1,5 +1,5 @@ -import {RegExpWrapper, StringWrapper} from 'angular2/src/facade/lang'; -import {List, ListWrapper, MapWrapper, Map} from 'angular2/src/facade/collection'; +import {RegExpWrapper, StringWrapper} from 'angular2/src/core/facade/lang'; +import {List, ListWrapper, MapWrapper, Map} from 'angular2/src/core/facade/collection'; import {DirectiveIndex} from './directive_record'; diff --git a/modules/angular2/src/core/change_detection/constants.ts b/modules/angular2/src/core/change_detection/constants.ts index ff7435b4c5..f58815592f 100644 --- a/modules/angular2/src/core/change_detection/constants.ts +++ b/modules/angular2/src/core/change_detection/constants.ts @@ -1,5 +1,5 @@ // TODO:vsavkin Use enums after switching to TypeScript -import {StringWrapper, normalizeBool, isBlank} from 'angular2/src/facade/lang'; +import {StringWrapper, normalizeBool, isBlank} from 'angular2/src/core/facade/lang'; /** * CHECK_ONCE means that after calling detectChanges the mode of the change detector diff --git a/modules/angular2/src/core/change_detection/differs/default_iterable_differ.ts b/modules/angular2/src/core/change_detection/differs/default_iterable_differ.ts index f592cd0741..ee12fecab1 100644 --- a/modules/angular2/src/core/change_detection/differs/default_iterable_differ.ts +++ b/modules/angular2/src/core/change_detection/differs/default_iterable_differ.ts @@ -1,10 +1,10 @@ -import {CONST, BaseException} from 'angular2/src/facade/lang'; +import {CONST, BaseException} from 'angular2/src/core/facade/lang'; import { isListLikeIterable, iterateListLike, ListWrapper, MapWrapper -} from 'angular2/src/facade/collection'; +} from 'angular2/src/core/facade/collection'; import { isBlank, @@ -13,7 +13,7 @@ import { getMapKey, looseIdentical, isArray -} from 'angular2/src/facade/lang'; +} from 'angular2/src/core/facade/lang'; import {ChangeDetectorRef} from '../change_detector_ref'; import {IterableDiffer, IterableDifferFactory} from '../differs/iterable_differs'; diff --git a/modules/angular2/src/core/change_detection/differs/default_keyvalue_differ.ts b/modules/angular2/src/core/change_detection/differs/default_keyvalue_differ.ts index 5d6371d445..8c893e3781 100644 --- a/modules/angular2/src/core/change_detection/differs/default_keyvalue_differ.ts +++ b/modules/angular2/src/core/change_detection/differs/default_keyvalue_differ.ts @@ -1,4 +1,4 @@ -import {ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/facade/collection'; +import {ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection'; import { stringify, looseIdentical, @@ -6,7 +6,7 @@ import { CONST, isBlank, BaseException -} from 'angular2/src/facade/lang'; +} from 'angular2/src/core/facade/lang'; import {ChangeDetectorRef} from '../change_detector_ref'; import {KeyValueDiffer, KeyValueDifferFactory} from '../differs/keyvalue_differs'; diff --git a/modules/angular2/src/core/change_detection/differs/iterable_differs.ts b/modules/angular2/src/core/change_detection/differs/iterable_differs.ts index 4ec889daeb..acebc00a5c 100644 --- a/modules/angular2/src/core/change_detection/differs/iterable_differs.ts +++ b/modules/angular2/src/core/change_detection/differs/iterable_differs.ts @@ -1,5 +1,5 @@ -import {isBlank, isPresent, BaseException, CONST} from 'angular2/src/facade/lang'; -import {ListWrapper} from 'angular2/src/facade/collection'; +import {isBlank, isPresent, BaseException, CONST} from 'angular2/src/core/facade/lang'; +import {ListWrapper} from 'angular2/src/core/facade/collection'; import {ChangeDetectorRef} from '../change_detector_ref'; import {Binding, SkipSelfMetadata, OptionalMetadata, Injectable} from 'angular2/di'; diff --git a/modules/angular2/src/core/change_detection/differs/keyvalue_differs.ts b/modules/angular2/src/core/change_detection/differs/keyvalue_differs.ts index 5fd68fd140..3f6812c301 100644 --- a/modules/angular2/src/core/change_detection/differs/keyvalue_differs.ts +++ b/modules/angular2/src/core/change_detection/differs/keyvalue_differs.ts @@ -1,5 +1,5 @@ -import {isBlank, isPresent, BaseException, CONST} from 'angular2/src/facade/lang'; -import {ListWrapper} from 'angular2/src/facade/collection'; +import {isBlank, isPresent, BaseException, CONST} from 'angular2/src/core/facade/lang'; +import {ListWrapper} from 'angular2/src/core/facade/collection'; import {ChangeDetectorRef} from '../change_detector_ref'; import {Binding, SkipSelfMetadata, OptionalMetadata, Injectable} from 'angular2/di'; diff --git a/modules/angular2/src/core/change_detection/directive_record.ts b/modules/angular2/src/core/change_detection/directive_record.ts index 3658414b72..c22d63235e 100644 --- a/modules/angular2/src/core/change_detection/directive_record.ts +++ b/modules/angular2/src/core/change_detection/directive_record.ts @@ -1,4 +1,4 @@ -import {StringWrapper, normalizeBool, isBlank} from 'angular2/src/facade/lang'; +import {StringWrapper, normalizeBool, isBlank} from 'angular2/src/core/facade/lang'; import {isDefaultChangeDetectionStrategy} from './constants'; export class DirectiveIndex { diff --git a/modules/angular2/src/core/change_detection/dynamic_change_detector.ts b/modules/angular2/src/core/change_detection/dynamic_change_detector.ts index 7b30b4a67f..76f9feb0bb 100644 --- a/modules/angular2/src/core/change_detection/dynamic_change_detector.ts +++ b/modules/angular2/src/core/change_detection/dynamic_change_detector.ts @@ -4,8 +4,8 @@ import { BaseException, FunctionWrapper, StringWrapper -} from 'angular2/src/facade/lang'; -import {List, ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/facade/collection'; +} from 'angular2/src/core/facade/lang'; +import {List, ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection'; import {AbstractChangeDetector} from './abstract_change_detector'; import {EventBinding} from './event_binding'; diff --git a/modules/angular2/src/core/change_detection/exceptions.ts b/modules/angular2/src/core/change_detection/exceptions.ts index e235d7371f..9ca4f26b2f 100644 --- a/modules/angular2/src/core/change_detection/exceptions.ts +++ b/modules/angular2/src/core/change_detection/exceptions.ts @@ -1,4 +1,4 @@ -import {BaseException} from "angular2/src/facade/lang"; +import {BaseException} from "angular2/src/core/facade/lang"; /** * An error thrown if application changes model breaking the top-down data flow. diff --git a/modules/angular2/src/core/change_detection/interfaces.ts b/modules/angular2/src/core/change_detection/interfaces.ts index 6560c7b0ed..27fe0b80c0 100644 --- a/modules/angular2/src/core/change_detection/interfaces.ts +++ b/modules/angular2/src/core/change_detection/interfaces.ts @@ -1,5 +1,5 @@ -import {List} from 'angular2/src/facade/collection'; -import {CONST} from 'angular2/src/facade/lang'; +import {List} from 'angular2/src/core/facade/collection'; +import {CONST} from 'angular2/src/core/facade/lang'; import {Locals} from './parser/locals'; import {BindingTarget, BindingRecord} from './binding_record'; import {DirectiveIndex, DirectiveRecord} from './directive_record'; diff --git a/modules/angular2/src/core/change_detection/jit_proto_change_detector.ts b/modules/angular2/src/core/change_detection/jit_proto_change_detector.ts index aeb0da7c3d..b143287fe6 100644 --- a/modules/angular2/src/core/change_detection/jit_proto_change_detector.ts +++ b/modules/angular2/src/core/change_detection/jit_proto_change_detector.ts @@ -1,5 +1,5 @@ -import {ListWrapper} from 'angular2/src/facade/collection'; -import {isPresent} from 'angular2/src/facade/lang'; +import {ListWrapper} from 'angular2/src/core/facade/collection'; +import {isPresent} from 'angular2/src/core/facade/lang'; import {ProtoChangeDetector, ChangeDetector, ChangeDetectorDefinition} from './interfaces'; import {ChangeDetectorJITGenerator} from './change_detection_jit_generator'; diff --git a/modules/angular2/src/core/change_detection/parser/ast.ts b/modules/angular2/src/core/change_detection/parser/ast.ts index f0e8b97262..7dbe59c35f 100644 --- a/modules/angular2/src/core/change_detection/parser/ast.ts +++ b/modules/angular2/src/core/change_detection/parser/ast.ts @@ -1,5 +1,5 @@ -import {isBlank, isPresent, FunctionWrapper, BaseException} from "angular2/src/facade/lang"; -import {List, Map, ListWrapper, StringMapWrapper} from "angular2/src/facade/collection"; +import {isBlank, isPresent, FunctionWrapper, BaseException} from "angular2/src/core/facade/lang"; +import {List, Map, ListWrapper, StringMapWrapper} from "angular2/src/core/facade/collection"; export class AST { visit(visitor: AstVisitor): any { return null; } diff --git a/modules/angular2/src/core/change_detection/parser/lexer.ts b/modules/angular2/src/core/change_detection/parser/lexer.ts index 618f8456cc..2b54b45b33 100644 --- a/modules/angular2/src/core/change_detection/parser/lexer.ts +++ b/modules/angular2/src/core/change_detection/parser/lexer.ts @@ -1,12 +1,12 @@ -import {Injectable} from 'angular2/src/di/decorators'; -import {List, ListWrapper, SetWrapper} from "angular2/src/facade/collection"; +import {Injectable} from 'angular2/src/core/di/decorators'; +import {List, ListWrapper, SetWrapper} from "angular2/src/core/facade/collection"; import { NumberWrapper, StringJoiner, StringWrapper, BaseException, isPresent -} from "angular2/src/facade/lang"; +} from "angular2/src/core/facade/lang"; export enum TokenType { CHARACTER, diff --git a/modules/angular2/src/core/change_detection/parser/locals.ts b/modules/angular2/src/core/change_detection/parser/locals.ts index 349e0fa57e..02eab8bd7a 100644 --- a/modules/angular2/src/core/change_detection/parser/locals.ts +++ b/modules/angular2/src/core/change_detection/parser/locals.ts @@ -1,5 +1,5 @@ -import {isPresent, BaseException} from 'angular2/src/facade/lang'; -import {ListWrapper, MapWrapper} from 'angular2/src/facade/collection'; +import {isPresent, BaseException} from 'angular2/src/core/facade/lang'; +import {ListWrapper, MapWrapper} from 'angular2/src/core/facade/collection'; export class Locals { constructor(public parent: Locals, public current: Map) {} diff --git a/modules/angular2/src/core/change_detection/parser/parser.ts b/modules/angular2/src/core/change_detection/parser/parser.ts index debce8186c..40e571fdf1 100644 --- a/modules/angular2/src/core/change_detection/parser/parser.ts +++ b/modules/angular2/src/core/change_detection/parser/parser.ts @@ -1,6 +1,6 @@ -import {Injectable} from 'angular2/src/di/decorators'; -import {isBlank, isPresent, BaseException, StringWrapper} from 'angular2/src/facade/lang'; -import {ListWrapper, List} from 'angular2/src/facade/collection'; +import {Injectable} from 'angular2/src/core/di/decorators'; +import {isBlank, isPresent, BaseException, StringWrapper} from 'angular2/src/core/facade/lang'; +import {ListWrapper, List} from 'angular2/src/core/facade/collection'; import { Lexer, EOF, @@ -16,7 +16,7 @@ import { $LPAREN, $RPAREN } from './lexer'; -import {reflector, Reflector} from 'angular2/src/reflection/reflection'; +import {reflector, Reflector} from 'angular2/src/core/reflection/reflection'; import { AST, EmptyExpr, diff --git a/modules/angular2/src/core/change_detection/pipe_lifecycle_reflector.dart b/modules/angular2/src/core/change_detection/pipe_lifecycle_reflector.dart index 9fb8545f71..3951dc4f20 100644 --- a/modules/angular2/src/core/change_detection/pipe_lifecycle_reflector.dart +++ b/modules/angular2/src/core/change_detection/pipe_lifecycle_reflector.dart @@ -1,5 +1,5 @@ library angular2.core.compiler.pipe_lifecycle_reflector; -import 'package:angular2/src/change_detection/pipe_transform.dart'; +import 'package:angular2/src/core/change_detection/pipe_transform.dart'; bool implementsOnDestroy(Object pipe) => pipe is PipeOnDestroy; diff --git a/modules/angular2/src/core/change_detection/pipe_transform.ts b/modules/angular2/src/core/change_detection/pipe_transform.ts index 557a3cbf2d..e47526a350 100644 --- a/modules/angular2/src/core/change_detection/pipe_transform.ts +++ b/modules/angular2/src/core/change_detection/pipe_transform.ts @@ -1,4 +1,4 @@ -import {ABSTRACT, BaseException, CONST, Type} from 'angular2/src/facade/lang'; +import {ABSTRACT, BaseException, CONST, Type} from 'angular2/src/core/facade/lang'; /** * An interface which all pipes must implement. diff --git a/modules/angular2/src/core/change_detection/pregen_proto_change_detector.dart b/modules/angular2/src/core/change_detection/pregen_proto_change_detector.dart index 27ba1d00b0..5ba0489966 100644 --- a/modules/angular2/src/core/change_detection/pregen_proto_change_detector.dart +++ b/modules/angular2/src/core/change_detection/pregen_proto_change_detector.dart @@ -1,23 +1,23 @@ library angular2.src.change_detection.pregen_proto_change_detector; -import 'package:angular2/src/change_detection/interfaces.dart'; -import 'package:angular2/src/facade/lang.dart' show looseIdentical; +import 'package:angular2/src/core/change_detection/interfaces.dart'; +import 'package:angular2/src/core/facade/lang.dart' show looseIdentical; export 'dart:core' show List; -export 'package:angular2/src/change_detection/abstract_change_detector.dart' +export 'package:angular2/src/core/change_detection/abstract_change_detector.dart' show AbstractChangeDetector; -export 'package:angular2/src/change_detection/change_detection.dart' +export 'package:angular2/src/core/change_detection/change_detection.dart' show preGeneratedProtoDetectors; -export 'package:angular2/src/change_detection/directive_record.dart' +export 'package:angular2/src/core/change_detection/directive_record.dart' show DirectiveIndex, DirectiveRecord; -export 'package:angular2/src/change_detection/interfaces.dart' +export 'package:angular2/src/core/change_detection/interfaces.dart' show ChangeDetector, ChangeDetectorDefinition, ProtoChangeDetector; -export 'package:angular2/src/change_detection/pipes.dart' show Pipes; -export 'package:angular2/src/change_detection/proto_record.dart' +export 'package:angular2/src/core/change_detection/pipes.dart' show Pipes; +export 'package:angular2/src/core/change_detection/proto_record.dart' show ProtoRecord; -export 'package:angular2/src/change_detection/change_detection_util.dart' +export 'package:angular2/src/core/change_detection/change_detection_util.dart' show ChangeDetectionUtil; -export 'package:angular2/src/facade/lang.dart' show looseIdentical; +export 'package:angular2/src/core/facade/lang.dart' show looseIdentical; typedef ProtoChangeDetector PregenProtoChangeDetectorFactory( ChangeDetectorDefinition definition); diff --git a/modules/angular2/src/core/change_detection/pregen_proto_change_detector.ts b/modules/angular2/src/core/change_detection/pregen_proto_change_detector.ts index 52df89cb02..6f000919cc 100644 --- a/modules/angular2/src/core/change_detection/pregen_proto_change_detector.ts +++ b/modules/angular2/src/core/change_detection/pregen_proto_change_detector.ts @@ -1,4 +1,4 @@ -import {BaseException} from 'angular2/src/facade/lang'; +import {BaseException} from 'angular2/src/core/facade/lang'; import {ProtoChangeDetector, ChangeDetector} from './interfaces'; import {coalesce} from './coalesce'; diff --git a/modules/angular2/src/core/change_detection/proto_change_detector.ts b/modules/angular2/src/core/change_detection/proto_change_detector.ts index e9f08a8293..59a8e096f4 100644 --- a/modules/angular2/src/core/change_detection/proto_change_detector.ts +++ b/modules/angular2/src/core/change_detection/proto_change_detector.ts @@ -1,5 +1,5 @@ -import {BaseException, Type, isBlank, isPresent, isString} from 'angular2/src/facade/lang'; -import {List, ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/facade/collection'; +import {BaseException, Type, isBlank, isPresent, isString} from 'angular2/src/core/facade/lang'; +import {List, ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection'; import { PropertyRead, diff --git a/modules/angular2/src/core/change_detection/proto_record.ts b/modules/angular2/src/core/change_detection/proto_record.ts index 701d709fdd..f22d46423a 100644 --- a/modules/angular2/src/core/change_detection/proto_record.ts +++ b/modules/angular2/src/core/change_detection/proto_record.ts @@ -1,4 +1,4 @@ -import {List} from 'angular2/src/facade/collection'; +import {List} from 'angular2/src/core/facade/collection'; import {BindingRecord} from './binding_record'; import {DirectiveIndex} from './directive_record'; diff --git a/modules/angular2/src/core/compiler/compiler.ts b/modules/angular2/src/core/compiler/compiler.ts index 3795a1c0ae..23d3851acd 100644 --- a/modules/angular2/src/core/compiler/compiler.ts +++ b/modules/angular2/src/core/compiler/compiler.ts @@ -9,9 +9,9 @@ import { stringify, isArray, isPromise -} from 'angular2/src/facade/lang'; -import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; -import {List, ListWrapper, Map, MapWrapper} from 'angular2/src/facade/collection'; +} from 'angular2/src/core/facade/lang'; +import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async'; +import {List, ListWrapper, Map, MapWrapper} from 'angular2/src/core/facade/collection'; import {DirectiveResolver} from './directive_resolver'; @@ -23,10 +23,10 @@ import {PipeResolver} from './pipe_resolver'; import {ViewMetadata} from 'angular2/metadata'; import {ComponentUrlMapper} from './component_url_mapper'; import {ProtoViewFactory} from './proto_view_factory'; -import {UrlResolver} from 'angular2/src/services/url_resolver'; -import {AppRootUrl} from 'angular2/src/services/app_root_url'; +import {UrlResolver} from 'angular2/src/core/services/url_resolver'; +import {AppRootUrl} from 'angular2/src/core/services/app_root_url'; import {ElementBinder} from './element_binder'; -import {wtfStartTimeRange, wtfEndTimeRange} from '../../profile/profile'; +import {wtfStartTimeRange, wtfEndTimeRange} from '../profile/profile'; import {PipeBinding} from '../pipes/pipe_binding'; import {DEFAULT_PIPES_TOKEN} from 'angular2/pipes'; @@ -37,7 +37,7 @@ import { ViewType, RenderProtoViewMergeMapping, RenderProtoViewRef -} from 'angular2/src/render/api'; +} from 'angular2/src/core/render/api'; /** * Cache that stores the AppProtoView of the template of a component. diff --git a/modules/angular2/src/core/compiler/component_url_mapper.ts b/modules/angular2/src/core/compiler/component_url_mapper.ts index 9e94b54206..75462191e9 100644 --- a/modules/angular2/src/core/compiler/component_url_mapper.ts +++ b/modules/angular2/src/core/compiler/component_url_mapper.ts @@ -1,6 +1,6 @@ import {Injectable} from 'angular2/di'; -import {Type, isPresent} from 'angular2/src/facade/lang'; -import {Map, MapWrapper} from 'angular2/src/facade/collection'; +import {Type, isPresent} from 'angular2/src/core/facade/lang'; +import {Map, MapWrapper} from 'angular2/src/core/facade/collection'; /** * Resolve a `Type` from a {@link ComponentMetadata} into a URL. diff --git a/modules/angular2/src/core/compiler/directive_lifecycle_reflector.dart b/modules/angular2/src/core/compiler/directive_lifecycle_reflector.dart index f9b1a2b7a1..e16737ad75 100644 --- a/modules/angular2/src/core/compiler/directive_lifecycle_reflector.dart +++ b/modules/angular2/src/core/compiler/directive_lifecycle_reflector.dart @@ -2,7 +2,7 @@ library angular2.src.core.compiler.directive_lifecycle_reflector; import 'package:angular2/src/core/metadata.dart'; import 'package:angular2/src/core/compiler/interfaces.dart'; -import 'package:angular2/src/reflection/reflection.dart'; +import 'package:angular2/src/core/reflection/reflection.dart'; bool hasLifecycleHook(LifecycleEvent e, type, DirectiveMetadata annotation) { if (annotation.lifecycle != null) { diff --git a/modules/angular2/src/core/compiler/directive_lifecycle_reflector.ts b/modules/angular2/src/core/compiler/directive_lifecycle_reflector.ts index c34bc81160..a8c4ef0a6d 100644 --- a/modules/angular2/src/core/compiler/directive_lifecycle_reflector.ts +++ b/modules/angular2/src/core/compiler/directive_lifecycle_reflector.ts @@ -1,4 +1,4 @@ -import {Type, isPresent} from 'angular2/src/facade/lang'; +import {Type, isPresent} from 'angular2/src/core/facade/lang'; import {LifecycleEvent, DirectiveMetadata} from 'angular2/metadata'; export function hasLifecycleHook(e: LifecycleEvent, type, annotation: DirectiveMetadata): boolean { diff --git a/modules/angular2/src/core/compiler/directive_resolver.ts b/modules/angular2/src/core/compiler/directive_resolver.ts index 6f55c8c3b5..7f9f389f59 100644 --- a/modules/angular2/src/core/compiler/directive_resolver.ts +++ b/modules/angular2/src/core/compiler/directive_resolver.ts @@ -1,7 +1,7 @@ import {resolveForwardRef, Injectable} from 'angular2/di'; -import {Type, isPresent, BaseException, stringify} from 'angular2/src/facade/lang'; +import {Type, isPresent, BaseException, stringify} from 'angular2/src/core/facade/lang'; import {DirectiveMetadata} from 'angular2/metadata'; -import {reflector} from 'angular2/src/reflection/reflection'; +import {reflector} from 'angular2/src/core/reflection/reflection'; /** * Resolve a `Type` for {@link DirectiveMetadata}. diff --git a/modules/angular2/src/core/compiler/dynamic_component_loader.ts b/modules/angular2/src/core/compiler/dynamic_component_loader.ts index 9f7b63bbd0..8caca3a974 100644 --- a/modules/angular2/src/core/compiler/dynamic_component_loader.ts +++ b/modules/angular2/src/core/compiler/dynamic_component_loader.ts @@ -1,7 +1,7 @@ import {Key, Injector, ResolvedBinding, Binding, bind, Injectable} from 'angular2/di'; import {Compiler} from './compiler'; -import {Type, BaseException, stringify, isPresent} from 'angular2/src/facade/lang'; -import {Promise} from 'angular2/src/facade/async'; +import {Type, BaseException, stringify, isPresent} from 'angular2/src/core/facade/lang'; +import {Promise} from 'angular2/src/core/facade/async'; import {AppViewManager} from 'angular2/src/core/compiler/view_manager'; import {ElementRef} from './element_ref'; import {ViewRef, HostViewRef} from './view_ref'; diff --git a/modules/angular2/src/core/compiler/element_binder.ts b/modules/angular2/src/core/compiler/element_binder.ts index 6f93f5908d..fef7840648 100644 --- a/modules/angular2/src/core/compiler/element_binder.ts +++ b/modules/angular2/src/core/compiler/element_binder.ts @@ -1,4 +1,4 @@ -import {isBlank, isPresent, BaseException} from 'angular2/src/facade/lang'; +import {isBlank, isPresent, BaseException} from 'angular2/src/core/facade/lang'; import * as eiModule from './element_injector'; import {DirectiveBinding} from './element_injector'; import * as viewModule from './view'; diff --git a/modules/angular2/src/core/compiler/element_injector.ts b/modules/angular2/src/core/compiler/element_injector.ts index e389e0f1ee..7140a6c6b9 100644 --- a/modules/angular2/src/core/compiler/element_injector.ts +++ b/modules/angular2/src/core/compiler/element_injector.ts @@ -6,9 +6,9 @@ import { stringify, CONST_EXPR, StringWrapper -} from 'angular2/src/facade/lang'; -import {EventEmitter, ObservableWrapper} from 'angular2/src/facade/async'; -import {List, ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/facade/collection'; +} from 'angular2/src/core/facade/lang'; +import {EventEmitter, ObservableWrapper} from 'angular2/src/core/facade/async'; +import {List, ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection'; import { Injector, ProtoInjector, @@ -29,7 +29,7 @@ import { InjectorInlineStrategy, InjectorDynamicStrategy, BindingWithVisibility -} from 'angular2/src/di/injector'; +} from 'angular2/src/core/di/injector'; import {AttributeMetadata, QueryMetadata} from '../metadata/di'; @@ -40,11 +40,14 @@ import {ElementRef} from './element_ref'; import {TemplateRef} from './template_ref'; import {DirectiveMetadata, ComponentMetadata, LifecycleEvent} from '../metadata/directives'; import {hasLifecycleHook} from './directive_lifecycle_reflector'; -import {ChangeDetector, ChangeDetectorRef} from 'angular2/src/change_detection/change_detection'; +import { + ChangeDetector, + ChangeDetectorRef +} from 'angular2/src/core/change_detection/change_detection'; import {QueryList} from './query_list'; -import {reflector} from 'angular2/src/reflection/reflection'; -import {RenderDirectiveMetadata} from 'angular2/src/render/api'; -import {EventConfig} from 'angular2/src/render/dom/util'; +import {reflector} from 'angular2/src/core/reflection/reflection'; +import {RenderDirectiveMetadata} from 'angular2/src/core/render/api'; +import {EventConfig} from 'angular2/src/core/render/dom/util'; import {PipeBinding} from '../pipes/pipe_binding'; var _staticKeys; diff --git a/modules/angular2/src/core/compiler/element_ref.ts b/modules/angular2/src/core/compiler/element_ref.ts index 7d1b43f1d3..cdd9dbb721 100644 --- a/modules/angular2/src/core/compiler/element_ref.ts +++ b/modules/angular2/src/core/compiler/element_ref.ts @@ -1,6 +1,6 @@ -import {BaseException, isPresent} from 'angular2/src/facade/lang'; +import {BaseException, isPresent} from 'angular2/src/core/facade/lang'; import {ViewRef} from './view_ref'; -import {RenderViewRef, RenderElementRef, Renderer} from 'angular2/src/render/api'; +import {RenderViewRef, RenderElementRef, Renderer} from 'angular2/src/core/render/api'; /** * Reference to the element. diff --git a/modules/angular2/src/core/compiler/interfaces.ts b/modules/angular2/src/core/compiler/interfaces.ts index 1d67207ace..b77584eaf5 100644 --- a/modules/angular2/src/core/compiler/interfaces.ts +++ b/modules/angular2/src/core/compiler/interfaces.ts @@ -1,5 +1,5 @@ -import {StringMap} from 'angular2/src/facade/collection'; -import {global} from 'angular2/src/facade/lang'; +import {StringMap} from 'angular2/src/core/facade/collection'; +import {global} from 'angular2/src/core/facade/lang'; // This is here only so that after TS transpilation the file is not empty. // TODO(rado): find a better way to fix this, or remove if likely culprit diff --git a/modules/angular2/src/core/compiler/pipe_resolver.ts b/modules/angular2/src/core/compiler/pipe_resolver.ts index 2ecc61a844..68abbb3695 100644 --- a/modules/angular2/src/core/compiler/pipe_resolver.ts +++ b/modules/angular2/src/core/compiler/pipe_resolver.ts @@ -1,7 +1,7 @@ import {resolveForwardRef, Injectable} from 'angular2/di'; -import {Type, isPresent, BaseException, stringify} from 'angular2/src/facade/lang'; +import {Type, isPresent, BaseException, stringify} from 'angular2/src/core/facade/lang'; import {PipeMetadata} from '../metadata/directives'; -import {reflector} from 'angular2/src/reflection/reflection'; +import {reflector} from 'angular2/src/core/reflection/reflection'; /** * Resolve a `Type` for {@link PipeMetadata}. diff --git a/modules/angular2/src/core/compiler/proto_view_factory.ts b/modules/angular2/src/core/compiler/proto_view_factory.ts index d2cba49648..24664f10ce 100644 --- a/modules/angular2/src/core/compiler/proto_view_factory.ts +++ b/modules/angular2/src/core/compiler/proto_view_factory.ts @@ -1,8 +1,8 @@ import {Injectable} from 'angular2/di'; -import {List, ListWrapper, MapWrapper} from 'angular2/src/facade/collection'; -import {isPresent, isBlank, BaseException, assertionsEnabled} from 'angular2/src/facade/lang'; -import {reflector} from 'angular2/src/reflection/reflection'; +import {List, ListWrapper, MapWrapper} from 'angular2/src/core/facade/collection'; +import {isPresent, isBlank, BaseException, assertionsEnabled} from 'angular2/src/core/facade/lang'; +import {reflector} from 'angular2/src/core/reflection/reflection'; import { ChangeDetection, @@ -14,7 +14,7 @@ import { ChangeDetectorDefinition, ChangeDetectorGenConfig, ASTWithSource -} from 'angular2/src/change_detection/change_detection'; +} from 'angular2/src/core/change_detection/change_detection'; import {PipeBinding} from 'angular2/src/core/pipes/pipe_binding'; import {ProtoPipes} from 'angular2/src/core/pipes/pipes'; @@ -26,7 +26,7 @@ import { DirectiveBinder, ProtoViewDto, ViewType -} from 'angular2/src/render/api'; +} from 'angular2/src/core/render/api'; import {AppProtoView} from './view'; import {ElementBinder} from './element_binder'; import {ProtoElementInjector, DirectiveBinding} from './element_injector'; diff --git a/modules/angular2/src/core/compiler/query_list.ts b/modules/angular2/src/core/compiler/query_list.ts index bd57057e2f..1f862ddd6e 100644 --- a/modules/angular2/src/core/compiler/query_list.ts +++ b/modules/angular2/src/core/compiler/query_list.ts @@ -1,4 +1,4 @@ -import {List, ListWrapper, MapWrapper} from 'angular2/src/facade/collection'; +import {List, ListWrapper, MapWrapper} from 'angular2/src/core/facade/collection'; /** * An iterable and observable live list of components in the DOM. diff --git a/modules/angular2/src/core/compiler/view.ts b/modules/angular2/src/core/compiler/view.ts index 1a0b3fb478..fbaebb5ebc 100644 --- a/modules/angular2/src/core/compiler/view.ts +++ b/modules/angular2/src/core/compiler/view.ts @@ -5,7 +5,7 @@ import { StringMapWrapper, List, StringMap -} from 'angular2/src/facade/collection'; +} from 'angular2/src/core/facade/collection'; import { AST, ChangeDetector, @@ -16,8 +16,8 @@ import { BindingTarget, Locals, ProtoChangeDetector -} from 'angular2/src/change_detection/change_detection'; -import {DebugContext} from 'angular2/src/change_detection/interfaces'; +} from 'angular2/src/core/change_detection/change_detection'; +import {DebugContext} from 'angular2/src/core/change_detection/interfaces'; import { ProtoElementInjector, @@ -26,15 +26,15 @@ import { DirectiveBinding } from './element_injector'; import {ElementBinder} from './element_binder'; -import {isPresent, isBlank, BaseException} from 'angular2/src/facade/lang'; -import * as renderApi from 'angular2/src/render/api'; -import {RenderEventDispatcher} from 'angular2/src/render/api'; +import {isPresent, isBlank, BaseException} from 'angular2/src/core/facade/lang'; +import * as renderApi from 'angular2/src/core/render/api'; +import {RenderEventDispatcher} from 'angular2/src/core/render/api'; import {ViewRef, ProtoViewRef, internalView} from './view_ref'; import {ElementRef} from './element_ref'; import {ProtoPipes} from 'angular2/src/core/pipes/pipes'; -import {camelCaseToDashCase} from 'angular2/src/render/dom/util'; +import {camelCaseToDashCase} from 'angular2/src/core/render/dom/util'; -export {DebugContext} from 'angular2/src/change_detection/interfaces'; +export {DebugContext} from 'angular2/src/core/change_detection/interfaces'; const REFLECT_PREFIX: string = 'ng-reflect-'; diff --git a/modules/angular2/src/core/compiler/view_container_ref.ts b/modules/angular2/src/core/compiler/view_container_ref.ts index 6212a1c349..a11a4babf1 100644 --- a/modules/angular2/src/core/compiler/view_container_ref.ts +++ b/modules/angular2/src/core/compiler/view_container_ref.ts @@ -1,6 +1,6 @@ -import {ListWrapper, List} from 'angular2/src/facade/collection'; +import {ListWrapper, List} from 'angular2/src/core/facade/collection'; import {ResolvedBinding} from 'angular2/di'; -import {isPresent, isBlank} from 'angular2/src/facade/lang'; +import {isPresent, isBlank} from 'angular2/src/core/facade/lang'; import * as avmModule from './view_manager'; import * as viewModule from './view'; diff --git a/modules/angular2/src/core/compiler/view_manager.ts b/modules/angular2/src/core/compiler/view_manager.ts index 14092d0f44..ff6d39daf3 100644 --- a/modules/angular2/src/core/compiler/view_manager.ts +++ b/modules/angular2/src/core/compiler/view_manager.ts @@ -1,5 +1,5 @@ import {Injector, Binding, Injectable, ResolvedBinding} from 'angular2/di'; -import {isPresent, isBlank, BaseException} from 'angular2/src/facade/lang'; +import {isPresent, isBlank, BaseException} from 'angular2/src/core/facade/lang'; import * as viewModule from './view'; import {ElementRef} from './element_ref'; import {ProtoViewRef, ViewRef, HostViewRef, internalView, internalProtoView} from './view_ref'; @@ -11,11 +11,11 @@ import { RenderFragmentRef, RenderViewWithFragments, ViewType -} from 'angular2/src/render/api'; +} from 'angular2/src/core/render/api'; import {AppViewManagerUtils} from './view_manager_utils'; import {AppViewPool} from './view_pool'; import {AppViewListener} from './view_listener'; -import {wtfCreateScope, wtfLeave, WtfScopeFn} from '../../profile/profile'; +import {wtfCreateScope, wtfLeave, WtfScopeFn} from '../profile/profile'; /** * Entry point for creating, moving views in the view hierarchy and destroying views. diff --git a/modules/angular2/src/core/compiler/view_manager_utils.ts b/modules/angular2/src/core/compiler/view_manager_utils.ts index 7d91fade95..e26649b075 100644 --- a/modules/angular2/src/core/compiler/view_manager_utils.ts +++ b/modules/angular2/src/core/compiler/view_manager_utils.ts @@ -1,16 +1,22 @@ import {Injector, Binding, Injectable, ResolvedBinding} from 'angular2/di'; -import {ListWrapper, MapWrapper, Map, StringMapWrapper, List} from 'angular2/src/facade/collection'; +import { + ListWrapper, + MapWrapper, + Map, + StringMapWrapper, + List +} from 'angular2/src/core/facade/collection'; import * as eli from './element_injector'; -import {isPresent, isBlank, BaseException} from 'angular2/src/facade/lang'; +import {isPresent, isBlank, BaseException} from 'angular2/src/core/facade/lang'; import * as viewModule from './view'; import {internalView} from './view_ref'; import * as avmModule from './view_manager'; import {ElementRef} from './element_ref'; import {TemplateRef} from './template_ref'; -import {Renderer, RenderViewWithFragments} from 'angular2/src/render/api'; -import {Locals} from 'angular2/src/change_detection/change_detection'; +import {Renderer, RenderViewWithFragments} from 'angular2/src/core/render/api'; +import {Locals} from 'angular2/src/core/change_detection/change_detection'; import {Pipes} from 'angular2/src/core/pipes/pipes'; -import {RenderViewRef, RenderFragmentRef, ViewType} from 'angular2/src/render/api'; +import {RenderViewRef, RenderFragmentRef, ViewType} from 'angular2/src/core/render/api'; @Injectable() export class AppViewManagerUtils { diff --git a/modules/angular2/src/core/compiler/view_pool.ts b/modules/angular2/src/core/compiler/view_pool.ts index b1369f94ef..229891562c 100644 --- a/modules/angular2/src/core/compiler/view_pool.ts +++ b/modules/angular2/src/core/compiler/view_pool.ts @@ -1,7 +1,7 @@ import {Inject, Injectable, OpaqueToken} from 'angular2/di'; -import {ListWrapper, MapWrapper, Map, List} from 'angular2/src/facade/collection'; -import {isPresent, isBlank, CONST_EXPR} from 'angular2/src/facade/lang'; +import {ListWrapper, MapWrapper, Map, List} from 'angular2/src/core/facade/collection'; +import {isPresent, isBlank, CONST_EXPR} from 'angular2/src/core/facade/lang'; import * as viewModule from './view'; diff --git a/modules/angular2/src/core/compiler/view_ref.ts b/modules/angular2/src/core/compiler/view_ref.ts index ef7326a0e6..2706969258 100644 --- a/modules/angular2/src/core/compiler/view_ref.ts +++ b/modules/angular2/src/core/compiler/view_ref.ts @@ -1,6 +1,6 @@ -import {isPresent} from 'angular2/src/facade/lang'; +import {isPresent} from 'angular2/src/core/facade/lang'; import * as viewModule from './view'; -import {RenderViewRef, RenderFragmentRef} from 'angular2/src/render/api'; +import {RenderViewRef, RenderFragmentRef} from 'angular2/src/core/render/api'; // This is a workaround for privacy in Dart as we don't have library parts export function internalView(viewRef: ViewRef): viewModule.AppView { diff --git a/modules/angular2/src/core/compiler/view_resolver.ts b/modules/angular2/src/core/compiler/view_resolver.ts index 89d0b6de1c..9f3673c3a3 100644 --- a/modules/angular2/src/core/compiler/view_resolver.ts +++ b/modules/angular2/src/core/compiler/view_resolver.ts @@ -1,10 +1,10 @@ import {Injectable} from 'angular2/di'; import {ViewMetadata} from '../metadata/view'; -import {Type, stringify, isBlank, BaseException} from 'angular2/src/facade/lang'; -import {Map, MapWrapper, List, ListWrapper} from 'angular2/src/facade/collection'; +import {Type, stringify, isBlank, BaseException} from 'angular2/src/core/facade/lang'; +import {Map, MapWrapper, List, ListWrapper} from 'angular2/src/core/facade/collection'; -import {reflector} from 'angular2/src/reflection/reflection'; +import {reflector} from 'angular2/src/core/reflection/reflection'; @Injectable() diff --git a/modules/angular2/src/core/debug/debug_element.ts b/modules/angular2/src/core/debug/debug_element.ts index d320dedeb3..1ac528529a 100644 --- a/modules/angular2/src/core/debug/debug_element.ts +++ b/modules/angular2/src/core/debug/debug_element.ts @@ -1,7 +1,7 @@ -import {Type, isPresent, BaseException, isBlank} from 'angular2/src/facade/lang'; -import {List, ListWrapper, MapWrapper, Predicate} from 'angular2/src/facade/collection'; +import {Type, isPresent, BaseException, isBlank} from 'angular2/src/core/facade/lang'; +import {List, ListWrapper, MapWrapper, Predicate} from 'angular2/src/core/facade/collection'; -import {DOM} from 'angular2/src/dom/dom_adapter'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; import {ElementInjector} from 'angular2/src/core/compiler/element_injector'; import {AppView} from 'angular2/src/core/compiler/view'; diff --git a/modules/angular2/src/core/debug/debug_element_view_listener.ts b/modules/angular2/src/core/debug/debug_element_view_listener.ts index 8dd109de2c..56a54c3934 100644 --- a/modules/angular2/src/core/debug/debug_element_view_listener.ts +++ b/modules/angular2/src/core/debug/debug_element_view_listener.ts @@ -1,10 +1,10 @@ -import {CONST_EXPR, isPresent, NumberWrapper, StringWrapper} from 'angular2/src/facade/lang'; -import {MapWrapper, Map, ListWrapper, List} from 'angular2/src/facade/collection'; +import {CONST_EXPR, isPresent, NumberWrapper, StringWrapper} from 'angular2/src/core/facade/lang'; +import {MapWrapper, Map, ListWrapper, List} from 'angular2/src/core/facade/collection'; import {Injectable, bind, Binding} from 'angular2/di'; import {AppViewListener} from 'angular2/src/core/compiler/view_listener'; import {AppView} from 'angular2/src/core/compiler/view'; -import {DOM} from 'angular2/src/dom/dom_adapter'; -import {Renderer} from 'angular2/src/render/api'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {Renderer} from 'angular2/src/core/render/api'; import {DebugElement} from './debug_element'; const NG_ID_PROPERTY = 'ngid'; diff --git a/modules/angular2/src/core/di/binding.ts b/modules/angular2/src/core/di/binding.ts index 525760b542..aa943708fe 100644 --- a/modules/angular2/src/core/di/binding.ts +++ b/modules/angular2/src/core/di/binding.ts @@ -7,9 +7,9 @@ import { BaseException, stringify, isArray -} from 'angular2/src/facade/lang'; -import {List, MapWrapper, ListWrapper} from 'angular2/src/facade/collection'; -import {reflector} from 'angular2/src/reflection/reflection'; +} from 'angular2/src/core/facade/lang'; +import {List, MapWrapper, ListWrapper} from 'angular2/src/core/facade/collection'; +import {reflector} from 'angular2/src/core/reflection/reflection'; import {Key} from './key'; import { InjectMetadata, diff --git a/modules/angular2/src/core/di/exceptions.ts b/modules/angular2/src/core/di/exceptions.ts index d16fa2c60d..dc25df252d 100644 --- a/modules/angular2/src/core/di/exceptions.ts +++ b/modules/angular2/src/core/di/exceptions.ts @@ -1,5 +1,5 @@ -import {ListWrapper, List} from 'angular2/src/facade/collection'; -import {stringify, BaseException, isBlank} from 'angular2/src/facade/lang'; +import {ListWrapper, List} from 'angular2/src/core/facade/collection'; +import {stringify, BaseException, isBlank} from 'angular2/src/core/facade/lang'; import {Key} from './key'; import {Injector} from './injector'; diff --git a/modules/angular2/src/core/di/forward_ref.ts b/modules/angular2/src/core/di/forward_ref.ts index 12ab4d3afd..0d44b3caf6 100644 --- a/modules/angular2/src/core/di/forward_ref.ts +++ b/modules/angular2/src/core/di/forward_ref.ts @@ -1,4 +1,4 @@ -import {Type, stringify, isFunction} from 'angular2/src/facade/lang'; +import {Type, stringify, isFunction} from 'angular2/src/core/facade/lang'; export interface ForwardRefFn { (): any; } diff --git a/modules/angular2/src/core/di/injector.ts b/modules/angular2/src/core/di/injector.ts index 9ddec6506d..f4a325846c 100644 --- a/modules/angular2/src/core/di/injector.ts +++ b/modules/angular2/src/core/di/injector.ts @@ -1,4 +1,4 @@ -import {Map, List, MapWrapper, ListWrapper} from 'angular2/src/facade/collection'; +import {Map, List, MapWrapper, ListWrapper} from 'angular2/src/core/facade/collection'; import {ResolvedBinding, Binding, Dependency, BindingBuilder, bind} from './binding'; import { AbstractBindingError, @@ -8,7 +8,7 @@ import { InvalidBindingError, OutOfBoundsError } from './exceptions'; -import {FunctionWrapper, Type, isPresent, isBlank, CONST_EXPR} from 'angular2/src/facade/lang'; +import {FunctionWrapper, Type, isPresent, isBlank, CONST_EXPR} from 'angular2/src/core/facade/lang'; import {Key} from './key'; import {resolveForwardRef} from './forward_ref'; import {SelfMetadata, HostMetadata, SkipSelfMetadata} from './metadata'; diff --git a/modules/angular2/src/core/di/key.ts b/modules/angular2/src/core/di/key.ts index 6d1261d818..e33bb136fa 100644 --- a/modules/angular2/src/core/di/key.ts +++ b/modules/angular2/src/core/di/key.ts @@ -1,5 +1,5 @@ -import {MapWrapper} from 'angular2/src/facade/collection'; -import {stringify, CONST, Type, isBlank, BaseException} from 'angular2/src/facade/lang'; +import {MapWrapper} from 'angular2/src/core/facade/collection'; +import {stringify, CONST, Type, isBlank, BaseException} from 'angular2/src/core/facade/lang'; import {TypeLiteral} from './type_literal'; import {resolveForwardRef} from './forward_ref'; diff --git a/modules/angular2/src/core/di/metadata.ts b/modules/angular2/src/core/di/metadata.ts index 8dc8895b7b..58dd5b8ed7 100644 --- a/modules/angular2/src/core/di/metadata.ts +++ b/modules/angular2/src/core/di/metadata.ts @@ -1,4 +1,4 @@ -import {CONST, CONST_EXPR, stringify, isBlank, isPresent} from "angular2/src/facade/lang"; +import {CONST, CONST_EXPR, stringify, isBlank, isPresent} from "angular2/src/core/facade/lang"; /** * A parameter metadata that specifies a dependency. diff --git a/modules/angular2/src/core/di/opaque_token.ts b/modules/angular2/src/core/di/opaque_token.ts index 1063e33386..42e2af989a 100644 --- a/modules/angular2/src/core/di/opaque_token.ts +++ b/modules/angular2/src/core/di/opaque_token.ts @@ -1,4 +1,4 @@ -import {CONST} from 'angular2/src/facade/lang'; +import {CONST} from 'angular2/src/core/facade/lang'; @CONST() export class OpaqueToken { diff --git a/modules/angular2/src/core/directives/ng_class.ts b/modules/angular2/src/core/directives/ng_class.ts index ad83203be0..d3fe622d4d 100644 --- a/modules/angular2/src/core/directives/ng_class.ts +++ b/modules/angular2/src/core/directives/ng_class.ts @@ -1,14 +1,18 @@ -import {isPresent, isString, StringWrapper, isBlank} from 'angular2/src/facade/lang'; +import {isPresent, isString, StringWrapper, isBlank} from 'angular2/src/core/facade/lang'; import {Directive, LifecycleEvent} from 'angular2/metadata'; import {ElementRef} from 'angular2/core'; -import {Renderer} from 'angular2/src/render/api'; +import {Renderer} from 'angular2/src/core/render/api'; import { KeyValueDiffer, IterableDiffer, IterableDiffers, KeyValueDiffers } from 'angular2/change_detection'; -import {ListWrapper, StringMapWrapper, isListLikeIterable} from 'angular2/src/facade/collection'; +import { + ListWrapper, + StringMapWrapper, + isListLikeIterable +} from 'angular2/src/core/facade/collection'; /** * Adds and removes CSS classes based on an {expression} value. diff --git a/modules/angular2/src/core/directives/ng_for.ts b/modules/angular2/src/core/directives/ng_for.ts index 40d3da30b8..a7e0dbae5d 100644 --- a/modules/angular2/src/core/directives/ng_for.ts +++ b/modules/angular2/src/core/directives/ng_for.ts @@ -1,7 +1,7 @@ import {Directive, LifecycleEvent} from 'angular2/metadata'; import {ViewContainerRef, ViewRef, TemplateRef} from 'angular2/core'; import {ChangeDetectorRef, IterableDiffer, IterableDiffers} from 'angular2/change_detection'; -import {isPresent, isBlank} from 'angular2/src/facade/lang'; +import {isPresent, isBlank} from 'angular2/src/core/facade/lang'; /** * The `NgFor` directive instantiates a template once per item from an iterable. The context for diff --git a/modules/angular2/src/core/directives/ng_if.ts b/modules/angular2/src/core/directives/ng_if.ts index 7536dcfa5e..c5c2a6a316 100644 --- a/modules/angular2/src/core/directives/ng_if.ts +++ b/modules/angular2/src/core/directives/ng_if.ts @@ -1,6 +1,6 @@ import {Directive} from 'angular2/metadata'; import {ViewContainerRef, TemplateRef} from 'angular2/core'; -import {isBlank} from 'angular2/src/facade/lang'; +import {isBlank} from 'angular2/src/core/facade/lang'; /** * Removes or recreates a portion of the DOM tree based on an {expression}. diff --git a/modules/angular2/src/core/directives/ng_style.ts b/modules/angular2/src/core/directives/ng_style.ts index 6474aba731..a55a6057ea 100644 --- a/modules/angular2/src/core/directives/ng_style.ts +++ b/modules/angular2/src/core/directives/ng_style.ts @@ -1,8 +1,8 @@ import {Directive, LifecycleEvent} from 'angular2/metadata'; import {ElementRef} from 'angular2/core'; import {KeyValueDiffer, KeyValueDiffers} from 'angular2/change_detection'; -import {isPresent, isBlank, print} from 'angular2/src/facade/lang'; -import {Renderer} from 'angular2/src/render/api'; +import {isPresent, isBlank, print} from 'angular2/src/core/facade/lang'; +import {Renderer} from 'angular2/src/core/render/api'; /** * Adds or removes styles based on an {expression}. diff --git a/modules/angular2/src/core/directives/ng_switch.ts b/modules/angular2/src/core/directives/ng_switch.ts index 46945c9d44..031fa0b8f7 100644 --- a/modules/angular2/src/core/directives/ng_switch.ts +++ b/modules/angular2/src/core/directives/ng_switch.ts @@ -1,8 +1,8 @@ import {Directive} from 'angular2/metadata'; import {Host} from 'angular2/di'; import {ViewContainerRef, TemplateRef} from 'angular2/core'; -import {isPresent, isBlank, normalizeBlank, CONST_EXPR} from 'angular2/src/facade/lang'; -import {ListWrapper, List, Map} from 'angular2/src/facade/collection'; +import {isPresent, isBlank, normalizeBlank, CONST_EXPR} from 'angular2/src/core/facade/lang'; +import {ListWrapper, List, Map} from 'angular2/src/core/facade/collection'; const _WHEN_DEFAULT = CONST_EXPR(new Object()); diff --git a/modules/angular2/src/core/directives/observable_list_diff.dart b/modules/angular2/src/core/directives/observable_list_diff.dart index c9bdc1b812..52b42fd800 100644 --- a/modules/angular2/src/core/directives/observable_list_diff.dart +++ b/modules/angular2/src/core/directives/observable_list_diff.dart @@ -2,7 +2,7 @@ library angular2.directives.observable_list_iterable_diff; import 'package:observe/observe.dart' show ObservableList; import 'package:angular2/change_detection.dart'; -import 'package:angular2/src/change_detection/differs/default_iterable_differ.dart'; +import 'package:angular2/src/core/change_detection/differs/default_iterable_differ.dart'; import 'dart:async'; class ObservableListDiff extends DefaultIterableDiffer { diff --git a/modules/angular2/src/core/dom/browser_adapter.ts b/modules/angular2/src/core/dom/browser_adapter.ts index d3bcf59e31..2a6508dcdb 100644 --- a/modules/angular2/src/core/dom/browser_adapter.ts +++ b/modules/angular2/src/core/dom/browser_adapter.ts @@ -1,5 +1,5 @@ -import {List, MapWrapper, ListWrapper} from 'angular2/src/facade/collection'; -import {isBlank, isPresent, global} from 'angular2/src/facade/lang'; +import {List, MapWrapper, ListWrapper} from 'angular2/src/core/facade/collection'; +import {isBlank, isPresent, global} from 'angular2/src/core/facade/lang'; import {setRootDomAdapter} from './dom_adapter'; import {GenericBrowserDomAdapter} from './generic_browser_adapter'; diff --git a/modules/angular2/src/core/dom/dom_adapter.ts b/modules/angular2/src/core/dom/dom_adapter.ts index 976776d3d0..0459331406 100644 --- a/modules/angular2/src/core/dom/dom_adapter.ts +++ b/modules/angular2/src/core/dom/dom_adapter.ts @@ -1,4 +1,4 @@ -import {BaseException, isBlank} from 'angular2/src/facade/lang'; +import {BaseException, isBlank} from 'angular2/src/core/facade/lang'; export var DOM: DomAdapter; @@ -8,6 +8,8 @@ export function setRootDomAdapter(adapter: DomAdapter) { } } + + function _abstract() { return new BaseException('This method is abstract'); } diff --git a/modules/angular2/src/core/dom/generic_browser_adapter.ts b/modules/angular2/src/core/dom/generic_browser_adapter.ts index 759d0fbd3d..ee260630e9 100644 --- a/modules/angular2/src/core/dom/generic_browser_adapter.ts +++ b/modules/angular2/src/core/dom/generic_browser_adapter.ts @@ -1,5 +1,5 @@ -import {List, ListWrapper} from 'angular2/src/facade/collection'; -import {isPresent, isFunction} from 'angular2/src/facade/lang'; +import {List, ListWrapper} from 'angular2/src/core/facade/collection'; +import {isPresent, isFunction} from 'angular2/src/core/facade/lang'; import {DomAdapter} from './dom_adapter'; /** diff --git a/modules/angular2/src/core/dom/parse5_adapter.ts b/modules/angular2/src/core/dom/parse5_adapter.ts index 5cba9e858c..8804c66c4a 100644 --- a/modules/angular2/src/core/dom/parse5_adapter.ts +++ b/modules/angular2/src/core/dom/parse5_adapter.ts @@ -7,10 +7,10 @@ var cssParse = require('css').parse; var url = require('url'); -import {List, MapWrapper, ListWrapper, StringMapWrapper} from 'angular2/src/facade/collection'; +import {List, MapWrapper, ListWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection'; import {DomAdapter, setRootDomAdapter} from './dom_adapter'; -import {BaseException, isPresent, isBlank, global} from 'angular2/src/facade/lang'; -import {SelectorMatcher, CssSelector} from 'angular2/src/render/dom/compiler/selector'; +import {BaseException, isPresent, isBlank, global} from 'angular2/src/core/facade/lang'; +import {SelectorMatcher, CssSelector} from 'angular2/src/core/render/dom/compiler/selector'; var _attrToPropMap = { 'class': 'className', diff --git a/modules/angular2/src/core/exception_handler.ts b/modules/angular2/src/core/exception_handler.ts index 749622f842..84c11bad1b 100644 --- a/modules/angular2/src/core/exception_handler.ts +++ b/modules/angular2/src/core/exception_handler.ts @@ -1,6 +1,6 @@ import {Injectable} from 'angular2/di'; -import {isPresent, isBlank, print, BaseException} from 'angular2/src/facade/lang'; -import {ListWrapper, isListLikeIterable} from 'angular2/src/facade/collection'; +import {isPresent, isBlank, print, BaseException} from 'angular2/src/core/facade/lang'; +import {ListWrapper, isListLikeIterable} from 'angular2/src/core/facade/collection'; class _ArrayLogger { res: any[] = []; diff --git a/modules/angular2/src/core/facade/async.ts b/modules/angular2/src/core/facade/async.ts index 67e32b5741..43f9d6e1e6 100644 --- a/modules/angular2/src/core/facade/async.ts +++ b/modules/angular2/src/core/facade/async.ts @@ -1,7 +1,7 @@ -/// +/// -import {global, isPresent} from 'angular2/src/facade/lang'; -import {List} from 'angular2/src/facade/collection'; +import {global, isPresent} from 'angular2/src/core/facade/lang'; +import {List} from 'angular2/src/core/facade/collection'; import * as Rx from 'rx'; export {Promise}; diff --git a/modules/angular2/src/core/facade/collection.ts b/modules/angular2/src/core/facade/collection.ts index 6602a8cc87..384c30006f 100644 --- a/modules/angular2/src/core/facade/collection.ts +++ b/modules/angular2/src/core/facade/collection.ts @@ -1,4 +1,4 @@ -import {isJsObject, global, isPresent, isBlank, isArray} from 'angular2/src/facade/lang'; +import {isJsObject, global, isPresent, isBlank, isArray} from 'angular2/src/core/facade/lang'; export var List = global.Array; export var Map = global.Map; diff --git a/modules/angular2/src/core/facade/lang.ts b/modules/angular2/src/core/facade/lang.ts index abed296589..f624846311 100644 --- a/modules/angular2/src/core/facade/lang.ts +++ b/modules/angular2/src/core/facade/lang.ts @@ -1,4 +1,4 @@ -/// +/// var _global: BrowserNodeGlobal = (typeof window === 'undefined' ? global : window); export {_global as global}; diff --git a/modules/angular2/src/core/facade/math.ts b/modules/angular2/src/core/facade/math.ts index 2a6a9eab8e..435525f02b 100644 --- a/modules/angular2/src/core/facade/math.ts +++ b/modules/angular2/src/core/facade/math.ts @@ -1,4 +1,4 @@ -import {global} from 'angular2/src/facade/lang'; +import {global} from 'angular2/src/core/facade/lang'; export var Math = global.Math; export var NaN = typeof NaN; diff --git a/modules/angular2/src/core/life_cycle/life_cycle.ts b/modules/angular2/src/core/life_cycle/life_cycle.ts index f591c9b486..f560eaede7 100644 --- a/modules/angular2/src/core/life_cycle/life_cycle.ts +++ b/modules/angular2/src/core/life_cycle/life_cycle.ts @@ -1,8 +1,8 @@ import {Injectable} from 'angular2/di'; -import {ChangeDetector} from 'angular2/src/change_detection/change_detection'; +import {ChangeDetector} from 'angular2/src/core/change_detection/change_detection'; import {NgZone} from 'angular2/src/core/zone/ng_zone'; -import {isPresent, BaseException} from 'angular2/src/facade/lang'; -import {wtfLeave, wtfCreateScope, WtfScopeFn} from '../../profile/profile'; +import {isPresent, BaseException} from 'angular2/src/core/facade/lang'; +import {wtfLeave, wtfCreateScope, WtfScopeFn} from '../profile/profile'; /** * Provides access to explicitly trigger change detection in an application. diff --git a/modules/angular2/src/core/metadata.dart b/modules/angular2/src/core/metadata.dart index f968a71708..dc79d27c7a 100644 --- a/modules/angular2/src/core/metadata.dart +++ b/modules/angular2/src/core/metadata.dart @@ -1,6 +1,6 @@ library angular2.src.core.metadata; -import "package:angular2/src/facade/collection.dart" show List; +import "package:angular2/src/core/facade/collection.dart" show List; import "./metadata/di.dart"; import "./metadata/directives.dart"; import "./metadata/view.dart"; diff --git a/modules/angular2/src/core/metadata.ts b/modules/angular2/src/core/metadata.ts index 2cc1c704c4..6c32827d8b 100644 --- a/modules/angular2/src/core/metadata.ts +++ b/modules/angular2/src/core/metadata.ts @@ -34,8 +34,8 @@ import { import {ViewMetadata, ViewEncapsulation} from './metadata/view'; -import {makeDecorator, makeParamDecorator, TypeDecorator, Class} from '../util/decorators'; -import {Type} from 'angular2/src/facade/lang'; +import {makeDecorator, makeParamDecorator, TypeDecorator, Class} from './util/decorators'; +import {Type} from 'angular2/src/core/facade/lang'; /** * Interface for the {@link DirectiveMetadata} decorator function. diff --git a/modules/angular2/src/core/metadata/di.ts b/modules/angular2/src/core/metadata/di.ts index e0b5ff0849..bf70cf2839 100644 --- a/modules/angular2/src/core/metadata/di.ts +++ b/modules/angular2/src/core/metadata/di.ts @@ -1,5 +1,12 @@ -import {CONST, Type, stringify, isPresent, StringWrapper, isString} from 'angular2/src/facade/lang'; -import {DependencyMetadata} from 'angular2/src/di/metadata'; +import { + CONST, + Type, + stringify, + isPresent, + StringWrapper, + isString +} from 'angular2/src/core/facade/lang'; +import {DependencyMetadata} from 'angular2/src/core/di/metadata'; import {resolveForwardRef} from 'angular2/di'; /** diff --git a/modules/angular2/src/core/metadata/directives.ts b/modules/angular2/src/core/metadata/directives.ts index 4e36f42dff..54facadd1a 100644 --- a/modules/angular2/src/core/metadata/directives.ts +++ b/modules/angular2/src/core/metadata/directives.ts @@ -1,6 +1,6 @@ -import {CONST, CONST_EXPR} from 'angular2/src/facade/lang'; -import {List} from 'angular2/src/facade/collection'; -import {InjectableMetadata} from 'angular2/src/di/metadata'; +import {CONST, CONST_EXPR} from 'angular2/src/core/facade/lang'; +import {List} from 'angular2/src/core/facade/collection'; +import {InjectableMetadata} from 'angular2/src/core/di/metadata'; import {DEFAULT} from 'angular2/change_detection'; /** diff --git a/modules/angular2/src/core/metadata/view.ts b/modules/angular2/src/core/metadata/view.ts index ed6726921f..417e2649bc 100644 --- a/modules/angular2/src/core/metadata/view.ts +++ b/modules/angular2/src/core/metadata/view.ts @@ -1,7 +1,7 @@ -import {ABSTRACT, CONST, Type} from 'angular2/src/facade/lang'; -import {ViewEncapsulation} from 'angular2/src/render/api'; +import {ABSTRACT, CONST, Type} from 'angular2/src/core/facade/lang'; +import {ViewEncapsulation} from 'angular2/src/core/render/api'; -export {ViewEncapsulation} from 'angular2/src/render/api'; +export {ViewEncapsulation} from 'angular2/src/core/render/api'; /** * Declares the available HTML templates for an application. diff --git a/modules/angular2/src/core/pipes/async_pipe.ts b/modules/angular2/src/core/pipes/async_pipe.ts index 54c02aad15..20a63fee69 100644 --- a/modules/angular2/src/core/pipes/async_pipe.ts +++ b/modules/angular2/src/core/pipes/async_pipe.ts @@ -1,12 +1,12 @@ -import {isBlank, isPresent, isPromise, CONST, BaseException} from 'angular2/src/facade/lang'; -import {Observable, Promise, ObservableWrapper} from 'angular2/src/facade/async'; +import {isBlank, isPresent, isPromise, CONST, BaseException} from 'angular2/src/core/facade/lang'; +import {Observable, Promise, ObservableWrapper} from 'angular2/src/core/facade/async'; import {Injectable} from 'angular2/di'; import {PipeTransform, PipeOnDestroy, WrappedValue} from 'angular2/change_detection'; import {InvalidPipeArgumentException} from './invalid_pipe_argument_exception'; import {ChangeDetectorRef} from 'angular2/change_detection'; -import {Pipe} from '../core/metadata'; +import {Pipe} from '../metadata'; class ObservableStrategy { diff --git a/modules/angular2/src/core/pipes/date_pipe.ts b/modules/angular2/src/core/pipes/date_pipe.ts index 7ce90e7b49..8605c760ad 100644 --- a/modules/angular2/src/core/pipes/date_pipe.ts +++ b/modules/angular2/src/core/pipes/date_pipe.ts @@ -7,15 +7,15 @@ import { CONST, isBlank, FunctionWrapper -} from 'angular2/src/facade/lang'; -import {DateFormatter} from 'angular2/src/facade/intl'; +} from 'angular2/src/core/facade/lang'; +import {DateFormatter} from 'angular2/src/core/facade/intl'; import {Injectable} from 'angular2/di'; -import {StringMapWrapper, ListWrapper} from 'angular2/src/facade/collection'; +import {StringMapWrapper, ListWrapper} from 'angular2/src/core/facade/collection'; import {PipeTransform, WrappedValue} from 'angular2/change_detection'; import {InvalidPipeArgumentException} from './invalid_pipe_argument_exception'; -import {Pipe} from '../core/metadata'; +import {Pipe} from '../metadata'; // TODO: move to a global configable location along with other i18n components. var defaultLocale: string = 'en-US'; diff --git a/modules/angular2/src/core/pipes/default_pipes.ts b/modules/angular2/src/core/pipes/default_pipes.ts index 1bc679f4f3..47b0ed489a 100644 --- a/modules/angular2/src/core/pipes/default_pipes.ts +++ b/modules/angular2/src/core/pipes/default_pipes.ts @@ -6,7 +6,7 @@ import {LimitToPipe} from './limit_to_pipe'; import {DatePipe} from './date_pipe'; import {DecimalPipe, PercentPipe, CurrencyPipe} from './number_pipe'; -import {CONST_EXPR} from 'angular2/src/facade/lang'; +import {CONST_EXPR} from 'angular2/src/core/facade/lang'; import {Binding, OpaqueToken} from 'angular2/di'; const DEFAULT_PIPES_LIST = CONST_EXPR([ diff --git a/modules/angular2/src/core/pipes/invalid_pipe_argument_exception.ts b/modules/angular2/src/core/pipes/invalid_pipe_argument_exception.ts index 44601f1373..99c55bb30b 100644 --- a/modules/angular2/src/core/pipes/invalid_pipe_argument_exception.ts +++ b/modules/angular2/src/core/pipes/invalid_pipe_argument_exception.ts @@ -1,4 +1,4 @@ -import {ABSTRACT, BaseException, CONST, Type} from 'angular2/src/facade/lang'; +import {ABSTRACT, BaseException, CONST, Type} from 'angular2/src/core/facade/lang'; export class InvalidPipeArgumentException extends BaseException { constructor(type: Type, value: Object) { diff --git a/modules/angular2/src/core/pipes/json_pipe.ts b/modules/angular2/src/core/pipes/json_pipe.ts index 4fb41350cb..cdb27dfbea 100644 --- a/modules/angular2/src/core/pipes/json_pipe.ts +++ b/modules/angular2/src/core/pipes/json_pipe.ts @@ -1,9 +1,9 @@ -import {isBlank, isPresent, Json, CONST} from 'angular2/src/facade/lang'; +import {isBlank, isPresent, Json, CONST} from 'angular2/src/core/facade/lang'; import {Injectable} from 'angular2/di'; import {PipeTransform, WrappedValue} from 'angular2/change_detection'; -import {Pipe} from '../core/metadata'; +import {Pipe} from '../metadata'; /** * Implements json transforms to any object. diff --git a/modules/angular2/src/core/pipes/limit_to_pipe.ts b/modules/angular2/src/core/pipes/limit_to_pipe.ts index c2645884d0..ce2a0ea250 100644 --- a/modules/angular2/src/core/pipes/limit_to_pipe.ts +++ b/modules/angular2/src/core/pipes/limit_to_pipe.ts @@ -5,15 +5,15 @@ import { StringWrapper, BaseException, CONST -} from 'angular2/src/facade/lang'; -import {ListWrapper} from 'angular2/src/facade/collection'; -import {Math} from 'angular2/src/facade/math'; +} from 'angular2/src/core/facade/lang'; +import {ListWrapper} from 'angular2/src/core/facade/collection'; +import {Math} from 'angular2/src/core/facade/math'; import {Injectable} from 'angular2/di'; import {PipeTransform, WrappedValue} from 'angular2/change_detection'; import {InvalidPipeArgumentException} from './invalid_pipe_argument_exception'; -import {Pipe} from '../core/metadata'; +import {Pipe} from '../metadata'; /** * Creates a new List or String containing only a prefix/suffix of the diff --git a/modules/angular2/src/core/pipes/lowercase_pipe.ts b/modules/angular2/src/core/pipes/lowercase_pipe.ts index 8d97f17187..ae2e469945 100644 --- a/modules/angular2/src/core/pipes/lowercase_pipe.ts +++ b/modules/angular2/src/core/pipes/lowercase_pipe.ts @@ -1,11 +1,11 @@ -import {isString, StringWrapper, CONST, isBlank} from 'angular2/src/facade/lang'; +import {isString, StringWrapper, CONST, isBlank} from 'angular2/src/core/facade/lang'; import {Injectable} from 'angular2/di'; import {PipeTransform, WrappedValue} from 'angular2/change_detection'; import {InvalidPipeArgumentException} from './invalid_pipe_argument_exception'; -import {Pipe} from '../core/metadata'; +import {Pipe} from '../metadata'; /** * Implements lowercase transforms to text. diff --git a/modules/angular2/src/core/pipes/number_pipe.ts b/modules/angular2/src/core/pipes/number_pipe.ts index add422abc7..e6151dd9c9 100644 --- a/modules/angular2/src/core/pipes/number_pipe.ts +++ b/modules/angular2/src/core/pipes/number_pipe.ts @@ -8,15 +8,15 @@ import { BaseException, CONST, FunctionWrapper -} from 'angular2/src/facade/lang'; -import {NumberFormatter, NumberFormatStyle} from 'angular2/src/facade/intl'; +} from 'angular2/src/core/facade/lang'; +import {NumberFormatter, NumberFormatStyle} from 'angular2/src/core/facade/intl'; import {Injectable} from 'angular2/di'; -import {ListWrapper} from 'angular2/src/facade/collection'; +import {ListWrapper} from 'angular2/src/core/facade/collection'; import {PipeTransform, WrappedValue} from 'angular2/change_detection'; import {InvalidPipeArgumentException} from './invalid_pipe_argument_exception'; -import {Pipe} from '../core/metadata'; +import {Pipe} from '../metadata'; var defaultLocale: string = 'en-US'; var _re = RegExpWrapper.create('^(\\d+)?\\.((\\d+)(\\-(\\d+))?)?$'); diff --git a/modules/angular2/src/core/pipes/pipe_binding.ts b/modules/angular2/src/core/pipes/pipe_binding.ts index c02f574538..93fcf7ef7e 100644 --- a/modules/angular2/src/core/pipes/pipe_binding.ts +++ b/modules/angular2/src/core/pipes/pipe_binding.ts @@ -1,4 +1,4 @@ -import {Type} from 'angular2/src/facade/lang'; +import {Type} from 'angular2/src/core/facade/lang'; import {Key, Dependency, ResolvedBinding, Binding} from 'angular2/di'; import {PipeMetadata} from '../metadata/directives'; diff --git a/modules/angular2/src/core/pipes/pipes.ts b/modules/angular2/src/core/pipes/pipes.ts index 5f0e80b76b..465058a38b 100644 --- a/modules/angular2/src/core/pipes/pipes.ts +++ b/modules/angular2/src/core/pipes/pipes.ts @@ -1,7 +1,7 @@ -import {isBlank, isPresent, BaseException, CONST, Type} from 'angular2/src/facade/lang'; +import {isBlank, isPresent, BaseException, CONST, Type} from 'angular2/src/core/facade/lang'; import {Injectable, OptionalMetadata, SkipSelfMetadata, Binding, Injector, bind} from 'angular2/di'; import {PipeBinding} from './pipe_binding'; -import * as cd from 'angular2/src/change_detection/pipes'; +import * as cd from 'angular2/src/core/change_detection/pipes'; export class ProtoPipes { /** diff --git a/modules/angular2/src/core/pipes/uppercase_pipe.ts b/modules/angular2/src/core/pipes/uppercase_pipe.ts index 888a088e9a..ef6b07f36b 100644 --- a/modules/angular2/src/core/pipes/uppercase_pipe.ts +++ b/modules/angular2/src/core/pipes/uppercase_pipe.ts @@ -1,10 +1,10 @@ -import {isString, StringWrapper, CONST, isBlank} from 'angular2/src/facade/lang'; +import {isString, StringWrapper, CONST, isBlank} from 'angular2/src/core/facade/lang'; import {Injectable} from 'angular2/di'; import {PipeTransform, WrappedValue} from 'angular2/change_detection'; import {InvalidPipeArgumentException} from './invalid_pipe_argument_exception'; -import {Pipe} from '../core/metadata'; +import {Pipe} from '../metadata'; /** * Implements uppercase transforms to text. diff --git a/modules/angular2/src/core/platform_bindings.dart b/modules/angular2/src/core/platform_bindings.dart index f85c4cf196..b4cbf94990 100644 --- a/modules/angular2/src/core/platform_bindings.dart +++ b/modules/angular2/src/core/platform_bindings.dart @@ -3,7 +3,7 @@ library angular2.platform_bindings; import 'package:angular2/di.dart'; import './exception_handler.dart'; -import 'package:angular2/src/dom/dom_adapter.dart'; +import 'package:angular2/src/core/dom/dom_adapter.dart'; exceptionFactory() => new ExceptionHandler(DOM, true); diff --git a/modules/angular2/src/core/platform_bindings.ts b/modules/angular2/src/core/platform_bindings.ts index 5b462bb053..dbbe450c38 100644 --- a/modules/angular2/src/core/platform_bindings.ts +++ b/modules/angular2/src/core/platform_bindings.ts @@ -1,6 +1,6 @@ import {bind} from 'angular2/di'; import {ExceptionHandler} from './exception_handler'; -import {DOM} from 'angular2/src/dom/dom_adapter'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; export const EXCEPTION_BINDING = bind(ExceptionHandler).toFactory(() => new ExceptionHandler(DOM, false), []); diff --git a/modules/angular2/src/core/reflection/platform_reflection_capabilities.ts b/modules/angular2/src/core/reflection/platform_reflection_capabilities.ts index 25de66fe5b..3ceba5f918 100644 --- a/modules/angular2/src/core/reflection/platform_reflection_capabilities.ts +++ b/modules/angular2/src/core/reflection/platform_reflection_capabilities.ts @@ -1,6 +1,6 @@ -import {Type} from 'angular2/src/facade/lang'; +import {Type} from 'angular2/src/core/facade/lang'; import {GetterFn, SetterFn, MethodFn} from './types'; -import {List} from 'angular2/src/facade/collection'; +import {List} from 'angular2/src/core/facade/collection'; export interface PlatformReflectionCapabilities { isReflectionEnabled(): boolean; diff --git a/modules/angular2/src/core/reflection/reflection.dart b/modules/angular2/src/core/reflection/reflection.dart index 2048b00858..8d4d5eba6a 100644 --- a/modules/angular2/src/core/reflection/reflection.dart +++ b/modules/angular2/src/core/reflection/reflection.dart @@ -4,7 +4,7 @@ import 'reflector.dart'; import 'types.dart'; export 'reflector.dart'; import 'platform_reflection_capabilities.dart'; -import 'package:angular2/src/facade/lang.dart'; +import 'package:angular2/src/core/facade/lang.dart'; class NoReflectionCapabilities implements PlatformReflectionCapabilities { bool isReflectionEnabled() { diff --git a/modules/angular2/src/core/reflection/reflection.ts b/modules/angular2/src/core/reflection/reflection.ts index b5eb2ff84f..a91e0bada5 100644 --- a/modules/angular2/src/core/reflection/reflection.ts +++ b/modules/angular2/src/core/reflection/reflection.ts @@ -1,5 +1,5 @@ -import {Type, isPresent} from 'angular2/src/facade/lang'; -import {List, ListWrapper} from 'angular2/src/facade/collection'; +import {Type, isPresent} from 'angular2/src/core/facade/lang'; +import {List, ListWrapper} from 'angular2/src/core/facade/collection'; import {Reflector} from './reflector'; export {Reflector, ReflectionInfo} from './reflector'; import {ReflectionCapabilities} from './reflection_capabilities'; diff --git a/modules/angular2/src/core/reflection/reflection_capabilities.dart b/modules/angular2/src/core/reflection/reflection_capabilities.dart index 2023b9b427..f4cc889bc8 100644 --- a/modules/angular2/src/core/reflection/reflection_capabilities.dart +++ b/modules/angular2/src/core/reflection/reflection_capabilities.dart @@ -1,6 +1,6 @@ library reflection.reflection_capabilities; -import 'package:angular2/src/facade/lang.dart'; +import 'package:angular2/src/core/facade/lang.dart'; import 'types.dart'; import 'dart:mirrors'; import 'platform_reflection_capabilities.dart'; diff --git a/modules/angular2/src/core/reflection/reflection_capabilities.ts b/modules/angular2/src/core/reflection/reflection_capabilities.ts index 6c1d439ad0..366bc800ed 100644 --- a/modules/angular2/src/core/reflection/reflection_capabilities.ts +++ b/modules/angular2/src/core/reflection/reflection_capabilities.ts @@ -5,8 +5,8 @@ import { global, stringify, BaseException -} from 'angular2/src/facade/lang'; -import {List, ListWrapper} from 'angular2/src/facade/collection'; +} from 'angular2/src/core/facade/lang'; +import {List, ListWrapper} from 'angular2/src/core/facade/collection'; import {GetterFn, SetterFn, MethodFn} from './types'; import {PlatformReflectionCapabilities} from 'platform_reflection_capabilities'; diff --git a/modules/angular2/src/core/reflection/reflector.ts b/modules/angular2/src/core/reflection/reflector.ts index 3fc12036ac..28a4569df4 100644 --- a/modules/angular2/src/core/reflection/reflector.ts +++ b/modules/angular2/src/core/reflection/reflector.ts @@ -1,4 +1,4 @@ -import {Type, isPresent, stringify, BaseException} from 'angular2/src/facade/lang'; +import {Type, isPresent, stringify, BaseException} from 'angular2/src/core/facade/lang'; import { List, ListWrapper, @@ -8,7 +8,7 @@ import { SetWrapper, StringMap, StringMapWrapper -} from 'angular2/src/facade/collection'; +} from 'angular2/src/core/facade/collection'; import {SetterFn, GetterFn, MethodFn} from './types'; import {PlatformReflectionCapabilities} from './platform_reflection_capabilities'; export {SetterFn, GetterFn, MethodFn} from './types'; diff --git a/modules/angular2/src/core/reflection/types.ts b/modules/angular2/src/core/reflection/types.ts index b94568f7a8..9570f38370 100644 --- a/modules/angular2/src/core/reflection/types.ts +++ b/modules/angular2/src/core/reflection/types.ts @@ -1,5 +1,5 @@ -import {Type} from 'angular2/src/facade/lang'; -import {List} from 'angular2/src/facade/collection'; +import {Type} from 'angular2/src/core/facade/lang'; +import {List} from 'angular2/src/core/facade/collection'; export type SetterFn = (obj: any, value: any) => void; export type GetterFn = (obj: any) => any; diff --git a/modules/angular2/src/core/render/api.ts b/modules/angular2/src/core/render/api.ts index 357fee02a5..6833085639 100644 --- a/modules/angular2/src/core/render/api.ts +++ b/modules/angular2/src/core/render/api.ts @@ -1,7 +1,13 @@ -import {isPresent, isBlank, RegExpWrapper} from 'angular2/src/facade/lang'; -import {Promise} from 'angular2/src/facade/async'; -import {List, Map, MapWrapper, StringMap, StringMapWrapper} from 'angular2/src/facade/collection'; -import {ASTWithSource} from 'angular2/src/change_detection/change_detection'; +import {isPresent, isBlank, RegExpWrapper} from 'angular2/src/core/facade/lang'; +import {Promise} from 'angular2/src/core/facade/async'; +import { + List, + Map, + MapWrapper, + StringMap, + StringMapWrapper +} from 'angular2/src/core/facade/collection'; +import {ASTWithSource} from 'angular2/src/core/change_detection/change_detection'; /** * General notes: diff --git a/modules/angular2/src/core/render/dom/compiler/compile_control.ts b/modules/angular2/src/core/render/dom/compiler/compile_control.ts index e9365f702e..4f11e61a9c 100644 --- a/modules/angular2/src/core/render/dom/compiler/compile_control.ts +++ b/modules/angular2/src/core/render/dom/compiler/compile_control.ts @@ -1,5 +1,5 @@ -import {isBlank} from 'angular2/src/facade/lang'; -import {List, ListWrapper} from 'angular2/src/facade/collection'; +import {isBlank} from 'angular2/src/core/facade/lang'; +import {List, ListWrapper} from 'angular2/src/core/facade/collection'; import {CompileElement} from './compile_element'; import {CompileStep} from './compile_step'; diff --git a/modules/angular2/src/core/render/dom/compiler/compile_element.ts b/modules/angular2/src/core/render/dom/compiler/compile_element.ts index 6a0face076..a5b2876dee 100644 --- a/modules/angular2/src/core/render/dom/compiler/compile_element.ts +++ b/modules/angular2/src/core/render/dom/compiler/compile_element.ts @@ -1,6 +1,12 @@ -import {List, Map, ListWrapper, MapWrapper} from 'angular2/src/facade/collection'; -import {DOM} from 'angular2/src/dom/dom_adapter'; -import {isBlank, isPresent, Type, StringJoiner, assertionsEnabled} from 'angular2/src/facade/lang'; +import {List, Map, ListWrapper, MapWrapper} from 'angular2/src/core/facade/collection'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import { + isBlank, + isPresent, + Type, + StringJoiner, + assertionsEnabled +} from 'angular2/src/core/facade/lang'; import {ProtoViewBuilder, ElementBinderBuilder} from '../view/proto_view_builder'; diff --git a/modules/angular2/src/core/render/dom/compiler/compile_pipeline.ts b/modules/angular2/src/core/render/dom/compiler/compile_pipeline.ts index 7cc8f1f865..0d20f0dbb7 100644 --- a/modules/angular2/src/core/render/dom/compiler/compile_pipeline.ts +++ b/modules/angular2/src/core/render/dom/compiler/compile_pipeline.ts @@ -1,6 +1,6 @@ -import {isPresent, isBlank} from 'angular2/src/facade/lang'; -import {List, ListWrapper} from 'angular2/src/facade/collection'; -import {DOM} from 'angular2/src/dom/dom_adapter'; +import {isPresent, isBlank} from 'angular2/src/core/facade/lang'; +import {List, ListWrapper} from 'angular2/src/core/facade/collection'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; import {CompileElement} from './compile_element'; import {CompileControl} from './compile_control'; import {CompileStep} from './compile_step'; diff --git a/modules/angular2/src/core/render/dom/compiler/compile_step_factory.ts b/modules/angular2/src/core/render/dom/compiler/compile_step_factory.ts index 70f30671e8..5f2b3b9955 100644 --- a/modules/angular2/src/core/render/dom/compiler/compile_step_factory.ts +++ b/modules/angular2/src/core/render/dom/compiler/compile_step_factory.ts @@ -1,5 +1,5 @@ -import {List} from 'angular2/src/facade/collection'; -import {Parser} from 'angular2/src/change_detection/change_detection'; +import {List} from 'angular2/src/core/facade/collection'; +import {Parser} from 'angular2/src/core/change_detection/change_detection'; import {ViewDefinition} from '../../api'; import {CompileStep} from './compile_step'; import {PropertyBindingParser} from './property_binding_parser'; diff --git a/modules/angular2/src/core/render/dom/compiler/compiler.ts b/modules/angular2/src/core/render/dom/compiler/compiler.ts index 7bbdfe968c..093974a15f 100644 --- a/modules/angular2/src/core/render/dom/compiler/compiler.ts +++ b/modules/angular2/src/core/render/dom/compiler/compiler.ts @@ -1,8 +1,8 @@ import {Injectable} from 'angular2/di'; -import {PromiseWrapper, Promise} from 'angular2/src/facade/async'; -import {BaseException, isPresent, isBlank} from 'angular2/src/facade/lang'; -import {DOM} from 'angular2/src/dom/dom_adapter'; +import {PromiseWrapper, Promise} from 'angular2/src/core/facade/async'; +import {BaseException, isPresent, isBlank} from 'angular2/src/core/facade/lang'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; import { ViewDefinition, @@ -15,10 +15,10 @@ import { ViewEncapsulation } from '../../api'; import {CompilePipeline} from './compile_pipeline'; -import {ViewLoader, TemplateAndStyles} from 'angular2/src/render/dom/compiler/view_loader'; +import {ViewLoader, TemplateAndStyles} from 'angular2/src/core/render/dom/compiler/view_loader'; import {CompileStepFactory, DefaultStepFactory} from './compile_step_factory'; import {ElementSchemaRegistry} from '../schema/element_schema_registry'; -import {Parser} from 'angular2/src/change_detection/change_detection'; +import {Parser} from 'angular2/src/core/change_detection/change_detection'; import * as pvm from '../view/proto_view_merger'; import {CssSelector} from './selector'; import {DOCUMENT, APP_ID} from '../dom_tokens'; diff --git a/modules/angular2/src/core/render/dom/compiler/directive_parser.ts b/modules/angular2/src/core/render/dom/compiler/directive_parser.ts index 87f162a553..6dd0acc9e1 100644 --- a/modules/angular2/src/core/render/dom/compiler/directive_parser.ts +++ b/modules/angular2/src/core/render/dom/compiler/directive_parser.ts @@ -1,9 +1,9 @@ -import {isPresent, isBlank, BaseException, StringWrapper} from 'angular2/src/facade/lang'; -import {List, MapWrapper, ListWrapper} from 'angular2/src/facade/collection'; -import {DOM} from 'angular2/src/dom/dom_adapter'; -import {Parser} from 'angular2/src/change_detection/change_detection'; +import {isPresent, isBlank, BaseException, StringWrapper} from 'angular2/src/core/facade/lang'; +import {List, MapWrapper, ListWrapper} from 'angular2/src/core/facade/collection'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {Parser} from 'angular2/src/core/change_detection/change_detection'; -import {SelectorMatcher, CssSelector} from 'angular2/src/render/dom/compiler/selector'; +import {SelectorMatcher, CssSelector} from 'angular2/src/core/render/dom/compiler/selector'; import {CompileStep} from './compile_step'; import {CompileElement} from './compile_element'; diff --git a/modules/angular2/src/core/render/dom/compiler/property_binding_parser.ts b/modules/angular2/src/core/render/dom/compiler/property_binding_parser.ts index a824c4ef87..ac3eebb1ed 100644 --- a/modules/angular2/src/core/render/dom/compiler/property_binding_parser.ts +++ b/modules/angular2/src/core/render/dom/compiler/property_binding_parser.ts @@ -1,7 +1,7 @@ -import {isPresent, RegExpWrapper, StringWrapper} from 'angular2/src/facade/lang'; -import {MapWrapper} from 'angular2/src/facade/collection'; +import {isPresent, RegExpWrapper, StringWrapper} from 'angular2/src/core/facade/lang'; +import {MapWrapper} from 'angular2/src/core/facade/collection'; -import {Parser} from 'angular2/src/change_detection/change_detection'; +import {Parser} from 'angular2/src/core/change_detection/change_detection'; import {CompileStep} from './compile_step'; import {CompileElement} from './compile_element'; diff --git a/modules/angular2/src/core/render/dom/compiler/selector.ts b/modules/angular2/src/core/render/dom/compiler/selector.ts index ca1b0bd9c5..7694a988e3 100644 --- a/modules/angular2/src/core/render/dom/compiler/selector.ts +++ b/modules/angular2/src/core/render/dom/compiler/selector.ts @@ -1,4 +1,4 @@ -import {List, Map, ListWrapper, MapWrapper} from 'angular2/src/facade/collection'; +import {List, Map, ListWrapper, MapWrapper} from 'angular2/src/core/facade/collection'; import { isPresent, isBlank, @@ -6,7 +6,7 @@ import { RegExpMatcherWrapper, StringWrapper, BaseException -} from 'angular2/src/facade/lang'; +} from 'angular2/src/core/facade/lang'; const _EMPTY_ATTR_VALUE = ''; diff --git a/modules/angular2/src/core/render/dom/compiler/shadow_css.ts b/modules/angular2/src/core/render/dom/compiler/shadow_css.ts index 5b4adfa38f..4f6afd624b 100644 --- a/modules/angular2/src/core/render/dom/compiler/shadow_css.ts +++ b/modules/angular2/src/core/render/dom/compiler/shadow_css.ts @@ -1,5 +1,5 @@ -import {DOM} from 'angular2/src/dom/dom_adapter'; -import {List, ListWrapper} from 'angular2/src/facade/collection'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {List, ListWrapper} from 'angular2/src/core/facade/collection'; import { StringWrapper, RegExp, @@ -8,7 +8,7 @@ import { isPresent, isBlank, BaseException -} from 'angular2/src/facade/lang'; +} from 'angular2/src/core/facade/lang'; /** * This file is a port of shadowCSS from webcomponents.js to TypeScript. diff --git a/modules/angular2/src/core/render/dom/compiler/style_encapsulator.ts b/modules/angular2/src/core/render/dom/compiler/style_encapsulator.ts index 4185d71bd7..806ac03766 100644 --- a/modules/angular2/src/core/render/dom/compiler/style_encapsulator.ts +++ b/modules/angular2/src/core/render/dom/compiler/style_encapsulator.ts @@ -3,8 +3,8 @@ import {CompileElement} from '../compiler/compile_element'; import {CompileControl} from '../compiler/compile_control'; import {ViewDefinition, ViewEncapsulation, ViewType} from '../../api'; import {NG_CONTENT_ELEMENT_NAME, isElementWithTag} from '../util'; -import {DOM} from 'angular2/src/dom/dom_adapter'; -import {isBlank, isPresent} from 'angular2/src/facade/lang'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {isBlank, isPresent} from 'angular2/src/core/facade/lang'; import {ShadowCss} from './shadow_css'; export class StyleEncapsulator implements CompileStep { diff --git a/modules/angular2/src/core/render/dom/compiler/style_inliner.ts b/modules/angular2/src/core/render/dom/compiler/style_inliner.ts index 9ddeaf2320..b8c34416fd 100644 --- a/modules/angular2/src/core/render/dom/compiler/style_inliner.ts +++ b/modules/angular2/src/core/render/dom/compiler/style_inliner.ts @@ -1,8 +1,8 @@ import {Injectable} from 'angular2/di'; -import {XHR} from 'angular2/src/render/xhr'; -import {ListWrapper} from 'angular2/src/facade/collection'; +import {XHR} from 'angular2/src/core/render/xhr'; +import {ListWrapper} from 'angular2/src/core/facade/collection'; -import {UrlResolver} from 'angular2/src/services/url_resolver'; +import {UrlResolver} from 'angular2/src/core/services/url_resolver'; import {StyleUrlResolver} from './style_url_resolver'; import { @@ -13,11 +13,11 @@ import { StringWrapper, normalizeBlank, isPromise -} from 'angular2/src/facade/lang'; +} from 'angular2/src/core/facade/lang'; import { Promise, PromiseWrapper, -} from 'angular2/src/facade/async'; +} from 'angular2/src/core/facade/async'; /** * Inline @import rules in the given CSS. diff --git a/modules/angular2/src/core/render/dom/compiler/style_url_resolver.ts b/modules/angular2/src/core/render/dom/compiler/style_url_resolver.ts index c794a000ad..9a092f73d8 100644 --- a/modules/angular2/src/core/render/dom/compiler/style_url_resolver.ts +++ b/modules/angular2/src/core/render/dom/compiler/style_url_resolver.ts @@ -2,8 +2,8 @@ // https://github.com/webcomponents/webcomponentsjs/blob/master/src/HTMLImports/path.js import {Injectable} from 'angular2/di'; -import {RegExp, RegExpWrapper, StringWrapper} from 'angular2/src/facade/lang'; -import {UrlResolver} from 'angular2/src/services/url_resolver'; +import {RegExp, RegExpWrapper, StringWrapper} from 'angular2/src/core/facade/lang'; +import {UrlResolver} from 'angular2/src/core/services/url_resolver'; /** * Rewrites URLs by resolving '@import' and 'url()' URLs from the given base URL. diff --git a/modules/angular2/src/core/render/dom/compiler/text_interpolation_parser.ts b/modules/angular2/src/core/render/dom/compiler/text_interpolation_parser.ts index 4e734c7c3b..b3ae329215 100644 --- a/modules/angular2/src/core/render/dom/compiler/text_interpolation_parser.ts +++ b/modules/angular2/src/core/render/dom/compiler/text_interpolation_parser.ts @@ -1,7 +1,7 @@ -import {RegExpWrapper, StringWrapper, isPresent} from 'angular2/src/facade/lang'; -import {DOM} from 'angular2/src/dom/dom_adapter'; +import {RegExpWrapper, StringWrapper, isPresent} from 'angular2/src/core/facade/lang'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; -import {Parser} from 'angular2/src/change_detection/change_detection'; +import {Parser} from 'angular2/src/core/change_detection/change_detection'; import {CompileStep} from './compile_step'; import {CompileElement} from './compile_element'; diff --git a/modules/angular2/src/core/render/dom/compiler/view_loader.ts b/modules/angular2/src/core/render/dom/compiler/view_loader.ts index ca1429ada5..05095389ab 100644 --- a/modules/angular2/src/core/render/dom/compiler/view_loader.ts +++ b/modules/angular2/src/core/render/dom/compiler/view_loader.ts @@ -6,13 +6,13 @@ import { stringify, isPromise, StringWrapper -} from 'angular2/src/facade/lang'; -import {Map, MapWrapper, ListWrapper, List} from 'angular2/src/facade/collection'; -import {PromiseWrapper, Promise} from 'angular2/src/facade/async'; -import {DOM} from 'angular2/src/dom/dom_adapter'; +} from 'angular2/src/core/facade/lang'; +import {Map, MapWrapper, ListWrapper, List} from 'angular2/src/core/facade/collection'; +import {PromiseWrapper, Promise} from 'angular2/src/core/facade/async'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; import {ViewDefinition} from '../../api'; -import {XHR} from 'angular2/src/render/xhr'; +import {XHR} from 'angular2/src/core/render/xhr'; import {StyleInliner} from './style_inliner'; import {StyleUrlResolver} from './style_url_resolver'; diff --git a/modules/angular2/src/core/render/dom/compiler/view_splitter.ts b/modules/angular2/src/core/render/dom/compiler/view_splitter.ts index 6df3a755a6..4395b36098 100644 --- a/modules/angular2/src/core/render/dom/compiler/view_splitter.ts +++ b/modules/angular2/src/core/render/dom/compiler/view_splitter.ts @@ -1,7 +1,7 @@ -import {isBlank, isPresent, BaseException, StringWrapper} from 'angular2/src/facade/lang'; -import {DOM} from 'angular2/src/dom/dom_adapter'; -import {MapWrapper, ListWrapper} from 'angular2/src/facade/collection'; -import {Parser} from 'angular2/src/change_detection/change_detection'; +import {isBlank, isPresent, BaseException, StringWrapper} from 'angular2/src/core/facade/lang'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {MapWrapper, ListWrapper} from 'angular2/src/core/facade/collection'; +import {Parser} from 'angular2/src/core/change_detection/change_detection'; import {CompileStep} from './compile_step'; import {CompileElement} from './compile_element'; diff --git a/modules/angular2/src/core/render/dom/convert.ts b/modules/angular2/src/core/render/dom/convert.ts index 7c041c6f3c..11e17a59d9 100644 --- a/modules/angular2/src/core/render/dom/convert.ts +++ b/modules/angular2/src/core/render/dom/convert.ts @@ -1,6 +1,6 @@ -import {ListWrapper, MapWrapper} from 'angular2/src/facade/collection'; -import {isPresent, isArray} from 'angular2/src/facade/lang'; -import {RenderDirectiveMetadata} from 'angular2/src/render/api'; +import {ListWrapper, MapWrapper} from 'angular2/src/core/facade/collection'; +import {isPresent, isArray} from 'angular2/src/core/facade/lang'; +import {RenderDirectiveMetadata} from 'angular2/src/core/render/api'; /** * Converts a [DirectiveMetadata] to a map representation. This creates a copy, diff --git a/modules/angular2/src/core/render/dom/dom_renderer.ts b/modules/angular2/src/core/render/dom/dom_renderer.ts index bb3df68f52..d6e7a50bd6 100644 --- a/modules/angular2/src/core/render/dom/dom_renderer.ts +++ b/modules/angular2/src/core/render/dom/dom_renderer.ts @@ -5,10 +5,16 @@ import { BaseException, RegExpWrapper, CONST_EXPR -} from 'angular2/src/facade/lang'; -import {ListWrapper, MapWrapper, Map, StringMapWrapper, List} from 'angular2/src/facade/collection'; +} from 'angular2/src/core/facade/lang'; +import { + ListWrapper, + MapWrapper, + Map, + StringMapWrapper, + List +} from 'angular2/src/core/facade/collection'; -import {DOM} from 'angular2/src/dom/dom_adapter'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; import {EventManager} from './events/event_manager'; diff --git a/modules/angular2/src/core/render/dom/dom_tokens.ts b/modules/angular2/src/core/render/dom/dom_tokens.ts index 0c73ea5970..57eaab7b0b 100644 --- a/modules/angular2/src/core/render/dom/dom_tokens.ts +++ b/modules/angular2/src/core/render/dom/dom_tokens.ts @@ -1,5 +1,5 @@ import {OpaqueToken, Binding} from 'angular2/di'; -import {CONST_EXPR, StringWrapper, Math} from 'angular2/src/facade/lang'; +import {CONST_EXPR, StringWrapper, Math} from 'angular2/src/core/facade/lang'; export const DOCUMENT: OpaqueToken = CONST_EXPR(new OpaqueToken('DocumentToken')); diff --git a/modules/angular2/src/core/render/dom/events/event_manager.ts b/modules/angular2/src/core/render/dom/events/event_manager.ts index c67d52ce1e..9d3399595c 100644 --- a/modules/angular2/src/core/render/dom/events/event_manager.ts +++ b/modules/angular2/src/core/render/dom/events/event_manager.ts @@ -1,6 +1,6 @@ -import {isBlank, BaseException, isPresent, StringWrapper} from 'angular2/src/facade/lang'; -import {DOM} from 'angular2/src/dom/dom_adapter'; -import {List, ListWrapper, MapWrapper} from 'angular2/src/facade/collection'; +import {isBlank, BaseException, isPresent, StringWrapper} from 'angular2/src/core/facade/lang'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {List, ListWrapper, MapWrapper} from 'angular2/src/core/facade/collection'; import {NgZone} from 'angular2/src/core/zone/ng_zone'; var BUBBLE_SYMBOL = '^'; diff --git a/modules/angular2/src/core/render/dom/events/hammer_common.ts b/modules/angular2/src/core/render/dom/events/hammer_common.ts index 6b8630e6b4..5c156be153 100644 --- a/modules/angular2/src/core/render/dom/events/hammer_common.ts +++ b/modules/angular2/src/core/render/dom/events/hammer_common.ts @@ -1,5 +1,5 @@ import {EventManagerPlugin} from './event_manager'; -import {StringMapWrapper} from 'angular2/src/facade/collection'; +import {StringMapWrapper} from 'angular2/src/core/facade/collection'; var _eventNames = { // pan diff --git a/modules/angular2/src/core/render/dom/events/hammer_gestures.dart b/modules/angular2/src/core/render/dom/events/hammer_gestures.dart index 14efa41aaf..61239c6fba 100644 --- a/modules/angular2/src/core/render/dom/events/hammer_gestures.dart +++ b/modules/angular2/src/core/render/dom/events/hammer_gestures.dart @@ -2,7 +2,7 @@ library angular.events; import 'dart:html'; import './hammer_common.dart'; -import 'package:angular2/src/facade/lang.dart' show BaseException; +import 'package:angular2/src/core/facade/lang.dart' show BaseException; import 'dart:js' as js; diff --git a/modules/angular2/src/core/render/dom/events/hammer_gestures.ts b/modules/angular2/src/core/render/dom/events/hammer_gestures.ts index 3f14f531fe..fcebef5cfa 100644 --- a/modules/angular2/src/core/render/dom/events/hammer_gestures.ts +++ b/modules/angular2/src/core/render/dom/events/hammer_gestures.ts @@ -1,7 +1,7 @@ -/// +/// import {HammerGesturesPluginCommon} from './hammer_common'; -import {isPresent, BaseException} from 'angular2/src/facade/lang'; +import {isPresent, BaseException} from 'angular2/src/core/facade/lang'; export class HammerGesturesPlugin extends HammerGesturesPluginCommon { constructor() { super(); } diff --git a/modules/angular2/src/core/render/dom/events/key_events.ts b/modules/angular2/src/core/render/dom/events/key_events.ts index 29bf157ff0..4c18f8f489 100644 --- a/modules/angular2/src/core/render/dom/events/key_events.ts +++ b/modules/angular2/src/core/render/dom/events/key_events.ts @@ -1,4 +1,4 @@ -import {DOM} from 'angular2/src/dom/dom_adapter'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; import { isPresent, isBlank, @@ -6,8 +6,8 @@ import { RegExpWrapper, BaseException, NumberWrapper -} from 'angular2/src/facade/lang'; -import {StringMapWrapper, ListWrapper} from 'angular2/src/facade/collection'; +} from 'angular2/src/core/facade/lang'; +import {StringMapWrapper, ListWrapper} from 'angular2/src/core/facade/collection'; import {EventManagerPlugin} from './event_manager'; import {NgZone} from 'angular2/src/core/zone/ng_zone'; diff --git a/modules/angular2/src/core/render/dom/schema/dom_element_schema_registry.ts b/modules/angular2/src/core/render/dom/schema/dom_element_schema_registry.ts index 6733a9aff4..346cd143d2 100644 --- a/modules/angular2/src/core/render/dom/schema/dom_element_schema_registry.ts +++ b/modules/angular2/src/core/render/dom/schema/dom_element_schema_registry.ts @@ -1,6 +1,6 @@ -import {isPresent} from 'angular2/src/facade/lang'; -import {StringMapWrapper} from 'angular2/src/facade/collection'; -import {DOM} from 'angular2/src/dom/dom_adapter'; +import {isPresent} from 'angular2/src/core/facade/lang'; +import {StringMapWrapper} from 'angular2/src/core/facade/collection'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; import {ElementSchemaRegistry} from './element_schema_registry'; diff --git a/modules/angular2/src/core/render/dom/template_cloner.ts b/modules/angular2/src/core/render/dom/template_cloner.ts index f608240759..2d979431b9 100644 --- a/modules/angular2/src/core/render/dom/template_cloner.ts +++ b/modules/angular2/src/core/render/dom/template_cloner.ts @@ -1,6 +1,6 @@ -import {isString} from 'angular2/src/facade/lang'; +import {isString} from 'angular2/src/core/facade/lang'; import {Injectable, Inject} from 'angular2/di'; -import {DOM} from 'angular2/src/dom/dom_adapter'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; import {MAX_IN_MEMORY_ELEMENTS_PER_TEMPLATE} from './dom_tokens'; @Injectable() diff --git a/modules/angular2/src/core/render/dom/util.ts b/modules/angular2/src/core/render/dom/util.ts index 74198fc41b..af78f4dc0f 100644 --- a/modules/angular2/src/core/render/dom/util.ts +++ b/modules/angular2/src/core/render/dom/util.ts @@ -1,6 +1,6 @@ -import {StringWrapper, isPresent, isBlank} from 'angular2/src/facade/lang'; -import {DOM} from 'angular2/src/dom/dom_adapter'; -import {ListWrapper} from 'angular2/src/facade/collection'; +import {StringWrapper, isPresent, isBlank} from 'angular2/src/core/facade/lang'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {ListWrapper} from 'angular2/src/core/facade/collection'; import {DomProtoView} from './view/proto_view'; import {DomElementBinder} from './view/element_binder'; import {TemplateCloner} from './template_cloner'; diff --git a/modules/angular2/src/core/render/dom/view/element_binder.ts b/modules/angular2/src/core/render/dom/view/element_binder.ts index d0c37991f7..8cd669799f 100644 --- a/modules/angular2/src/core/render/dom/view/element_binder.ts +++ b/modules/angular2/src/core/render/dom/view/element_binder.ts @@ -1,6 +1,6 @@ -import {AST} from 'angular2/src/change_detection/change_detection'; -import {List, ListWrapper} from 'angular2/src/facade/collection'; -import {isPresent} from 'angular2/src/facade/lang'; +import {AST} from 'angular2/src/core/change_detection/change_detection'; +import {List, ListWrapper} from 'angular2/src/core/facade/collection'; +import {isPresent} from 'angular2/src/core/facade/lang'; export class DomElementBinder { textNodeIndices: List; diff --git a/modules/angular2/src/core/render/dom/view/proto_view.ts b/modules/angular2/src/core/render/dom/view/proto_view.ts index 7d1d36e6bd..9c697379c7 100644 --- a/modules/angular2/src/core/render/dom/view/proto_view.ts +++ b/modules/angular2/src/core/render/dom/view/proto_view.ts @@ -1,9 +1,9 @@ -import {List, ListWrapper} from 'angular2/src/facade/collection'; +import {List, ListWrapper} from 'angular2/src/core/facade/collection'; import {DomElementBinder} from './element_binder'; import {RenderProtoViewRef, ViewType, ViewEncapsulation} from '../../api'; -import {DOM} from 'angular2/src/dom/dom_adapter'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; import {TemplateCloner} from '../template_cloner'; diff --git a/modules/angular2/src/core/render/dom/view/proto_view_builder.ts b/modules/angular2/src/core/render/dom/view/proto_view_builder.ts index 256f66d4f5..cac570c5e7 100644 --- a/modules/angular2/src/core/render/dom/view/proto_view_builder.ts +++ b/modules/angular2/src/core/render/dom/view/proto_view_builder.ts @@ -1,4 +1,4 @@ -import {isPresent, isBlank, BaseException, StringWrapper} from 'angular2/src/facade/lang'; +import {isPresent, isBlank, BaseException, StringWrapper} from 'angular2/src/core/facade/lang'; import { ListWrapper, MapWrapper, @@ -6,8 +6,8 @@ import { SetWrapper, List, StringMapWrapper -} from 'angular2/src/facade/collection'; -import {DOM} from 'angular2/src/dom/dom_adapter'; +} from 'angular2/src/core/facade/collection'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; import { ASTWithSource, @@ -16,7 +16,7 @@ import { PropertyRead, LiteralArray, ImplicitReceiver -} from 'angular2/src/change_detection/change_detection'; +} from 'angular2/src/core/change_detection/change_detection'; import {DomProtoView, DomProtoViewRef, resolveInternalDomProtoView} from './proto_view'; import {DomElementBinder, Event, HostAction} from './element_binder'; diff --git a/modules/angular2/src/core/render/dom/view/proto_view_merger.ts b/modules/angular2/src/core/render/dom/view/proto_view_merger.ts index 3648b61d87..5fad74367c 100644 --- a/modules/angular2/src/core/render/dom/view/proto_view_merger.ts +++ b/modules/angular2/src/core/render/dom/view/proto_view_merger.ts @@ -1,6 +1,6 @@ -import {DOM} from 'angular2/src/dom/dom_adapter'; -import {isPresent, isBlank, BaseException, isArray} from 'angular2/src/facade/lang'; -import {ListWrapper, SetWrapper, MapWrapper} from 'angular2/src/facade/collection'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {isPresent, isBlank, BaseException, isArray} from 'angular2/src/core/facade/lang'; +import {ListWrapper, SetWrapper, MapWrapper} from 'angular2/src/core/facade/collection'; import {DomProtoView, DomProtoViewRef, resolveInternalDomProtoView} from './proto_view'; import {DomElementBinder} from './element_binder'; diff --git a/modules/angular2/src/core/render/dom/view/shared_styles_host.ts b/modules/angular2/src/core/render/dom/view/shared_styles_host.ts index fc6b6572bd..23810dada3 100644 --- a/modules/angular2/src/core/render/dom/view/shared_styles_host.ts +++ b/modules/angular2/src/core/render/dom/view/shared_styles_host.ts @@ -1,6 +1,6 @@ -import {DOM} from 'angular2/src/dom/dom_adapter'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; import {Inject, Injectable} from 'angular2/di'; -import {SetWrapper} from 'angular2/src/facade/collection'; +import {SetWrapper} from 'angular2/src/core/facade/collection'; import {DOCUMENT} from '../dom_tokens'; @Injectable() diff --git a/modules/angular2/src/core/render/dom/view/view.ts b/modules/angular2/src/core/render/dom/view/view.ts index 907fd6c071..df70150f13 100644 --- a/modules/angular2/src/core/render/dom/view/view.ts +++ b/modules/angular2/src/core/render/dom/view/view.ts @@ -1,6 +1,12 @@ -import {DOM} from 'angular2/src/dom/dom_adapter'; -import {ListWrapper, MapWrapper, Map, StringMapWrapper, List} from 'angular2/src/facade/collection'; -import {isPresent, isBlank, BaseException, stringify} from 'angular2/src/facade/lang'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import { + ListWrapper, + MapWrapper, + Map, + StringMapWrapper, + List +} from 'angular2/src/core/facade/collection'; +import {isPresent, isBlank, BaseException, stringify} from 'angular2/src/core/facade/lang'; import {DomProtoView} from './proto_view'; diff --git a/modules/angular2/src/core/render/dom/view/view_container.ts b/modules/angular2/src/core/render/dom/view/view_container.ts index c0a236939b..de3b9735cd 100644 --- a/modules/angular2/src/core/render/dom/view/view_container.ts +++ b/modules/angular2/src/core/render/dom/view/view_container.ts @@ -1,4 +1,4 @@ -import {ListWrapper, MapWrapper, List} from 'angular2/src/facade/collection'; +import {ListWrapper, MapWrapper, List} from 'angular2/src/core/facade/collection'; import * as viewModule from './view'; diff --git a/modules/angular2/src/core/render/xhr.ts b/modules/angular2/src/core/render/xhr.ts index 4a31d5fa32..0efb301636 100644 --- a/modules/angular2/src/core/render/xhr.ts +++ b/modules/angular2/src/core/render/xhr.ts @@ -1,4 +1,4 @@ -import {Promise} from 'angular2/src/facade/async'; +import {Promise} from 'angular2/src/core/facade/async'; export class XHR { get(url: string): Promise { return null; } diff --git a/modules/angular2/src/core/render/xhr_impl.ts b/modules/angular2/src/core/render/xhr_impl.ts index 8b7756591a..4e213d380b 100644 --- a/modules/angular2/src/core/render/xhr_impl.ts +++ b/modules/angular2/src/core/render/xhr_impl.ts @@ -1,6 +1,6 @@ import {Injectable} from 'angular2/di'; -import {Promise, PromiseWrapper, PromiseCompleter} from 'angular2/src/facade/async'; -import {isPresent} from 'angular2/src/facade/lang'; +import {Promise, PromiseWrapper, PromiseCompleter} from 'angular2/src/core/facade/async'; +import {isPresent} from 'angular2/src/core/facade/lang'; import {XHR} from './xhr'; @Injectable() diff --git a/modules/angular2/src/core/render/xhr_mock.ts b/modules/angular2/src/core/render/xhr_mock.ts index 48a34ec3c9..6099e96f29 100644 --- a/modules/angular2/src/core/render/xhr_mock.ts +++ b/modules/angular2/src/core/render/xhr_mock.ts @@ -1,7 +1,7 @@ -import {XHR} from 'angular2/src/render/xhr'; -import {List, ListWrapper, Map, MapWrapper} from 'angular2/src/facade/collection'; -import {isBlank, isPresent, normalizeBlank, BaseException} from 'angular2/src/facade/lang'; -import {PromiseCompleter, PromiseWrapper, Promise} from 'angular2/src/facade/async'; +import {XHR} from 'angular2/src/core/render/xhr'; +import {List, ListWrapper, Map, MapWrapper} from 'angular2/src/core/facade/collection'; +import {isBlank, isPresent, normalizeBlank, BaseException} from 'angular2/src/core/facade/lang'; +import {PromiseCompleter, PromiseWrapper, Promise} from 'angular2/src/core/facade/async'; export class MockXHR extends XHR { private _expectations: List<_Expectation>; diff --git a/modules/angular2/src/core/services/anchor_based_app_root_url.ts b/modules/angular2/src/core/services/anchor_based_app_root_url.ts index 0742b01c0a..e77abf9308 100644 --- a/modules/angular2/src/core/services/anchor_based_app_root_url.ts +++ b/modules/angular2/src/core/services/anchor_based_app_root_url.ts @@ -1,5 +1,5 @@ -import {AppRootUrl} from "angular2/src/services/app_root_url"; -import {DOM} from "angular2/src/dom/dom_adapter"; +import {AppRootUrl} from "angular2/src/core/services/app_root_url"; +import {DOM} from "angular2/src/core/dom/dom_adapter"; import {Injectable} from "angular2/di"; /** diff --git a/modules/angular2/src/core/services/app_root_url.ts b/modules/angular2/src/core/services/app_root_url.ts index 9b543402b5..e378430108 100644 --- a/modules/angular2/src/core/services/app_root_url.ts +++ b/modules/angular2/src/core/services/app_root_url.ts @@ -1,5 +1,5 @@ import {Injectable} from 'angular2/di'; -import {isBlank} from 'angular2/src/facade/lang'; +import {isBlank} from 'angular2/src/core/facade/lang'; /** * Specifies app root url for the application. diff --git a/modules/angular2/src/core/services/ruler.ts b/modules/angular2/src/core/services/ruler.ts index 07b7b31b98..f2e563655d 100644 --- a/modules/angular2/src/core/services/ruler.ts +++ b/modules/angular2/src/core/services/ruler.ts @@ -1,5 +1,5 @@ -import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; -import {DomAdapter} from 'angular2/src/dom/dom_adapter'; +import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async'; +import {DomAdapter} from 'angular2/src/core/dom/dom_adapter'; import {ElementRef} from 'angular2/src/core/compiler/element_ref'; export class Rectangle { diff --git a/modules/angular2/src/core/services/title.ts b/modules/angular2/src/core/services/title.ts index c07a0148da..d7367aaac5 100644 --- a/modules/angular2/src/core/services/title.ts +++ b/modules/angular2/src/core/services/title.ts @@ -1,4 +1,4 @@ -import {DOM} from 'angular2/src/dom/dom_adapter'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; /** * A service that can be used to get and set the title of a current HTML document. diff --git a/modules/angular2/src/core/services/url_resolver.ts b/modules/angular2/src/core/services/url_resolver.ts index 924c9f88d8..c355ac40b7 100644 --- a/modules/angular2/src/core/services/url_resolver.ts +++ b/modules/angular2/src/core/services/url_resolver.ts @@ -5,8 +5,8 @@ import { RegExpWrapper, BaseException, normalizeBlank -} from 'angular2/src/facade/lang'; -import {ListWrapper} from 'angular2/src/facade/collection'; +} from 'angular2/src/core/facade/lang'; +import {ListWrapper} from 'angular2/src/core/facade/collection'; /** * Used by the {@link Compiler} when resolving HTML and CSS template URLs. diff --git a/modules/angular2/src/core/testability/get_testability.ts b/modules/angular2/src/core/testability/get_testability.ts index e8ccf97f58..ab98d25761 100644 --- a/modules/angular2/src/core/testability/get_testability.ts +++ b/modules/angular2/src/core/testability/get_testability.ts @@ -1,5 +1,5 @@ import {TestabilityRegistry, Testability} from 'angular2/src/core/testability/testability'; -import {global} from 'angular2/src/facade/lang'; +import {global} from 'angular2/src/core/facade/lang'; class PublicTestability { _testability: Testability; diff --git a/modules/angular2/src/core/testability/testability.ts b/modules/angular2/src/core/testability/testability.ts index c7bc613407..a8a7328696 100644 --- a/modules/angular2/src/core/testability/testability.ts +++ b/modules/angular2/src/core/testability/testability.ts @@ -1,10 +1,10 @@ import {Injectable} from 'angular2/di'; -import {DOM} from 'angular2/src/dom/dom_adapter'; -import {Map, MapWrapper, List, ListWrapper} from 'angular2/src/facade/collection'; -import {StringWrapper, isBlank, BaseException} from 'angular2/src/facade/lang'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {Map, MapWrapper, List, ListWrapper} from 'angular2/src/core/facade/collection'; +import {StringWrapper, isBlank, BaseException} from 'angular2/src/core/facade/lang'; import * as getTestabilityModule from './get_testability'; import {NgZone} from '../zone/ng_zone'; -import {PromiseWrapper} from 'angular2/src/facade/async'; +import {PromiseWrapper} from 'angular2/src/core/facade/async'; /** diff --git a/modules/angular2/src/core/util/decorators.ts b/modules/angular2/src/core/util/decorators.ts index 4be326eee8..0e32683baf 100644 --- a/modules/angular2/src/core/util/decorators.ts +++ b/modules/angular2/src/core/util/decorators.ts @@ -1,4 +1,4 @@ -import {global, Type, isFunction, stringify} from 'angular2/src/facade/lang'; +import {global, Type, isFunction, stringify} from 'angular2/src/core/facade/lang'; /** * Declares the interface to be used with {@link Class}. diff --git a/modules/angular2/src/core/zone/ng_zone.ts b/modules/angular2/src/core/zone/ng_zone.ts index 37df4ade4f..261a01ecbc 100644 --- a/modules/angular2/src/core/zone/ng_zone.ts +++ b/modules/angular2/src/core/zone/ng_zone.ts @@ -1,6 +1,6 @@ -import {List, ListWrapper, StringMapWrapper} from 'angular2/src/facade/collection'; -import {normalizeBlank, isPresent, global} from 'angular2/src/facade/lang'; -import {wtfLeave, wtfCreateScope, WtfScopeFn} from '../../profile/profile'; +import {List, ListWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection'; +import {normalizeBlank, isPresent, global} from 'angular2/src/core/facade/lang'; +import {wtfLeave, wtfCreateScope, WtfScopeFn} from '../profile/profile'; export interface NgZoneZone extends Zone { _innerZone: boolean; } diff --git a/modules/angular2/src/forms/directives.ts b/modules/angular2/src/forms/directives.ts index d3d5fe645f..83c5dfe651 100644 --- a/modules/angular2/src/forms/directives.ts +++ b/modules/angular2/src/forms/directives.ts @@ -1,4 +1,4 @@ -import {Type, CONST_EXPR} from 'angular2/src/facade/lang'; +import {Type, CONST_EXPR} from 'angular2/src/core/facade/lang'; import {NgControlName} from './directives/ng_control_name'; import {NgFormControl} from './directives/ng_form_control'; import {NgModel} from './directives/ng_model'; diff --git a/modules/angular2/src/forms/directives/checkbox_value_accessor.ts b/modules/angular2/src/forms/directives/checkbox_value_accessor.ts index ac408e2c33..8c3eaf3fb1 100644 --- a/modules/angular2/src/forms/directives/checkbox_value_accessor.ts +++ b/modules/angular2/src/forms/directives/checkbox_value_accessor.ts @@ -5,7 +5,7 @@ import {Self} from 'angular2/di'; import {NgControl} from './ng_control'; import {ControlValueAccessor} from './control_value_accessor'; -import {isPresent} from 'angular2/src/facade/lang'; +import {isPresent} from 'angular2/src/core/facade/lang'; import {setProperty} from './shared'; /** diff --git a/modules/angular2/src/forms/directives/control_container.ts b/modules/angular2/src/forms/directives/control_container.ts index 4796f64118..eb1896b5c3 100644 --- a/modules/angular2/src/forms/directives/control_container.ts +++ b/modules/angular2/src/forms/directives/control_container.ts @@ -1,6 +1,6 @@ import {Form} from './form_interface'; import {AbstractControlDirective} from './abstract_control_directive'; -import {List} from 'angular2/src/facade/collection'; +import {List} from 'angular2/src/core/facade/collection'; /** * A directive that contains a group of [NgControl]. diff --git a/modules/angular2/src/forms/directives/default_value_accessor.ts b/modules/angular2/src/forms/directives/default_value_accessor.ts index 8d0b6cbff0..e45317956b 100644 --- a/modules/angular2/src/forms/directives/default_value_accessor.ts +++ b/modules/angular2/src/forms/directives/default_value_accessor.ts @@ -4,7 +4,7 @@ import {ElementRef} from 'angular2/core'; import {Self} from 'angular2/di'; import {NgControl} from './ng_control'; import {ControlValueAccessor} from './control_value_accessor'; -import {isBlank, isPresent} from 'angular2/src/facade/lang'; +import {isBlank, isPresent} from 'angular2/src/core/facade/lang'; import {setProperty} from './shared'; /** diff --git a/modules/angular2/src/forms/directives/ng_control_group.ts b/modules/angular2/src/forms/directives/ng_control_group.ts index b6a60eb366..ac79efa901 100644 --- a/modules/angular2/src/forms/directives/ng_control_group.ts +++ b/modules/angular2/src/forms/directives/ng_control_group.ts @@ -1,7 +1,7 @@ import {Directive, LifecycleEvent} from 'angular2/metadata'; import {Inject, Host, SkipSelf, forwardRef, Binding} from 'angular2/di'; -import {List, ListWrapper} from 'angular2/src/facade/collection'; -import {CONST_EXPR} from 'angular2/src/facade/lang'; +import {List, ListWrapper} from 'angular2/src/core/facade/collection'; +import {CONST_EXPR} from 'angular2/src/core/facade/lang'; import {ControlContainer} from './control_container'; import {controlPath} from './shared'; diff --git a/modules/angular2/src/forms/directives/ng_control_name.ts b/modules/angular2/src/forms/directives/ng_control_name.ts index cd48121e17..96b133678c 100644 --- a/modules/angular2/src/forms/directives/ng_control_name.ts +++ b/modules/angular2/src/forms/directives/ng_control_name.ts @@ -1,6 +1,6 @@ -import {CONST_EXPR} from 'angular2/src/facade/lang'; -import {EventEmitter, ObservableWrapper} from 'angular2/src/facade/async'; -import {List, StringMap} from 'angular2/src/facade/collection'; +import {CONST_EXPR} from 'angular2/src/core/facade/lang'; +import {EventEmitter, ObservableWrapper} from 'angular2/src/core/facade/async'; +import {List, StringMap} from 'angular2/src/core/facade/collection'; import {QueryList} from 'angular2/core'; import {Query, Directive, LifecycleEvent} from 'angular2/metadata'; diff --git a/modules/angular2/src/forms/directives/ng_form.ts b/modules/angular2/src/forms/directives/ng_form.ts index 3b4dc88371..d6fa27d6b7 100644 --- a/modules/angular2/src/forms/directives/ng_form.ts +++ b/modules/angular2/src/forms/directives/ng_form.ts @@ -3,9 +3,9 @@ import { ObservableWrapper, EventEmitter, PromiseCompleter -} from 'angular2/src/facade/async'; -import {StringMapWrapper, List, ListWrapper} from 'angular2/src/facade/collection'; -import {isPresent, isBlank, CONST_EXPR} from 'angular2/src/facade/lang'; +} from 'angular2/src/core/facade/async'; +import {StringMapWrapper, List, ListWrapper} from 'angular2/src/core/facade/collection'; +import {isPresent, isBlank, CONST_EXPR} from 'angular2/src/core/facade/lang'; import {Directive} from 'angular2/metadata'; import {forwardRef, Binding} from 'angular2/di'; import {NgControl} from './ng_control'; diff --git a/modules/angular2/src/forms/directives/ng_form_control.ts b/modules/angular2/src/forms/directives/ng_form_control.ts index f460c42816..62853e1878 100644 --- a/modules/angular2/src/forms/directives/ng_form_control.ts +++ b/modules/angular2/src/forms/directives/ng_form_control.ts @@ -1,5 +1,5 @@ -import {CONST_EXPR} from 'angular2/src/facade/lang'; -import {EventEmitter, ObservableWrapper} from 'angular2/src/facade/async'; +import {CONST_EXPR} from 'angular2/src/core/facade/lang'; +import {EventEmitter, ObservableWrapper} from 'angular2/src/core/facade/async'; import {QueryList} from 'angular2/core'; import {Query, Directive, LifecycleEvent} from 'angular2/metadata'; diff --git a/modules/angular2/src/forms/directives/ng_form_model.ts b/modules/angular2/src/forms/directives/ng_form_model.ts index bc4d903bd2..616e085f87 100644 --- a/modules/angular2/src/forms/directives/ng_form_model.ts +++ b/modules/angular2/src/forms/directives/ng_form_model.ts @@ -1,6 +1,6 @@ -import {CONST_EXPR} from 'angular2/src/facade/lang'; -import {List, ListWrapper} from 'angular2/src/facade/collection'; -import {ObservableWrapper, EventEmitter} from 'angular2/src/facade/async'; +import {CONST_EXPR} from 'angular2/src/core/facade/lang'; +import {List, ListWrapper} from 'angular2/src/core/facade/collection'; +import {ObservableWrapper, EventEmitter} from 'angular2/src/core/facade/async'; import {Directive, LifecycleEvent} from 'angular2/metadata'; import {forwardRef, Binding} from 'angular2/di'; diff --git a/modules/angular2/src/forms/directives/ng_model.ts b/modules/angular2/src/forms/directives/ng_model.ts index 4b3fc62418..dcb6af205f 100644 --- a/modules/angular2/src/forms/directives/ng_model.ts +++ b/modules/angular2/src/forms/directives/ng_model.ts @@ -1,5 +1,5 @@ -import {CONST_EXPR} from 'angular2/src/facade/lang'; -import {EventEmitter, ObservableWrapper} from 'angular2/src/facade/async'; +import {CONST_EXPR} from 'angular2/src/core/facade/lang'; +import {EventEmitter, ObservableWrapper} from 'angular2/src/core/facade/async'; import {QueryList} from 'angular2/core'; import {Query, Directive, LifecycleEvent} from 'angular2/metadata'; diff --git a/modules/angular2/src/forms/directives/select_control_value_accessor.ts b/modules/angular2/src/forms/directives/select_control_value_accessor.ts index 89662783a4..82b11bbcc6 100644 --- a/modules/angular2/src/forms/directives/select_control_value_accessor.ts +++ b/modules/angular2/src/forms/directives/select_control_value_accessor.ts @@ -5,7 +5,7 @@ import {Query, Directive} from 'angular2/metadata'; import {NgControl} from './ng_control'; import {ControlValueAccessor} from './control_value_accessor'; -import {isPresent} from 'angular2/src/facade/lang'; +import {isPresent} from 'angular2/src/core/facade/lang'; import {setProperty} from './shared'; /** diff --git a/modules/angular2/src/forms/directives/shared.ts b/modules/angular2/src/forms/directives/shared.ts index 0df149a307..937374de58 100644 --- a/modules/angular2/src/forms/directives/shared.ts +++ b/modules/angular2/src/forms/directives/shared.ts @@ -1,5 +1,5 @@ -import {ListWrapper, StringMapWrapper} from 'angular2/src/facade/collection'; -import {isBlank, BaseException, looseIdentical} from 'angular2/src/facade/lang'; +import {ListWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection'; +import {isBlank, BaseException, looseIdentical} from 'angular2/src/core/facade/lang'; import {ControlContainer} from './control_container'; import {NgControl} from './ng_control'; diff --git a/modules/angular2/src/forms/directives/validators.ts b/modules/angular2/src/forms/directives/validators.ts index c873da7f33..e1e8a71c55 100644 --- a/modules/angular2/src/forms/directives/validators.ts +++ b/modules/angular2/src/forms/directives/validators.ts @@ -1,5 +1,5 @@ import {forwardRef, Binding} from 'angular2/di'; -import {CONST_EXPR} from 'angular2/src/facade/lang'; +import {CONST_EXPR} from 'angular2/src/core/facade/lang'; import {Directive} from 'angular2/metadata'; import {Validators} from '../validators'; diff --git a/modules/angular2/src/forms/form_builder.ts b/modules/angular2/src/forms/form_builder.ts index 5754107b7a..ccdcbce183 100644 --- a/modules/angular2/src/forms/form_builder.ts +++ b/modules/angular2/src/forms/form_builder.ts @@ -1,6 +1,6 @@ import {Injectable} from 'angular2/di'; -import {StringMapWrapper, ListWrapper, List} from 'angular2/src/facade/collection'; -import {isPresent, isArray} from 'angular2/src/facade/lang'; +import {StringMapWrapper, ListWrapper, List} from 'angular2/src/core/facade/collection'; +import {isPresent, isArray} from 'angular2/src/core/facade/lang'; import * as modelModule from './model'; diff --git a/modules/angular2/src/forms/model.ts b/modules/angular2/src/forms/model.ts index 7b8536fe15..a3a742c57d 100644 --- a/modules/angular2/src/forms/model.ts +++ b/modules/angular2/src/forms/model.ts @@ -1,6 +1,6 @@ -import {StringWrapper, isPresent, isBlank} from 'angular2/src/facade/lang'; -import {Observable, EventEmitter, ObservableWrapper} from 'angular2/src/facade/async'; -import {StringMap, StringMapWrapper, ListWrapper, List} from 'angular2/src/facade/collection'; +import {StringWrapper, isPresent, isBlank} from 'angular2/src/core/facade/lang'; +import {Observable, EventEmitter, ObservableWrapper} from 'angular2/src/core/facade/async'; +import {StringMap, StringMapWrapper, ListWrapper, List} from 'angular2/src/core/facade/collection'; import {Validators} from './validators'; /** diff --git a/modules/angular2/src/forms/validators.ts b/modules/angular2/src/forms/validators.ts index fef986bcf6..418a72f682 100644 --- a/modules/angular2/src/forms/validators.ts +++ b/modules/angular2/src/forms/validators.ts @@ -1,5 +1,5 @@ -import {isBlank, isPresent} from 'angular2/src/facade/lang'; -import {List, ListWrapper, StringMapWrapper} from 'angular2/src/facade/collection'; +import {isBlank, isPresent} from 'angular2/src/core/facade/lang'; +import {List, ListWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection'; import * as modelModule from './model'; diff --git a/modules/angular2/src/http/backends/browser_jsonp.ts b/modules/angular2/src/http/backends/browser_jsonp.ts index ba7b53af30..abc31dc20c 100644 --- a/modules/angular2/src/http/backends/browser_jsonp.ts +++ b/modules/angular2/src/http/backends/browser_jsonp.ts @@ -1,5 +1,5 @@ import {Injectable} from 'angular2/di'; -import {global} from 'angular2/src/facade/lang'; +import {global} from 'angular2/src/core/facade/lang'; let _nextRequestId = 0; export const JSONP_HOME = '__ng_jsonp__'; diff --git a/modules/angular2/src/http/backends/jsonp_backend.ts b/modules/angular2/src/http/backends/jsonp_backend.ts index 37c963eed3..3cfbb29466 100644 --- a/modules/angular2/src/http/backends/jsonp_backend.ts +++ b/modules/angular2/src/http/backends/jsonp_backend.ts @@ -5,8 +5,8 @@ import {Response} from '../static_response'; import {ResponseOptions, BaseResponseOptions} from '../base_response_options'; import {Injectable} from 'angular2/di'; import {BrowserJsonp} from './browser_jsonp'; -import {EventEmitter, ObservableWrapper} from 'angular2/src/facade/async'; -import {StringWrapper, isPresent, ENUM_INDEX, makeTypeError} from 'angular2/src/facade/lang'; +import {EventEmitter, ObservableWrapper} from 'angular2/src/core/facade/async'; +import {StringWrapper, isPresent, ENUM_INDEX, makeTypeError} from 'angular2/src/core/facade/lang'; export class JSONPConnection implements Connection { readyState: ReadyStates; diff --git a/modules/angular2/src/http/backends/mock_backend.ts b/modules/angular2/src/http/backends/mock_backend.ts index fe1a82dc5e..9ed9030964 100644 --- a/modules/angular2/src/http/backends/mock_backend.ts +++ b/modules/angular2/src/http/backends/mock_backend.ts @@ -3,9 +3,9 @@ import {Request} from '../static_request'; import {Response} from '../static_response'; import {ReadyStates} from '../enums'; import {Connection, ConnectionBackend} from '../interfaces'; -import {ObservableWrapper, EventEmitter} from 'angular2/src/facade/async'; -import {isPresent} from 'angular2/src/facade/lang'; -import {IMPLEMENTS, BaseException} from 'angular2/src/facade/lang'; +import {ObservableWrapper, EventEmitter} from 'angular2/src/core/facade/async'; +import {isPresent} from 'angular2/src/core/facade/lang'; +import {IMPLEMENTS, BaseException} from 'angular2/src/core/facade/lang'; /** * @@ -107,7 +107,7 @@ export class MockConnection { * #Example * * ``` - * import {MockBackend, DefaultOptions, Http} from 'http/http'; + * import {MockBackend, DefaultOptions, Http} from 'angular2/http'; * it('should get some data', inject([AsyncTestCompleter], (async) => { * var connection; * var injector = Injector.resolveAndCreate([ @@ -140,7 +140,7 @@ export class MockBackend { * #Example * * ``` - * import {MockBackend, Http, BaseRequestOptions} from 'http/http'; + * import {MockBackend, Http, BaseRequestOptions} from 'angular2/http'; * import {Injector} from 'angular2/di'; * * it('should get a response', () => { diff --git a/modules/angular2/src/http/backends/xhr_backend.ts b/modules/angular2/src/http/backends/xhr_backend.ts index b2ae729889..e5096520ac 100644 --- a/modules/angular2/src/http/backends/xhr_backend.ts +++ b/modules/angular2/src/http/backends/xhr_backend.ts @@ -5,8 +5,8 @@ import {Response} from '../static_response'; import {ResponseOptions, BaseResponseOptions} from '../base_response_options'; import {Injectable} from 'angular2/di'; import {BrowserXhr} from './browser_xhr'; -import {EventEmitter, ObservableWrapper} from 'angular2/src/facade/async'; -import {isPresent, ENUM_INDEX} from 'angular2/src/facade/lang'; +import {EventEmitter, ObservableWrapper} from 'angular2/src/core/facade/async'; +import {isPresent, ENUM_INDEX} from 'angular2/src/core/facade/lang'; /** * Creates connections using `XMLHttpRequest`. Given a fully-qualified @@ -65,7 +65,7 @@ export class XHRConnection implements Connection { if (isPresent(baseResponseOptions)) { responseOptions = baseResponseOptions.merge(responseOptions); } - ObservableWrapper.callThrow(this.response, new Response(responseOptions)) + ObservableWrapper.callThrow(this.response, new Response(responseOptions)); }); // TODO(jeffbcross): make this more dynamic based on body type @@ -92,7 +92,7 @@ export class XHRConnection implements Connection { * #Example * * ``` - * import {Http, MyNodeBackend, HTTP_BINDINGS, BaseRequestOptions} from 'http/http'; + * import {Http, MyNodeBackend, HTTP_BINDINGS, BaseRequestOptions} from 'angular2/http'; * @Component({ * viewBindings: [ * HTTP_BINDINGS, diff --git a/modules/angular2/src/http/base_request_options.ts b/modules/angular2/src/http/base_request_options.ts index becfd2f9eb..53fb803a4a 100644 --- a/modules/angular2/src/http/base_request_options.ts +++ b/modules/angular2/src/http/base_request_options.ts @@ -1,4 +1,4 @@ -import {CONST_EXPR, CONST, isPresent, isString} from 'angular2/src/facade/lang'; +import {CONST_EXPR, CONST, isPresent, isString} from 'angular2/src/core/facade/lang'; import {Headers} from './headers'; import {RequestModesOpts, RequestMethods, RequestCacheOpts, RequestCredentialsOpts} from './enums'; import {RequestOptionsArgs} from './interfaces'; diff --git a/modules/angular2/src/http/base_response_options.ts b/modules/angular2/src/http/base_response_options.ts index 1d7d27dc9e..77935a5b52 100644 --- a/modules/angular2/src/http/base_response_options.ts +++ b/modules/angular2/src/http/base_response_options.ts @@ -1,5 +1,5 @@ import {Injectable} from 'angular2/di'; -import {isPresent, isJsObject} from 'angular2/src/facade/lang'; +import {isPresent, isJsObject} from 'angular2/src/core/facade/lang'; import {Headers} from './headers'; import {ResponseTypes} from './enums'; import {ResponseOptionsArgs} from './interfaces'; diff --git a/modules/angular2/src/http/enums.ts b/modules/angular2/src/http/enums.ts index 81e4afe7ee..efdc8b6c78 100644 --- a/modules/angular2/src/http/enums.ts +++ b/modules/angular2/src/http/enums.ts @@ -1,4 +1,4 @@ -import {StringMap, StringMapWrapper} from 'angular2/src/facade/collection'; +import {StringMap, StringMapWrapper} from 'angular2/src/core/facade/collection'; /** * Acceptable origin modes to be associated with a {@link Request}, based on diff --git a/modules/angular2/src/http/headers.ts b/modules/angular2/src/http/headers.ts index d56192e794..f72ecf848f 100644 --- a/modules/angular2/src/http/headers.ts +++ b/modules/angular2/src/http/headers.ts @@ -5,7 +5,7 @@ import { isType, StringWrapper, BaseException -} from 'angular2/src/facade/lang'; +} from 'angular2/src/core/facade/lang'; import { isListLikeIterable, List, @@ -13,7 +13,7 @@ import { MapWrapper, ListWrapper, StringMap -} from 'angular2/src/facade/collection'; +} from 'angular2/src/core/facade/collection'; /** * Polyfill for [Headers](https://developer.mozilla.org/en-US/docs/Web/API/Headers/Headers), as diff --git a/modules/angular2/src/http/http.ts b/modules/angular2/src/http/http.ts index eef426a2da..ee010d71ba 100644 --- a/modules/angular2/src/http/http.ts +++ b/modules/angular2/src/http/http.ts @@ -1,10 +1,10 @@ -import {isString, isPresent, isBlank, makeTypeError} from 'angular2/src/facade/lang'; -import {Injectable} from 'angular2/src/di/decorators'; +import {isString, isPresent, isBlank, makeTypeError} from 'angular2/src/core/facade/lang'; +import {Injectable} from 'angular2/src/core/di/decorators'; import {RequestOptionsArgs, Connection, ConnectionBackend} from './interfaces'; import {Request} from './static_request'; import {BaseRequestOptions, RequestOptions} from './base_request_options'; import {RequestMethods} from './enums'; -import {EventEmitter} from 'angular2/src/facade/async'; +import {EventEmitter} from 'angular2/src/core/facade/async'; function httpRequest(backend: ConnectionBackend, request: Request): EventEmitter { return backend.createConnection(request).response; diff --git a/modules/angular2/src/http/http_utils.ts b/modules/angular2/src/http/http_utils.ts index 082d493f24..9338985a50 100644 --- a/modules/angular2/src/http/http_utils.ts +++ b/modules/angular2/src/http/http_utils.ts @@ -1 +1 @@ -export {isJsObject} from 'angular2/src/facade/lang'; +export {isJsObject} from 'angular2/src/core/facade/lang'; diff --git a/modules/angular2/src/http/index.ts b/modules/angular2/src/http/index.ts index 14dfa12312..49b8314cc8 100644 --- a/modules/angular2/src/http/index.ts +++ b/modules/angular2/src/http/index.ts @@ -1,12 +1,13 @@ -require('reflect-metadata'); -require('traceur-runtime'); -import {HTTP_BINDINGS, JSONP_BINDINGS, Http, Jsonp} from './http'; -import {Injector} from 'angular2/angular2'; -export * from './http'; +// Index to be used if Http is ever configured as a standalone npm package. +// require('reflect-metadata'); +// require('traceur-runtime'); +// import {HTTP_BINDINGS, JSONP_BINDINGS, Http, Jsonp} from './http'; +// import {Injector} from 'angular2/angular2'; +// export * from './http'; -/** - * TODO(jeffbcross): export each as their own top-level file, to require as: - * require('http/http'); require('http/jsonp'); - */ -export var http = Injector.resolveAndCreate([HTTP_BINDINGS]).get(Http); -export var jsonp = Injector.resolveAndCreate([JSONP_BINDINGS]).get(Jsonp); +// /** +// * TODO(jeffbcross): export each as their own top-level file, to require as: +// * require('angular2/http'); require('http/jsonp'); +// */ +// export var http = Injector.resolveAndCreate([HTTP_BINDINGS]).get(Http); +// export var jsonp = Injector.resolveAndCreate([JSONP_BINDINGS]).get(Jsonp); diff --git a/modules/angular2/src/http/interfaces.ts b/modules/angular2/src/http/interfaces.ts index e16f826293..9af565f9d1 100644 --- a/modules/angular2/src/http/interfaces.ts +++ b/modules/angular2/src/http/interfaces.ts @@ -1,4 +1,4 @@ -/// +/// import { ReadyStates, @@ -9,8 +9,8 @@ import { ResponseTypes } from './enums'; import {Headers} from './headers'; -import {BaseException} from 'angular2/src/facade/lang'; -import {EventEmitter} from 'angular2/src/facade/async'; +import {BaseException} from 'angular2/src/core/facade/lang'; +import {EventEmitter} from 'angular2/src/core/facade/async'; import {Request} from './static_request'; import {URLSearchParamsUnionFixer, URLSearchParams} from './url_search_params'; diff --git a/modules/angular2/src/http/static_request.ts b/modules/angular2/src/http/static_request.ts index 4d79ef762e..4b2c34b9ee 100644 --- a/modules/angular2/src/http/static_request.ts +++ b/modules/angular2/src/http/static_request.ts @@ -8,7 +8,7 @@ import { isPresent, isJsObject, StringWrapper -} from 'angular2/src/facade/lang'; +} from 'angular2/src/core/facade/lang'; // TODO(jeffbcross): properly implement body accessors /** diff --git a/modules/angular2/src/http/static_response.ts b/modules/angular2/src/http/static_response.ts index 1f11707ceb..97e85b6be8 100644 --- a/modules/angular2/src/http/static_response.ts +++ b/modules/angular2/src/http/static_response.ts @@ -1,5 +1,5 @@ import {ResponseTypes} from './enums'; -import {BaseException, CONST_EXPR, isString, isPresent, Json} from 'angular2/src/facade/lang'; +import {BaseException, CONST_EXPR, isString, isPresent, Json} from 'angular2/src/core/facade/lang'; import {Headers} from './headers'; import {ResponseOptions} from './base_response_options'; import {isJsObject} from './http_utils'; diff --git a/modules/angular2/src/http/url_search_params.ts b/modules/angular2/src/http/url_search_params.ts index 034d2e4dde..3696d9a167 100644 --- a/modules/angular2/src/http/url_search_params.ts +++ b/modules/angular2/src/http/url_search_params.ts @@ -1,11 +1,11 @@ -import {CONST_EXPR, isPresent, isBlank, StringWrapper} from 'angular2/src/facade/lang'; +import {CONST_EXPR, isPresent, isBlank, StringWrapper} from 'angular2/src/core/facade/lang'; import { Map, MapWrapper, List, ListWrapper, isListLikeIterable -} from 'angular2/src/facade/collection'; +} from 'angular2/src/core/facade/collection'; function paramParser(rawParams: string = ''): Map> { var map: Map> = new Map(); diff --git a/modules/angular2/src/mock/location_mock.ts b/modules/angular2/src/mock/location_mock.ts index e8ecb12253..e85d377b64 100644 --- a/modules/angular2/src/mock/location_mock.ts +++ b/modules/angular2/src/mock/location_mock.ts @@ -1,8 +1,8 @@ import {SpyObject, proxy} from 'angular2/test_lib'; -import {IMPLEMENTS} from 'angular2/src/facade/lang'; -import {EventEmitter, ObservableWrapper} from 'angular2/src/facade/async'; -import {List, ListWrapper} from 'angular2/src/facade/collection'; +import {IMPLEMENTS} from 'angular2/src/core/facade/lang'; +import {EventEmitter, ObservableWrapper} from 'angular2/src/core/facade/async'; +import {List, ListWrapper} from 'angular2/src/core/facade/collection'; import {Location} from 'angular2/src/router/location'; diff --git a/modules/angular2/src/mock/mock_location_strategy.ts b/modules/angular2/src/mock/mock_location_strategy.ts index 602dd078e0..8387c60a21 100644 --- a/modules/angular2/src/mock/mock_location_strategy.ts +++ b/modules/angular2/src/mock/mock_location_strategy.ts @@ -1,5 +1,5 @@ -import {EventEmitter, ObservableWrapper} from 'angular2/src/facade/async'; -import {List} from 'angular2/src/facade/collection'; +import {EventEmitter, ObservableWrapper} from 'angular2/src/core/facade/async'; +import {List} from 'angular2/src/core/facade/collection'; import {LocationStrategy} from 'angular2/src/router/location_strategy'; diff --git a/modules/angular2/src/mock/view_resolver_mock.ts b/modules/angular2/src/mock/view_resolver_mock.ts index 87844bd234..91a207183d 100644 --- a/modules/angular2/src/mock/view_resolver_mock.ts +++ b/modules/angular2/src/mock/view_resolver_mock.ts @@ -1,5 +1,5 @@ -import {Map, MapWrapper, ListWrapper} from 'angular2/src/facade/collection'; -import {Type, isPresent, BaseException, stringify, isBlank} from 'angular2/src/facade/lang'; +import {Map, MapWrapper, ListWrapper} from 'angular2/src/core/facade/collection'; +import {Type, isPresent, BaseException, stringify, isBlank} from 'angular2/src/core/facade/lang'; import {ViewMetadata} from '../core/metadata'; import {ViewResolver} from 'angular2/src/core/compiler/view_resolver'; diff --git a/modules/angular2/src/router/async_route_handler.ts b/modules/angular2/src/router/async_route_handler.ts index 40f3e1e2e2..f271d09304 100644 --- a/modules/angular2/src/router/async_route_handler.ts +++ b/modules/angular2/src/router/async_route_handler.ts @@ -1,6 +1,6 @@ import {RouteHandler} from './route_handler'; -import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; -import {isPresent, Type} from 'angular2/src/facade/lang'; +import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async'; +import {isPresent, Type} from 'angular2/src/core/facade/lang'; export class AsyncRouteHandler implements RouteHandler { _resolvedComponent: Promise = null; diff --git a/modules/angular2/src/router/hash_location_strategy.ts b/modules/angular2/src/router/hash_location_strategy.ts index 963f109f67..364d9f6d20 100644 --- a/modules/angular2/src/router/hash_location_strategy.ts +++ b/modules/angular2/src/router/hash_location_strategy.ts @@ -1,7 +1,7 @@ -import {DOM} from 'angular2/src/dom/dom_adapter'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; import {Injectable} from 'angular2/di'; import {LocationStrategy} from './location_strategy'; -import {EventListener, History, Location} from 'angular2/src/facade/browser'; +import {EventListener, History, Location} from 'angular2/src/core/facade/browser'; @Injectable() export class HashLocationStrategy extends LocationStrategy { diff --git a/modules/angular2/src/router/instruction.ts b/modules/angular2/src/router/instruction.ts index db8b85508f..a2a6525c5b 100644 --- a/modules/angular2/src/router/instruction.ts +++ b/modules/angular2/src/router/instruction.ts @@ -5,9 +5,9 @@ import { StringMapWrapper, List, ListWrapper -} from 'angular2/src/facade/collection'; -import {isPresent, isBlank, normalizeBlank, Type} from 'angular2/src/facade/lang'; -import {Promise} from 'angular2/src/facade/async'; +} from 'angular2/src/core/facade/collection'; +import {isPresent, isBlank, normalizeBlank, Type} from 'angular2/src/core/facade/lang'; +import {Promise} from 'angular2/src/core/facade/async'; import {PathRecognizer} from './path_recognizer'; import {Url} from './url_parser'; diff --git a/modules/angular2/src/router/interfaces.ts b/modules/angular2/src/router/interfaces.ts index 88edd16d8b..acb91c256f 100644 --- a/modules/angular2/src/router/interfaces.ts +++ b/modules/angular2/src/router/interfaces.ts @@ -1,5 +1,5 @@ import {ComponentInstruction} from './instruction'; -import {global} from 'angular2/src/facade/lang'; +import {global} from 'angular2/src/core/facade/lang'; // This is here only so that after TS transpilation the file is not empty. // TODO(rado): find a better way to fix this, or remove if likely culprit diff --git a/modules/angular2/src/router/lifecycle_annotations.ts b/modules/angular2/src/router/lifecycle_annotations.ts index bc00745cbc..0abbd95d69 100644 --- a/modules/angular2/src/router/lifecycle_annotations.ts +++ b/modules/angular2/src/router/lifecycle_annotations.ts @@ -3,9 +3,9 @@ * to be used by the decorator versions of these annotations. */ -import {makeDecorator} from 'angular2/src/util/decorators'; +import {makeDecorator} from 'angular2/src/core/util/decorators'; import {CanActivate as CanActivateAnnotation} from './lifecycle_annotations_impl'; -import {Promise} from 'angular2/src/facade/async'; +import {Promise} from 'angular2/src/core/facade/async'; import {ComponentInstruction} from 'angular2/src/router/instruction'; export { diff --git a/modules/angular2/src/router/lifecycle_annotations_impl.ts b/modules/angular2/src/router/lifecycle_annotations_impl.ts index db3367bc8b..357f22c7f1 100644 --- a/modules/angular2/src/router/lifecycle_annotations_impl.ts +++ b/modules/angular2/src/router/lifecycle_annotations_impl.ts @@ -1,4 +1,4 @@ -import {CONST, CONST_EXPR} from 'angular2/src/facade/lang'; +import {CONST, CONST_EXPR} from 'angular2/src/core/facade/lang'; @CONST() export class RouteLifecycleHook { diff --git a/modules/angular2/src/router/location.ts b/modules/angular2/src/router/location.ts index 9432b88149..cd383bf5ef 100644 --- a/modules/angular2/src/router/location.ts +++ b/modules/angular2/src/router/location.ts @@ -1,7 +1,7 @@ import {LocationStrategy} from './location_strategy'; -import {StringWrapper, isPresent, CONST_EXPR} from 'angular2/src/facade/lang'; -import {EventEmitter, ObservableWrapper} from 'angular2/src/facade/async'; -import {BaseException, isBlank} from 'angular2/src/facade/lang'; +import {StringWrapper, isPresent, CONST_EXPR} from 'angular2/src/core/facade/lang'; +import {EventEmitter, ObservableWrapper} from 'angular2/src/core/facade/async'; +import {BaseException, isBlank} from 'angular2/src/core/facade/lang'; import {OpaqueToken, Injectable, Optional, Inject} from 'angular2/di'; export const APP_BASE_HREF: OpaqueToken = CONST_EXPR(new OpaqueToken('appBaseHref')); diff --git a/modules/angular2/src/router/location_strategy.ts b/modules/angular2/src/router/location_strategy.ts index ec008ee85b..0ae386641d 100644 --- a/modules/angular2/src/router/location_strategy.ts +++ b/modules/angular2/src/router/location_strategy.ts @@ -1,4 +1,4 @@ -import {BaseException} from 'angular2/src/facade/lang'; +import {BaseException} from 'angular2/src/core/facade/lang'; function _abstract() { return new BaseException('This method is abstract'); diff --git a/modules/angular2/src/router/path_location_strategy.ts b/modules/angular2/src/router/path_location_strategy.ts index a3325a425e..5f0506d082 100644 --- a/modules/angular2/src/router/path_location_strategy.ts +++ b/modules/angular2/src/router/path_location_strategy.ts @@ -1,6 +1,6 @@ -import {DOM} from 'angular2/src/dom/dom_adapter'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; import {Injectable} from 'angular2/di'; -import {EventListener, History, Location} from 'angular2/src/facade/browser'; +import {EventListener, History, Location} from 'angular2/src/core/facade/browser'; import {LocationStrategy} from './location_strategy'; @Injectable() diff --git a/modules/angular2/src/router/path_recognizer.ts b/modules/angular2/src/router/path_recognizer.ts index 269dece17c..2e3550ab27 100644 --- a/modules/angular2/src/router/path_recognizer.ts +++ b/modules/angular2/src/router/path_recognizer.ts @@ -6,7 +6,7 @@ import { isPresent, isBlank, BaseException -} from 'angular2/src/facade/lang'; +} from 'angular2/src/core/facade/lang'; import { Map, MapWrapper, @@ -14,8 +14,8 @@ import { StringMapWrapper, List, ListWrapper -} from 'angular2/src/facade/collection'; -import {IMPLEMENTS} from 'angular2/src/facade/lang'; +} from 'angular2/src/core/facade/collection'; +import {IMPLEMENTS} from 'angular2/src/core/facade/lang'; import {RouteHandler} from './route_handler'; import {Url, RootUrl, serializeParams} from './url_parser'; diff --git a/modules/angular2/src/router/pipeline.ts b/modules/angular2/src/router/pipeline.ts index ec0579cc4e..28c3f88596 100644 --- a/modules/angular2/src/router/pipeline.ts +++ b/modules/angular2/src/router/pipeline.ts @@ -1,5 +1,5 @@ -import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; -import {List, ListWrapper} from 'angular2/src/facade/collection'; +import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async'; +import {List, ListWrapper} from 'angular2/src/core/facade/collection'; import {Instruction} from './instruction'; import {Injectable} from 'angular2/di'; diff --git a/modules/angular2/src/router/route_config_decorator.ts b/modules/angular2/src/router/route_config_decorator.ts index ba518e6b7d..6d5a833498 100644 --- a/modules/angular2/src/router/route_config_decorator.ts +++ b/modules/angular2/src/router/route_config_decorator.ts @@ -1,6 +1,6 @@ import {RouteConfig as RouteConfigAnnotation, RouteDefinition} from './route_config_impl'; -import {makeDecorator} from 'angular2/src/util/decorators'; -import {List} from 'angular2/src/facade/collection'; +import {makeDecorator} from 'angular2/src/core/util/decorators'; +import {List} from 'angular2/src/core/facade/collection'; export {Route, Redirect, AuxRoute, AsyncRoute, RouteDefinition} from './route_config_impl'; export var RouteConfig: (configs: List) => ClassDecorator = diff --git a/modules/angular2/src/router/route_config_impl.ts b/modules/angular2/src/router/route_config_impl.ts index d4d2548b34..b828a0052d 100644 --- a/modules/angular2/src/router/route_config_impl.ts +++ b/modules/angular2/src/router/route_config_impl.ts @@ -1,5 +1,5 @@ -import {CONST, Type} from 'angular2/src/facade/lang'; -import {List} from 'angular2/src/facade/collection'; +import {CONST, Type} from 'angular2/src/core/facade/lang'; +import {List} from 'angular2/src/core/facade/collection'; import {RouteDefinition} from './route_definition'; export {RouteDefinition} from './route_definition'; diff --git a/modules/angular2/src/router/route_config_nomalizer.ts b/modules/angular2/src/router/route_config_nomalizer.ts index f809987649..872e4399ec 100644 --- a/modules/angular2/src/router/route_config_nomalizer.ts +++ b/modules/angular2/src/router/route_config_nomalizer.ts @@ -1,6 +1,6 @@ import {AsyncRoute, AuxRoute, Route, Redirect, RouteDefinition} from './route_config_decorator'; import {ComponentDefinition} from './route_definition'; -import {Type, BaseException} from 'angular2/src/facade/lang'; +import {Type, BaseException} from 'angular2/src/core/facade/lang'; /** * Given a JS Object that represents... returns a corresponding Route, AsyncRoute, or Redirect diff --git a/modules/angular2/src/router/route_data.ts b/modules/angular2/src/router/route_data.ts index f7cba6aa02..e2674efdbe 100644 --- a/modules/angular2/src/router/route_data.ts +++ b/modules/angular2/src/router/route_data.ts @@ -1,4 +1,4 @@ import {OpaqueToken} from 'angular2/di'; -import {CONST_EXPR} from 'angular2/src/facade/lang'; +import {CONST_EXPR} from 'angular2/src/core/facade/lang'; export const ROUTE_DATA: OpaqueToken = CONST_EXPR(new OpaqueToken('routeData')); diff --git a/modules/angular2/src/router/route_definition.ts b/modules/angular2/src/router/route_definition.ts index c6f90aae36..64eb705c45 100644 --- a/modules/angular2/src/router/route_definition.ts +++ b/modules/angular2/src/router/route_definition.ts @@ -1,4 +1,4 @@ -import {CONST, Type} from 'angular2/src/facade/lang'; +import {CONST, Type} from 'angular2/src/core/facade/lang'; export interface RouteDefinition { path: string; diff --git a/modules/angular2/src/router/route_handler.ts b/modules/angular2/src/router/route_handler.ts index 97c862f56a..9ce1d974b8 100644 --- a/modules/angular2/src/router/route_handler.ts +++ b/modules/angular2/src/router/route_handler.ts @@ -1,5 +1,5 @@ -import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; -import {Type} from 'angular2/src/facade/lang'; +import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async'; +import {Type} from 'angular2/src/core/facade/lang'; export interface RouteHandler { componentType: Type; diff --git a/modules/angular2/src/router/route_lifecycle_reflector.dart b/modules/angular2/src/router/route_lifecycle_reflector.dart index 94559474be..afc3362d06 100644 --- a/modules/angular2/src/router/route_lifecycle_reflector.dart +++ b/modules/angular2/src/router/route_lifecycle_reflector.dart @@ -2,7 +2,7 @@ library angular.router.route_lifecycle_reflector; import 'package:angular2/src/router/lifecycle_annotations_impl.dart'; import 'package:angular2/src/router/interfaces.dart'; -import 'package:angular2/src/reflection/reflection.dart'; +import 'package:angular2/src/core/reflection/reflection.dart'; bool hasLifecycleHook(RouteLifecycleHook e, type) { if (type is! Type) return false; diff --git a/modules/angular2/src/router/route_lifecycle_reflector.ts b/modules/angular2/src/router/route_lifecycle_reflector.ts index 418b696e51..767c9454cb 100644 --- a/modules/angular2/src/router/route_lifecycle_reflector.ts +++ b/modules/angular2/src/router/route_lifecycle_reflector.ts @@ -1,6 +1,6 @@ -import {Type, isPresent} from 'angular2/src/facade/lang'; +import {Type, isPresent} from 'angular2/src/core/facade/lang'; import {RouteLifecycleHook, CanActivate} from './lifecycle_annotations_impl'; -import {reflector} from 'angular2/src/reflection/reflection'; +import {reflector} from 'angular2/src/core/reflection/reflection'; export function hasLifecycleHook(e: RouteLifecycleHook, type): boolean { if (!(type instanceof Type)) return false; diff --git a/modules/angular2/src/router/route_recognizer.ts b/modules/angular2/src/router/route_recognizer.ts index 9046921e4a..b97ed4d3ec 100644 --- a/modules/angular2/src/router/route_recognizer.ts +++ b/modules/angular2/src/router/route_recognizer.ts @@ -8,7 +8,7 @@ import { isStringMap, BaseException, Type -} from 'angular2/src/facade/lang'; +} from 'angular2/src/core/facade/lang'; import { Map, MapWrapper, @@ -16,7 +16,7 @@ import { ListWrapper, StringMap, StringMapWrapper -} from 'angular2/src/facade/collection'; +} from 'angular2/src/core/facade/collection'; import {PathRecognizer, PathMatch} from './path_recognizer'; import {Route, AsyncRoute, AuxRoute, Redirect, RouteDefinition} from './route_config_impl'; diff --git a/modules/angular2/src/router/route_registry.ts b/modules/angular2/src/router/route_registry.ts index bc7e3a7f7d..4ff02aa2d6 100644 --- a/modules/angular2/src/router/route_registry.ts +++ b/modules/angular2/src/router/route_registry.ts @@ -8,8 +8,8 @@ import { MapWrapper, StringMap, StringMapWrapper -} from 'angular2/src/facade/collection'; -import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; +} from 'angular2/src/core/facade/collection'; +import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async'; import { isPresent, isBlank, @@ -21,7 +21,7 @@ import { BaseException, Type, getTypeNameForDebugging -} from 'angular2/src/facade/lang'; +} from 'angular2/src/core/facade/lang'; import { RouteConfig, AsyncRoute, @@ -30,7 +30,7 @@ import { Redirect, RouteDefinition } from './route_config_impl'; -import {reflector} from 'angular2/src/reflection/reflection'; +import {reflector} from 'angular2/src/core/reflection/reflection'; import {Injectable} from 'angular2/di'; import {normalizeRouteConfig} from './route_config_nomalizer'; import {parser, Url, pathSegmentsToUrl} from './url_parser'; diff --git a/modules/angular2/src/router/router.ts b/modules/angular2/src/router/router.ts index 8f38824289..b5157e50c1 100644 --- a/modules/angular2/src/router/router.ts +++ b/modules/angular2/src/router/router.ts @@ -1,5 +1,16 @@ -import {Promise, PromiseWrapper, EventEmitter, ObservableWrapper} from 'angular2/src/facade/async'; -import {Map, StringMapWrapper, MapWrapper, List, ListWrapper} from 'angular2/src/facade/collection'; +import { + Promise, + PromiseWrapper, + EventEmitter, + ObservableWrapper +} from 'angular2/src/core/facade/async'; +import { + Map, + StringMapWrapper, + MapWrapper, + List, + ListWrapper +} from 'angular2/src/core/facade/collection'; import { isBlank, isString, @@ -8,7 +19,7 @@ import { Type, isArray, BaseException -} from 'angular2/src/facade/lang'; +} from 'angular2/src/core/facade/lang'; import {RouteRegistry} from './route_registry'; import {Pipeline} from './pipeline'; diff --git a/modules/angular2/src/router/router_link.ts b/modules/angular2/src/router/router_link.ts index f3b41c44b8..b3cae364c1 100644 --- a/modules/angular2/src/router/router_link.ts +++ b/modules/angular2/src/router/router_link.ts @@ -1,5 +1,5 @@ import {Directive} from '../core/metadata'; -import {List, StringMap, StringMapWrapper} from 'angular2/src/facade/collection'; +import {List, StringMap, StringMapWrapper} from 'angular2/src/core/facade/collection'; import {Router} from './router'; import {Location} from './location'; diff --git a/modules/angular2/src/router/router_outlet.ts b/modules/angular2/src/router/router_outlet.ts index 2fa1772cf1..7ea11ed8d4 100644 --- a/modules/angular2/src/router/router_outlet.ts +++ b/modules/angular2/src/router/router_outlet.ts @@ -1,6 +1,6 @@ -import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; -import {StringMapWrapper} from 'angular2/src/facade/collection'; -import {isBlank, isPresent} from 'angular2/src/facade/lang'; +import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async'; +import {StringMapWrapper} from 'angular2/src/core/facade/collection'; +import {isBlank, isPresent} from 'angular2/src/core/facade/lang'; import {Directive, Attribute} from '../core/metadata'; import {DynamicComponentLoader, ComponentRef, ElementRef} from 'angular2/core'; diff --git a/modules/angular2/src/router/sync_route_handler.ts b/modules/angular2/src/router/sync_route_handler.ts index a388657bf3..6b17ffc9c8 100644 --- a/modules/angular2/src/router/sync_route_handler.ts +++ b/modules/angular2/src/router/sync_route_handler.ts @@ -1,6 +1,6 @@ import {RouteHandler} from './route_handler'; -import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; -import {Type} from 'angular2/src/facade/lang'; +import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async'; +import {Type} from 'angular2/src/core/facade/lang'; export class SyncRouteHandler implements RouteHandler { _resolvedComponent: Promise = null; diff --git a/modules/angular2/src/router/url_parser.ts b/modules/angular2/src/router/url_parser.ts index 647d72a8da..f8a39e7fa7 100644 --- a/modules/angular2/src/router/url_parser.ts +++ b/modules/angular2/src/router/url_parser.ts @@ -1,11 +1,11 @@ -import {List, StringMap, StringMapWrapper} from 'angular2/src/facade/collection'; +import {List, StringMap, StringMapWrapper} from 'angular2/src/core/facade/collection'; import { isPresent, isBlank, BaseException, RegExpWrapper, CONST_EXPR -} from 'angular2/src/facade/lang'; +} from 'angular2/src/core/facade/lang'; export class Url { diff --git a/modules/angular2/src/test_lib/benchmark_util.ts b/modules/angular2/src/test_lib/benchmark_util.ts index 80e6ff5648..cb902c3f9d 100644 --- a/modules/angular2/src/test_lib/benchmark_util.ts +++ b/modules/angular2/src/test_lib/benchmark_util.ts @@ -1,6 +1,6 @@ -import {BrowserDomAdapter} from 'angular2/src/dom/browser_adapter'; -import {document, window} from 'angular2/src/facade/browser'; -import {NumberWrapper, BaseException, isBlank} from 'angular2/src/facade/lang'; +import {BrowserDomAdapter} from 'angular2/src/core/dom/browser_adapter'; +import {document, window} from 'angular2/src/core/facade/browser'; +import {NumberWrapper, BaseException, isBlank} from 'angular2/src/core/facade/lang'; var DOM = new BrowserDomAdapter(); diff --git a/modules/angular2/src/test_lib/fake_async.dart b/modules/angular2/src/test_lib/fake_async.dart index d4ca5d042f..facb963baf 100644 --- a/modules/angular2/src/test_lib/fake_async.dart +++ b/modules/angular2/src/test_lib/fake_async.dart @@ -2,7 +2,7 @@ library test_lib.fake_async; import 'dart:async' show runZoned, ZoneSpecification; import 'package:quiver/testing/async.dart' as quiver; -import 'package:angular2/src/facade/lang.dart' show BaseException; +import 'package:angular2/src/core/facade/lang.dart' show BaseException; const _u = const Object(); diff --git a/modules/angular2/src/test_lib/fake_async.ts b/modules/angular2/src/test_lib/fake_async.ts index 4c9a9870ed..c19b6e3d38 100644 --- a/modules/angular2/src/test_lib/fake_async.ts +++ b/modules/angular2/src/test_lib/fake_async.ts @@ -1,7 +1,7 @@ /// -import {BaseException, global} from 'angular2/src/facade/lang'; -import {ListWrapper} from 'angular2/src/facade/collection'; +import {BaseException, global} from 'angular2/src/core/facade/lang'; +import {ListWrapper} from 'angular2/src/core/facade/collection'; import {NgZoneZone} from 'angular2/src/core/zone/ng_zone'; var _scheduler; diff --git a/modules/angular2/src/test_lib/spies.dart b/modules/angular2/src/test_lib/spies.dart index e906e1aed3..9769c93ef8 100644 --- a/modules/angular2/src/test_lib/spies.dart +++ b/modules/angular2/src/test_lib/spies.dart @@ -1,6 +1,6 @@ library test_lib.spies; -import 'package:angular2/src/change_detection/change_detection.dart'; +import 'package:angular2/src/core/change_detection/change_detection.dart'; import 'package:angular2/di.dart'; import './test_lib.dart'; diff --git a/modules/angular2/src/test_lib/spies.ts b/modules/angular2/src/test_lib/spies.ts index 7343ac2c0c..c1606b5109 100644 --- a/modules/angular2/src/test_lib/spies.ts +++ b/modules/angular2/src/test_lib/spies.ts @@ -3,7 +3,7 @@ import { ChangeDetectorRef, ProtoChangeDetector, DynamicChangeDetector -} from 'angular2/src/change_detection/change_detection'; +} from 'angular2/src/core/change_detection/change_detection'; import {DependencyProvider} from 'angular2/di'; diff --git a/modules/angular2/src/test_lib/test_component_builder.ts b/modules/angular2/src/test_lib/test_component_builder.ts index b016884659..95c4ad2c11 100644 --- a/modules/angular2/src/test_lib/test_component_builder.ts +++ b/modules/angular2/src/test_lib/test_component_builder.ts @@ -1,8 +1,8 @@ import {Injector, bind, Injectable} from 'angular2/di'; -import {Type, isPresent, BaseException, isBlank} from 'angular2/src/facade/lang'; -import {Promise} from 'angular2/src/facade/async'; -import {List, ListWrapper, MapWrapper} from 'angular2/src/facade/collection'; +import {Type, isPresent, BaseException, isBlank} from 'angular2/src/core/facade/lang'; +import {Promise} from 'angular2/src/core/facade/async'; +import {List, ListWrapper, MapWrapper} from 'angular2/src/core/facade/collection'; import {ViewMetadata} from '../core/metadata'; @@ -16,10 +16,10 @@ import { import {el} from './utils'; -import {DOCUMENT} from 'angular2/src/render/render'; -import {DOM} from 'angular2/src/dom/dom_adapter'; +import {DOCUMENT} from 'angular2/src/core/render/render'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; -import {DebugElement} from 'angular2/src/debug/debug_element'; +import {DebugElement} from 'angular2/src/core/debug/debug_element'; export class RootTestComponent extends DebugElement { _componentRef: ComponentRef; diff --git a/modules/angular2/src/test_lib/test_injector.ts b/modules/angular2/src/test_lib/test_injector.ts index 455043d932..f1016062b4 100644 --- a/modules/angular2/src/test_lib/test_injector.ts +++ b/modules/angular2/src/test_lib/test_injector.ts @@ -1,7 +1,7 @@ import {bind, Binding} from 'angular2/di'; import {Compiler, CompilerCache} from 'angular2/src/core/compiler/compiler'; -import {Reflector, reflector} from 'angular2/src/reflection/reflection'; +import {Reflector, reflector} from 'angular2/src/core/reflection/reflection'; import { Parser, Lexer, @@ -11,29 +11,29 @@ import { defaultIterableDiffers, KeyValueDiffers, defaultKeyValueDiffers -} from 'angular2/src/change_detection/change_detection'; +} from 'angular2/src/core/change_detection/change_detection'; import {DEFAULT_PIPES} from 'angular2/pipes'; import {ExceptionHandler} from 'angular2/src/core/exception_handler'; -import {ViewLoader} from 'angular2/src/render/dom/compiler/view_loader'; +import {ViewLoader} from 'angular2/src/core/render/dom/compiler/view_loader'; import {ViewResolver} from 'angular2/src/core/compiler/view_resolver'; import {DirectiveResolver} from 'angular2/src/core/compiler/directive_resolver'; import {PipeResolver} from 'angular2/src/core/compiler/pipe_resolver'; import {DynamicComponentLoader} from 'angular2/src/core/compiler/dynamic_component_loader'; -import {XHR} from 'angular2/src/render/xhr'; +import {XHR} from 'angular2/src/core/render/xhr'; import {ComponentUrlMapper} from 'angular2/src/core/compiler/component_url_mapper'; -import {UrlResolver} from 'angular2/src/services/url_resolver'; -import {AppRootUrl} from 'angular2/src/services/app_root_url'; -import {AnchorBasedAppRootUrl} from 'angular2/src/services/anchor_based_app_root_url'; -import {StyleUrlResolver} from 'angular2/src/render/dom/compiler/style_url_resolver'; -import {StyleInliner} from 'angular2/src/render/dom/compiler/style_inliner'; +import {UrlResolver} from 'angular2/src/core/services/url_resolver'; +import {AppRootUrl} from 'angular2/src/core/services/app_root_url'; +import {AnchorBasedAppRootUrl} from 'angular2/src/core/services/anchor_based_app_root_url'; +import {StyleUrlResolver} from 'angular2/src/core/render/dom/compiler/style_url_resolver'; +import {StyleInliner} from 'angular2/src/core/render/dom/compiler/style_inliner'; import {NgZone} from 'angular2/src/core/zone/ng_zone'; -import {DOM} from 'angular2/src/dom/dom_adapter'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; -import {EventManager, DomEventsPlugin} from 'angular2/src/render/dom/events/event_manager'; +import {EventManager, DomEventsPlugin} from 'angular2/src/core/render/dom/events/event_manager'; import {MockViewResolver} from 'angular2/src/mock/view_resolver_mock'; -import {MockXHR} from 'angular2/src/render/xhr_mock'; +import {MockXHR} from 'angular2/src/core/render/xhr_mock'; import {MockLocationStrategy} from 'angular2/src/mock/mock_location_strategy'; import {LocationStrategy} from 'angular2/src/router/location_strategy'; import {MockNgZone} from 'angular2/src/mock/ng_zone_mock'; @@ -42,15 +42,15 @@ import {TestComponentBuilder} from './test_component_builder'; import {Injector} from 'angular2/di'; -import {List, ListWrapper} from 'angular2/src/facade/collection'; -import {FunctionWrapper, Type} from 'angular2/src/facade/lang'; +import {List, ListWrapper} from 'angular2/src/core/facade/collection'; +import {FunctionWrapper, Type} from 'angular2/src/core/facade/lang'; import {AppViewPool, APP_VIEW_POOL_CAPACITY} from 'angular2/src/core/compiler/view_pool'; import {AppViewManager} from 'angular2/src/core/compiler/view_manager'; import {AppViewManagerUtils} from 'angular2/src/core/compiler/view_manager_utils'; import {ELEMENT_PROBE_BINDINGS} from 'angular2/debug'; import {ProtoViewFactory} from 'angular2/src/core/compiler/proto_view_factory'; -import {RenderCompiler, Renderer} from 'angular2/src/render/api'; +import {RenderCompiler, Renderer} from 'angular2/src/core/render/api'; import { DomRenderer, DOCUMENT, @@ -60,9 +60,11 @@ import { DomSharedStylesHost, MAX_IN_MEMORY_ELEMENTS_PER_TEMPLATE, TemplateCloner -} from 'angular2/src/render/render'; -import {ElementSchemaRegistry} from 'angular2/src/render/dom/schema/element_schema_registry'; -import {DomElementSchemaRegistry} from 'angular2/src/render/dom/schema/dom_element_schema_registry'; +} from 'angular2/src/core/render/render'; +import {ElementSchemaRegistry} from 'angular2/src/core/render/dom/schema/element_schema_registry'; +import { + DomElementSchemaRegistry +} from 'angular2/src/core/render/dom/schema/dom_element_schema_registry'; import {Serializer} from "angular2/src/web_workers/shared/serializer"; import {Log} from './utils'; diff --git a/modules/angular2/src/test_lib/test_lib.dart b/modules/angular2/src/test_lib/test_lib.dart index 13fbf2267a..e48becf8ee 100644 --- a/modules/angular2/src/test_lib/test_lib.dart +++ b/modules/angular2/src/test_lib/test_lib.dart @@ -15,15 +15,15 @@ export 'package:guinness/guinness.dart' SpyObject, SpyFunction; -import 'package:angular2/src/dom/dom_adapter.dart' show DOM; +import 'package:angular2/src/core/dom/dom_adapter.dart' show DOM; -import 'package:angular2/src/reflection/reflection.dart'; -import 'package:angular2/src/reflection/reflection_capabilities.dart'; +import 'package:angular2/src/core/reflection/reflection.dart'; +import 'package:angular2/src/core/reflection/reflection_capabilities.dart'; -import 'package:angular2/src/di/binding.dart' show bind; -import 'package:angular2/src/di/injector.dart' show Injector; +import 'package:angular2/src/core/di/binding.dart' show bind; +import 'package:angular2/src/core/di/injector.dart' show Injector; import 'package:angular2/src/core/exception_handler.dart' show ExceptionHandler; -import 'package:angular2/src/facade/collection.dart' show StringMapWrapper; +import 'package:angular2/src/core/facade/collection.dart' show StringMapWrapper; import 'test_injector.dart'; export 'test_injector.dart' show inject; diff --git a/modules/angular2/src/test_lib/test_lib.ts b/modules/angular2/src/test_lib/test_lib.ts index 8ec2dbaed5..0bdde39112 100644 --- a/modules/angular2/src/test_lib/test_lib.ts +++ b/modules/angular2/src/test_lib/test_lib.ts @@ -1,8 +1,8 @@ /// -import {DOM} from 'angular2/src/dom/dom_adapter'; -import {StringMapWrapper} from 'angular2/src/facade/collection'; -import {global} from 'angular2/src/facade/lang'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {StringMapWrapper} from 'angular2/src/core/facade/collection'; +import {global} from 'angular2/src/core/facade/lang'; import {NgZoneZone} from 'angular2/src/core/zone/ng_zone'; import {bind} from 'angular2/di'; diff --git a/modules/angular2/src/test_lib/utils.ts b/modules/angular2/src/test_lib/utils.ts index f300155c35..f7a7f9da7b 100644 --- a/modules/angular2/src/test_lib/utils.ts +++ b/modules/angular2/src/test_lib/utils.ts @@ -1,6 +1,12 @@ -import {List, ListWrapper, MapWrapper} from 'angular2/src/facade/collection'; -import {DOM} from 'angular2/src/dom/dom_adapter'; -import {isPresent, isString, RegExpWrapper, StringWrapper, RegExp} from 'angular2/src/facade/lang'; +import {List, ListWrapper, MapWrapper} from 'angular2/src/core/facade/collection'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import { + isPresent, + isString, + RegExpWrapper, + StringWrapper, + RegExp +} from 'angular2/src/core/facade/lang'; export class Log { _result: List; diff --git a/modules/angular2/src/web_workers/shared/api.ts b/modules/angular2/src/web_workers/shared/api.ts index 54b619e8ca..33dc657f35 100644 --- a/modules/angular2/src/web_workers/shared/api.ts +++ b/modules/angular2/src/web_workers/shared/api.ts @@ -1,6 +1,6 @@ -import {CONST_EXPR} from "angular2/src/facade/lang"; +import {CONST_EXPR} from "angular2/src/core/facade/lang"; import {OpaqueToken} from "angular2/di"; -import {RenderElementRef, RenderViewRef} from "angular2/src/render/api"; +import {RenderElementRef, RenderViewRef} from "angular2/src/core/render/api"; export const ON_WEB_WORKER = CONST_EXPR(new OpaqueToken('WebWorker.onWebWorker')); diff --git a/modules/angular2/src/web_workers/shared/client_message_broker.ts b/modules/angular2/src/web_workers/shared/client_message_broker.ts index 3d98f388cb..9813fd3e2a 100644 --- a/modules/angular2/src/web_workers/shared/client_message_broker.ts +++ b/modules/angular2/src/web_workers/shared/client_message_broker.ts @@ -1,17 +1,17 @@ /// import {MessageBus} from "angular2/src/web_workers/shared/message_bus"; -import {print, isPresent, DateWrapper, stringify} from "../../facade/lang"; +import {print, isPresent, DateWrapper, stringify} from "angular2/src/core/facade/lang"; import { Promise, PromiseCompleter, PromiseWrapper, ObservableWrapper, EventEmitter -} from "angular2/src/facade/async"; -import {ListWrapper, StringMapWrapper, MapWrapper} from "../../facade/collection"; +} from "angular2/src/core/facade/async"; +import {ListWrapper, StringMapWrapper, MapWrapper} from "angular2/src/core/facade/collection"; import {Serializer} from "angular2/src/web_workers/shared/serializer"; import {Injectable} from "angular2/di"; -import {Type} from "angular2/src/facade/lang"; +import {Type} from "angular2/src/core/facade/lang"; @Injectable() export class ClientMessageBrokerFactory { diff --git a/modules/angular2/src/web_workers/shared/isolate_message_bus.dart b/modules/angular2/src/web_workers/shared/isolate_message_bus.dart index d268dce41c..87325f8c37 100644 --- a/modules/angular2/src/web_workers/shared/isolate_message_bus.dart +++ b/modules/angular2/src/web_workers/shared/isolate_message_bus.dart @@ -5,7 +5,7 @@ import 'dart:async'; import 'dart:core'; import 'package:angular2/src/web_workers/shared/message_bus.dart' show MessageBus, MessageBusSink, MessageBusSource; -import 'package:angular2/src/facade/async.dart'; +import 'package:angular2/src/core/facade/async.dart'; class IsolateMessageBus implements MessageBus { final IsolateMessageBusSink sink; diff --git a/modules/angular2/src/web_workers/shared/message_bus.ts b/modules/angular2/src/web_workers/shared/message_bus.ts index 9192fa5735..b9073e57c2 100644 --- a/modules/angular2/src/web_workers/shared/message_bus.ts +++ b/modules/angular2/src/web_workers/shared/message_bus.ts @@ -1,5 +1,5 @@ -import {EventEmitter} from 'angular2/src/facade/async'; -import {BaseException} from 'angular2/src/facade/lang'; +import {EventEmitter} from 'angular2/src/core/facade/async'; +import {BaseException} from 'angular2/src/core/facade/lang'; function _abstract() { throw new BaseException("This method is abstract"); diff --git a/modules/angular2/src/web_workers/shared/post_message_bus.ts b/modules/angular2/src/web_workers/shared/post_message_bus.ts index 0a230dec13..a84a7c6b00 100644 --- a/modules/angular2/src/web_workers/shared/post_message_bus.ts +++ b/modules/angular2/src/web_workers/shared/post_message_bus.ts @@ -3,8 +3,8 @@ import { MessageBusSource, MessageBusSink } from "angular2/src/web_workers/shared/message_bus"; -import {EventEmitter} from 'angular2/src/facade/async'; -import {StringMap, StringMapWrapper} from 'angular2/src/facade/collection'; +import {EventEmitter} from 'angular2/src/core/facade/async'; +import {StringMap, StringMapWrapper} from 'angular2/src/core/facade/collection'; import {Injectable} from "angular2/di"; /** diff --git a/modules/angular2/src/web_workers/shared/render_proto_view_ref_store.ts b/modules/angular2/src/web_workers/shared/render_proto_view_ref_store.ts index 26f035c920..880ed9b633 100644 --- a/modules/angular2/src/web_workers/shared/render_proto_view_ref_store.ts +++ b/modules/angular2/src/web_workers/shared/render_proto_view_ref_store.ts @@ -1,5 +1,5 @@ import {Injectable, Inject} from "angular2/di"; -import {RenderProtoViewRef} from "angular2/src/render/api"; +import {RenderProtoViewRef} from "angular2/src/core/render/api"; import {ON_WEB_WORKER} from "angular2/src/web_workers/shared/api"; @Injectable() diff --git a/modules/angular2/src/web_workers/shared/render_view_with_fragments_store.ts b/modules/angular2/src/web_workers/shared/render_view_with_fragments_store.ts index 568b124f0f..7435c4b51f 100644 --- a/modules/angular2/src/web_workers/shared/render_view_with_fragments_store.ts +++ b/modules/angular2/src/web_workers/shared/render_view_with_fragments_store.ts @@ -1,7 +1,11 @@ import {Injectable, Inject} from "angular2/di"; -import {RenderViewRef, RenderFragmentRef, RenderViewWithFragments} from "angular2/src/render/api"; +import { + RenderViewRef, + RenderFragmentRef, + RenderViewWithFragments +} from "angular2/src/core/render/api"; import {ON_WEB_WORKER} from "angular2/src/web_workers/shared/api"; -import {List, ListWrapper} from "angular2/src/facade/collection"; +import {List, ListWrapper} from "angular2/src/core/facade/collection"; @Injectable() export class RenderViewWithFragmentsStore { diff --git a/modules/angular2/src/web_workers/shared/serializer.ts b/modules/angular2/src/web_workers/shared/serializer.ts index 499cb00fc1..f2f1669a47 100644 --- a/modules/angular2/src/web_workers/shared/serializer.ts +++ b/modules/angular2/src/web_workers/shared/serializer.ts @@ -5,7 +5,7 @@ import { serializeEnum, deserializeEnum, BaseException -} from "angular2/src/facade/lang"; +} from "angular2/src/core/facade/lang"; import { List, ListWrapper, @@ -13,7 +13,7 @@ import { StringMap, StringMapWrapper, MapWrapper -} from "angular2/src/facade/collection"; +} from "angular2/src/core/facade/collection"; import { ProtoViewDto, RenderDirectiveMetadata, @@ -30,10 +30,10 @@ import { ViewType, ViewEncapsulation, PropertyBindingType -} from "angular2/src/render/api"; +} from "angular2/src/core/render/api"; import {WebWorkerElementRef} from 'angular2/src/web_workers/shared/api'; -import {AST, ASTWithSource} from 'angular2/src/change_detection/change_detection'; -import {Parser} from "angular2/src/change_detection/parser/parser"; +import {AST, ASTWithSource} from 'angular2/src/core/change_detection/change_detection'; +import {Parser} from "angular2/src/core/change_detection/parser/parser"; import {Injectable} from "angular2/di"; import {RenderProtoViewRefStore} from 'angular2/src/web_workers/shared/render_proto_view_ref_store'; import { diff --git a/modules/angular2/src/web_workers/shared/service_message_broker.ts b/modules/angular2/src/web_workers/shared/service_message_broker.ts index 6cb60ff4bb..a9472d8b12 100644 --- a/modules/angular2/src/web_workers/shared/service_message_broker.ts +++ b/modules/angular2/src/web_workers/shared/service_message_broker.ts @@ -1,9 +1,14 @@ import {Injectable} from 'angular2/di'; -import {ListWrapper, Map, MapWrapper} from 'angular2/src/facade/collection'; +import {ListWrapper, Map, MapWrapper} from 'angular2/src/core/facade/collection'; import {Serializer} from "angular2/src/web_workers/shared/serializer"; -import {isPresent, Type, FunctionWrapper} from "angular2/src/facade/lang"; +import {isPresent, Type, FunctionWrapper} from "angular2/src/core/facade/lang"; import {MessageBus} from "angular2/src/web_workers/shared/message_bus"; -import {EventEmitter, Promise, PromiseWrapper, ObservableWrapper} from 'angular2/src/facade/async'; +import { + EventEmitter, + Promise, + PromiseWrapper, + ObservableWrapper +} from 'angular2/src/core/facade/async'; @Injectable() export class ServiceMessageBrokerFactory { diff --git a/modules/angular2/src/web_workers/ui/application.ts b/modules/angular2/src/web_workers/ui/application.ts index 18947746e8..a0b51bd1be 100644 --- a/modules/angular2/src/web_workers/ui/application.ts +++ b/modules/angular2/src/web_workers/ui/application.ts @@ -4,7 +4,7 @@ import { PostMessageBusSource } from 'angular2/src/web_workers/shared/post_message_bus'; import {MessageBus} from 'angular2/src/web_workers/shared/message_bus'; -import {BaseException} from "angular2/src/facade/lang"; +import {BaseException} from "angular2/src/core/facade/lang"; import {bootstrapUICommon} from "angular2/src/web_workers/ui/impl"; /** diff --git a/modules/angular2/src/web_workers/ui/di_bindings.ts b/modules/angular2/src/web_workers/ui/di_bindings.ts index 75ed23b11f..4e15252c8e 100644 --- a/modules/angular2/src/web_workers/ui/di_bindings.ts +++ b/modules/angular2/src/web_workers/ui/di_bindings.ts @@ -1,8 +1,8 @@ // TODO (jteplitz602): This whole file is nearly identical to core/application.ts. // There should be a way to refactor application so that this file is unnecessary. See #3277 import {Injector, bind, Binding} from "angular2/di"; -import {Reflector, reflector} from 'angular2/src/reflection/reflection'; -import {List, ListWrapper} from 'angular2/src/facade/collection'; +import {Reflector, reflector} from 'angular2/src/core/reflection/reflection'; +import {List, ListWrapper} from 'angular2/src/core/facade/collection'; import { Parser, Lexer, @@ -10,16 +10,16 @@ import { DynamicChangeDetection, JitChangeDetection, PreGeneratedChangeDetection -} from 'angular2/src/change_detection/change_detection'; +} from 'angular2/src/core/change_detection/change_detection'; import {DEFAULT_PIPES} from 'angular2/pipes'; -import {EventManager, DomEventsPlugin} from 'angular2/src/render/dom/events/event_manager'; +import {EventManager, DomEventsPlugin} from 'angular2/src/core/render/dom/events/event_manager'; import {Compiler, CompilerCache} from 'angular2/src/core/compiler/compiler'; -import {BrowserDomAdapter} from 'angular2/src/dom/browser_adapter'; -import {KeyEventsPlugin} from 'angular2/src/render/dom/events/key_events'; -import {HammerGesturesPlugin} from 'angular2/src/render/dom/events/hammer_gestures'; +import {BrowserDomAdapter} from 'angular2/src/core/dom/browser_adapter'; +import {KeyEventsPlugin} from 'angular2/src/core/render/dom/events/key_events'; +import {HammerGesturesPlugin} from 'angular2/src/core/render/dom/events/hammer_gestures'; import {AppViewPool, APP_VIEW_POOL_CAPACITY} from 'angular2/src/core/compiler/view_pool'; -import {Renderer, RenderCompiler} from 'angular2/src/render/api'; -import {AppRootUrl} from 'angular2/src/services/app_root_url'; +import {Renderer, RenderCompiler} from 'angular2/src/core/render/api'; +import {AppRootUrl} from 'angular2/src/core/services/app_root_url'; import { DomRenderer, DOCUMENT, @@ -27,38 +27,40 @@ import { APP_ID_RANDOM_BINDING, MAX_IN_MEMORY_ELEMENTS_PER_TEMPLATE, TemplateCloner -} from 'angular2/src/render/render'; -import {ElementSchemaRegistry} from 'angular2/src/render/dom/schema/element_schema_registry'; -import {DomElementSchemaRegistry} from 'angular2/src/render/dom/schema/dom_element_schema_registry'; +} from 'angular2/src/core/render/render'; +import {ElementSchemaRegistry} from 'angular2/src/core/render/dom/schema/element_schema_registry'; +import { + DomElementSchemaRegistry +} from 'angular2/src/core/render/dom/schema/dom_element_schema_registry'; import { SharedStylesHost, DomSharedStylesHost -} from 'angular2/src/render/dom/view/shared_styles_host'; -import {DOM} from 'angular2/src/dom/dom_adapter'; +} from 'angular2/src/core/render/dom/view/shared_styles_host'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; import {NgZone} from 'angular2/src/core/zone/ng_zone'; import {AppViewManager} from 'angular2/src/core/compiler/view_manager'; import {AppViewManagerUtils} from 'angular2/src/core/compiler/view_manager_utils'; import {AppViewListener} from 'angular2/src/core/compiler/view_listener'; import {ProtoViewFactory} from 'angular2/src/core/compiler/proto_view_factory'; import {ViewResolver} from 'angular2/src/core/compiler/view_resolver'; -import {ViewLoader} from 'angular2/src/render/dom/compiler/view_loader'; +import {ViewLoader} from 'angular2/src/core/render/dom/compiler/view_loader'; import {DirectiveResolver} from 'angular2/src/core/compiler/directive_resolver'; import {ExceptionHandler} from 'angular2/src/core/exception_handler'; import {ComponentUrlMapper} from 'angular2/src/core/compiler/component_url_mapper'; -import {StyleInliner} from 'angular2/src/render/dom/compiler/style_inliner'; +import {StyleInliner} from 'angular2/src/core/render/dom/compiler/style_inliner'; import {DynamicComponentLoader} from 'angular2/src/core/compiler/dynamic_component_loader'; -import {StyleUrlResolver} from 'angular2/src/render/dom/compiler/style_url_resolver'; -import {UrlResolver} from 'angular2/src/services/url_resolver'; +import {StyleUrlResolver} from 'angular2/src/core/render/dom/compiler/style_url_resolver'; +import {UrlResolver} from 'angular2/src/core/services/url_resolver'; import {Testability} from 'angular2/src/core/testability/testability'; -import {XHR} from 'angular2/src/render/xhr'; -import {XHRImpl} from 'angular2/src/render/xhr_impl'; +import {XHR} from 'angular2/src/core/render/xhr'; +import {XHRImpl} from 'angular2/src/core/render/xhr_impl'; import {Serializer} from 'angular2/src/web_workers/shared/serializer'; import {ON_WEB_WORKER} from 'angular2/src/web_workers/shared/api'; import {RenderProtoViewRefStore} from 'angular2/src/web_workers/shared/render_proto_view_ref_store'; import { RenderViewWithFragmentsStore } from 'angular2/src/web_workers/shared/render_view_with_fragments_store'; -import {AnchorBasedAppRootUrl} from 'angular2/src/services/anchor_based_app_root_url'; +import {AnchorBasedAppRootUrl} from 'angular2/src/core/services/anchor_based_app_root_url'; import {WebWorkerMain} from 'angular2/src/web_workers/ui/impl'; import {MessageBus} from 'angular2/src/web_workers/shared/message_bus'; import {MessageBasedRenderCompiler} from 'angular2/src/web_workers/ui/render_compiler'; diff --git a/modules/angular2/src/web_workers/ui/event_dispatcher.ts b/modules/angular2/src/web_workers/ui/event_dispatcher.ts index e79fe60550..b6588ff668 100644 --- a/modules/angular2/src/web_workers/ui/event_dispatcher.ts +++ b/modules/angular2/src/web_workers/ui/event_dispatcher.ts @@ -1,7 +1,7 @@ import { RenderViewRef, RenderEventDispatcher, -} from 'angular2/src/render/api'; +} from 'angular2/src/core/render/api'; import {Serializer} from 'angular2/src/web_workers/shared/serializer'; import { serializeMouseEvent, @@ -9,9 +9,9 @@ import { serializeGenericEvent, serializeEventWithTarget } from 'angular2/src/web_workers/ui/event_serializer'; -import {BaseException} from "angular2/src/facade/lang"; -import {StringMapWrapper} from 'angular2/src/facade/collection'; -import {EventEmitter, ObservableWrapper} from 'angular2/src/facade/async'; +import {BaseException} from "angular2/src/core/facade/lang"; +import {StringMapWrapper} from 'angular2/src/core/facade/collection'; +import {EventEmitter, ObservableWrapper} from 'angular2/src/core/facade/async'; export class EventDispatcher implements RenderEventDispatcher { constructor(private _viewRef: RenderViewRef, private _sink: EventEmitter, diff --git a/modules/angular2/src/web_workers/ui/event_serializer.dart b/modules/angular2/src/web_workers/ui/event_serializer.dart index 2c4d06ef7f..6c10df0341 100644 --- a/modules/angular2/src/web_workers/ui/event_serializer.dart +++ b/modules/angular2/src/web_workers/ui/event_serializer.dart @@ -1,6 +1,6 @@ library angular2.src.web_workers.event_serializer; -import 'package:angular2/src/facade/collection.dart'; +import 'package:angular2/src/core/facade/collection.dart'; // TODO(jteplitz602): Remove Mirrors from serialization #3348 @MirrorsUsed( symbols: "altKey, bubbles, button, cancelable, client, ctrlKey, " + diff --git a/modules/angular2/src/web_workers/ui/event_serializer.ts b/modules/angular2/src/web_workers/ui/event_serializer.ts index 8be40065c3..7d22567a94 100644 --- a/modules/angular2/src/web_workers/ui/event_serializer.ts +++ b/modules/angular2/src/web_workers/ui/event_serializer.ts @@ -1,5 +1,5 @@ -import {StringMap, Set} from 'angular2/src/facade/collection'; -import {isPresent} from 'angular2/src/facade/lang'; +import {StringMap, Set} from 'angular2/src/core/facade/collection'; +import {isPresent} from 'angular2/src/core/facade/lang'; const MOUSE_EVENT_PROPERTIES = [ "altKey", diff --git a/modules/angular2/src/web_workers/ui/impl.ts b/modules/angular2/src/web_workers/ui/impl.ts index 2347ed18a5..9e45648112 100644 --- a/modules/angular2/src/web_workers/ui/impl.ts +++ b/modules/angular2/src/web_workers/ui/impl.ts @@ -9,8 +9,8 @@ import {createInjector} from "./di_bindings"; import {MessageBus, MessageBusSink} from "angular2/src/web_workers/shared/message_bus"; import {createNgZone} from 'angular2/src/core/application_common'; import {Injectable} from 'angular2/di'; -import {BrowserDomAdapter} from 'angular2/src/dom/browser_adapter'; -import {wtfInit} from 'angular2/src/profile/wtf_init'; +import {BrowserDomAdapter} from 'angular2/src/core/dom/browser_adapter'; +import {wtfInit} from 'angular2/src/core/profile/wtf_init'; import {WebWorkerSetup} from 'angular2/src/web_workers/ui/setup'; import {MessageBasedRenderCompiler} from 'angular2/src/web_workers/ui/render_compiler'; import {MessageBasedRenderer} from 'angular2/src/web_workers/ui/renderer'; diff --git a/modules/angular2/src/web_workers/ui/render_compiler.ts b/modules/angular2/src/web_workers/ui/render_compiler.ts index 8330351945..1812c746ca 100644 --- a/modules/angular2/src/web_workers/ui/render_compiler.ts +++ b/modules/angular2/src/web_workers/ui/render_compiler.ts @@ -1,4 +1,4 @@ -import {Injectable} from 'angular2/di'; +import {Injectable} from 'angular2/src/core/di/decorators'; import { RenderDirectiveMetadata, ProtoViewDto, @@ -6,7 +6,7 @@ import { RenderProtoViewRef, RenderProtoViewMergeMapping, RenderCompiler -} from 'angular2/src/render/api'; +} from 'angular2/src/core/render/api'; import {RENDER_COMPILER_CHANNEL} from 'angular2/src/web_workers/shared/messaging_api'; import {bind} from './bind'; import {ServiceMessageBrokerFactory} from 'angular2/src/web_workers/shared/service_message_broker'; diff --git a/modules/angular2/src/web_workers/ui/renderer.ts b/modules/angular2/src/web_workers/ui/renderer.ts index 21b253ea65..53053642df 100644 --- a/modules/angular2/src/web_workers/ui/renderer.ts +++ b/modules/angular2/src/web_workers/ui/renderer.ts @@ -6,10 +6,10 @@ import { RenderFragmentRef, RenderProtoViewRef, Renderer -} from 'angular2/src/render/api'; +} from 'angular2/src/core/render/api'; import {WebWorkerElementRef} from 'angular2/src/web_workers/shared/api'; import {EVENT_CHANNEL, RENDERER_CHANNEL} from 'angular2/src/web_workers/shared/messaging_api'; -import {BaseException, Type} from 'angular2/src/facade/lang'; +import {BaseException, Type} from 'angular2/src/core/facade/lang'; import {bind} from './bind'; import {EventDispatcher} from 'angular2/src/web_workers/ui/event_dispatcher'; import { diff --git a/modules/angular2/src/web_workers/ui/setup.ts b/modules/angular2/src/web_workers/ui/setup.ts index 7b84a254d3..7c4c15d800 100644 --- a/modules/angular2/src/web_workers/ui/setup.ts +++ b/modules/angular2/src/web_workers/ui/setup.ts @@ -1,7 +1,7 @@ import {SETUP_CHANNEL} from 'angular2/src/web_workers/shared/messaging_api'; -import {EventEmitter, ObservableWrapper} from 'angular2/src/facade/async'; +import {EventEmitter, ObservableWrapper} from 'angular2/src/core/facade/async'; import {MessageBus} from 'angular2/src/web_workers/shared/message_bus'; -import {AnchorBasedAppRootUrl} from 'angular2/src/services/anchor_based_app_root_url'; +import {AnchorBasedAppRootUrl} from 'angular2/src/core/services/anchor_based_app_root_url'; import {Injectable} from 'angular2/di'; @Injectable() diff --git a/modules/angular2/src/web_workers/ui/xhr_impl.ts b/modules/angular2/src/web_workers/ui/xhr_impl.ts index a29dc34281..3d92ca9c14 100644 --- a/modules/angular2/src/web_workers/ui/xhr_impl.ts +++ b/modules/angular2/src/web_workers/ui/xhr_impl.ts @@ -1,7 +1,7 @@ import {Injectable} from 'angular2/di'; import {PRIMITIVE} from 'angular2/src/web_workers/shared/serializer'; import {XHR_CHANNEL} from 'angular2/src/web_workers/shared/messaging_api'; -import {XHR} from 'angular2/src/render/xhr'; +import {XHR} from 'angular2/src/core/render/xhr'; import {ServiceMessageBrokerFactory} from 'angular2/src/web_workers/shared/service_message_broker'; import {bind} from './bind'; diff --git a/modules/angular2/src/web_workers/worker/application.dart b/modules/angular2/src/web_workers/worker/application.dart index 4386c50bcd..48cf8ed211 100644 --- a/modules/angular2/src/web_workers/worker/application.dart +++ b/modules/angular2/src/web_workers/worker/application.dart @@ -3,9 +3,9 @@ library angular2.src.web_workers.worker; import "package:angular2/src/web_workers/shared/isolate_message_bus.dart"; import "package:angular2/src/web_workers/worker/application_common.dart" show bootstrapWebWorkerCommon; -import "package:angular2/src/facade/async.dart" show Future; +import "package:angular2/src/core/facade/async.dart" show Future; import "package:angular2/src/core/application_ref.dart" show ApplicationRef; -import "package:angular2/src/facade/lang.dart" show Type, BaseException; +import "package:angular2/src/core/facade/lang.dart" show Type, BaseException; import "dart:isolate"; import "dart:async"; import 'dart:core'; diff --git a/modules/angular2/src/web_workers/worker/application.ts b/modules/angular2/src/web_workers/worker/application.ts index 50be81ba98..c7ce020343 100644 --- a/modules/angular2/src/web_workers/worker/application.ts +++ b/modules/angular2/src/web_workers/worker/application.ts @@ -3,10 +3,10 @@ import { PostMessageBusSink, PostMessageBusSource } from 'angular2/src/web_workers/shared/post_message_bus'; -import {Type, BaseException} from "angular2/src/facade/lang"; +import {Type, BaseException} from "angular2/src/core/facade/lang"; import {Binding} from "angular2/di"; -import {Map} from 'angular2/src/facade/collection'; -import {Promise} from 'angular2/src/facade/async'; +import {Map} from 'angular2/src/core/facade/collection'; +import {Promise} from 'angular2/src/core/facade/async'; import {bootstrapWebWorkerCommon} from "angular2/src/web_workers/worker/application_common"; import {ApplicationRef} from "angular2/src/core/application_ref"; import {Injectable} from "angular2/di"; diff --git a/modules/angular2/src/web_workers/worker/application_common.ts b/modules/angular2/src/web_workers/worker/application_common.ts index bb126d737d..0aa8ec3928 100644 --- a/modules/angular2/src/web_workers/worker/application_common.ts +++ b/modules/angular2/src/web_workers/worker/application_common.ts @@ -8,9 +8,9 @@ import { assertionsEnabled, print, stringify -} from 'angular2/src/facade/lang'; +} from 'angular2/src/core/facade/lang'; import {Compiler, CompilerCache} from 'angular2/src/core/compiler/compiler'; -import {Reflector, reflector} from 'angular2/src/reflection/reflection'; +import {Reflector, reflector} from 'angular2/src/core/reflection/reflection'; import { Parser, Lexer, @@ -22,22 +22,22 @@ import { defaultIterableDiffers, KeyValueDiffers, defaultKeyValueDiffers -} from 'angular2/src/change_detection/change_detection'; +} from 'angular2/src/core/change_detection/change_detection'; import {DEFAULT_PIPES} from 'angular2/pipes'; -import {StyleUrlResolver} from 'angular2/src/render/dom/compiler/style_url_resolver'; +import {StyleUrlResolver} from 'angular2/src/core/render/dom/compiler/style_url_resolver'; import {ExceptionHandler} from 'angular2/src/core/exception_handler'; import {DirectiveResolver} from 'angular2/src/core/compiler/directive_resolver'; import {PipeResolver} from 'angular2/src/core/compiler/pipe_resolver'; import {ViewResolver} from 'angular2/src/core/compiler/view_resolver'; -import {List, ListWrapper} from 'angular2/src/facade/collection'; -import {Promise, PromiseWrapper, PromiseCompleter} from 'angular2/src/facade/async'; +import {List, ListWrapper} from 'angular2/src/core/facade/collection'; +import {Promise, PromiseWrapper, PromiseCompleter} from 'angular2/src/core/facade/async'; import {NgZone} from 'angular2/src/core/zone/ng_zone'; import {LifeCycle} from 'angular2/src/core/life_cycle/life_cycle'; -import {XHR} from 'angular2/src/render/xhr'; +import {XHR} from 'angular2/src/core/render/xhr'; import {WebWorkerXHRImpl} from 'angular2/src/web_workers/worker/xhr_impl'; import {ComponentUrlMapper} from 'angular2/src/core/compiler/component_url_mapper'; -import {UrlResolver} from 'angular2/src/services/url_resolver'; -import {AppRootUrl} from 'angular2/src/services/app_root_url'; +import {UrlResolver} from 'angular2/src/core/services/url_resolver'; +import {AppRootUrl} from 'angular2/src/core/services/app_root_url'; import { ComponentRef, DynamicComponentLoader @@ -49,7 +49,7 @@ import {AppViewManagerUtils} from 'angular2/src/core/compiler/view_manager_utils import {AppViewListener} from 'angular2/src/core/compiler/view_listener'; import {ProtoViewFactory} from 'angular2/src/core/compiler/proto_view_factory'; import {WebWorkerRenderer, WebWorkerCompiler} from './renderer'; -import {Renderer, RenderCompiler} from 'angular2/src/render/api'; +import {Renderer, RenderCompiler} from 'angular2/src/core/render/api'; import {internalView} from 'angular2/src/core/compiler/view_ref'; import {ClientMessageBrokerFactory} from 'angular2/src/web_workers/shared/client_message_broker'; @@ -62,7 +62,7 @@ import {RenderProtoViewRefStore} from 'angular2/src/web_workers/shared/render_pr import { RenderViewWithFragmentsStore } from 'angular2/src/web_workers/shared/render_view_with_fragments_store'; -import {ObservableWrapper} from 'angular2/src/facade/async'; +import {ObservableWrapper} from 'angular2/src/core/facade/async'; import {SETUP_CHANNEL} from 'angular2/src/web_workers/shared/messaging_api'; import {WebWorkerEventDispatcher} from 'angular2/src/web_workers/worker/event_dispatcher'; diff --git a/modules/angular2/src/web_workers/worker/event_deserializer.ts b/modules/angular2/src/web_workers/worker/event_deserializer.ts index 3db097918a..9563ec0fa2 100644 --- a/modules/angular2/src/web_workers/worker/event_deserializer.ts +++ b/modules/angular2/src/web_workers/worker/event_deserializer.ts @@ -1,4 +1,4 @@ -import {StringMap} from "angular2/src/facade/collection"; +import {StringMap} from "angular2/src/core/facade/collection"; // no deserialization is necessary in TS. // This is only here to match dart interface diff --git a/modules/angular2/src/web_workers/worker/event_dispatcher.ts b/modules/angular2/src/web_workers/worker/event_dispatcher.ts index 393a1dffc9..2eec0efa1e 100644 --- a/modules/angular2/src/web_workers/worker/event_dispatcher.ts +++ b/modules/angular2/src/web_workers/worker/event_dispatcher.ts @@ -1,10 +1,10 @@ import {Injectable} from 'angular2/di'; -import {Map, MapWrapper} from 'angular2/src/facade/collection'; -import {RenderViewRef, RenderEventDispatcher} from 'angular2/src/render/api'; +import {Map, MapWrapper} from 'angular2/src/core/facade/collection'; +import {RenderViewRef, RenderEventDispatcher} from 'angular2/src/core/render/api'; import {Serializer} from 'angular2/src/web_workers/shared/serializer'; import {EVENT_CHANNEL} from 'angular2/src/web_workers/shared/messaging_api'; import {MessageBus} from 'angular2/src/web_workers/shared/message_bus'; -import {EventEmitter, ObservableWrapper} from 'angular2/src/facade/async'; +import {EventEmitter, ObservableWrapper} from 'angular2/src/core/facade/async'; import {deserializeGenericEvent} from './event_deserializer'; import {NgZone} from 'angular2/src/core/zone/ng_zone'; diff --git a/modules/angular2/src/web_workers/worker/renderer.ts b/modules/angular2/src/web_workers/worker/renderer.ts index 6fa225ecd3..59416f7606 100644 --- a/modules/angular2/src/web_workers/worker/renderer.ts +++ b/modules/angular2/src/web_workers/worker/renderer.ts @@ -11,15 +11,15 @@ import { RenderProtoViewMergeMapping, RenderViewWithFragments, RenderFragmentRef -} from 'angular2/src/render/api'; -import {Promise, PromiseWrapper} from "angular2/src/facade/async"; +} from 'angular2/src/core/render/api'; +import {Promise, PromiseWrapper} from "angular2/src/core/facade/async"; import { ClientMessageBroker, ClientMessageBrokerFactory, FnArg, UiArguments } from "angular2/src/web_workers/shared/client_message_broker"; -import {isPresent, print, BaseException} from "angular2/src/facade/lang"; +import {isPresent, print, BaseException} from "angular2/src/core/facade/lang"; import {Injectable} from "angular2/di"; import { RenderViewWithFragmentsStore, diff --git a/modules/angular2/src/web_workers/worker/xhr_impl.ts b/modules/angular2/src/web_workers/worker/xhr_impl.ts index 1675ba410a..4dcc4569a4 100644 --- a/modules/angular2/src/web_workers/worker/xhr_impl.ts +++ b/modules/angular2/src/web_workers/worker/xhr_impl.ts @@ -1,6 +1,6 @@ import {Injectable} from 'angular2/di'; -import {Promise} from 'angular2/src/facade/async'; -import {XHR} from 'angular2/src/render/xhr'; +import {Promise} from 'angular2/src/core/facade/async'; +import {XHR} from 'angular2/src/core/render/xhr'; import { FnArg, UiArguments, diff --git a/modules/angular2/test/benchmark/transform/directive_linker/simple.dart b/modules/angular2/test/benchmark/transform/directive_linker/simple.dart index 679632d2a3..1bf3607865 100644 --- a/modules/angular2/test/benchmark/transform/directive_linker/simple.dart +++ b/modules/angular2/test/benchmark/transform/directive_linker/simple.dart @@ -28,7 +28,7 @@ const aContents = ''' library a.ng_deps.dart; import 'package:angular2/src/core/application.dart'; -import 'package:angular2/src/reflection/reflection_capabilities.dart'; +import 'package:angular2/src/core/reflection/reflection_capabilities.dart'; import 'b.dart'; bool _visited = false; diff --git a/modules/angular2/test/benchmark/transform/integration/hello_world.dart b/modules/angular2/test/benchmark/transform/integration/hello_world.dart index e7d51fe90e..e7151771b3 100644 --- a/modules/angular2/test/benchmark/transform/integration/hello_world.dart +++ b/modules/angular2/test/benchmark/transform/integration/hello_world.dart @@ -27,8 +27,8 @@ const indexContents = ''' library examples.src.hello_world.index; import "index_common.dart" as app; -import "package:angular2/src/reflection/reflection.dart" show reflector; -import "package:angular2/src/reflection/reflection_capabilities.dart" +import "package:angular2/src/core/reflection/reflection.dart" show reflector; +import "package:angular2/src/core/reflection/reflection_capabilities.dart" show ReflectionCapabilities; main() { diff --git a/modules/angular2/test/benchmark/transform/reflection_remover/simple.dart b/modules/angular2/test/benchmark/transform/reflection_remover/simple.dart index 2a140d33a2..b3a0fa4565 100644 --- a/modules/angular2/test/benchmark/transform/reflection_remover/simple.dart +++ b/modules/angular2/test/benchmark/transform/reflection_remover/simple.dart @@ -25,8 +25,8 @@ const indexContents = ''' library web_foo; import 'package:angular2/bootstrap.dart'; -import 'package:angular2/src/reflection/reflection.dart'; -import 'package:angular2/src/reflection/reflection_capabilities.dart'; +import 'package:angular2/src/core/reflection/reflection.dart'; +import 'package:angular2/src/core/reflection/reflection_capabilities.dart'; void main() { reflector.reflectionCapabilities = new ReflectionCapabilities(); diff --git a/modules/angular2/test/core/application_spec.ts b/modules/angular2/test/core/application_spec.ts index f4b1417d8b..749265617c 100644 --- a/modules/angular2/test/core/application_spec.ts +++ b/modules/angular2/test/core/application_spec.ts @@ -10,16 +10,16 @@ import { xdescribe, xit } from 'angular2/test_lib'; -import {isPresent, stringify} from 'angular2/src/facade/lang'; +import {isPresent, stringify} from 'angular2/src/core/facade/lang'; import {bootstrap, ApplicationRef} from 'angular2/src/core/application'; import {Component, Directive, View} from 'angular2/metadata'; -import {DOM} from 'angular2/src/dom/dom_adapter'; -import {PromiseWrapper} from 'angular2/src/facade/async'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {PromiseWrapper} from 'angular2/src/core/facade/async'; import {bind, Inject, Injector} from 'angular2/di'; import {LifeCycle} from 'angular2/core'; import {ExceptionHandler} from 'angular2/src/core/exception_handler'; import {Testability, TestabilityRegistry} from 'angular2/src/core/testability/testability'; -import {DOCUMENT} from 'angular2/src/render/render'; +import {DOCUMENT} from 'angular2/src/core/render/render'; import {IS_DART} from '../platform'; @Component({selector: 'hello-app'}) diff --git a/modules/angular2/test/core/change_detection/change_detection_spec.ts b/modules/angular2/test/core/change_detection/change_detection_spec.ts index e180097891..f1b76db558 100644 --- a/modules/angular2/test/core/change_detection/change_detection_spec.ts +++ b/modules/angular2/test/core/change_detection/change_detection_spec.ts @@ -14,7 +14,7 @@ import { PreGeneratedChangeDetection, ChangeDetectorDefinition, DynamicProtoChangeDetector -} from 'angular2/src/change_detection/change_detection'; +} from 'angular2/src/core/change_detection/change_detection'; export function main() { describe("PreGeneratedChangeDetection", () => { diff --git a/modules/angular2/test/core/change_detection/change_detector_config.ts b/modules/angular2/test/core/change_detection/change_detector_config.ts index 291e96d56f..e0506c6422 100644 --- a/modules/angular2/test/core/change_detection/change_detector_config.ts +++ b/modules/angular2/test/core/change_detection/change_detector_config.ts @@ -1,5 +1,5 @@ -import {ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/facade/collection'; -import {isBlank, isPresent} from 'angular2/src/facade/lang'; +import {ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection'; +import {isBlank, isPresent} from 'angular2/src/core/facade/lang'; import { DEFAULT, ON_PUSH, @@ -11,10 +11,10 @@ import { Locals, Parser, ChangeDetectorGenConfig -} from 'angular2/src/change_detection/change_detection'; -import {ON_PUSH_OBSERVE} from 'angular2/src/change_detection/constants'; -import {reflector} from 'angular2/src/reflection/reflection'; -import {ReflectionCapabilities} from 'angular2/src/reflection/reflection_capabilities'; +} from 'angular2/src/core/change_detection/change_detection'; +import {ON_PUSH_OBSERVE} from 'angular2/src/core/change_detection/constants'; +import {reflector} from 'angular2/src/core/reflection/reflection'; +import {ReflectionCapabilities} from 'angular2/src/core/reflection/reflection_capabilities'; /* * This file defines `ChangeDetectorDefinition` objects which are used in the tests defined in diff --git a/modules/angular2/test/core/change_detection/change_detector_spec.ts b/modules/angular2/test/core/change_detection/change_detector_spec.ts index 2cacb40255..c5b25ca00e 100644 --- a/modules/angular2/test/core/change_detection/change_detector_spec.ts +++ b/modules/angular2/test/core/change_detection/change_detector_spec.ts @@ -1,4 +1,4 @@ -/// +/// import { ddescribe, describe, @@ -19,8 +19,8 @@ import { isJsObject, BaseException, FunctionWrapper -} from 'angular2/src/facade/lang'; -import {List, ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/facade/collection'; +} from 'angular2/src/core/facade/lang'; +import {List, ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection'; import { ChangeDispatcher, @@ -45,15 +45,15 @@ import { Parser, Locals, ProtoChangeDetector -} from 'angular2/src/change_detection/change_detection'; +} from 'angular2/src/core/change_detection/change_detection'; -import {Pipes} from 'angular2/src/change_detection/pipes'; -import {JitProtoChangeDetector} from 'angular2/src/change_detection/jit_proto_change_detector'; +import {Pipes} from 'angular2/src/core/change_detection/pipes'; +import {JitProtoChangeDetector} from 'angular2/src/core/change_detection/jit_proto_change_detector'; import {getDefinition} from './change_detector_config'; import {createObservableModel} from './change_detector_spec_util'; import {getFactoryById} from './generated/change_detector_classes'; -import {IS_DART} from '../platform'; +import {IS_DART} from '../../platform'; const _DEFAULT_CONTEXT = CONST_EXPR(new Object()); diff --git a/modules/angular2/test/core/change_detection/coalesce_spec.ts b/modules/angular2/test/core/change_detection/coalesce_spec.ts index ccb8159083..58f5ab474a 100644 --- a/modules/angular2/test/core/change_detection/coalesce_spec.ts +++ b/modules/angular2/test/core/change_detection/coalesce_spec.ts @@ -1,9 +1,9 @@ import {ddescribe, describe, it, iit, xit, expect, beforeEach, afterEach} from 'angular2/test_lib'; -import {isBlank} from 'angular2/src/facade/lang'; +import {isBlank} from 'angular2/src/core/facade/lang'; -import {coalesce} from 'angular2/src/change_detection/coalesce'; -import {RecordType, ProtoRecord} from 'angular2/src/change_detection/proto_record'; -import {DirectiveIndex} from 'angular2/src/change_detection/directive_record'; +import {coalesce} from 'angular2/src/core/change_detection/coalesce'; +import {RecordType, ProtoRecord} from 'angular2/src/core/change_detection/proto_record'; +import {DirectiveIndex} from 'angular2/src/core/change_detection/directive_record'; export function main() { function r(funcOrValue, args, contextIndex, selfIndex, diff --git a/modules/angular2/test/core/change_detection/differs/default_iterable_differ_spec.ts b/modules/angular2/test/core/change_detection/differs/default_iterable_differ_spec.ts index fb0040054c..1db5b8da30 100644 --- a/modules/angular2/test/core/change_detection/differs/default_iterable_differ_spec.ts +++ b/modules/angular2/test/core/change_detection/differs/default_iterable_differ_spec.ts @@ -2,13 +2,13 @@ import {ddescribe, describe, it, iit, xit, expect, beforeEach, afterEach} from ' import { DefaultIterableDiffer, DefaultIterableDifferFactory -} from 'angular2/src/change_detection/differs/default_iterable_differ'; +} from 'angular2/src/core/change_detection/differs/default_iterable_differ'; -import {NumberWrapper} from 'angular2/src/facade/lang'; -import {ListWrapper, MapWrapper} from 'angular2/src/facade/collection'; +import {NumberWrapper} from 'angular2/src/core/facade/lang'; +import {ListWrapper, MapWrapper} from 'angular2/src/core/facade/collection'; -import {TestIterable} from '../iterable'; -import {iterableChangesAsString} from '../util'; +import {TestIterable} from '../../../core/change_detection/iterable'; +import {iterableChangesAsString} from '../../../core/change_detection/util'; // todo(vicb): UnmodifiableListView / frozen object when implemented export function main() { diff --git a/modules/angular2/test/core/change_detection/differs/default_keyvalue_differ_spec.ts b/modules/angular2/test/core/change_detection/differs/default_keyvalue_differ_spec.ts index 4c6d348bf5..eb9a74bc05 100644 --- a/modules/angular2/test/core/change_detection/differs/default_keyvalue_differ_spec.ts +++ b/modules/angular2/test/core/change_detection/differs/default_keyvalue_differ_spec.ts @@ -2,10 +2,10 @@ import {ddescribe, describe, it, iit, xit, expect, beforeEach, afterEach} from ' import { DefaultKeyValueDiffer, DefaultKeyValueDifferFactory -} from 'angular2/src/change_detection/differs/default_keyvalue_differ'; -import {NumberWrapper, isJsObject} from 'angular2/src/facade/lang'; -import {MapWrapper} from 'angular2/src/facade/collection'; -import {kvChangesAsString} from '../util'; +} from 'angular2/src/core/change_detection/differs/default_keyvalue_differ'; +import {NumberWrapper, isJsObject} from 'angular2/src/core/facade/lang'; +import {MapWrapper} from 'angular2/src/core/facade/collection'; +import {kvChangesAsString} from '../../../core/change_detection/util'; // todo(vicb): Update the code & tests for object equality export function main() { diff --git a/modules/angular2/test/core/change_detection/differs/iterable_differs_spec.ts b/modules/angular2/test/core/change_detection/differs/iterable_differs_spec.ts index 493d086a83..7225f5dbb7 100644 --- a/modules/angular2/test/core/change_detection/differs/iterable_differs_spec.ts +++ b/modules/angular2/test/core/change_detection/differs/iterable_differs_spec.ts @@ -9,7 +9,7 @@ import { afterEach, SpyIterableDifferFactory } from 'angular2/test_lib'; -import {IterableDiffers} from 'angular2/src/change_detection/differs/iterable_differs'; +import {IterableDiffers} from 'angular2/src/core/change_detection/differs/iterable_differs'; import {Injector, bind} from 'angular2/di'; export function main() { diff --git a/modules/angular2/test/core/change_detection/iterable.ts b/modules/angular2/test/core/change_detection/iterable.ts index 17539b257f..4d5eadf2ce 100644 --- a/modules/angular2/test/core/change_detection/iterable.ts +++ b/modules/angular2/test/core/change_detection/iterable.ts @@ -1,4 +1,4 @@ -import {List} from 'angular2/src/facade/collection'; +import {List} from 'angular2/src/core/facade/collection'; export class TestIterable { list: List; diff --git a/modules/angular2/test/core/change_detection/parser/lexer_spec.ts b/modules/angular2/test/core/change_detection/parser/lexer_spec.ts index c97602e2a1..490d1671f9 100644 --- a/modules/angular2/test/core/change_detection/parser/lexer_spec.ts +++ b/modules/angular2/test/core/change_detection/parser/lexer_spec.ts @@ -1,9 +1,9 @@ import {ddescribe, describe, it, expect} from 'angular2/test_lib'; -import {Lexer, Token} from 'angular2/src/change_detection/parser/lexer'; +import {Lexer, Token} from 'angular2/src/core/change_detection/parser/lexer'; -import {List, ListWrapper} from "angular2/src/facade/collection"; -import {StringWrapper} from "angular2/src/facade/lang"; +import {List, ListWrapper} from "angular2/src/core/facade/collection"; +import {StringWrapper} from "angular2/src/core/facade/lang"; function lex(text: string): List { return new Lexer().tokenize(text); diff --git a/modules/angular2/test/core/change_detection/parser/locals_spec.ts b/modules/angular2/test/core/change_detection/parser/locals_spec.ts index b1c796f477..9b5bdce0fd 100644 --- a/modules/angular2/test/core/change_detection/parser/locals_spec.ts +++ b/modules/angular2/test/core/change_detection/parser/locals_spec.ts @@ -1,8 +1,8 @@ import {ddescribe, describe, it, xit, iit, expect, beforeEach} from 'angular2/test_lib'; -import {Locals} from 'angular2/src/change_detection/parser/locals'; +import {Locals} from 'angular2/src/core/change_detection/parser/locals'; -import {MapWrapper} from 'angular2/src/facade/collection'; +import {MapWrapper} from 'angular2/src/core/facade/collection'; export function main() { describe('Locals', () => { diff --git a/modules/angular2/test/core/change_detection/parser/parser_spec.ts b/modules/angular2/test/core/change_detection/parser/parser_spec.ts index cf11b55bb5..7f715dd007 100644 --- a/modules/angular2/test/core/change_detection/parser/parser_spec.ts +++ b/modules/angular2/test/core/change_detection/parser/parser_spec.ts @@ -1,11 +1,11 @@ import {ddescribe, describe, it, xit, iit, expect, beforeEach} from 'angular2/test_lib'; -import {BaseException, isBlank, isPresent} from 'angular2/src/facade/lang'; -import {reflector} from 'angular2/src/reflection/reflection'; -import {MapWrapper, ListWrapper} from 'angular2/src/facade/collection'; -import {Parser} from 'angular2/src/change_detection/parser/parser'; +import {BaseException, isBlank, isPresent} from 'angular2/src/core/facade/lang'; +import {reflector} from 'angular2/src/core/reflection/reflection'; +import {MapWrapper, ListWrapper} from 'angular2/src/core/facade/collection'; +import {Parser} from 'angular2/src/core/change_detection/parser/parser'; import {Unparser} from './unparser'; -import {Lexer} from 'angular2/src/change_detection/parser/lexer'; -import {BindingPipe, LiteralPrimitive, AST} from 'angular2/src/change_detection/parser/ast'; +import {Lexer} from 'angular2/src/core/change_detection/parser/lexer'; +import {BindingPipe, LiteralPrimitive, AST} from 'angular2/src/core/change_detection/parser/ast'; class TestData { constructor(public a?: any, public b?: any, public fnReturnValue?: any) {} diff --git a/modules/angular2/test/core/change_detection/parser/unparser.ts b/modules/angular2/test/core/change_detection/parser/unparser.ts index 1037c75292..eff3183757 100644 --- a/modules/angular2/test/core/change_detection/parser/unparser.ts +++ b/modules/angular2/test/core/change_detection/parser/unparser.ts @@ -21,10 +21,10 @@ import { PrefixNot, SafePropertyRead, SafeMethodCall -} from 'angular2/src/change_detection/parser/ast'; +} from 'angular2/src/core/change_detection/parser/ast'; -import {StringWrapper, isPresent, isString} from 'angular2/src/facade/lang'; +import {StringWrapper, isPresent, isString} from 'angular2/src/core/facade/lang'; export class Unparser implements AstVisitor { private static _quoteRegExp = /"/g; diff --git a/modules/angular2/test/core/change_detection/proto_record_builder_spec.ts b/modules/angular2/test/core/change_detection/proto_record_builder_spec.ts index a6c53fe93e..96b896ce2e 100644 --- a/modules/angular2/test/core/change_detection/proto_record_builder_spec.ts +++ b/modules/angular2/test/core/change_detection/proto_record_builder_spec.ts @@ -10,9 +10,9 @@ import { inject } from 'angular2/test_lib'; -import {ProtoRecordBuilder} from 'angular2/src/change_detection/proto_change_detector'; -import {BindingRecord} from 'angular2/src/change_detection/binding_record'; -import {Parser} from 'angular2/src/change_detection/parser/parser'; +import {ProtoRecordBuilder} from 'angular2/src/core/change_detection/proto_change_detector'; +import {BindingRecord} from 'angular2/src/core/change_detection/binding_record'; +import {Parser} from 'angular2/src/core/change_detection/parser/parser'; export function main() { describe("ProtoRecordBuilder", () => { diff --git a/modules/angular2/test/core/change_detection/proto_record_spec.ts b/modules/angular2/test/core/change_detection/proto_record_spec.ts index fb62af7ff7..51e931e595 100644 --- a/modules/angular2/test/core/change_detection/proto_record_spec.ts +++ b/modules/angular2/test/core/change_detection/proto_record_spec.ts @@ -1,7 +1,7 @@ import {ddescribe, describe, it, iit, xit, expect, beforeEach, afterEach} from 'angular2/test_lib'; -import {isBlank} from 'angular2/src/facade/lang'; +import {isBlank} from 'angular2/src/core/facade/lang'; -import {RecordType, ProtoRecord} from 'angular2/src/change_detection/proto_record'; +import {RecordType, ProtoRecord} from 'angular2/src/core/change_detection/proto_record'; export function main() { function r({lastInBinding, mode, name, directiveIndex, argumentToPureFunction, referencedBySelf}: diff --git a/modules/angular2/test/core/change_detection/util.ts b/modules/angular2/test/core/change_detection/util.ts index e2c62453e1..2a0668ef75 100644 --- a/modules/angular2/test/core/change_detection/util.ts +++ b/modules/angular2/test/core/change_detection/util.ts @@ -1,4 +1,4 @@ -import {isBlank, CONST_EXPR} from 'angular2/src/facade/lang'; +import {isBlank, CONST_EXPR} from 'angular2/src/core/facade/lang'; export function iterableChangesAsString({collection = CONST_EXPR([]), previous = CONST_EXPR([]), additions = CONST_EXPR([]), moves = CONST_EXPR([]), diff --git a/modules/angular2/test/core/compiler/compiler_spec.ts b/modules/angular2/test/core/compiler/compiler_spec.ts index a1e35a6afe..5d7364d2b4 100644 --- a/modules/angular2/test/core/compiler/compiler_spec.ts +++ b/modules/angular2/test/core/compiler/compiler_spec.ts @@ -13,9 +13,22 @@ import { proxy } from 'angular2/test_lib'; -import {List, ListWrapper, Map, MapWrapper, StringMapWrapper} from 'angular2/src/facade/collection'; -import {IMPLEMENTS, Type, isBlank, stringify, isPresent, isArray} from 'angular2/src/facade/lang'; -import {PromiseCompleter, PromiseWrapper, Promise} from 'angular2/src/facade/async'; +import { + List, + ListWrapper, + Map, + MapWrapper, + StringMapWrapper +} from 'angular2/src/core/facade/collection'; +import { + IMPLEMENTS, + Type, + isBlank, + stringify, + isPresent, + isArray +} from 'angular2/src/core/facade/lang'; +import {PromiseCompleter, PromiseWrapper, Promise} from 'angular2/src/core/facade/async'; import {Compiler, CompilerCache} from 'angular2/src/core/compiler/compiler'; import {AppProtoView} from 'angular2/src/core/compiler/view'; @@ -32,8 +45,8 @@ import { } from 'angular2/src/core/compiler/component_url_mapper'; import {ProtoViewFactory} from 'angular2/src/core/compiler/proto_view_factory'; -import {UrlResolver} from 'angular2/src/services/url_resolver'; -import {AppRootUrl} from 'angular2/src/services/app_root_url'; +import {UrlResolver} from 'angular2/src/core/services/url_resolver'; +import {AppRootUrl} from 'angular2/src/core/services/app_root_url'; import { ProtoViewDto, ViewType, @@ -43,9 +56,9 @@ import { RenderDirectiveMetadata, DirectiveBinder, RenderElementBinder -} from 'angular2/src/render/api'; +} from 'angular2/src/core/render/api'; // TODO(tbosch): Spys don't support named modules... -import {RenderCompiler} from 'angular2/src/render/api'; +import {RenderCompiler} from 'angular2/src/core/render/api'; import {PipeBinding} from 'angular2/src/core/pipes/pipe_binding'; diff --git a/modules/angular2/test/core/compiler/directive_lifecycle_spec.ts b/modules/angular2/test/core/compiler/directive_lifecycle_spec.ts index 5cad210af5..294e4fccac 100644 --- a/modules/angular2/test/core/compiler/directive_lifecycle_spec.ts +++ b/modules/angular2/test/core/compiler/directive_lifecycle_spec.ts @@ -13,7 +13,7 @@ import { proxy } from 'angular2/test_lib'; -import {DirectiveMetadata, LifecycleEvent} from '../../../src/core/metadata'; +import {DirectiveMetadata, LifecycleEvent} from 'angular2/src/core/metadata'; import {DirectiveBinding} from 'angular2/src/core/compiler/element_injector'; export function main() { diff --git a/modules/angular2/test/core/compiler/dynamic_component_loader_spec.ts b/modules/angular2/test/core/compiler/dynamic_component_loader_spec.ts index f37129f82d..e1af55de98 100644 --- a/modules/angular2/test/core/compiler/dynamic_component_loader_spec.ts +++ b/modules/angular2/test/core/compiler/dynamic_component_loader_spec.ts @@ -23,8 +23,8 @@ import {NgIf} from 'angular2/directives'; import {Component, View, ViewMetadata, LifecycleEvent} from 'angular2/metadata'; import {DynamicComponentLoader} from 'angular2/src/core/compiler/dynamic_component_loader'; import {ElementRef} from 'angular2/src/core/compiler/element_ref'; -import {DOCUMENT} from 'angular2/src/render/render'; -import {DOM} from 'angular2/src/dom/dom_adapter'; +import {DOCUMENT} from 'angular2/src/core/render/render'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; export function main() { describe('DynamicComponentLoader', function() { diff --git a/modules/angular2/test/core/compiler/element_injector_spec.ts b/modules/angular2/test/core/compiler/element_injector_spec.ts index 53faa26ae5..a4b5e5747a 100644 --- a/modules/angular2/test/core/compiler/element_injector_spec.ts +++ b/modules/angular2/test/core/compiler/element_injector_spec.ts @@ -17,14 +17,14 @@ import { el, containsRegexp } from 'angular2/test_lib'; -import {isBlank, isPresent, IMPLEMENTS, stringify} from 'angular2/src/facade/lang'; +import {isBlank, isPresent, IMPLEMENTS, stringify} from 'angular2/src/core/facade/lang'; import { ListWrapper, MapWrapper, List, StringMapWrapper, iterateListLike -} from 'angular2/src/facade/collection'; +} from 'angular2/src/core/facade/collection'; import { ProtoElementInjector, ElementInjector, @@ -45,7 +45,7 @@ import {AppProtoView, AppView} from 'angular2/src/core/compiler/view'; import {ViewContainerRef} from 'angular2/src/core/compiler/view_container_ref'; import {TemplateRef} from 'angular2/src/core/compiler/template_ref'; import {ElementRef} from 'angular2/src/core/compiler/element_ref'; -import {DynamicChangeDetector, ChangeDetectorRef, Parser, Lexer} from 'angular2/src/change_detection/change_detection'; +import {DynamicChangeDetector, ChangeDetectorRef, Parser, Lexer} from 'angular2/src/core/change_detection/change_detection'; import {QueryList} from 'angular2/src/core/compiler/query_list'; @proxy diff --git a/modules/angular2/test/core/compiler/integration_dart_spec.dart b/modules/angular2/test/core/compiler/integration_dart_spec.dart index 73dccc33e7..98c246e5e8 100644 --- a/modules/angular2/test/core/compiler/integration_dart_spec.dart +++ b/modules/angular2/test/core/compiler/integration_dart_spec.dart @@ -5,8 +5,8 @@ import 'package:angular2/angular2.dart'; import 'package:angular2/di.dart'; import 'package:angular2/test_lib.dart'; import 'package:observe/observe.dart'; -import 'package:angular2/src/directives/observable_list_diff.dart'; -import 'package:angular2/src/change_detection/differs/default_iterable_differ.dart'; +import 'package:angular2/src/core/directives/observable_list_diff.dart'; +import 'package:angular2/src/core/change_detection/differs/default_iterable_differ.dart'; class MockException implements Error { var message; diff --git a/modules/angular2/test/core/compiler/integration_spec.ts b/modules/angular2/test/core/compiler/integration_spec.ts index 693bd90f31..74d76da18a 100644 --- a/modules/angular2/test/core/compiler/integration_spec.ts +++ b/modules/angular2/test/core/compiler/integration_spec.ts @@ -21,7 +21,7 @@ import { } from 'angular2/test_lib'; -import {DOM} from 'angular2/src/dom/dom_adapter'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; import { Type, isPresent, @@ -33,14 +33,14 @@ import { isBlank, CONST, CONST_EXPR -} from 'angular2/src/facade/lang'; +} from 'angular2/src/core/facade/lang'; import { PromiseWrapper, EventEmitter, ObservableWrapper, PromiseCompleter, Promise -} from 'angular2/src/facade/async'; +} from 'angular2/src/core/facade/async'; import { Injector, @@ -62,14 +62,14 @@ import { ChangeDetection, DynamicChangeDetection, ChangeDetectorGenConfig -} from 'angular2/src/change_detection/change_detection'; +} from 'angular2/src/core/change_detection/change_detection'; import {Directive, Component, View, ViewMetadata, Attribute, Query, Pipe} from 'angular2/metadata'; import {QueryList} from 'angular2/src/core/compiler/query_list'; -import {NgIf} from 'angular2/src/directives/ng_if'; -import {NgFor} from 'angular2/src/directives/ng_for'; +import {NgIf} from 'angular2/src/core/directives/ng_if'; +import {NgFor} from 'angular2/src/core/directives/ng_for'; import {ViewContainerRef} from 'angular2/src/core/compiler/view_container_ref'; import {ViewRef} from 'angular2/src/core/compiler/view_ref'; @@ -78,7 +78,7 @@ import {Compiler} from 'angular2/src/core/compiler/compiler'; import {ElementRef} from 'angular2/src/core/compiler/element_ref'; import {TemplateRef} from 'angular2/src/core/compiler/template_ref'; -import {DomRenderer} from 'angular2/src/render/dom/dom_renderer'; +import {DomRenderer} from 'angular2/src/core/render/dom/dom_renderer'; import {IS_DART} from '../../platform'; const ANCHOR_ELEMENT = CONST_EXPR(new OpaqueToken('AnchorElement')); diff --git a/modules/angular2/test/core/compiler/projection_integration_spec.ts b/modules/angular2/test/core/compiler/projection_integration_spec.ts index 34624a8ddc..0abf29adcf 100644 --- a/modules/angular2/test/core/compiler/projection_integration_spec.ts +++ b/modules/angular2/test/core/compiler/projection_integration_spec.ts @@ -21,7 +21,7 @@ import { By } from 'angular2/test_lib'; -import {DOM} from 'angular2/src/dom/dom_adapter'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; import { forwardRef, @@ -33,7 +33,7 @@ import { } from 'angular2/angular2'; import {Component, Directive, View, ViewMetadata} from 'angular2/metadata'; -import {MAX_IN_MEMORY_ELEMENTS_PER_TEMPLATE} from 'angular2/src/render/render'; +import {MAX_IN_MEMORY_ELEMENTS_PER_TEMPLATE} from 'angular2/src/core/render/render'; export function main() { describe('projection', () => { diff --git a/modules/angular2/test/core/compiler/proto_view_factory_spec.ts b/modules/angular2/test/core/compiler/proto_view_factory_spec.ts index 51ee5f92be..6b306f4fbb 100644 --- a/modules/angular2/test/core/compiler/proto_view_factory_spec.ts +++ b/modules/angular2/test/core/compiler/proto_view_factory_spec.ts @@ -13,8 +13,8 @@ import { proxy } from 'angular2/test_lib'; -import {isBlank, IMPLEMENTS, stringify} from 'angular2/src/facade/lang'; -import {MapWrapper} from 'angular2/src/facade/collection'; +import {isBlank, IMPLEMENTS, stringify} from 'angular2/src/core/facade/lang'; +import {MapWrapper} from 'angular2/src/core/facade/collection'; import { ChangeDetection, @@ -22,7 +22,7 @@ import { BindingRecord, DirectiveIndex, Parser -} from 'angular2/src/change_detection/change_detection'; +} from 'angular2/src/core/change_detection/change_detection'; import { BindingRecordsCreator, ProtoViewFactory, @@ -41,7 +41,7 @@ import { ViewType, ProtoViewDto, DirectiveBinder -} from 'angular2/src/render/api'; +} from 'angular2/src/core/render/api'; export function main() { // TODO(tbosch): add missing tests diff --git a/modules/angular2/test/core/compiler/query_integration_spec.ts b/modules/angular2/test/core/compiler/query_integration_spec.ts index ed7720b2e1..66e71946e4 100644 --- a/modules/angular2/test/core/compiler/query_integration_spec.ts +++ b/modules/angular2/test/core/compiler/query_integration_spec.ts @@ -21,7 +21,7 @@ import {Query, ViewQuery, Component, Directive, View} from 'angular2/metadata'; import {NgIf, NgFor} from 'angular2/angular2'; -import {BrowserDomAdapter} from 'angular2/src/dom/browser_adapter'; +import {BrowserDomAdapter} from 'angular2/src/core/dom/browser_adapter'; export function main() { BrowserDomAdapter.makeCurrent(); diff --git a/modules/angular2/test/core/compiler/query_list_spec.ts b/modules/angular2/test/core/compiler/query_list_spec.ts index 7d26c87b94..5dfa2f198f 100644 --- a/modules/angular2/test/core/compiler/query_list_spec.ts +++ b/modules/angular2/test/core/compiler/query_list_spec.ts @@ -1,7 +1,7 @@ import {describe, it, expect, beforeEach, ddescribe, iit, xit, el} from 'angular2/test_lib'; -import {List, MapWrapper, ListWrapper, iterateListLike} from 'angular2/src/facade/collection'; -import {StringWrapper} from 'angular2/src/facade/lang'; +import {List, MapWrapper, ListWrapper, iterateListLike} from 'angular2/src/core/facade/collection'; +import {StringWrapper} from 'angular2/src/core/facade/lang'; import {QueryList} from 'angular2/src/core/compiler/query_list'; diff --git a/modules/angular2/test/core/compiler/view_container_ref_spec.ts b/modules/angular2/test/core/compiler/view_container_ref_spec.ts index 4438308d7d..b2b46e48ce 100644 --- a/modules/angular2/test/core/compiler/view_container_ref_spec.ts +++ b/modules/angular2/test/core/compiler/view_container_ref_spec.ts @@ -16,7 +16,7 @@ import { proxy } from 'angular2/test_lib'; -import {IMPLEMENTS} from 'angular2/src/facade/lang'; +import {IMPLEMENTS} from 'angular2/src/core/facade/lang'; import {AppView, AppViewContainer} from 'angular2/src/core/compiler/view'; import {ViewContainerRef} from 'angular2/src/core/compiler/view_container_ref'; diff --git a/modules/angular2/test/core/compiler/view_manager_spec.ts b/modules/angular2/test/core/compiler/view_manager_spec.ts index 6b09185436..344188e274 100644 --- a/modules/angular2/test/core/compiler/view_manager_spec.ts +++ b/modules/angular2/test/core/compiler/view_manager_spec.ts @@ -16,7 +16,7 @@ import { proxy } from 'angular2/test_lib'; import {Injector, bind} from 'angular2/di'; -import {IMPLEMENTS} from 'angular2/src/facade/lang'; +import {IMPLEMENTS} from 'angular2/src/core/facade/lang'; import { AppProtoView, @@ -35,7 +35,7 @@ import { ViewType, RenderProtoViewMergeMapping, RenderViewWithFragments -} from 'angular2/src/render/api'; +} from 'angular2/src/core/render/api'; import {AppViewManager} from 'angular2/src/core/compiler/view_manager'; import {AppViewManagerUtils} from 'angular2/src/core/compiler/view_manager_utils'; import {AppViewListener} from 'angular2/src/core/compiler/view_listener'; diff --git a/modules/angular2/test/core/compiler/view_manager_utils_spec.ts b/modules/angular2/test/core/compiler/view_manager_utils_spec.ts index d00a8163f7..4ad052ddfa 100644 --- a/modules/angular2/test/core/compiler/view_manager_utils_spec.ts +++ b/modules/angular2/test/core/compiler/view_manager_utils_spec.ts @@ -20,8 +20,8 @@ import { } from 'angular2/test_lib'; import {Injector, bind} from 'angular2/di'; -import {IMPLEMENTS, isBlank, isPresent} from 'angular2/src/facade/lang'; -import {MapWrapper, ListWrapper, StringMapWrapper} from 'angular2/src/facade/collection'; +import {IMPLEMENTS, isBlank, isPresent} from 'angular2/src/core/facade/lang'; +import {MapWrapper, ListWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection'; import {AppProtoView, AppView, AppProtoViewMergeMapping} from 'angular2/src/core/compiler/view'; import {ElementBinder} from 'angular2/src/core/compiler/element_binder'; @@ -38,7 +38,7 @@ import { RenderProtoViewMergeMapping, ViewType, RenderViewWithFragments -} from 'angular2/src/render/render'; +} from 'angular2/src/core/render/render'; export function main() { // TODO(tbosch): add more tests here! diff --git a/modules/angular2/test/core/compiler/view_pool_spec.ts b/modules/angular2/test/core/compiler/view_pool_spec.ts index 15698b5683..b47365a2e8 100644 --- a/modules/angular2/test/core/compiler/view_pool_spec.ts +++ b/modules/angular2/test/core/compiler/view_pool_spec.ts @@ -17,7 +17,7 @@ import { } from 'angular2/test_lib'; import {AppViewPool} from 'angular2/src/core/compiler/view_pool'; import {AppProtoView, AppView} from 'angular2/src/core/compiler/view'; -import {MapWrapper, Map} from 'angular2/src/facade/collection'; +import {MapWrapper, Map} from 'angular2/src/core/facade/collection'; export function main() { describe('AppViewPool', () => { diff --git a/modules/angular2/test/core/debug/debug_element_spec.ts b/modules/angular2/test/core/debug/debug_element_spec.ts index d4f20ce18c..c9daef8182 100644 --- a/modules/angular2/test/core/debug/debug_element_spec.ts +++ b/modules/angular2/test/core/debug/debug_element_spec.ts @@ -16,10 +16,10 @@ import { Scope } from 'angular2/test_lib'; -import {DOM} from 'angular2/src/dom/dom_adapter'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; -import {List, ListWrapper} from 'angular2/src/facade/collection'; -import {PromiseWrapper, EventEmitter, ObservableWrapper} from 'angular2/src/facade/async'; +import {List, ListWrapper} from 'angular2/src/core/facade/collection'; +import {PromiseWrapper, EventEmitter, ObservableWrapper} from 'angular2/src/core/facade/async'; import {Injectable} from 'angular2/di'; @@ -29,7 +29,7 @@ import { View, } from 'angular2/metadata'; -import {NgFor} from 'angular2/src/directives/ng_for'; +import {NgFor} from 'angular2/src/core/directives/ng_for'; @Injectable() class Logger { diff --git a/modules/angular2/test/core/debug/debug_element_view_listener_spec.ts b/modules/angular2/test/core/debug/debug_element_view_listener_spec.ts index 6d13619bc8..2e61335c45 100644 --- a/modules/angular2/test/core/debug/debug_element_view_listener_spec.ts +++ b/modules/angular2/test/core/debug/debug_element_view_listener_spec.ts @@ -16,7 +16,7 @@ import { Scope, inspectNativeElement } from 'angular2/test_lib'; -import {global} from 'angular2/src/facade/lang'; +import {global} from 'angular2/src/core/facade/lang'; import {APP_VIEW_POOL_CAPACITY} from 'angular2/src/core/compiler/view_pool'; import {Injectable, bind} from 'angular2/di'; import { @@ -24,7 +24,7 @@ import { Component, View, } from 'angular2/metadata'; -import {IS_DART} from '../platform'; +import {IS_DART} from '../../platform'; @Component({selector: 'my-comp'}) @View({directives: []}) diff --git a/modules/angular2/test/core/di/forward_ref_spec.ts b/modules/angular2/test/core/di/forward_ref_spec.ts index 779ecf8a3d..fe43c2b0fd 100644 --- a/modules/angular2/test/core/di/forward_ref_spec.ts +++ b/modules/angular2/test/core/di/forward_ref_spec.ts @@ -10,7 +10,7 @@ import { xit, } from 'angular2/test_lib'; import {forwardRef, resolveForwardRef} from 'angular2/di'; -import {Type} from 'angular2/src/facade/lang'; +import {Type} from 'angular2/src/core/facade/lang'; export function main() { describe("forwardRef", function() { diff --git a/modules/angular2/test/core/di/injector_spec.ts b/modules/angular2/test/core/di/injector_spec.ts index 36d7ac5e3e..e4f5ed6336 100644 --- a/modules/angular2/test/core/di/injector_spec.ts +++ b/modules/angular2/test/core/di/injector_spec.ts @@ -1,4 +1,4 @@ -import {isBlank, BaseException, stringify} from 'angular2/src/facade/lang'; +import {isBlank, BaseException, stringify} from 'angular2/src/core/facade/lang'; import { describe, ddescribe, @@ -27,7 +27,7 @@ import { Visibility } from 'angular2/di'; -import {InjectorInlineStrategy, InjectorDynamicStrategy} from 'angular2/src/di/injector'; +import {InjectorInlineStrategy, InjectorDynamicStrategy} from 'angular2/src/core/di/injector'; class CustomDependencyMetadata extends DependencyMetadata {} diff --git a/modules/angular2/test/core/directives/ng_class_spec.ts b/modules/angular2/test/core/directives/ng_class_spec.ts index 2e267dfba2..e093e5f599 100644 --- a/modules/angular2/test/core/directives/ng_class_spec.ts +++ b/modules/angular2/test/core/directives/ng_class_spec.ts @@ -13,9 +13,9 @@ import { it, xit, } from 'angular2/test_lib'; -import {List, ListWrapper, StringMapWrapper} from 'angular2/src/facade/collection'; +import {List, ListWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection'; import {Component, View, NgFor, bind} from 'angular2/angular2'; -import {NgClass} from 'angular2/src/directives/ng_class'; +import {NgClass} from 'angular2/src/core/directives/ng_class'; import {APP_VIEW_POOL_CAPACITY} from 'angular2/src/core/compiler/view_pool'; function detectChangesAndCheck(rootTC, classes: string, elIndex: number = 0) { diff --git a/modules/angular2/test/core/directives/ng_for_spec.ts b/modules/angular2/test/core/directives/ng_for_spec.ts index f0981b474d..a0b3b46abb 100644 --- a/modules/angular2/test/core/directives/ng_for_spec.ts +++ b/modules/angular2/test/core/directives/ng_for_spec.ts @@ -13,11 +13,11 @@ import { xit, } from 'angular2/test_lib'; -import {ListWrapper} from 'angular2/src/facade/collection'; +import {ListWrapper} from 'angular2/src/core/facade/collection'; import {Component, View} from 'angular2/angular2'; -import {NgFor} from 'angular2/src/directives/ng_for'; +import {NgFor} from 'angular2/src/core/directives/ng_for'; export function main() { diff --git a/modules/angular2/test/core/directives/ng_if_spec.ts b/modules/angular2/test/core/directives/ng_if_spec.ts index 9f05fd3af5..cfdbaf5b54 100644 --- a/modules/angular2/test/core/directives/ng_if_spec.ts +++ b/modules/angular2/test/core/directives/ng_if_spec.ts @@ -13,12 +13,12 @@ import { xit, } from 'angular2/test_lib'; -import {DOM} from 'angular2/src/dom/dom_adapter'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; import {Component, View} from 'angular2/angular2'; -import {NgIf} from 'angular2/src/directives/ng_if'; -import {IS_DART} from '../platform'; +import {NgIf} from 'angular2/src/core/directives/ng_if'; +import {IS_DART} from '../../platform'; export function main() { describe('ng-if directive', () => { diff --git a/modules/angular2/test/core/directives/ng_style_spec.ts b/modules/angular2/test/core/directives/ng_style_spec.ts index ed4e8a5460..4a6131aedf 100644 --- a/modules/angular2/test/core/directives/ng_style_spec.ts +++ b/modules/angular2/test/core/directives/ng_style_spec.ts @@ -14,12 +14,12 @@ import { xit, } from 'angular2/test_lib'; -import {StringMapWrapper} from 'angular2/src/facade/collection'; +import {StringMapWrapper} from 'angular2/src/core/facade/collection'; import {Component, View} from 'angular2/angular2'; -import {DOM} from 'angular2/src/dom/dom_adapter'; -import {NgStyle} from 'angular2/src/directives/ng_style'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {NgStyle} from 'angular2/src/core/directives/ng_style'; export function main() { describe('binding to CSS styles', () => { diff --git a/modules/angular2/test/core/directives/ng_switch_spec.ts b/modules/angular2/test/core/directives/ng_switch_spec.ts index 1cb291ff5b..6e242e45ce 100644 --- a/modules/angular2/test/core/directives/ng_switch_spec.ts +++ b/modules/angular2/test/core/directives/ng_switch_spec.ts @@ -14,7 +14,7 @@ import { import {Component, View} from 'angular2/angular2'; -import {NgSwitch, NgSwitchWhen, NgSwitchDefault} from 'angular2/src/directives/ng_switch'; +import {NgSwitch, NgSwitchWhen, NgSwitchDefault} from 'angular2/src/core/directives/ng_switch'; export function main() { describe('switch', () => { diff --git a/modules/angular2/test/core/directives/non_bindable_spec.ts b/modules/angular2/test/core/directives/non_bindable_spec.ts index 1557c1729e..9907ad8d83 100644 --- a/modules/angular2/test/core/directives/non_bindable_spec.ts +++ b/modules/angular2/test/core/directives/non_bindable_spec.ts @@ -12,13 +12,13 @@ import { it, xit, } from 'angular2/test_lib'; -import {DOM} from 'angular2/src/dom/dom_adapter'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; import {Component, Directive, View} from 'angular2/angular2'; import {ElementRef} from 'angular2/src/core/compiler/element_ref'; -import {NgNonBindable} from 'angular2/src/directives/ng_non_bindable'; +import {NgNonBindable} from 'angular2/src/core/directives/ng_non_bindable'; export function main() { describe('non-bindable', () => { diff --git a/modules/angular2/test/core/directives/observable_list_diff_spec.dart b/modules/angular2/test/core/directives/observable_list_diff_spec.dart index 745592c578..441c851e17 100644 --- a/modules/angular2/test/core/directives/observable_list_diff_spec.dart +++ b/modules/angular2/test/core/directives/observable_list_diff_spec.dart @@ -2,7 +2,7 @@ library angular2.test.directives.observable_list_iterable_diff_spec; import 'package:angular2/test_lib.dart'; import 'package:observe/observe.dart' show ObservableList; -import 'package:angular2/src/directives/observable_list_diff.dart'; +import 'package:angular2/src/core/directives/observable_list_diff.dart'; main() { describe('ObservableListDiff', () { diff --git a/modules/angular2/test/core/dom/dom_adapter_spec.ts b/modules/angular2/test/core/dom/dom_adapter_spec.ts index 814c0d2f61..8b9bf91be6 100644 --- a/modules/angular2/test/core/dom/dom_adapter_spec.ts +++ b/modules/angular2/test/core/dom/dom_adapter_spec.ts @@ -14,7 +14,7 @@ import { stringifyElement } from 'angular2/test_lib'; -import {DOM} from 'angular2/src/dom/dom_adapter'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; export function main() { describe('dom adapter', () => { diff --git a/modules/angular2/test/core/dom/html5lib_adapter.server.spec.dart b/modules/angular2/test/core/dom/html5lib_adapter.server.spec.dart index be777951fa..c044adc29e 100644 --- a/modules/angular2/test/core/dom/html5lib_adapter.server.spec.dart +++ b/modules/angular2/test/core/dom/html5lib_adapter.server.spec.dart @@ -2,7 +2,7 @@ library angular2.dom.html5lib_adapter.test; import 'package:guinness/guinness.dart'; import 'package:unittest/unittest.dart' hide expect; -import 'package:angular2/src/dom/html_adapter.dart'; +import 'package:angular2/src/core/dom/html_adapter.dart'; // A smoke-test of the adapter. It is primarily tested by the compiler. main() { diff --git a/modules/angular2/test/core/exception_handler_spec.ts b/modules/angular2/test/core/exception_handler_spec.ts index d096f11f5c..36242728b2 100644 --- a/modules/angular2/test/core/exception_handler_spec.ts +++ b/modules/angular2/test/core/exception_handler_spec.ts @@ -11,7 +11,7 @@ import { xit, Log } from 'angular2/test_lib'; -import {BaseException} from 'angular2/src/facade/lang'; +import {BaseException} from 'angular2/src/core/facade/lang'; import {ExceptionHandler} from 'angular2/src/core/exception_handler'; class _CustomException { diff --git a/modules/angular2/test/core/facade/async_dart_spec.dart b/modules/angular2/test/core/facade/async_dart_spec.dart index 23c030fcd2..d64d8006ed 100644 --- a/modules/angular2/test/core/facade/async_dart_spec.dart +++ b/modules/angular2/test/core/facade/async_dart_spec.dart @@ -2,7 +2,7 @@ library angular2.test.facade.async_dart_spec; import 'package:angular2/test_lib.dart'; -import 'package:angular2/src/facade/async.dart'; +import 'package:angular2/src/core/facade/async.dart'; class MockException implements Error { var message; diff --git a/modules/angular2/test/core/facade/async_spec.ts b/modules/angular2/test/core/facade/async_spec.ts index 5af01f45e5..acaef2ba59 100644 --- a/modules/angular2/test/core/facade/async_spec.ts +++ b/modules/angular2/test/core/facade/async_spec.ts @@ -12,8 +12,8 @@ import { inject } from 'angular2/test_lib'; -import {ObservableWrapper, EventEmitter, PromiseWrapper} from 'angular2/src/facade/async'; -import {ListWrapper} from 'angular2/src/facade/collection'; +import {ObservableWrapper, EventEmitter, PromiseWrapper} from 'angular2/src/core/facade/async'; +import {ListWrapper} from 'angular2/src/core/facade/collection'; export function main() { describe('EventEmitter', () => { diff --git a/modules/angular2/test/core/facade/collection_spec.ts b/modules/angular2/test/core/facade/collection_spec.ts index f8542b7a53..0ac6255e1e 100644 --- a/modules/angular2/test/core/facade/collection_spec.ts +++ b/modules/angular2/test/core/facade/collection_spec.ts @@ -6,7 +6,7 @@ import { StringMap, StringMapWrapper, MapWrapper -} from 'angular2/src/facade/collection'; +} from 'angular2/src/core/facade/collection'; export function main() { describe('ListWrapper', () => { diff --git a/modules/angular2/test/core/facade/lang_spec.ts b/modules/angular2/test/core/facade/lang_spec.ts index e954165869..d8e4931854 100644 --- a/modules/angular2/test/core/facade/lang_spec.ts +++ b/modules/angular2/test/core/facade/lang_spec.ts @@ -5,7 +5,7 @@ import { RegExpMatcherWrapper, StringWrapper, CONST_EXPR -} from 'angular2/src/facade/lang'; +} from 'angular2/src/core/facade/lang'; export function main() { describe('RegExp', () => { diff --git a/modules/angular2/test/core/forward_ref_integration_spec.ts b/modules/angular2/test/core/forward_ref_integration_spec.ts index 353a6b5970..2a7e57c3d8 100644 --- a/modules/angular2/test/core/forward_ref_integration_spec.ts +++ b/modules/angular2/test/core/forward_ref_integration_spec.ts @@ -14,7 +14,7 @@ import { import {Directive, Component, Query, View} from 'angular2/metadata'; import {QueryList, NgFor} from 'angular2/angular2'; import {forwardRef, resolveForwardRef, bind, Inject} from 'angular2/di'; -import {Type} from 'angular2/src/facade/lang'; +import {Type} from 'angular2/src/core/facade/lang'; export function main() { describe("forwardRef integration", function() { diff --git a/modules/angular2/test/core/life_cycle/life_cycle_spec.ts b/modules/angular2/test/core/life_cycle/life_cycle_spec.ts index 7222bb4785..a83944b51e 100644 --- a/modules/angular2/test/core/life_cycle/life_cycle_spec.ts +++ b/modules/angular2/test/core/life_cycle/life_cycle_spec.ts @@ -15,7 +15,7 @@ import { SpyChangeDetector, } from 'angular2/test_lib'; import {LifeCycle} from 'angular2/core'; -import {IMPLEMENTS} from 'angular2/src/facade/lang'; +import {IMPLEMENTS} from 'angular2/src/core/facade/lang'; export function main() { describe("LifeCycle", () => { diff --git a/modules/angular2/test/core/metadata/decorators_spec.ts b/modules/angular2/test/core/metadata/decorators_spec.ts index 888567a513..74abf9770e 100644 --- a/modules/angular2/test/core/metadata/decorators_spec.ts +++ b/modules/angular2/test/core/metadata/decorators_spec.ts @@ -11,7 +11,7 @@ import { } from 'angular2/test_lib'; import {Component, View, Directive} from 'angular2/angular2'; -import {reflector} from 'angular2/src/reflection/reflection'; +import {reflector} from 'angular2/src/core/reflection/reflection'; export function main() { describe('es5 decorators', () => { diff --git a/modules/angular2/test/core/profile/wtf_impl_spec.dart b/modules/angular2/test/core/profile/wtf_impl_spec.dart index 4be667f2aa..6fcce40beb 100644 --- a/modules/angular2/test/core/profile/wtf_impl_spec.dart +++ b/modules/angular2/test/core/profile/wtf_impl_spec.dart @@ -2,7 +2,7 @@ library angular2.test.core.wtf_impl; import 'package:angular2/test_lib.dart'; -import 'package:angular2/src/profile/wtf_impl.dart' as impl; +import 'package:angular2/src/core/profile/wtf_impl.dart' as impl; main() { describe('WTF', () { diff --git a/modules/angular2/test/core/reflection/reflector_common.ts b/modules/angular2/test/core/reflection/reflector_common.ts index ea6d16b697..3481c59423 100644 --- a/modules/angular2/test/core/reflection/reflector_common.ts +++ b/modules/angular2/test/core/reflection/reflector_common.ts @@ -1,4 +1,4 @@ -import {makeDecorator, makeParamDecorator} from 'angular2/src/util/decorators'; +import {makeDecorator, makeParamDecorator} from 'angular2/src/core/util/decorators'; export class ClassDecoratorImpl { value; diff --git a/modules/angular2/test/core/reflection/reflector_spec.ts b/modules/angular2/test/core/reflection/reflector_spec.ts index 4649987f9b..a0df234d13 100644 --- a/modules/angular2/test/core/reflection/reflector_spec.ts +++ b/modules/angular2/test/core/reflection/reflector_spec.ts @@ -1,9 +1,9 @@ import {describe, it, iit, ddescribe, expect, beforeEach} from 'angular2/test_lib'; -import {Reflector, ReflectionInfo} from 'angular2/src/reflection/reflection'; -import {ReflectionCapabilities} from 'angular2/src/reflection/reflection_capabilities'; +import {Reflector, ReflectionInfo} from 'angular2/src/core/reflection/reflection'; +import {ReflectionCapabilities} from 'angular2/src/core/reflection/reflection_capabilities'; import {ClassDecorator, ParamDecorator, classDecorator, paramDecorator} from './reflector_common'; -import {List} from 'angular2/src/facade/collection'; -import {IS_DART} from '../platform'; +import {List} from 'angular2/src/core/facade/collection'; +import {IS_DART} from '../../platform'; class AType { value; diff --git a/modules/angular2/test/core/render/api_spec.ts b/modules/angular2/test/core/render/api_spec.ts index 261c9602f3..f2f9b4bdab 100644 --- a/modules/angular2/test/core/render/api_spec.ts +++ b/modules/angular2/test/core/render/api_spec.ts @@ -1,6 +1,6 @@ -import {RenderDirectiveMetadata} from 'angular2/src/render/api'; +import {RenderDirectiveMetadata} from 'angular2/src/core/render/api'; -import {MapWrapper} from 'angular2/src/facade/collection'; +import {MapWrapper} from 'angular2/src/core/facade/collection'; import {ddescribe, describe, expect, it} from 'angular2/test_lib'; export function main() { diff --git a/modules/angular2/test/core/render/dom/compiler/compiler_common_tests.ts b/modules/angular2/test/core/render/dom/compiler/compiler_common_tests.ts index 9ade42faba..123350c31f 100644 --- a/modules/angular2/test/core/render/dom/compiler/compiler_common_tests.ts +++ b/modules/angular2/test/core/render/dom/compiler/compiler_common_tests.ts @@ -10,27 +10,33 @@ import { it, } from 'angular2/test_lib'; -import {DOM} from 'angular2/src/dom/dom_adapter'; -import {List, ListWrapper, Map, MapWrapper, StringMapWrapper} from 'angular2/src/facade/collection'; -import {Type, isBlank, stringify, isPresent, BaseException} from 'angular2/src/facade/lang'; -import {PromiseWrapper, Promise} from 'angular2/src/facade/async'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import { + List, + ListWrapper, + Map, + MapWrapper, + StringMapWrapper +} from 'angular2/src/core/facade/collection'; +import {Type, isBlank, stringify, isPresent, BaseException} from 'angular2/src/core/facade/lang'; +import {PromiseWrapper, Promise} from 'angular2/src/core/facade/async'; -import {DomCompiler} from 'angular2/src/render/dom/compiler/compiler'; +import {DomCompiler} from 'angular2/src/core/render/dom/compiler/compiler'; import { ProtoViewDto, ViewDefinition, RenderDirectiveMetadata, ViewType, ViewEncapsulation -} from 'angular2/src/render/api'; -import {CompileStep} from 'angular2/src/render/dom/compiler/compile_step'; -import {CompileStepFactory} from 'angular2/src/render/dom/compiler/compile_step_factory'; -import {ElementSchemaRegistry} from 'angular2/src/render/dom/schema/element_schema_registry'; -import {ViewLoader, TemplateAndStyles} from 'angular2/src/render/dom/compiler/view_loader'; +} from 'angular2/src/core/render/api'; +import {CompileStep} from 'angular2/src/core/render/dom/compiler/compile_step'; +import {CompileStepFactory} from 'angular2/src/core/render/dom/compiler/compile_step_factory'; +import {ElementSchemaRegistry} from 'angular2/src/core/render/dom/schema/element_schema_registry'; +import {ViewLoader, TemplateAndStyles} from 'angular2/src/core/render/dom/compiler/view_loader'; -import {resolveInternalDomProtoView} from 'angular2/src/render/dom/view/proto_view'; -import {SharedStylesHost} from 'angular2/src/render/dom/view/shared_styles_host'; -import {TemplateCloner} from 'angular2/src/render/dom/template_cloner'; +import {resolveInternalDomProtoView} from 'angular2/src/core/render/dom/view/proto_view'; +import {SharedStylesHost} from 'angular2/src/core/render/dom/view/shared_styles_host'; +import {TemplateCloner} from 'angular2/src/core/render/dom/template_cloner'; import {MockStep} from './pipeline_spec'; diff --git a/modules/angular2/test/core/render/dom/compiler/compiler_html5lib.server.spec.dart b/modules/angular2/test/core/render/dom/compiler/compiler_html5lib.server.spec.dart index 0a2f98865b..be6f2ac158 100644 --- a/modules/angular2/test/core/render/dom/compiler/compiler_html5lib.server.spec.dart +++ b/modules/angular2/test/core/render/dom/compiler/compiler_html5lib.server.spec.dart @@ -1,6 +1,6 @@ library angular2.compiler.html5lib_dom_adapter.test; -import 'package:angular2/src/dom/html_adapter.dart'; +import 'package:angular2/src/core/dom/html_adapter.dart'; import 'package:angular2/src/test_lib/test_lib.dart' show testSetup; import 'compiler_common_tests.dart'; diff --git a/modules/angular2/test/core/render/dom/compiler/directive_parser_spec.ts b/modules/angular2/test/core/render/dom/compiler/directive_parser_spec.ts index a7b1533f00..cbd0ec316a 100644 --- a/modules/angular2/test/core/render/dom/compiler/directive_parser_spec.ts +++ b/modules/angular2/test/core/render/dom/compiler/directive_parser_spec.ts @@ -1,12 +1,12 @@ import {describe, beforeEach, it, xit, expect, iit, ddescribe, el} from 'angular2/test_lib'; -import {isPresent, isBlank, assertionsEnabled, IMPLEMENTS} from 'angular2/src/facade/lang'; -import {ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/facade/collection'; -import {DOM} from 'angular2/src/dom/dom_adapter'; -import {DirectiveParser} from 'angular2/src/render/dom/compiler/directive_parser'; -import {CompilePipeline} from 'angular2/src/render/dom/compiler/compile_pipeline'; -import {ViewDefinition, RenderDirectiveMetadata, ViewType} from 'angular2/src/render/api'; -import {Lexer, Parser} from 'angular2/src/change_detection/change_detection'; -import {ElementBinderBuilder} from 'angular2/src/render/dom/view/proto_view_builder'; +import {isPresent, isBlank, assertionsEnabled, IMPLEMENTS} from 'angular2/src/core/facade/lang'; +import {ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {DirectiveParser} from 'angular2/src/core/render/dom/compiler/directive_parser'; +import {CompilePipeline} from 'angular2/src/core/render/dom/compiler/compile_pipeline'; +import {ViewDefinition, RenderDirectiveMetadata, ViewType} from 'angular2/src/core/render/api'; +import {Lexer, Parser} from 'angular2/src/core/change_detection/change_detection'; +import {ElementBinderBuilder} from 'angular2/src/core/render/dom/view/proto_view_builder'; import {MockStep} from './pipeline_spec'; export function main() { diff --git a/modules/angular2/test/core/render/dom/compiler/pipeline_spec.ts b/modules/angular2/test/core/render/dom/compiler/pipeline_spec.ts index 9b88a27fe2..1d9367cd84 100644 --- a/modules/angular2/test/core/render/dom/compiler/pipeline_spec.ts +++ b/modules/angular2/test/core/render/dom/compiler/pipeline_spec.ts @@ -1,15 +1,20 @@ import {describe, beforeEach, it, expect, iit, ddescribe, el} from 'angular2/test_lib'; -import {ListWrapper, List, MapWrapper} from 'angular2/src/facade/collection'; -import {DOM} from 'angular2/src/dom/dom_adapter'; -import {isPresent, NumberWrapper, StringWrapper, IMPLEMENTS} from 'angular2/src/facade/lang'; +import {ListWrapper, List, MapWrapper} from 'angular2/src/core/facade/collection'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {isPresent, NumberWrapper, StringWrapper, IMPLEMENTS} from 'angular2/src/core/facade/lang'; -import {CompilePipeline} from 'angular2/src/render/dom/compiler/compile_pipeline'; -import {CompileElement} from 'angular2/src/render/dom/compiler/compile_element'; -import {CompileStep} from 'angular2/src/render/dom/compiler/compile_step'; -import {CompileControl} from 'angular2/src/render/dom/compiler/compile_control'; +import {CompilePipeline} from 'angular2/src/core/render/dom/compiler/compile_pipeline'; +import {CompileElement} from 'angular2/src/core/render/dom/compiler/compile_element'; +import {CompileStep} from 'angular2/src/core/render/dom/compiler/compile_step'; +import {CompileControl} from 'angular2/src/core/render/dom/compiler/compile_control'; -import {ProtoViewBuilder} from 'angular2/src/render/dom/view/proto_view_builder'; -import {ProtoViewDto, ViewType, ViewEncapsulation, ViewDefinition} from 'angular2/src/render/api'; +import {ProtoViewBuilder} from 'angular2/src/core/render/dom/view/proto_view_builder'; +import { + ProtoViewDto, + ViewType, + ViewEncapsulation, + ViewDefinition +} from 'angular2/src/core/render/api'; export function main() { describe('compile_pipeline', () => { diff --git a/modules/angular2/test/core/render/dom/compiler/property_binding_parser_spec.ts b/modules/angular2/test/core/render/dom/compiler/property_binding_parser_spec.ts index 6f6b6c8272..a4d0f63357 100644 --- a/modules/angular2/test/core/render/dom/compiler/property_binding_parser_spec.ts +++ b/modules/angular2/test/core/render/dom/compiler/property_binding_parser_spec.ts @@ -1,11 +1,11 @@ import {describe, beforeEach, it, expect, iit, ddescribe, el} from 'angular2/test_lib'; -import {IMPLEMENTS} from 'angular2/src/facade/lang'; -import {PropertyBindingParser} from 'angular2/src/render/dom/compiler/property_binding_parser'; -import {CompilePipeline} from 'angular2/src/render/dom/compiler/compile_pipeline'; -import {MapWrapper, ListWrapper} from 'angular2/src/facade/collection'; -import {Lexer, Parser} from 'angular2/src/change_detection/change_detection'; -import {ElementBinderBuilder} from 'angular2/src/render/dom/view/proto_view_builder'; -import {ViewDefinition, ViewType} from 'angular2/src/render/api'; +import {IMPLEMENTS} from 'angular2/src/core/facade/lang'; +import {PropertyBindingParser} from 'angular2/src/core/render/dom/compiler/property_binding_parser'; +import {CompilePipeline} from 'angular2/src/core/render/dom/compiler/compile_pipeline'; +import {MapWrapper, ListWrapper} from 'angular2/src/core/facade/collection'; +import {Lexer, Parser} from 'angular2/src/core/change_detection/change_detection'; +import {ElementBinderBuilder} from 'angular2/src/core/render/dom/view/proto_view_builder'; +import {ViewDefinition, ViewType} from 'angular2/src/core/render/api'; import {MockStep} from './pipeline_spec'; var EMPTY_MAP = new Map(); diff --git a/modules/angular2/test/core/render/dom/compiler/selector_spec.ts b/modules/angular2/test/core/render/dom/compiler/selector_spec.ts index 683dfda485..48ae7a7666 100644 --- a/modules/angular2/test/core/render/dom/compiler/selector_spec.ts +++ b/modules/angular2/test/core/render/dom/compiler/selector_spec.ts @@ -1,8 +1,8 @@ import {describe, it, expect, beforeEach, ddescribe, iit, xit, el} from 'angular2/test_lib'; -import {DOM} from 'angular2/src/dom/dom_adapter'; -import {SelectorMatcher} from 'angular2/src/render/dom/compiler/selector'; -import {CssSelector} from 'angular2/src/render/dom/compiler/selector'; -import {List, ListWrapper, MapWrapper} from 'angular2/src/facade/collection'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {SelectorMatcher} from 'angular2/src/core/render/dom/compiler/selector'; +import {CssSelector} from 'angular2/src/core/render/dom/compiler/selector'; +import {List, ListWrapper, MapWrapper} from 'angular2/src/core/facade/collection'; export function main() { describe('SelectorMatcher', () => { diff --git a/modules/angular2/test/core/render/dom/compiler/shadow_css_spec.ts b/modules/angular2/test/core/render/dom/compiler/shadow_css_spec.ts index 66dd775558..c60e7430c7 100644 --- a/modules/angular2/test/core/render/dom/compiler/shadow_css_spec.ts +++ b/modules/angular2/test/core/render/dom/compiler/shadow_css_spec.ts @@ -9,10 +9,10 @@ import { el, normalizeCSS } from 'angular2/test_lib'; -import {ShadowCss} from 'angular2/src/render/dom/compiler/shadow_css'; +import {ShadowCss} from 'angular2/src/core/render/dom/compiler/shadow_css'; -import {RegExpWrapper, StringWrapper, isPresent} from 'angular2/src/facade/lang'; -import {DOM} from 'angular2/src/dom/dom_adapter'; +import {RegExpWrapper, StringWrapper, isPresent} from 'angular2/src/core/facade/lang'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; export function main() { describe('ShadowCss', function() { diff --git a/modules/angular2/test/core/render/dom/compiler/style_encapsulator_spec.ts b/modules/angular2/test/core/render/dom/compiler/style_encapsulator_spec.ts index c6e243bd4b..0c7c9719b6 100644 --- a/modules/angular2/test/core/render/dom/compiler/style_encapsulator_spec.ts +++ b/modules/angular2/test/core/render/dom/compiler/style_encapsulator_spec.ts @@ -12,17 +12,17 @@ import { SpyObject, } from 'angular2/test_lib'; -import {DOM} from 'angular2/src/dom/dom_adapter'; -import {CompilePipeline} from 'angular2/src/render/dom/compiler/compile_pipeline'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {CompilePipeline} from 'angular2/src/core/render/dom/compiler/compile_pipeline'; -import {MapWrapper, ListWrapper} from 'angular2/src/facade/collection'; +import {MapWrapper, ListWrapper} from 'angular2/src/core/facade/collection'; import { ProtoViewBuilder, ElementBinderBuilder -} from 'angular2/src/render/dom/view/proto_view_builder'; -import {ViewDefinition, ViewType, ViewEncapsulation} from 'angular2/src/render/api'; +} from 'angular2/src/core/render/dom/view/proto_view_builder'; +import {ViewDefinition, ViewType, ViewEncapsulation} from 'angular2/src/core/render/api'; -import {StyleEncapsulator} from 'angular2/src/render/dom/compiler/style_encapsulator'; +import {StyleEncapsulator} from 'angular2/src/core/render/dom/compiler/style_encapsulator'; import {MockStep} from './pipeline_spec'; export function main() { diff --git a/modules/angular2/test/core/render/dom/compiler/style_inliner_spec.ts b/modules/angular2/test/core/render/dom/compiler/style_inliner_spec.ts index 0f8b81eac0..96d6c5f4df 100644 --- a/modules/angular2/test/core/render/dom/compiler/style_inliner_spec.ts +++ b/modules/angular2/test/core/render/dom/compiler/style_inliner_spec.ts @@ -11,13 +11,13 @@ import { it, xit, } from 'angular2/test_lib'; -import {StyleInliner} from 'angular2/src/render/dom/compiler/style_inliner'; +import {StyleInliner} from 'angular2/src/core/render/dom/compiler/style_inliner'; -import {isBlank} from 'angular2/src/facade/lang'; -import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; -import {Map, MapWrapper} from 'angular2/src/facade/collection'; +import {isBlank} from 'angular2/src/core/facade/lang'; +import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async'; +import {Map, MapWrapper} from 'angular2/src/core/facade/collection'; -import {XHR} from 'angular2/src/render/xhr'; +import {XHR} from 'angular2/src/core/render/xhr'; import {bind} from 'angular2/di'; diff --git a/modules/angular2/test/core/render/dom/compiler/style_url_resolver_spec.ts b/modules/angular2/test/core/render/dom/compiler/style_url_resolver_spec.ts index 31a0bd7942..9edcb33916 100644 --- a/modules/angular2/test/core/render/dom/compiler/style_url_resolver_spec.ts +++ b/modules/angular2/test/core/render/dom/compiler/style_url_resolver_spec.ts @@ -1,7 +1,7 @@ import {describe, it, expect, beforeEach, ddescribe, iit, xit, el} from 'angular2/test_lib'; -import {StyleUrlResolver} from 'angular2/src/render/dom/compiler/style_url_resolver'; +import {StyleUrlResolver} from 'angular2/src/core/render/dom/compiler/style_url_resolver'; -import {UrlResolver} from 'angular2/src/services/url_resolver'; +import {UrlResolver} from 'angular2/src/core/services/url_resolver'; export function main() { describe('StyleUrlResolver', () => { diff --git a/modules/angular2/test/core/render/dom/compiler/text_interpolation_parser_spec.ts b/modules/angular2/test/core/render/dom/compiler/text_interpolation_parser_spec.ts index d6a0d85190..a4fc646db4 100644 --- a/modules/angular2/test/core/render/dom/compiler/text_interpolation_parser_spec.ts +++ b/modules/angular2/test/core/render/dom/compiler/text_interpolation_parser_spec.ts @@ -1,15 +1,17 @@ import {describe, beforeEach, expect, it, iit, ddescribe, el} from 'angular2/test_lib'; -import {TextInterpolationParser} from 'angular2/src/render/dom/compiler/text_interpolation_parser'; -import {CompilePipeline} from 'angular2/src/render/dom/compiler/compile_pipeline'; -import {MapWrapper, ListWrapper} from 'angular2/src/facade/collection'; -import {Lexer, Parser, ASTWithSource} from 'angular2/src/change_detection/change_detection'; +import { + TextInterpolationParser +} from 'angular2/src/core/render/dom/compiler/text_interpolation_parser'; +import {CompilePipeline} from 'angular2/src/core/render/dom/compiler/compile_pipeline'; +import {MapWrapper, ListWrapper} from 'angular2/src/core/facade/collection'; +import {Lexer, Parser, ASTWithSource} from 'angular2/src/core/change_detection/change_detection'; import {IgnoreChildrenStep} from './pipeline_spec'; import { ProtoViewBuilder, ElementBinderBuilder -} from 'angular2/src/render/dom/view/proto_view_builder'; -import {DOM} from 'angular2/src/dom/dom_adapter'; -import {ViewDefinition, ViewType} from 'angular2/src/render/api'; +} from 'angular2/src/core/render/dom/view/proto_view_builder'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {ViewDefinition, ViewType} from 'angular2/src/core/render/api'; export function main() { describe('TextInterpolationParser', () => { diff --git a/modules/angular2/test/core/render/dom/compiler/view_loader_spec.ts b/modules/angular2/test/core/render/dom/compiler/view_loader_spec.ts index eb8ded30c0..64122563b8 100644 --- a/modules/angular2/test/core/render/dom/compiler/view_loader_spec.ts +++ b/modules/angular2/test/core/render/dom/compiler/view_loader_spec.ts @@ -10,16 +10,16 @@ import { it, xit, } from 'angular2/test_lib'; -import {ViewLoader, TemplateAndStyles} from 'angular2/src/render/dom/compiler/view_loader'; -import {StyleInliner} from 'angular2/src/render/dom/compiler/style_inliner'; -import {StyleUrlResolver} from 'angular2/src/render/dom/compiler/style_url_resolver'; -import {UrlResolver} from 'angular2/src/services/url_resolver'; +import {ViewLoader, TemplateAndStyles} from 'angular2/src/core/render/dom/compiler/view_loader'; +import {StyleInliner} from 'angular2/src/core/render/dom/compiler/style_inliner'; +import {StyleUrlResolver} from 'angular2/src/core/render/dom/compiler/style_url_resolver'; +import {UrlResolver} from 'angular2/src/core/services/url_resolver'; -import {PromiseWrapper, Promise} from 'angular2/src/facade/async'; -import {MapWrapper, ListWrapper} from 'angular2/src/facade/collection'; -import {XHR} from 'angular2/src/render/xhr'; -import {MockXHR} from 'angular2/src/render/xhr_mock'; -import {ViewDefinition} from 'angular2/src/render/api'; +import {PromiseWrapper, Promise} from 'angular2/src/core/facade/async'; +import {MapWrapper, ListWrapper} from 'angular2/src/core/facade/collection'; +import {XHR} from 'angular2/src/core/render/xhr'; +import {MockXHR} from 'angular2/src/core/render/xhr_mock'; +import {ViewDefinition} from 'angular2/src/core/render/api'; export function main() { describe('ViewLoader', () => { diff --git a/modules/angular2/test/core/render/dom/compiler/view_splitter_spec.ts b/modules/angular2/test/core/render/dom/compiler/view_splitter_spec.ts index 7ed60a9ae3..3b1d3f4402 100644 --- a/modules/angular2/test/core/render/dom/compiler/view_splitter_spec.ts +++ b/modules/angular2/test/core/render/dom/compiler/view_splitter_spec.ts @@ -8,15 +8,15 @@ import { el, stringifyElement } from 'angular2/test_lib'; -import {MapWrapper} from 'angular2/src/facade/collection'; +import {MapWrapper} from 'angular2/src/core/facade/collection'; -import {ViewSplitter} from 'angular2/src/render/dom/compiler/view_splitter'; -import {CompilePipeline} from 'angular2/src/render/dom/compiler/compile_pipeline'; -import {CompileElement} from 'angular2/src/render/dom/compiler/compile_element'; -import {ProtoViewDto, ViewType, ViewDefinition} from 'angular2/src/render/api'; -import {DOM} from 'angular2/src/dom/dom_adapter'; +import {ViewSplitter} from 'angular2/src/core/render/dom/compiler/view_splitter'; +import {CompilePipeline} from 'angular2/src/core/render/dom/compiler/compile_pipeline'; +import {CompileElement} from 'angular2/src/core/render/dom/compiler/compile_element'; +import {ProtoViewDto, ViewType, ViewDefinition} from 'angular2/src/core/render/api'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; -import {Lexer, Parser} from 'angular2/src/change_detection/change_detection'; +import {Lexer, Parser} from 'angular2/src/core/change_detection/change_detection'; export function main() { describe('ViewSplitter', () => { diff --git a/modules/angular2/test/core/render/dom/convert_spec.ts b/modules/angular2/test/core/render/dom/convert_spec.ts index 529d7701cf..b9161c53cf 100644 --- a/modules/angular2/test/core/render/dom/convert_spec.ts +++ b/modules/angular2/test/core/render/dom/convert_spec.ts @@ -1,6 +1,9 @@ -import {MapWrapper} from 'angular2/src/facade/collection'; -import {RenderDirectiveMetadata} from 'angular2/src/render/api'; -import {directiveMetadataFromMap, directiveMetadataToMap} from 'angular2/src/render/dom/convert'; +import {MapWrapper} from 'angular2/src/core/facade/collection'; +import {RenderDirectiveMetadata} from 'angular2/src/core/render/api'; +import { + directiveMetadataFromMap, + directiveMetadataToMap +} from 'angular2/src/core/render/dom/convert'; import {ddescribe, describe, expect, it} from 'angular2/test_lib'; export function main() { diff --git a/modules/angular2/test/core/render/dom/dom_renderer_integration_spec.ts b/modules/angular2/test/core/render/dom/dom_renderer_integration_spec.ts index 40c5342fb7..6d93ed7fd5 100644 --- a/modules/angular2/test/core/render/dom/dom_renderer_integration_spec.ts +++ b/modules/angular2/test/core/render/dom/dom_renderer_integration_spec.ts @@ -13,8 +13,8 @@ import { SpyObject, } from 'angular2/test_lib'; -import {MapWrapper} from 'angular2/src/facade/collection'; -import {DOM} from 'angular2/src/dom/dom_adapter'; +import {MapWrapper} from 'angular2/src/core/facade/collection'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; import {DomTestbed, TestRootView, elRef} from './dom_testbed'; @@ -23,7 +23,7 @@ import { RenderDirectiveMetadata, RenderViewRef, ViewEncapsulation -} from 'angular2/src/render/api'; +} from 'angular2/src/core/render/api'; export function main() { describe('DomRenderer integration', () => { diff --git a/modules/angular2/test/core/render/dom/dom_testbed.ts b/modules/angular2/test/core/render/dom/dom_testbed.ts index 533951fb4a..2793f932a6 100644 --- a/modules/angular2/test/core/render/dom/dom_testbed.ts +++ b/modules/angular2/test/core/render/dom/dom_testbed.ts @@ -1,12 +1,12 @@ import {Inject, Injectable} from 'angular2/di'; -import {isPresent} from 'angular2/src/facade/lang'; -import {MapWrapper, ListWrapper, List, Map} from 'angular2/src/facade/collection'; -import {PromiseWrapper, Promise} from 'angular2/src/facade/async'; -import {DOM} from 'angular2/src/dom/dom_adapter'; +import {isPresent} from 'angular2/src/core/facade/lang'; +import {MapWrapper, ListWrapper, List, Map} from 'angular2/src/core/facade/collection'; +import {PromiseWrapper, Promise} from 'angular2/src/core/facade/async'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; -import {DomRenderer} from 'angular2/src/render/dom/dom_renderer'; -import {DOCUMENT} from 'angular2/src/render/dom/dom_tokens'; -import {DefaultDomCompiler} from 'angular2/src/render/dom/compiler/compiler'; +import {DomRenderer} from 'angular2/src/core/render/dom/dom_renderer'; +import {DOCUMENT} from 'angular2/src/core/render/dom/dom_tokens'; +import {DefaultDomCompiler} from 'angular2/src/core/render/dom/compiler/compiler'; import { RenderViewWithFragments, RenderFragmentRef, @@ -18,9 +18,9 @@ import { RenderElementRef, RenderProtoViewMergeMapping, RenderProtoViewRef -} from 'angular2/src/render/api'; -import {resolveInternalDomView} from 'angular2/src/render/dom/view/view'; -import {resolveInternalDomFragment} from 'angular2/src/render/dom/view/fragment'; +} from 'angular2/src/core/render/api'; +import {resolveInternalDomView} from 'angular2/src/core/render/dom/view/view'; +import {resolveInternalDomFragment} from 'angular2/src/core/render/dom/view/fragment'; import {el, dispatchEvent} from 'angular2/test_lib'; export class TestRootView { diff --git a/modules/angular2/test/core/render/dom/events/event_manager_spec.ts b/modules/angular2/test/core/render/dom/events/event_manager_spec.ts index 35a49f9889..b8767b3437 100644 --- a/modules/angular2/test/core/render/dom/events/event_manager_spec.ts +++ b/modules/angular2/test/core/render/dom/events/event_manager_spec.ts @@ -13,10 +13,10 @@ import { EventManager, EventManagerPlugin, DomEventsPlugin -} from 'angular2/src/render/dom/events/event_manager'; +} from 'angular2/src/core/render/dom/events/event_manager'; import {NgZone} from 'angular2/src/core/zone/ng_zone'; -import {List, ListWrapper, Map, MapWrapper} from 'angular2/src/facade/collection'; -import {DOM} from 'angular2/src/dom/dom_adapter'; +import {List, ListWrapper, Map, MapWrapper} from 'angular2/src/core/facade/collection'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; export function main() { var domEventPlugin; diff --git a/modules/angular2/test/core/render/dom/events/key_events_spec.ts b/modules/angular2/test/core/render/dom/events/key_events_spec.ts index d3fafe17d7..9f2b8df0b9 100644 --- a/modules/angular2/test/core/render/dom/events/key_events_spec.ts +++ b/modules/angular2/test/core/render/dom/events/key_events_spec.ts @@ -9,7 +9,7 @@ import { beforeEach, el } from 'angular2/test_lib'; -import {KeyEventsPlugin} from 'angular2/src/render/dom/events/key_events'; +import {KeyEventsPlugin} from 'angular2/src/core/render/dom/events/key_events'; export function main() { describe('KeyEvents', () => { diff --git a/modules/angular2/test/core/render/dom/schema/dom_element_schema_registry_spec.ts b/modules/angular2/test/core/render/dom/schema/dom_element_schema_registry_spec.ts index c84c1000ae..6794f7ad40 100644 --- a/modules/angular2/test/core/render/dom/schema/dom_element_schema_registry_spec.ts +++ b/modules/angular2/test/core/render/dom/schema/dom_element_schema_registry_spec.ts @@ -9,10 +9,12 @@ import { it, xit } from 'angular2/test_lib'; -import {IS_DART} from '../../../platform'; +import {IS_DART} from '../../../../platform'; -import {DomElementSchemaRegistry} from 'angular2/src/render/dom/schema/dom_element_schema_registry'; -import {DOM} from 'angular2/src/dom/dom_adapter'; +import { + DomElementSchemaRegistry +} from 'angular2/src/core/render/dom/schema/dom_element_schema_registry'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; export function main() { // DOMElementSchema can only be used on the JS side where we can safely diff --git a/modules/angular2/test/core/render/dom/template_cloner_spec.ts b/modules/angular2/test/core/render/dom/template_cloner_spec.ts index d8ac1aabcc..2e5b2c69e2 100644 --- a/modules/angular2/test/core/render/dom/template_cloner_spec.ts +++ b/modules/angular2/test/core/render/dom/template_cloner_spec.ts @@ -13,8 +13,8 @@ import { SpyObject, } from 'angular2/test_lib'; -import {DOM} from 'angular2/src/dom/dom_adapter'; -import {TemplateCloner} from 'angular2/src/render/dom/template_cloner'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {TemplateCloner} from 'angular2/src/core/render/dom/template_cloner'; export function main() { describe('TemplateCloner', () => { diff --git a/modules/angular2/test/core/render/dom/util_spec.ts b/modules/angular2/test/core/render/dom/util_spec.ts index c303bb52c6..f8b6b92a76 100644 --- a/modules/angular2/test/core/render/dom/util_spec.ts +++ b/modules/angular2/test/core/render/dom/util_spec.ts @@ -1,4 +1,4 @@ -import {EventConfig} from 'angular2/src/render/dom/util'; +import {EventConfig} from 'angular2/src/core/render/dom/util'; import {ddescribe, describe, expect, it} from 'angular2/test_lib'; export function main() { diff --git a/modules/angular2/test/core/render/dom/view/proto_view_builder_spec.ts b/modules/angular2/test/core/render/dom/view/proto_view_builder_spec.ts index 067b859e2c..048161118b 100644 --- a/modules/angular2/test/core/render/dom/view/proto_view_builder_spec.ts +++ b/modules/angular2/test/core/render/dom/view/proto_view_builder_spec.ts @@ -10,13 +10,15 @@ import { el } from 'angular2/test_lib'; -import {DomElementSchemaRegistry} from 'angular2/src/render/dom/schema/dom_element_schema_registry'; -import {TemplateCloner} from 'angular2/src/render/dom/template_cloner'; -import {ProtoViewBuilder} from 'angular2/src/render/dom/view/proto_view_builder'; -import {ASTWithSource, AST} from 'angular2/src/change_detection/change_detection'; -import {PropertyBindingType, ViewType, ViewEncapsulation} from 'angular2/src/render/api'; -import {DOM} from 'angular2/src/dom/dom_adapter'; -import {IS_DART} from '../../../platform'; +import { + DomElementSchemaRegistry +} from 'angular2/src/core/render/dom/schema/dom_element_schema_registry'; +import {TemplateCloner} from 'angular2/src/core/render/dom/template_cloner'; +import {ProtoViewBuilder} from 'angular2/src/core/render/dom/view/proto_view_builder'; +import {ASTWithSource, AST} from 'angular2/src/core/change_detection/change_detection'; +import {PropertyBindingType, ViewType, ViewEncapsulation} from 'angular2/src/core/render/api'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {IS_DART} from '../../../../platform'; export function main() { function emptyExpr() { return new ASTWithSource(new AST(), 'empty', 'empty'); } diff --git a/modules/angular2/test/core/render/dom/view/proto_view_merger_integration_spec.ts b/modules/angular2/test/core/render/dom/view/proto_view_merger_integration_spec.ts index 1eb2629fea..d9a5418673 100644 --- a/modules/angular2/test/core/render/dom/view/proto_view_merger_integration_spec.ts +++ b/modules/angular2/test/core/render/dom/view/proto_view_merger_integration_spec.ts @@ -15,9 +15,9 @@ import { stringifyElement } from 'angular2/test_lib'; -import {isPresent} from 'angular2/src/facade/lang'; +import {isPresent} from 'angular2/src/core/facade/lang'; -import {DomTestbed} from '../dom_testbed'; +import {DomTestbed} from '../../../../core/render/dom/dom_testbed'; import { ViewDefinition, @@ -25,14 +25,17 @@ import { RenderProtoViewMergeMapping, ViewEncapsulation, ViewType -} from 'angular2/src/render/api'; +} from 'angular2/src/core/render/api'; -import {DOM} from 'angular2/src/dom/dom_adapter'; -import {cloneAndQueryProtoView} from 'angular2/src/render/dom/util'; -import {TemplateCloner} from 'angular2/src/render/dom/template_cloner'; -import {resolveInternalDomProtoView, DomProtoView} from 'angular2/src/render/dom/view/proto_view'; -import {ProtoViewBuilder} from 'angular2/src/render/dom/view/proto_view_builder'; -import {ElementSchemaRegistry} from 'angular2/src/render/dom/schema/element_schema_registry'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {cloneAndQueryProtoView} from 'angular2/src/core/render/dom/util'; +import {TemplateCloner} from 'angular2/src/core/render/dom/template_cloner'; +import { + resolveInternalDomProtoView, + DomProtoView +} from 'angular2/src/core/render/dom/view/proto_view'; +import {ProtoViewBuilder} from 'angular2/src/core/render/dom/view/proto_view_builder'; +import {ElementSchemaRegistry} from 'angular2/src/core/render/dom/schema/element_schema_registry'; export function main() { describe('ProtoViewMerger integration test', () => { diff --git a/modules/angular2/test/core/render/dom/view/shared_styles_host_spec.ts b/modules/angular2/test/core/render/dom/view/shared_styles_host_spec.ts index 4a4da3a5bc..a435192daf 100644 --- a/modules/angular2/test/core/render/dom/view/shared_styles_host_spec.ts +++ b/modules/angular2/test/core/render/dom/view/shared_styles_host_spec.ts @@ -16,8 +16,8 @@ import { proxy } from 'angular2/test_lib'; -import {DOM} from 'angular2/src/dom/dom_adapter'; -import {DomSharedStylesHost} from 'angular2/src/render/dom/view/shared_styles_host'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {DomSharedStylesHost} from 'angular2/src/core/render/dom/view/shared_styles_host'; export function main() { describe('DomSharedStylesHost', () => { diff --git a/modules/angular2/test/core/render/dom/view/view_spec.ts b/modules/angular2/test/core/render/dom/view/view_spec.ts index 2090f48d85..d4b0c0ff33 100644 --- a/modules/angular2/test/core/render/dom/view/view_spec.ts +++ b/modules/angular2/test/core/render/dom/view/view_spec.ts @@ -15,14 +15,14 @@ import { SpyObject, proxy } from 'angular2/test_lib'; -import {isBlank} from 'angular2/src/facade/lang'; -import {ListWrapper} from 'angular2/src/facade/collection'; +import {isBlank} from 'angular2/src/core/facade/lang'; +import {ListWrapper} from 'angular2/src/core/facade/collection'; -import {DomProtoView} from 'angular2/src/render/dom/view/proto_view'; -import {DomElementBinder} from 'angular2/src/render/dom/view/element_binder'; -import {DomView} from 'angular2/src/render/dom/view/view'; -import {DOM} from 'angular2/src/dom/dom_adapter'; -import {TemplateCloner} from 'angular2/src/render/dom/template_cloner'; +import {DomProtoView} from 'angular2/src/core/render/dom/view/proto_view'; +import {DomElementBinder} from 'angular2/src/core/render/dom/view/element_binder'; +import {DomView} from 'angular2/src/core/render/dom/view/view'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {TemplateCloner} from 'angular2/src/core/render/dom/template_cloner'; export function main() { describe('DomView', () => { diff --git a/modules/angular2/test/core/render/xhr_impl_spec.ts b/modules/angular2/test/core/render/xhr_impl_spec.ts index b28c29f569..6acffd8dd7 100644 --- a/modules/angular2/test/core/render/xhr_impl_spec.ts +++ b/modules/angular2/test/core/render/xhr_impl_spec.ts @@ -10,14 +10,14 @@ import { xit } from 'angular2/test_lib'; -import {XHRImpl} from 'angular2/src/render/xhr_impl'; -import {PromiseWrapper} from 'angular2/src/facade/async'; +import {XHRImpl} from 'angular2/src/core/render/xhr_impl'; +import {PromiseWrapper} from 'angular2/src/core/facade/async'; export function main() { describe('XHRImpl', () => { var xhr: XHRImpl; - var url200 = '/base/modules/angular2/test/services/static_assets/200.html'; - var url404 = '/base/modules/angular2/test/services/static_assets/404.html'; + var url200 = '/base/modules/angular2/test/core/services/static_assets/200.html'; + var url404 = '/base/modules/angular2/test/core/services/static_assets/404.html'; beforeEach(() => { xhr = new XHRImpl(); }); diff --git a/modules/angular2/test/core/render/xhr_mock_spec.ts b/modules/angular2/test/core/render/xhr_mock_spec.ts index 25c799f029..7008a5e025 100644 --- a/modules/angular2/test/core/render/xhr_mock_spec.ts +++ b/modules/angular2/test/core/render/xhr_mock_spec.ts @@ -9,9 +9,9 @@ import { inject, it, } from 'angular2/test_lib'; -import {MockXHR} from 'angular2/src/render/xhr_mock'; -import {PromiseWrapper, Promise} from 'angular2/src/facade/async'; -import {isPresent} from 'angular2/src/facade/lang'; +import {MockXHR} from 'angular2/src/core/render/xhr_mock'; +import {PromiseWrapper, Promise} from 'angular2/src/core/facade/async'; +import {isPresent} from 'angular2/src/core/facade/lang'; export function main() { describe('MockXHR', () => { diff --git a/modules/angular2/test/core/services/ruler_spec.ts b/modules/angular2/test/core/services/ruler_spec.ts index 2f805331e7..e5a55cf7f1 100644 --- a/modules/angular2/test/core/services/ruler_spec.ts +++ b/modules/angular2/test/core/services/ruler_spec.ts @@ -11,12 +11,12 @@ import { proxy } from 'angular2/test_lib'; -import {DOM, DomAdapter} from 'angular2/src/dom/dom_adapter'; +import {DOM, DomAdapter} from 'angular2/src/core/dom/dom_adapter'; import {ElementRef} from 'angular2/src/core/compiler/element_ref'; -import {Ruler, Rectangle} from 'angular2/src/services/ruler'; +import {Ruler, Rectangle} from 'angular2/src/core/services/ruler'; import {createRectangle} from './rectangle_mock'; -import {IMPLEMENTS} from 'angular2/src/facade/lang'; +import {IMPLEMENTS} from 'angular2/src/core/facade/lang'; function assertDimensions(rect: Rectangle, left, right, top, bottom, width, height) { expect(rect.left).toEqual(left); diff --git a/modules/angular2/test/core/services/title_spec.ts b/modules/angular2/test/core/services/title_spec.ts index 0d5b84a017..157ffe6674 100644 --- a/modules/angular2/test/core/services/title_spec.ts +++ b/modules/angular2/test/core/services/title_spec.ts @@ -1,7 +1,7 @@ import {ddescribe, describe, it, iit, xit, expect, afterEach} from 'angular2/test_lib'; -import {DOM} from 'angular2/src/dom/dom_adapter'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; -import {Title} from 'angular2/src/services/title'; +import {Title} from 'angular2/src/core/services/title'; export function main() { describe('title service', () => { diff --git a/modules/angular2/test/core/services/url_resolver_spec.ts b/modules/angular2/test/core/services/url_resolver_spec.ts index 385cb3bec2..2e981085f2 100644 --- a/modules/angular2/test/core/services/url_resolver_spec.ts +++ b/modules/angular2/test/core/services/url_resolver_spec.ts @@ -1,5 +1,5 @@ import {describe, it, expect, beforeEach, ddescribe, iit, xit, el} from 'angular2/test_lib'; -import {UrlResolver} from 'angular2/src/services/url_resolver'; +import {UrlResolver} from 'angular2/src/core/services/url_resolver'; export function main() { describe('UrlResolver', () => { diff --git a/modules/angular2/test/core/testability/testability_spec.ts b/modules/angular2/test/core/testability/testability_spec.ts index 4cd900b6f4..0b34d96276 100644 --- a/modules/angular2/test/core/testability/testability_spec.ts +++ b/modules/angular2/test/core/testability/testability_spec.ts @@ -13,8 +13,8 @@ import { } from 'angular2/test_lib'; import {Testability} from 'angular2/src/core/testability/testability'; import {NgZone} from 'angular2/src/core/zone/ng_zone'; -import {normalizeBlank} from 'angular2/src/facade/lang'; -import {PromiseWrapper} from 'angular2/src/facade/async'; +import {normalizeBlank} from 'angular2/src/core/facade/lang'; +import {PromiseWrapper} from 'angular2/src/core/facade/async'; // Schedules a microtasks (using a resolved promise .then()) function microTask(fn: Function): void { diff --git a/modules/angular2/test/core/util/decorators_spec.ts b/modules/angular2/test/core/util/decorators_spec.ts index e29e4ae910..921e809e0b 100644 --- a/modules/angular2/test/core/util/decorators_spec.ts +++ b/modules/angular2/test/core/util/decorators_spec.ts @@ -10,10 +10,10 @@ import { xit, } from 'angular2/test_lib'; -import {makeDecorator, makeParamDecorator, Class} from 'angular2/src/util/decorators'; -import {global} from 'angular2/src/facade/lang'; +import {makeDecorator, makeParamDecorator, Class} from 'angular2/src/core/util/decorators'; +import {global} from 'angular2/src/core/facade/lang'; import {Inject} from 'angular2/angular2'; -import {reflector} from 'angular2/src/reflection/reflection'; +import {reflector} from 'angular2/src/core/reflection/reflection'; class TestAnnotation { constructor(public arg: any) {} diff --git a/modules/angular2/test/core/zone/ng_zone_spec.ts b/modules/angular2/test/core/zone/ng_zone_spec.ts index 4351c47f15..e8df5c541f 100644 --- a/modules/angular2/test/core/zone/ng_zone_spec.ts +++ b/modules/angular2/test/core/zone/ng_zone_spec.ts @@ -16,8 +16,8 @@ import { isIE } from 'angular2/test_lib'; -import {PromiseCompleter, PromiseWrapper, TimerWrapper} from 'angular2/src/facade/async'; -import {BaseException} from 'angular2/src/facade/lang'; +import {PromiseCompleter, PromiseWrapper, TimerWrapper} from 'angular2/src/core/facade/async'; +import {BaseException} from 'angular2/src/core/facade/lang'; import {NgZone} from 'angular2/src/core/zone/ng_zone'; diff --git a/modules/angular2/test/forms/integration_spec.ts b/modules/angular2/test/forms/integration_spec.ts index 0f13fc2e80..a6dc8b6315 100644 --- a/modules/angular2/test/forms/integration_spec.ts +++ b/modules/angular2/test/forms/integration_spec.ts @@ -18,7 +18,7 @@ import { isFirefox } from 'angular2/test_lib'; -import {DOM} from 'angular2/src/dom/dom_adapter'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; import {NgIf, NgFor} from 'angular2/directives'; import { diff --git a/modules/angular2/test/forms/model_spec.ts b/modules/angular2/test/forms/model_spec.ts index c0ecc74048..356f36faa5 100644 --- a/modules/angular2/test/forms/model_spec.ts +++ b/modules/angular2/test/forms/model_spec.ts @@ -14,7 +14,7 @@ import { inject } from 'angular2/test_lib'; import {ControlGroup, Control, ControlArray, Validators} from 'angular2/forms'; -import {ObservableWrapper} from 'angular2/src/facade/async'; +import {ObservableWrapper} from 'angular2/src/core/facade/async'; export function main() { describe("Form Model", () => { diff --git a/modules/angular2/test/http/backends/jsonp_backend_spec.ts b/modules/angular2/test/http/backends/jsonp_backend_spec.ts index 2ed17bbba7..603bb74235 100644 --- a/modules/angular2/test/http/backends/jsonp_backend_spec.ts +++ b/modules/angular2/test/http/backends/jsonp_backend_spec.ts @@ -11,18 +11,18 @@ import { xit, SpyObject } from 'angular2/test_lib'; -import {ObservableWrapper} from 'angular2/src/facade/async'; -import {BrowserJsonp} from 'http/src/backends/browser_jsonp'; -import {JSONPConnection, JSONPBackend} from 'http/src/backends/jsonp_backend'; +import {ObservableWrapper} from 'angular2/src/core/facade/async'; +import {BrowserJsonp} from 'angular2/src/http/backends/browser_jsonp'; +import {JSONPConnection, JSONPBackend} from 'angular2/src/http/backends/jsonp_backend'; import {bind, Injector} from 'angular2/di'; -import {isPresent, StringWrapper} from 'angular2/src/facade/lang'; -import {TimerWrapper} from 'angular2/src/facade/async'; -import {Request} from 'http/src/static_request'; -import {Response} from 'http/src/static_response'; -import {Map} from 'angular2/src/facade/collection'; -import {RequestOptions, BaseRequestOptions} from 'http/src/base_request_options'; -import {BaseResponseOptions, ResponseOptions} from 'http/src/base_response_options'; -import {ResponseTypes, ReadyStates, RequestMethods} from 'http/src/enums'; +import {isPresent, StringWrapper} from 'angular2/src/core/facade/lang'; +import {TimerWrapper} from 'angular2/src/core/facade/async'; +import {Request} from 'angular2/src/http/static_request'; +import {Response} from 'angular2/src/http/static_response'; +import {Map} from 'angular2/src/core/facade/collection'; +import {RequestOptions, BaseRequestOptions} from 'angular2/src/http/base_request_options'; +import {BaseResponseOptions, ResponseOptions} from 'angular2/src/http/base_response_options'; +import {ResponseTypes, ReadyStates, RequestMethods} from 'angular2/src/http/enums'; var addEventListenerSpy; var existingScripts = []; diff --git a/modules/angular2/test/http/backends/xhr_backend_spec.ts b/modules/angular2/test/http/backends/xhr_backend_spec.ts index 1ad67c2319..bd3dbbc8b5 100644 --- a/modules/angular2/test/http/backends/xhr_backend_spec.ts +++ b/modules/angular2/test/http/backends/xhr_backend_spec.ts @@ -11,17 +11,17 @@ import { xit, SpyObject } from 'angular2/test_lib'; -import {ObservableWrapper} from 'angular2/src/facade/async'; -import {BrowserXhr} from 'http/src/backends/browser_xhr'; -import {XHRConnection, XHRBackend} from 'http/src/backends/xhr_backend'; +import {ObservableWrapper} from 'angular2/src/core/facade/async'; +import {BrowserXhr} from 'angular2/src/http/backends/browser_xhr'; +import {XHRConnection, XHRBackend} from 'angular2/src/http/backends/xhr_backend'; import {bind, Injector} from 'angular2/di'; -import {Request} from 'http/src/static_request'; -import {Response} from 'http/src/static_response'; -import {Headers} from 'http/src/headers'; -import {Map} from 'angular2/src/facade/collection'; -import {RequestOptions, BaseRequestOptions} from 'http/src/base_request_options'; -import {BaseResponseOptions, ResponseOptions} from 'http/src/base_response_options'; -import {ResponseTypes} from 'http/src/enums'; +import {Request} from 'angular2/src/http/static_request'; +import {Response} from 'angular2/src/http/static_response'; +import {Headers} from 'angular2/src/http/headers'; +import {Map} from 'angular2/src/core/facade/collection'; +import {RequestOptions, BaseRequestOptions} from 'angular2/src/http/base_request_options'; +import {BaseResponseOptions, ResponseOptions} from 'angular2/src/http/base_response_options'; +import {ResponseTypes} from 'angular2/src/http/enums'; var abortSpy; var sendSpy; diff --git a/modules/angular2/test/http/base_request_options_spec.ts b/modules/angular2/test/http/base_request_options_spec.ts index d114e51fb1..5ef109579f 100644 --- a/modules/angular2/test/http/base_request_options_spec.ts +++ b/modules/angular2/test/http/base_request_options_spec.ts @@ -9,8 +9,8 @@ import { it, xit } from 'angular2/test_lib'; -import {BaseRequestOptions, RequestOptions} from 'http/src/base_request_options'; -import {RequestMethods, RequestModesOpts} from 'http/src/enums'; +import {BaseRequestOptions, RequestOptions} from 'angular2/src/http/base_request_options'; +import {RequestMethods, RequestModesOpts} from 'angular2/src/http/enums'; export function main() { describe('BaseRequestOptions', () => { diff --git a/modules/angular2/test/http/headers_spec.ts b/modules/angular2/test/http/headers_spec.ts index 9b74ae9d20..b7f767b8a5 100644 --- a/modules/angular2/test/http/headers_spec.ts +++ b/modules/angular2/test/http/headers_spec.ts @@ -1,5 +1,5 @@ -import {Headers} from 'http/src/headers'; -import {Map, StringMapWrapper} from 'angular2/src/facade/collection'; +import {Headers} from 'angular2/src/http/headers'; +import {Map, StringMapWrapper} from 'angular2/src/core/facade/collection'; import { AsyncTestCompleter, beforeEach, diff --git a/modules/angular2/test/http/http_spec.ts b/modules/angular2/test/http/http_spec.ts index 0b8ffc7961..21274f6a83 100644 --- a/modules/angular2/test/http/http_spec.ts +++ b/modules/angular2/test/http/http_spec.ts @@ -12,8 +12,8 @@ import { SpyObject } from 'angular2/test_lib'; import {Injector, bind} from 'angular2/di'; -import {MockBackend, MockConnection} from 'http/src/backends/mock_backend'; -import {EventEmitter, ObservableWrapper} from 'angular2/src/facade/async'; +import {MockBackend, MockConnection} from 'angular2/src/http/backends/mock_backend'; +import {EventEmitter, ObservableWrapper} from 'angular2/src/core/facade/async'; import { BaseRequestOptions, ConnectionBackend, @@ -29,7 +29,7 @@ import { JSONPBackend, Http, Jsonp -} from 'http/http'; +} from 'angular2/http'; class SpyObserver extends SpyObject { onNext: Function; diff --git a/modules/angular2/test/http/url_search_params_spec.ts b/modules/angular2/test/http/url_search_params_spec.ts index e151f530b4..b690be724f 100644 --- a/modules/angular2/test/http/url_search_params_spec.ts +++ b/modules/angular2/test/http/url_search_params_spec.ts @@ -9,7 +9,7 @@ import { it, xit } from 'angular2/test_lib'; -import {URLSearchParams} from 'http/src/url_search_params'; +import {URLSearchParams} from 'angular2/src/http/url_search_params'; export function main() { describe('URLSearchParams', () => { diff --git a/modules/angular2/test/mock/view_resolver_mock_spec.ts b/modules/angular2/test/mock/view_resolver_mock_spec.ts index 5301806848..2e9cbd334e 100644 --- a/modules/angular2/test/mock/view_resolver_mock_spec.ts +++ b/modules/angular2/test/mock/view_resolver_mock_spec.ts @@ -8,13 +8,13 @@ import { it, } from 'angular2/test_lib'; -import {stringify} from 'angular2/src/facade/lang'; +import {stringify} from 'angular2/src/core/facade/lang'; import {MockViewResolver} from 'angular2/src/mock/view_resolver_mock'; import {Component, View, ViewMetadata} from 'angular2/metadata'; -import {isBlank} from 'angular2/src/facade/lang'; +import {isBlank} from 'angular2/src/core/facade/lang'; export function main() { describe('MockViewResolver', () => { diff --git a/modules/angular2/test/pipes/async_pipe_spec.ts b/modules/angular2/test/pipes/async_pipe_spec.ts index 4e75716ce1..572772698d 100644 --- a/modules/angular2/test/pipes/async_pipe_spec.ts +++ b/modules/angular2/test/pipes/async_pipe_spec.ts @@ -13,7 +13,7 @@ import { SpyObject } from 'angular2/test_lib'; -import {IMPLEMENTS, isBlank} from 'angular2/src/facade/lang'; +import {IMPLEMENTS, isBlank} from 'angular2/src/core/facade/lang'; import {WrappedValue} from 'angular2/change_detection'; import {AsyncPipe} from 'angular2/pipes'; import { @@ -21,8 +21,8 @@ import { ObservableWrapper, PromiseWrapper, TimerWrapper -} from 'angular2/src/facade/async'; -import {DOM} from 'angular2/src/dom/dom_adapter'; +} from 'angular2/src/core/facade/async'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; export function main() { describe("AsyncPipe", () => { diff --git a/modules/angular2/test/pipes/date_pipe_spec.ts b/modules/angular2/test/pipes/date_pipe_spec.ts index 9d4169026d..8960411591 100644 --- a/modules/angular2/test/pipes/date_pipe_spec.ts +++ b/modules/angular2/test/pipes/date_pipe_spec.ts @@ -11,7 +11,7 @@ import { } from 'angular2/test_lib'; import {DatePipe} from 'angular2/pipes'; -import {DateWrapper} from 'angular2/src/facade/lang'; +import {DateWrapper} from 'angular2/src/core/facade/lang'; export function main() { describe("DatePipe", () => { diff --git a/modules/angular2/test/pipes/json_pipe_spec.ts b/modules/angular2/test/pipes/json_pipe_spec.ts index 001643ad6f..75534bb804 100644 --- a/modules/angular2/test/pipes/json_pipe_spec.ts +++ b/modules/angular2/test/pipes/json_pipe_spec.ts @@ -12,7 +12,7 @@ import { proxy, SpyObject } from 'angular2/test_lib'; -import {Json, RegExp, NumberWrapper, StringWrapper} from 'angular2/src/facade/lang'; +import {Json, RegExp, NumberWrapper, StringWrapper} from 'angular2/src/core/facade/lang'; import {JsonPipe} from 'angular2/pipes'; diff --git a/modules/angular2/test/router/integration/lifecycle_hook_spec.ts b/modules/angular2/test/router/integration/lifecycle_hook_spec.ts index 748b6d1cf4..dc50e00f82 100644 --- a/modules/angular2/test/router/integration/lifecycle_hook_spec.ts +++ b/modules/angular2/test/router/integration/lifecycle_hook_spec.ts @@ -17,14 +17,14 @@ import { import {Injector, Inject, bind} from 'angular2/di'; import {Component, View} from 'angular2/metadata'; -import {isPresent} from 'angular2/src/facade/lang'; +import {isPresent} from 'angular2/src/core/facade/lang'; import { Promise, PromiseWrapper, PromiseCompleter, EventEmitter, ObservableWrapper -} from 'angular2/src/facade/async'; +} from 'angular2/src/core/facade/async'; import {RootRouter} from 'angular2/src/router/router'; import {Pipeline} from 'angular2/src/router/pipeline'; diff --git a/modules/angular2/test/router/integration/outlet_spec.ts b/modules/angular2/test/router/integration/outlet_spec.ts index 76e3e9b1e8..4252ccb7ec 100644 --- a/modules/angular2/test/router/integration/outlet_spec.ts +++ b/modules/angular2/test/router/integration/outlet_spec.ts @@ -17,8 +17,8 @@ import { import {Injector, Inject, bind} from 'angular2/di'; import {Component, View} from 'angular2/metadata'; -import {CONST, NumberWrapper, isPresent, Json} from 'angular2/src/facade/lang'; -import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; +import {CONST, NumberWrapper, isPresent, Json} from 'angular2/src/core/facade/lang'; +import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async'; import {RootRouter} from 'angular2/src/router/router'; import {Pipeline} from 'angular2/src/router/pipeline'; diff --git a/modules/angular2/test/router/integration/router_integration_spec.ts b/modules/angular2/test/router/integration/router_integration_spec.ts index 49dc72d53b..f4c8b7dcba 100644 --- a/modules/angular2/test/router/integration/router_integration_spec.ts +++ b/modules/angular2/test/router/integration/router_integration_spec.ts @@ -16,12 +16,12 @@ import { import {bootstrap} from 'angular2/src/core/application'; import {Component, Directive, View} from 'angular2/metadata'; -import {DOM} from 'angular2/src/dom/dom_adapter'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; import {bind} from 'angular2/di'; -import {DOCUMENT} from 'angular2/src/render/render'; +import {DOCUMENT} from 'angular2/src/core/render/render'; import {RouteConfig, Route, Redirect} from 'angular2/src/router/route_config_decorator'; -import {PromiseWrapper} from 'angular2/src/facade/async'; -import {BaseException} from 'angular2/src/facade/lang'; +import {PromiseWrapper} from 'angular2/src/core/facade/async'; +import {BaseException} from 'angular2/src/core/facade/lang'; import { ROUTER_BINDINGS, RouteParams, diff --git a/modules/angular2/test/router/integration/router_link_spec.ts b/modules/angular2/test/router/integration/router_link_spec.ts index 488be5c79e..f5a2393789 100644 --- a/modules/angular2/test/router/integration/router_link_spec.ts +++ b/modules/angular2/test/router/integration/router_link_spec.ts @@ -17,7 +17,7 @@ import { By } from 'angular2/test_lib'; -import {IMPLEMENTS, NumberWrapper} from 'angular2/src/facade/lang'; +import {IMPLEMENTS, NumberWrapper} from 'angular2/src/core/facade/lang'; import {bind, Component, View} from 'angular2/angular2'; @@ -36,7 +36,7 @@ import { } from 'angular2/router'; import {DirectiveResolver} from 'angular2/src/core/compiler/directive_resolver'; -import {DOM} from 'angular2/src/dom/dom_adapter'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; export function main() { describe('router-link directive', function() { diff --git a/modules/angular2/test/router/location_spec.ts b/modules/angular2/test/router/location_spec.ts index 9ed195bb38..51e8048edc 100644 --- a/modules/angular2/test/router/location_spec.ts +++ b/modules/angular2/test/router/location_spec.ts @@ -13,7 +13,7 @@ import { } from 'angular2/test_lib'; import {Injector, bind} from 'angular2/di'; -import {CONST_EXPR} from 'angular2/src/facade/lang'; +import {CONST_EXPR} from 'angular2/src/core/facade/lang'; import {Location, APP_BASE_HREF} from 'angular2/src/router/location'; import {LocationStrategy} from 'angular2/src/router/location_strategy'; import {MockLocationStrategy} from 'angular2/src/mock/mock_location_strategy'; diff --git a/modules/angular2/test/router/route_config_spec.ts b/modules/angular2/test/router/route_config_spec.ts index f6a0594a79..d72b130286 100644 --- a/modules/angular2/test/router/route_config_spec.ts +++ b/modules/angular2/test/router/route_config_spec.ts @@ -13,10 +13,10 @@ import { import {bootstrap} from 'angular2/bootstrap'; import {Component, Directive, View} from 'angular2/metadata'; -import {DOM} from 'angular2/src/dom/dom_adapter'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; import {bind} from 'angular2/di'; -import {DOCUMENT} from 'angular2/src/render/render'; -import {Type} from 'angular2/src/facade/lang'; +import {DOCUMENT} from 'angular2/src/core/render/render'; +import {Type} from 'angular2/src/core/facade/lang'; import { ROUTER_BINDINGS, diff --git a/modules/angular2/test/router/route_recognizer_spec.ts b/modules/angular2/test/router/route_recognizer_spec.ts index e8d4c51975..df4bf15b6e 100644 --- a/modules/angular2/test/router/route_recognizer_spec.ts +++ b/modules/angular2/test/router/route_recognizer_spec.ts @@ -10,7 +10,7 @@ import { SpyObject } from 'angular2/test_lib'; -import {Map, StringMap, StringMapWrapper} from 'angular2/src/facade/collection'; +import {Map, StringMap, StringMapWrapper} from 'angular2/src/core/facade/collection'; import {RouteRecognizer} from 'angular2/src/router/route_recognizer'; import {ComponentInstruction} from 'angular2/src/router/instruction'; diff --git a/modules/angular2/test/router/route_registry_spec.ts b/modules/angular2/test/router/route_registry_spec.ts index 27f7b1ef4e..9e0136e693 100644 --- a/modules/angular2/test/router/route_registry_spec.ts +++ b/modules/angular2/test/router/route_registry_spec.ts @@ -10,8 +10,8 @@ import { SpyObject } from 'angular2/test_lib'; -import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; -import {Type} from 'angular2/src/facade/lang'; +import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async'; +import {Type} from 'angular2/src/core/facade/lang'; import {RouteRegistry} from 'angular2/src/router/route_registry'; import { diff --git a/modules/angular2/test/router/router_link_spec.ts b/modules/angular2/test/router/router_link_spec.ts index 4ab7a75753..f551f071d9 100644 --- a/modules/angular2/test/router/router_link_spec.ts +++ b/modules/angular2/test/router/router_link_spec.ts @@ -17,7 +17,7 @@ import { By } from 'angular2/test_lib'; -import {IMPLEMENTS} from 'angular2/src/facade/lang'; +import {IMPLEMENTS} from 'angular2/src/core/facade/lang'; import {bind, Component, View} from 'angular2/angular2'; @@ -34,7 +34,7 @@ import { } from 'angular2/router'; import {Instruction, ComponentInstruction} from 'angular2/src/router/instruction'; -import {DOM} from 'angular2/src/dom/dom_adapter'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; var dummyInstruction = new Instruction(new ComponentInstruction('detail', [], null), null, {}); diff --git a/modules/angular2/test/router/router_spec.ts b/modules/angular2/test/router/router_spec.ts index db23c7dec5..2171b5d66c 100644 --- a/modules/angular2/test/router/router_spec.ts +++ b/modules/angular2/test/router/router_spec.ts @@ -11,9 +11,9 @@ import { beforeEachBindings, SpyObject } from 'angular2/test_lib'; -import {IMPLEMENTS, Type} from 'angular2/src/facade/lang'; -import {Promise, PromiseWrapper, ObservableWrapper} from 'angular2/src/facade/async'; -import {ListWrapper} from 'angular2/src/facade/collection'; +import {IMPLEMENTS, Type} from 'angular2/src/core/facade/lang'; +import {Promise, PromiseWrapper, ObservableWrapper} from 'angular2/src/core/facade/async'; +import {ListWrapper} from 'angular2/src/core/facade/collection'; import {Router, RootRouter} from 'angular2/src/router/router'; import {Pipeline} from 'angular2/src/router/pipeline'; diff --git a/modules/angular2/test/test_lib/fake_async_spec.ts b/modules/angular2/test/test_lib/fake_async_spec.ts index ea751e9229..bdc445ca13 100644 --- a/modules/angular2/test/test_lib/fake_async_spec.ts +++ b/modules/angular2/test/test_lib/fake_async_spec.ts @@ -13,9 +13,9 @@ import { tick, xit } from 'angular2/test_lib'; -import {TimerWrapper, PromiseWrapper} from 'angular2/src/facade/async'; -import {BaseException, global} from 'angular2/src/facade/lang'; -import {Parser} from 'angular2/src/change_detection/change_detection'; +import {TimerWrapper, PromiseWrapper} from 'angular2/src/core/facade/async'; +import {BaseException, global} from 'angular2/src/core/facade/lang'; +import {Parser} from 'angular2/src/core/change_detection/change_detection'; export function main() { describe('fake async', () => { diff --git a/modules/angular2/test/test_lib/test_component_builder_spec.ts b/modules/angular2/test/test_lib/test_component_builder_spec.ts index ba31db1d45..ce07ee59e8 100644 --- a/modules/angular2/test/test_lib/test_component_builder_spec.ts +++ b/modules/angular2/test/test_lib/test_component_builder_spec.ts @@ -18,7 +18,7 @@ import {Injectable} from 'angular2/di'; import {Directive, Component, View, ViewMetadata} from 'angular2/metadata'; -import {NgIf} from 'angular2/src/directives/ng_if'; +import {NgIf} from 'angular2/src/core/directives/ng_if'; @Component({selector: 'child-comp'}) @View({template: `Original {{childBinding}}`, directives: []}) diff --git a/modules/angular2/test/test_lib/test_lib_spec.ts b/modules/angular2/test/test_lib/test_lib_spec.ts index 51e6b96052..7c16b7a42b 100644 --- a/modules/angular2/test/test_lib/test_lib_spec.ts +++ b/modules/angular2/test/test_lib/test_lib_spec.ts @@ -11,9 +11,9 @@ import { containsRegexp } from 'angular2/test_lib'; -import {DOM} from 'angular2/src/dom/dom_adapter'; -import {MapWrapper} from 'angular2/src/facade/collection'; -import {IMPLEMENTS, RegExpWrapper} from 'angular2/src/facade/lang'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {MapWrapper} from 'angular2/src/core/facade/collection'; +import {IMPLEMENTS, RegExpWrapper} from 'angular2/src/core/facade/lang'; class TestObj { prop; diff --git a/modules/angular2/test/web_workers/shared/message_bus_spec.ts b/modules/angular2/test/web_workers/shared/message_bus_spec.ts index ee2595f7c2..916b197d88 100644 --- a/modules/angular2/test/web_workers/shared/message_bus_spec.ts +++ b/modules/angular2/test/web_workers/shared/message_bus_spec.ts @@ -10,7 +10,7 @@ import { SpyObject, proxy } from 'angular2/test_lib'; -import {ObservableWrapper} from 'angular2/src/facade/async'; +import {ObservableWrapper} from 'angular2/src/core/facade/async'; import {MessageBus} from 'angular2/src/web_workers/shared/message_bus'; import {createConnectedMessageBus} from './message_bus_util'; diff --git a/modules/angular2/test/web_workers/shared/mock_event_emitter.dart b/modules/angular2/test/web_workers/shared/mock_event_emitter.dart index 451dc4bd2e..69f9ade133 100644 --- a/modules/angular2/test/web_workers/shared/mock_event_emitter.dart +++ b/modules/angular2/test/web_workers/shared/mock_event_emitter.dart @@ -2,7 +2,7 @@ library angular2.test.web_workers.worker.mock_event_emitter; import 'dart:core'; import 'dart:async'; -import "package:angular2/src/facade/async.dart"; +import "package:angular2/src/core/facade/async.dart"; class MockEventEmitter extends EventEmitter { List _nextFns = new List(); diff --git a/modules/angular2/test/web_workers/shared/mock_event_emitter.ts b/modules/angular2/test/web_workers/shared/mock_event_emitter.ts index b0c671b2e3..e0c8c17784 100644 --- a/modules/angular2/test/web_workers/shared/mock_event_emitter.ts +++ b/modules/angular2/test/web_workers/shared/mock_event_emitter.ts @@ -1,6 +1,6 @@ -import {EventEmitter} from 'angular2/src/facade/async'; +import {EventEmitter} from 'angular2/src/core/facade/async'; import * as Rx from 'rx'; -import {ListWrapper} from 'angular2/src/facade/collection'; +import {ListWrapper} from 'angular2/src/core/facade/collection'; export class MockEventEmitter extends EventEmitter { private _nextFns: List = []; diff --git a/modules/angular2/test/web_workers/shared/render_proto_view_ref_store_spec.ts b/modules/angular2/test/web_workers/shared/render_proto_view_ref_store_spec.ts index bead1eb906..83dab048ea 100644 --- a/modules/angular2/test/web_workers/shared/render_proto_view_ref_store_spec.ts +++ b/modules/angular2/test/web_workers/shared/render_proto_view_ref_store_spec.ts @@ -1,5 +1,5 @@ import {AsyncTestCompleter, inject, describe, it, expect} from "angular2/test_lib"; -import {RenderProtoViewRef} from "angular2/src/render/api"; +import {RenderProtoViewRef} from "angular2/src/core/render/api"; import {RenderProtoViewRefStore} from "angular2/src/web_workers/shared/render_proto_view_ref_store"; export function main() { diff --git a/modules/angular2/test/web_workers/shared/render_view_with_fragments_store_spec.ts b/modules/angular2/test/web_workers/shared/render_view_with_fragments_store_spec.ts index ee2ec57a32..fad2db235c 100644 --- a/modules/angular2/test/web_workers/shared/render_view_with_fragments_store_spec.ts +++ b/modules/angular2/test/web_workers/shared/render_view_with_fragments_store_spec.ts @@ -1,11 +1,15 @@ import {AsyncTestCompleter, beforeEach, inject, describe, it, expect} from "angular2/test_lib"; -import {RenderViewWithFragments, RenderViewRef, RenderFragmentRef} from "angular2/src/render/api"; +import { + RenderViewWithFragments, + RenderViewRef, + RenderFragmentRef +} from "angular2/src/core/render/api"; import { RenderViewWithFragmentsStore, WebWorkerRenderViewRef, WebWorkerRenderFragmentRef } from "angular2/src/web_workers/shared/render_view_with_fragments_store"; -import {List, ListWrapper} from "angular2/src/facade/collection"; +import {List, ListWrapper} from "angular2/src/core/facade/collection"; export function main() { describe("RenderViewWithFragmentsStore", () => { diff --git a/modules/angular2/test/web_workers/shared/service_message_broker_spec.ts b/modules/angular2/test/web_workers/shared/service_message_broker_spec.ts index 9ead3fcbb5..70adf38aa8 100644 --- a/modules/angular2/test/web_workers/shared/service_message_broker_spec.ts +++ b/modules/angular2/test/web_workers/shared/service_message_broker_spec.ts @@ -13,7 +13,7 @@ import { import {createPairedMessageBuses} from '../shared/web_worker_test_util'; import {Serializer, PRIMITIVE} from 'angular2/src/web_workers/shared/serializer'; import {ServiceMessageBroker} from 'angular2/src/web_workers/shared/service_message_broker'; -import {ObservableWrapper, PromiseWrapper} from 'angular2/src/facade/async'; +import {ObservableWrapper, PromiseWrapper} from 'angular2/src/core/facade/async'; import {bind} from 'angular2/di'; import {ON_WEB_WORKER} from 'angular2/src/web_workers/shared/api'; import {RenderProtoViewRefStore} from 'angular2/src/web_workers/shared/render_proto_view_ref_store'; diff --git a/modules/angular2/test/web_workers/shared/web_worker_test_util.ts b/modules/angular2/test/web_workers/shared/web_worker_test_util.ts index 5fb2777d6f..d6a32f94e1 100644 --- a/modules/angular2/test/web_workers/shared/web_worker_test_util.ts +++ b/modules/angular2/test/web_workers/shared/web_worker_test_util.ts @@ -1,4 +1,4 @@ -import {StringMap, StringMapWrapper, ListWrapper} from 'angular2/src/facade/collection'; +import {StringMap, StringMapWrapper, ListWrapper} from 'angular2/src/core/facade/collection'; import { MessageBusSink, MessageBusSource, diff --git a/modules/angular2/test/web_workers/worker/event_dispatcher_spec.ts b/modules/angular2/test/web_workers/worker/event_dispatcher_spec.ts index 05b829bef7..1eab8de5ed 100644 --- a/modules/angular2/test/web_workers/worker/event_dispatcher_spec.ts +++ b/modules/angular2/test/web_workers/worker/event_dispatcher_spec.ts @@ -10,7 +10,7 @@ import { SpyObject, proxy } from 'angular2/test_lib'; -import {IMPLEMENTS} from 'angular2/src/facade/lang'; +import {IMPLEMENTS} from 'angular2/src/core/facade/lang'; import {Serializer} from 'angular2/src/web_workers/shared/serializer'; import {NgZone} from 'angular2/src/core/zone/ng_zone'; import {ON_WEB_WORKER} from 'angular2/src/web_workers/shared/api'; @@ -20,10 +20,10 @@ import { RenderViewWithFragmentsStore, WebWorkerRenderViewRef } from 'angular2/src/web_workers/shared/render_view_with_fragments_store'; -import {RenderEventDispatcher, RenderViewRef} from 'angular2/src/render/api'; +import {RenderEventDispatcher, RenderViewRef} from 'angular2/src/core/render/api'; import {createPairedMessageBuses} from '../shared/web_worker_test_util'; import {WebWorkerEventDispatcher} from 'angular2/src/web_workers/worker/event_dispatcher'; -import {ObservableWrapper} from 'angular2/src/facade/async'; +import {ObservableWrapper} from 'angular2/src/core/facade/async'; import {EVENT_CHANNEL} from 'angular2/src/web_workers/shared/messaging_api'; export function main() { diff --git a/modules/angular2/test/web_workers/worker/renderer_integration_spec.ts b/modules/angular2/test/web_workers/worker/renderer_integration_spec.ts index 2ad0c485ec..4a48389518 100644 --- a/modules/angular2/test/web_workers/worker/renderer_integration_spec.ts +++ b/modules/angular2/test/web_workers/worker/renderer_integration_spec.ts @@ -8,8 +8,8 @@ import { createTestInjector, beforeEachBindings } from "angular2/test_lib"; -import {DOM} from 'angular2/src/dom/dom_adapter'; -import {DomTestbed, TestRootView, elRef} from '../../render/dom/dom_testbed'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {DomTestbed, TestRootView, elRef} from '../../core/render/dom/dom_testbed'; import {bind} from 'angular2/di'; import {WebWorkerCompiler, WebWorkerRenderer} from "angular2/src/web_workers/worker/renderer"; import { @@ -18,8 +18,8 @@ import { FnArg } from "angular2/src/web_workers/shared/client_message_broker"; import {Serializer} from "angular2/src/web_workers/shared/serializer"; -import {isPresent, isBlank, BaseException, Type} from "angular2/src/facade/lang"; -import {MapWrapper, ListWrapper} from "angular2/src/facade/collection"; +import {isPresent, isBlank, BaseException, Type} from "angular2/src/core/facade/lang"; +import {MapWrapper, ListWrapper} from "angular2/src/core/facade/collection"; import { RenderDirectiveMetadata, ProtoViewDto, @@ -29,7 +29,7 @@ import { RenderProtoViewMergeMapping, RenderViewRef, RenderFragmentRef -} from "angular2/src/render/api"; +} from "angular2/src/core/render/api"; import { RenderProtoViewRefStore, WebWorkerRenderProtoViewRef @@ -38,8 +38,11 @@ import { RenderViewWithFragmentsStore, WebWorkerRenderViewRef } from 'angular2/src/web_workers/shared/render_view_with_fragments_store'; -import {resolveInternalDomProtoView, DomProtoView} from 'angular2/src/render/dom/view/proto_view'; -import {someComponent} from '../../render/dom/dom_renderer_integration_spec'; +import { + resolveInternalDomProtoView, + DomProtoView +} from 'angular2/src/core/render/dom/view/proto_view'; +import {someComponent} from '../../core/render/dom/dom_renderer_integration_spec'; import {WebWorkerMain} from 'angular2/src/web_workers/ui/impl'; import {MessageBasedRenderCompiler} from 'angular2/src/web_workers/ui/render_compiler'; import {MessageBasedRenderer} from 'angular2/src/web_workers/ui/renderer'; diff --git a/modules/angular2/test/web_workers/worker/xhr_impl_spec.ts b/modules/angular2/test/web_workers/worker/xhr_impl_spec.ts index c8963ab253..0c3e68444d 100644 --- a/modules/angular2/test/web_workers/worker/xhr_impl_spec.ts +++ b/modules/angular2/test/web_workers/worker/xhr_impl_spec.ts @@ -10,14 +10,14 @@ import { SpyObject, proxy } from 'angular2/test_lib'; -import {IMPLEMENTS, Type} from 'angular2/src/facade/lang'; +import {IMPLEMENTS, Type} from 'angular2/src/core/facade/lang'; import { ClientMessageBroker, UiArguments, ClientMessageBrokerFactory } from 'angular2/src/web_workers/shared/client_message_broker'; import {WebWorkerXHRImpl} from "angular2/src/web_workers/worker/xhr_impl"; -import {PromiseWrapper} from "angular2/src/facade/async"; +import {PromiseWrapper} from "angular2/src/core/facade/async"; export function main() { describe("WebWorkerXHRImpl", () => { diff --git a/modules/angular2_material/src/components/button/button.ts b/modules/angular2_material/src/components/button/button.ts index 72a49969f2..122ff7e194 100644 --- a/modules/angular2_material/src/components/button/button.ts +++ b/modules/angular2_material/src/components/button/button.ts @@ -1,7 +1,7 @@ import {Component, View, LifecycleEvent, ViewEncapsulation} from 'angular2/angular2'; -import {TimerWrapper} from 'angular2/src/facade/async'; -import {isPresent} from 'angular2/src/facade/lang'; +import {TimerWrapper} from 'angular2/src/core/facade/async'; +import {isPresent} from 'angular2/src/core/facade/lang'; // TODO(jelbourn): Ink ripples. // TODO(jelbourn): Make the `isMosueDown` stuff done with one global listener. diff --git a/modules/angular2_material/src/components/checkbox/checkbox.ts b/modules/angular2_material/src/components/checkbox/checkbox.ts index eebf3d9f4e..97d7aada66 100644 --- a/modules/angular2_material/src/components/checkbox/checkbox.ts +++ b/modules/angular2_material/src/components/checkbox/checkbox.ts @@ -1,8 +1,8 @@ import {Component, View, Attribute, ViewEncapsulation} from 'angular2/angular2'; -import {isPresent} from 'angular2/src/facade/lang'; +import {isPresent} from 'angular2/src/core/facade/lang'; import {KeyCodes} from 'angular2_material/src/core/key_codes'; -import {KeyboardEvent} from 'angular2/src/facade/browser'; -import {NumberWrapper} from 'angular2/src/facade/lang'; +import {KeyboardEvent} from 'angular2/src/core/facade/browser'; +import {NumberWrapper} from 'angular2/src/core/facade/lang'; @Component({ selector: 'md-checkbox', diff --git a/modules/angular2_material/src/components/dialog/dialog.ts b/modules/angular2_material/src/components/dialog/dialog.ts index e19607a923..4ac7360f2f 100644 --- a/modules/angular2_material/src/components/dialog/dialog.ts +++ b/modules/angular2_material/src/components/dialog/dialog.ts @@ -12,10 +12,10 @@ import { } from 'angular2/angular2'; import {bind, Injectable, forwardRef, ResolvedBinding, Injector} from 'angular2/di'; -import {ObservableWrapper, Promise, PromiseWrapper} from 'angular2/src/facade/async'; -import {isPresent, Type} from 'angular2/src/facade/lang'; -import {DOM} from 'angular2/src/dom/dom_adapter'; -import {MouseEvent, KeyboardEvent} from 'angular2/src/facade/browser'; +import {ObservableWrapper, Promise, PromiseWrapper} from 'angular2/src/core/facade/async'; +import {isPresent, Type} from 'angular2/src/core/facade/lang'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {MouseEvent, KeyboardEvent} from 'angular2/src/core/facade/browser'; import {KeyCodes} from 'angular2_material/src/core/key_codes'; // TODO(jelbourn): Opener of dialog can control where it is rendered. diff --git a/modules/angular2_material/src/components/grid_list/grid_list.ts b/modules/angular2_material/src/components/grid_list/grid_list.ts index f1291a21e8..ecbd1e9bc9 100644 --- a/modules/angular2_material/src/components/grid_list/grid_list.ts +++ b/modules/angular2_material/src/components/grid_list/grid_list.ts @@ -7,9 +7,9 @@ import { LifecycleEvent } from 'angular2/angular2'; -import {ListWrapper} from 'angular2/src/facade/collection'; -import {StringWrapper, isPresent, isString, NumberWrapper} from 'angular2/src/facade/lang'; -import {Math} from 'angular2/src/facade/math'; +import {ListWrapper} from 'angular2/src/core/facade/collection'; +import {StringWrapper, isPresent, isString, NumberWrapper} from 'angular2/src/core/facade/lang'; +import {Math} from 'angular2/src/core/facade/math'; // TODO(jelbourn): Set appropriate aria attributes for grid list elements. // TODO(jelbourn): Animations. diff --git a/modules/angular2_material/src/components/input/input.ts b/modules/angular2_material/src/components/input/input.ts index 1d5d0f718e..3b601652f5 100644 --- a/modules/angular2_material/src/components/input/input.ts +++ b/modules/angular2_material/src/components/input/input.ts @@ -1,6 +1,6 @@ import {Directive, LifecycleEvent, Attribute, Host, SkipSelf} from 'angular2/angular2'; -import {ObservableWrapper, EventEmitter} from 'angular2/src/facade/async'; +import {ObservableWrapper, EventEmitter} from 'angular2/src/core/facade/async'; // TODO(jelbourn): validation (will depend on Forms API). // TODO(jelbourn): textarea resizing diff --git a/modules/angular2_material/src/components/progress-linear/progress_linear.ts b/modules/angular2_material/src/components/progress-linear/progress_linear.ts index 3385736217..ae95743678 100644 --- a/modules/angular2_material/src/components/progress-linear/progress_linear.ts +++ b/modules/angular2_material/src/components/progress-linear/progress_linear.ts @@ -1,7 +1,7 @@ import {Component, LifecycleEvent, View, ViewEncapsulation, Attribute} from 'angular2/angular2'; -import {CONST} from 'angular2/src/facade/lang'; -import {isPresent, isBlank} from 'angular2/src/facade/lang'; -import {Math} from 'angular2/src/facade/math'; +import {CONST} from 'angular2/src/core/facade/lang'; +import {isPresent, isBlank} from 'angular2/src/core/facade/lang'; +import {Math} from 'angular2/src/core/facade/math'; /** Different display / behavior modes for progress-linear. */ diff --git a/modules/angular2_material/src/components/radio/radio_button.ts b/modules/angular2_material/src/components/radio/radio_button.ts index 7ed31eaef4..6a90479085 100644 --- a/modules/angular2_material/src/components/radio/radio_button.ts +++ b/modules/angular2_material/src/components/radio/radio_button.ts @@ -9,10 +9,10 @@ import { Optional } from 'angular2/angular2'; -import {isPresent, StringWrapper, NumberWrapper} from 'angular2/src/facade/lang'; -import {ObservableWrapper, EventEmitter} from 'angular2/src/facade/async'; -import {ListWrapper} from 'angular2/src/facade/collection'; -import {Event, KeyboardEvent} from 'angular2/src/facade/browser'; +import {isPresent, StringWrapper, NumberWrapper} from 'angular2/src/core/facade/lang'; +import {ObservableWrapper, EventEmitter} from 'angular2/src/core/facade/async'; +import {ListWrapper} from 'angular2/src/core/facade/collection'; +import {Event, KeyboardEvent} from 'angular2/src/core/facade/browser'; import {MdRadioDispatcher} from 'angular2_material/src/components/radio/radio_dispatcher'; import {KeyCodes} from 'angular2_material/src/core/key_codes'; diff --git a/modules/angular2_material/src/components/radio/radio_dispatcher.ts b/modules/angular2_material/src/components/radio/radio_dispatcher.ts index c1f3c6e238..8834b51348 100644 --- a/modules/angular2_material/src/components/radio/radio_dispatcher.ts +++ b/modules/angular2_material/src/components/radio/radio_dispatcher.ts @@ -1,4 +1,4 @@ -import {List, ListWrapper} from 'angular2/src/facade/collection'; +import {List, ListWrapper} from 'angular2/src/core/facade/collection'; /** * Class for radio buttons to coordinate unique selection based on name. diff --git a/modules/angular2_material/src/core/key_codes.ts b/modules/angular2_material/src/core/key_codes.ts index ae7f080c96..82d8597c7f 100644 --- a/modules/angular2_material/src/core/key_codes.ts +++ b/modules/angular2_material/src/core/key_codes.ts @@ -1,4 +1,4 @@ -import {CONST} from 'angular2/src/facade/lang'; +import {CONST} from 'angular2/src/core/facade/lang'; // Can't use an enum because Dart doesn't support enum initializers. @CONST() diff --git a/modules/benchmarks/src/change_detection/change_detection_benchmark.ts b/modules/benchmarks/src/change_detection/change_detection_benchmark.ts index f033b5219d..af7a756702 100644 --- a/modules/benchmarks/src/change_detection/change_detection_benchmark.ts +++ b/modules/benchmarks/src/change_detection/change_detection_benchmark.ts @@ -1,7 +1,7 @@ -import {reflector} from 'angular2/src/reflection/reflection'; -import {isPresent} from 'angular2/src/facade/lang'; +import {reflector} from 'angular2/src/core/reflection/reflection'; +import {isPresent} from 'angular2/src/core/facade/lang'; import {getIntParameter, bindAction, microBenchmark} from 'angular2/src/test_lib/benchmark_util'; -import {BrowserDomAdapter} from 'angular2/src/dom/browser_adapter'; +import {BrowserDomAdapter} from 'angular2/src/core/dom/browser_adapter'; import { Lexer, @@ -17,7 +17,7 @@ import { DirectiveRecord, DirectiveIndex, DEFAULT -} from 'angular2/src/change_detection/change_detection'; +} from 'angular2/src/core/change_detection/change_detection'; // ---- SHARED diff --git a/modules/benchmarks/src/compiler/compiler_benchmark.ts b/modules/benchmarks/src/compiler/compiler_benchmark.ts index 8696325864..10cf72a771 100644 --- a/modules/benchmarks/src/compiler/compiler_benchmark.ts +++ b/modules/benchmarks/src/compiler/compiler_benchmark.ts @@ -1,13 +1,13 @@ -import {BrowserDomAdapter} from 'angular2/src/dom/browser_adapter'; -import {PromiseWrapper} from 'angular2/src/facade/async'; -import {List, ListWrapper, Map, MapWrapper} from 'angular2/src/facade/collection'; -import {DateWrapper, Type, print} from 'angular2/src/facade/lang'; +import {BrowserDomAdapter} from 'angular2/src/core/dom/browser_adapter'; +import {PromiseWrapper} from 'angular2/src/core/facade/async'; +import {List, ListWrapper, Map, MapWrapper} from 'angular2/src/core/facade/collection'; +import {DateWrapper, Type, print} from 'angular2/src/core/facade/lang'; import { Parser, Lexer, DynamicChangeDetection -} from 'angular2/src/change_detection/change_detection'; +} from 'angular2/src/core/change_detection/change_detection'; import {Compiler, CompilerCache} from 'angular2/src/core/compiler/compiler'; import {DirectiveResolver} from 'angular2/src/core/compiler/directive_resolver'; @@ -15,12 +15,12 @@ import {PipeResolver} from 'angular2/src/core/compiler/pipe_resolver'; import {Component, Directive, View, ViewMetadata} from 'angular2/metadata'; import {ViewResolver} from 'angular2/src/core/compiler/view_resolver'; -import {UrlResolver} from 'angular2/src/services/url_resolver'; -import {AppRootUrl} from 'angular2/src/services/app_root_url'; +import {UrlResolver} from 'angular2/src/core/services/url_resolver'; +import {AppRootUrl} from 'angular2/src/core/services/app_root_url'; import {ComponentUrlMapper} from 'angular2/src/core/compiler/component_url_mapper'; -import {reflector} from 'angular2/src/reflection/reflection'; -import {ReflectionCapabilities} from 'angular2/src/reflection/reflection_capabilities'; +import {reflector} from 'angular2/src/core/reflection/reflection'; +import {ReflectionCapabilities} from 'angular2/src/core/reflection/reflection_capabilities'; import {getIntParameter, bindAction} from 'angular2/src/test_lib/benchmark_util'; import {ProtoViewFactory} from 'angular2/src/core/compiler/proto_view_factory'; @@ -29,8 +29,10 @@ import { DefaultDomCompiler, SharedStylesHost, TemplateCloner -} from 'angular2/src/render/render'; -import {DomElementSchemaRegistry} from 'angular2/src/render/dom/schema/dom_element_schema_registry'; +} from 'angular2/src/core/render/render'; +import { + DomElementSchemaRegistry +} from 'angular2/src/core/render/dom/schema/dom_element_schema_registry'; export function main() { BrowserDomAdapter.makeCurrent(); diff --git a/modules/benchmarks/src/compiler/selector_benchmark.ts b/modules/benchmarks/src/compiler/selector_benchmark.ts index eb2ee08154..5b7d14f4b7 100644 --- a/modules/benchmarks/src/compiler/selector_benchmark.ts +++ b/modules/benchmarks/src/compiler/selector_benchmark.ts @@ -1,8 +1,8 @@ -import {SelectorMatcher} from "angular2/src/render/dom/compiler/selector"; -import {CssSelector} from "angular2/src/render/dom/compiler/selector"; -import {StringWrapper, Math} from 'angular2/src/facade/lang'; +import {SelectorMatcher} from "angular2/src/core/render/dom/compiler/selector"; +import {CssSelector} from "angular2/src/core/render/dom/compiler/selector"; +import {StringWrapper, Math} from 'angular2/src/core/facade/lang'; import {getIntParameter, bindAction} from 'angular2/src/test_lib/benchmark_util'; -import {BrowserDomAdapter} from 'angular2/src/dom/browser_adapter'; +import {BrowserDomAdapter} from 'angular2/src/core/dom/browser_adapter'; export function main() { BrowserDomAdapter.makeCurrent(); diff --git a/modules/benchmarks/src/costs/index.ts b/modules/benchmarks/src/costs/index.ts index 7829928ab6..3eeddbe39b 100644 --- a/modules/benchmarks/src/costs/index.ts +++ b/modules/benchmarks/src/costs/index.ts @@ -7,7 +7,7 @@ import { View } from 'angular2/bootstrap'; import {LifeCycle} from 'angular2/src/core/life_cycle/life_cycle'; -import {List, ListWrapper} from 'angular2/src/facade/collection'; +import {List, ListWrapper} from 'angular2/src/core/facade/collection'; import {getIntParameter, bindAction} from 'angular2/src/test_lib/benchmark_util'; import {NgIf, NgFor} from 'angular2/directives'; diff --git a/modules/benchmarks/src/di/di_benchmark.ts b/modules/benchmarks/src/di/di_benchmark.ts index 8e2491a790..82c57a72ba 100644 --- a/modules/benchmarks/src/di/di_benchmark.ts +++ b/modules/benchmarks/src/di/di_benchmark.ts @@ -1,8 +1,8 @@ import {Injectable, Injector, Key, bind} from "angular2/di"; -import {reflector} from 'angular2/src/reflection/reflection'; -import {ReflectionCapabilities} from 'angular2/src/reflection/reflection_capabilities'; +import {reflector} from 'angular2/src/core/reflection/reflection'; +import {ReflectionCapabilities} from 'angular2/src/core/reflection/reflection_capabilities'; import {getIntParameter, bindAction, microBenchmark} from 'angular2/src/test_lib/benchmark_util'; -import {BrowserDomAdapter} from 'angular2/src/dom/browser_adapter'; +import {BrowserDomAdapter} from 'angular2/src/core/dom/browser_adapter'; var count = 0; diff --git a/modules/benchmarks/src/element_injector/element_injector_benchmark.ts b/modules/benchmarks/src/element_injector/element_injector_benchmark.ts index 19dc4beaee..062f557e5b 100644 --- a/modules/benchmarks/src/element_injector/element_injector_benchmark.ts +++ b/modules/benchmarks/src/element_injector/element_injector_benchmark.ts @@ -1,9 +1,9 @@ -import {reflector} from 'angular2/src/reflection/reflection'; -import {ReflectionCapabilities} from 'angular2/src/reflection/reflection_capabilities'; +import {reflector} from 'angular2/src/core/reflection/reflection'; +import {ReflectionCapabilities} from 'angular2/src/core/reflection/reflection_capabilities'; import {Injectable, Injector} from 'angular2/di'; import {ProtoElementInjector, DirectiveBinding} from 'angular2/src/core/compiler/element_injector'; import {getIntParameter, bindAction, microBenchmark} from 'angular2/src/test_lib/benchmark_util'; -import {BrowserDomAdapter} from 'angular2/src/dom/browser_adapter'; +import {BrowserDomAdapter} from 'angular2/src/core/dom/browser_adapter'; var count = 0; diff --git a/modules/benchmarks/src/largetable/largetable_benchmark.ts b/modules/benchmarks/src/largetable/largetable_benchmark.ts index 16fa6028e4..94c593606c 100644 --- a/modules/benchmarks/src/largetable/largetable_benchmark.ts +++ b/modules/benchmarks/src/largetable/largetable_benchmark.ts @@ -2,8 +2,8 @@ import {bootstrap, Component, Directive, View} from 'angular2/bootstrap'; import {LifeCycle} from 'angular2/src/core/life_cycle/life_cycle'; -import {DOM} from 'angular2/src/dom/dom_adapter'; -import {window, document, gc} from 'angular2/src/facade/browser'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {window, document, gc} from 'angular2/src/core/facade/browser'; import { getIntParameter, getStringParameter, @@ -13,14 +13,14 @@ import { } from 'angular2/src/test_lib/benchmark_util'; import {NgFor, NgSwitch, NgSwitchWhen, NgSwitchDefault} from 'angular2/directives'; -import {BrowserDomAdapter} from 'angular2/src/dom/browser_adapter'; +import {BrowserDomAdapter} from 'angular2/src/core/dom/browser_adapter'; import {APP_VIEW_POOL_CAPACITY} from 'angular2/src/core/compiler/view_pool'; -import {ListWrapper} from 'angular2/src/facade/collection'; +import {ListWrapper} from 'angular2/src/core/facade/collection'; import {bind} from 'angular2/di'; -import {Inject} from 'angular2/src/di/decorators'; -import {reflector} from 'angular2/src/reflection/reflection'; +import {Inject} from 'angular2/src/core/di/decorators'; +import {reflector} from 'angular2/src/core/reflection/reflection'; export const BENCHMARK_TYPE = 'LargetableComponent.benchmarkType'; export const LARGETABLE_ROWS = 'LargetableComponent.rows'; diff --git a/modules/benchmarks/src/naive_infinite_scroll/app.ts b/modules/benchmarks/src/naive_infinite_scroll/app.ts index c8af2b18c4..fe5d45aacb 100644 --- a/modules/benchmarks/src/naive_infinite_scroll/app.ts +++ b/modules/benchmarks/src/naive_infinite_scroll/app.ts @@ -1,11 +1,11 @@ -import {isPresent} from 'angular2/src/facade/lang'; +import {isPresent} from 'angular2/src/core/facade/lang'; import {getIntParameter, bindAction} from 'angular2/src/test_lib/benchmark_util'; -import {TimerWrapper} from 'angular2/src/facade/async'; -import {List, ListWrapper} from 'angular2/src/facade/collection'; +import {TimerWrapper} from 'angular2/src/core/facade/async'; +import {List, ListWrapper} from 'angular2/src/core/facade/collection'; import {ScrollAreaComponent} from './scroll_area'; import {NgIf, NgFor} from 'angular2/directives'; -import {DOM} from 'angular2/src/dom/dom_adapter'; -import {document} from 'angular2/src/facade/browser'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {document} from 'angular2/src/core/facade/browser'; import {Component, Directive, View} from 'angular2/angular2'; diff --git a/modules/benchmarks/src/naive_infinite_scroll/cells.ts b/modules/benchmarks/src/naive_infinite_scroll/cells.ts index ee0b36160b..f038a45750 100644 --- a/modules/benchmarks/src/naive_infinite_scroll/cells.ts +++ b/modules/benchmarks/src/naive_infinite_scroll/cells.ts @@ -1,4 +1,4 @@ -import {List, ListWrapper, Map} from 'angular2/src/facade/collection'; +import {List, ListWrapper, Map} from 'angular2/src/core/facade/collection'; import {Company, Opportunity, Offering, Account, CustomDate, STATUS_LIST} from './common'; import {NgFor} from 'angular2/directives'; diff --git a/modules/benchmarks/src/naive_infinite_scroll/common.ts b/modules/benchmarks/src/naive_infinite_scroll/common.ts index edf9cbaa95..80da8c3124 100644 --- a/modules/benchmarks/src/naive_infinite_scroll/common.ts +++ b/modules/benchmarks/src/naive_infinite_scroll/common.ts @@ -1,6 +1,6 @@ -import {Math} from 'angular2/src/facade/math'; -import {StringWrapper} from 'angular2/src/facade/lang'; -import {ListWrapper, Map, MapWrapper} from 'angular2/src/facade/collection'; +import {Math} from 'angular2/src/core/facade/math'; +import {StringWrapper} from 'angular2/src/core/facade/lang'; +import {ListWrapper, Map, MapWrapper} from 'angular2/src/core/facade/collection'; export var ITEMS = 1000; export var ITEM_HEIGHT = 40; diff --git a/modules/benchmarks/src/naive_infinite_scroll/random_data.ts b/modules/benchmarks/src/naive_infinite_scroll/random_data.ts index 1795df9655..f65d97e9ac 100644 --- a/modules/benchmarks/src/naive_infinite_scroll/random_data.ts +++ b/modules/benchmarks/src/naive_infinite_scroll/random_data.ts @@ -1,5 +1,5 @@ -import {StringWrapper} from 'angular2/src/facade/lang'; -import {List, ListWrapper} from 'angular2/src/facade/collection'; +import {StringWrapper} from 'angular2/src/core/facade/lang'; +import {List, ListWrapper} from 'angular2/src/core/facade/collection'; import { CustomDate, Offering, diff --git a/modules/benchmarks/src/naive_infinite_scroll/scroll_area.ts b/modules/benchmarks/src/naive_infinite_scroll/scroll_area.ts index ed85247c5e..631db4de4b 100644 --- a/modules/benchmarks/src/naive_infinite_scroll/scroll_area.ts +++ b/modules/benchmarks/src/naive_infinite_scroll/scroll_area.ts @@ -1,5 +1,5 @@ -import {ListWrapper} from 'angular2/src/facade/collection'; -import {Math} from 'angular2/src/facade/math'; +import {ListWrapper} from 'angular2/src/core/facade/collection'; +import {Math} from 'angular2/src/core/facade/math'; import {Component, Directive, View} from 'angular2/angular2'; diff --git a/modules/benchmarks/src/static_tree/tree_benchmark.ts b/modules/benchmarks/src/static_tree/tree_benchmark.ts index a6a3dced4f..6dccedba96 100644 --- a/modules/benchmarks/src/static_tree/tree_benchmark.ts +++ b/modules/benchmarks/src/static_tree/tree_benchmark.ts @@ -8,11 +8,11 @@ import { } from 'angular2/bootstrap'; import {LifeCycle} from 'angular2/src/core/life_cycle/life_cycle'; -import {reflector} from 'angular2/src/reflection/reflection'; -import {ReflectionCapabilities} from 'angular2/src/reflection/reflection_capabilities'; -import {DOM} from 'angular2/src/dom/dom_adapter'; -import {List} from 'angular2/src/facade/collection'; -import {window, document, gc} from 'angular2/src/facade/browser'; +import {reflector} from 'angular2/src/core/reflection/reflection'; +import {ReflectionCapabilities} from 'angular2/src/core/reflection/reflection_capabilities'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {List} from 'angular2/src/core/facade/collection'; +import {window, document, gc} from 'angular2/src/core/facade/browser'; import { getIntParameter, getStringParameter, @@ -21,7 +21,7 @@ import { windowProfileEnd } from 'angular2/src/test_lib/benchmark_util'; import {NgIf} from 'angular2/directives'; -import {BrowserDomAdapter} from 'angular2/src/dom/browser_adapter'; +import {BrowserDomAdapter} from 'angular2/src/core/dom/browser_adapter'; import {APP_VIEW_POOL_CAPACITY} from 'angular2/src/core/compiler/view_pool'; import {bind, Binding} from 'angular2/di'; diff --git a/modules/benchmarks/src/tree/tree_benchmark.ts b/modules/benchmarks/src/tree/tree_benchmark.ts index c305a202c0..061adba94b 100644 --- a/modules/benchmarks/src/tree/tree_benchmark.ts +++ b/modules/benchmarks/src/tree/tree_benchmark.ts @@ -8,10 +8,10 @@ import { } from 'angular2/bootstrap'; import {LifeCycle} from 'angular2/src/core/life_cycle/life_cycle'; -import {DOM} from 'angular2/src/dom/dom_adapter'; -import {isPresent} from 'angular2/src/facade/lang'; -import {List} from 'angular2/src/facade/collection'; -import {window, document, gc} from 'angular2/src/facade/browser'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; +import {isPresent} from 'angular2/src/core/facade/lang'; +import {List} from 'angular2/src/core/facade/collection'; +import {window, document, gc} from 'angular2/src/core/facade/browser'; import { getIntParameter, getStringParameter, @@ -20,7 +20,7 @@ import { windowProfileEnd } from 'angular2/src/test_lib/benchmark_util'; import {NgIf} from 'angular2/directives'; -import {BrowserDomAdapter} from 'angular2/src/dom/browser_adapter'; +import {BrowserDomAdapter} from 'angular2/src/core/dom/browser_adapter'; import {APP_VIEW_POOL_CAPACITY} from 'angular2/src/core/compiler/view_pool'; import {bind, Binding} from 'angular2/di'; diff --git a/modules/benchpress/src/common_options.ts b/modules/benchpress/src/common_options.ts index f534c1e5f9..de2ef03c86 100644 --- a/modules/benchpress/src/common_options.ts +++ b/modules/benchpress/src/common_options.ts @@ -1,5 +1,5 @@ import {bind, Binding, OpaqueToken} from 'angular2/di'; -import {DateWrapper} from 'angular2/src/facade/lang'; +import {DateWrapper} from 'angular2/src/core/facade/lang'; export class Options { static get DEFAULT_BINDINGS(): Binding[] { return _DEFAULT_BINDINGS; } diff --git a/modules/benchpress/src/measure_values.ts b/modules/benchpress/src/measure_values.ts index bdacf455e2..bbac9adcc4 100644 --- a/modules/benchpress/src/measure_values.ts +++ b/modules/benchpress/src/measure_values.ts @@ -1,5 +1,5 @@ -import {Date, DateWrapper} from 'angular2/src/facade/lang'; -import {StringMap, Map} from 'angular2/src/facade/collection'; +import {Date, DateWrapper} from 'angular2/src/core/facade/lang'; +import {StringMap, Map} from 'angular2/src/core/facade/collection'; export class MeasureValues { constructor(public runIndex: number, public timeStamp: Date, diff --git a/modules/benchpress/src/metric.ts b/modules/benchpress/src/metric.ts index 7ce88d4ad9..f6707a433c 100644 --- a/modules/benchpress/src/metric.ts +++ b/modules/benchpress/src/metric.ts @@ -1,7 +1,7 @@ import {bind, Binding} from 'angular2/di'; -import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; -import {ABSTRACT, BaseException} from 'angular2/src/facade/lang'; -import {StringMap} from 'angular2/src/facade/collection'; +import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async'; +import {ABSTRACT, BaseException} from 'angular2/src/core/facade/lang'; +import {StringMap} from 'angular2/src/core/facade/collection'; /** * A metric is measures values diff --git a/modules/benchpress/src/metric/multi_metric.ts b/modules/benchpress/src/metric/multi_metric.ts index 5c55330be8..07126bd61d 100644 --- a/modules/benchpress/src/metric/multi_metric.ts +++ b/modules/benchpress/src/metric/multi_metric.ts @@ -1,6 +1,6 @@ import {bind, Binding, Injector, OpaqueToken} from 'angular2/di'; -import {List, ListWrapper, StringMapWrapper, StringMap} from 'angular2/src/facade/collection'; -import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; +import {List, ListWrapper, StringMapWrapper, StringMap} from 'angular2/src/core/facade/collection'; +import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async'; import {Metric} from '../metric'; diff --git a/modules/benchpress/src/metric/perflog_metric.ts b/modules/benchpress/src/metric/perflog_metric.ts index b2dfb47f77..c348bb2c00 100644 --- a/modules/benchpress/src/metric/perflog_metric.ts +++ b/modules/benchpress/src/metric/perflog_metric.ts @@ -1,4 +1,4 @@ -import {PromiseWrapper, Promise, TimerWrapper} from 'angular2/src/facade/async'; +import {PromiseWrapper, Promise, TimerWrapper} from 'angular2/src/core/facade/async'; import { isPresent, isBlank, @@ -7,8 +7,8 @@ import { Math, RegExpWrapper, NumberWrapper -} from 'angular2/src/facade/lang'; -import {ListWrapper, StringMap, StringMapWrapper} from 'angular2/src/facade/collection'; +} from 'angular2/src/core/facade/lang'; +import {ListWrapper, StringMap, StringMapWrapper} from 'angular2/src/core/facade/collection'; import {bind, Binding, OpaqueToken} from 'angular2/di'; import {WebDriverExtension, PerfLogFeatures} from '../web_driver_extension'; diff --git a/modules/benchpress/src/reporter.ts b/modules/benchpress/src/reporter.ts index 015934e974..b2a779cfd4 100644 --- a/modules/benchpress/src/reporter.ts +++ b/modules/benchpress/src/reporter.ts @@ -1,8 +1,8 @@ import {bind, Binding} from 'angular2/di'; -import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; -import {ABSTRACT, BaseException} from 'angular2/src/facade/lang'; +import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async'; +import {ABSTRACT, BaseException} from 'angular2/src/core/facade/lang'; import {MeasureValues} from './measure_values'; -import {List} from 'angular2/src/facade/collection'; +import {List} from 'angular2/src/core/facade/collection'; /** * A reporter reports measure values and the valid sample. diff --git a/modules/benchpress/src/reporter/console_reporter.ts b/modules/benchpress/src/reporter/console_reporter.ts index 4e85589927..546f5e34bd 100644 --- a/modules/benchpress/src/reporter/console_reporter.ts +++ b/modules/benchpress/src/reporter/console_reporter.ts @@ -1,7 +1,7 @@ -import {print, isPresent, isBlank, NumberWrapper} from 'angular2/src/facade/lang'; -import {StringMapWrapper, ListWrapper, List} from 'angular2/src/facade/collection'; -import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; -import {Math} from 'angular2/src/facade/math'; +import {print, isPresent, isBlank, NumberWrapper} from 'angular2/src/core/facade/lang'; +import {StringMapWrapper, ListWrapper, List} from 'angular2/src/core/facade/collection'; +import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async'; +import {Math} from 'angular2/src/core/facade/math'; import {bind, Binding, OpaqueToken} from 'angular2/di'; import {Statistic} from '../statistic'; diff --git a/modules/benchpress/src/reporter/json_file_reporter.ts b/modules/benchpress/src/reporter/json_file_reporter.ts index ae704c1b90..e549fb2fbd 100644 --- a/modules/benchpress/src/reporter/json_file_reporter.ts +++ b/modules/benchpress/src/reporter/json_file_reporter.ts @@ -1,6 +1,6 @@ -import {DateWrapper, isPresent, isBlank, Json} from 'angular2/src/facade/lang'; -import {List} from 'angular2/src/facade/collection'; -import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; +import {DateWrapper, isPresent, isBlank, Json} from 'angular2/src/core/facade/lang'; +import {List} from 'angular2/src/core/facade/collection'; +import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async'; import {bind, Binding, OpaqueToken} from 'angular2/di'; diff --git a/modules/benchpress/src/reporter/multi_reporter.ts b/modules/benchpress/src/reporter/multi_reporter.ts index 9f2583e66c..77fd5d7057 100644 --- a/modules/benchpress/src/reporter/multi_reporter.ts +++ b/modules/benchpress/src/reporter/multi_reporter.ts @@ -1,6 +1,6 @@ import {bind, Binding, Injector, OpaqueToken} from 'angular2/di'; -import {List, ListWrapper} from 'angular2/src/facade/collection'; -import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; +import {List, ListWrapper} from 'angular2/src/core/facade/collection'; +import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async'; import {MeasureValues} from '../measure_values'; import {Reporter} from '../reporter'; diff --git a/modules/benchpress/src/runner.ts b/modules/benchpress/src/runner.ts index fb4b537d73..1f1a5d7578 100644 --- a/modules/benchpress/src/runner.ts +++ b/modules/benchpress/src/runner.ts @@ -1,7 +1,7 @@ import {Injector, bind, Binding} from 'angular2/di'; -import {isPresent, isBlank} from 'angular2/src/facade/lang'; -import {List, ListWrapper} from 'angular2/src/facade/collection'; -import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; +import {isPresent, isBlank} from 'angular2/src/core/facade/lang'; +import {List, ListWrapper} from 'angular2/src/core/facade/collection'; +import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async'; import {Sampler, SampleState} from './sampler'; import {ConsoleReporter} from './reporter/console_reporter'; diff --git a/modules/benchpress/src/sample_description.ts b/modules/benchpress/src/sample_description.ts index dc0824877f..fc04d43311 100644 --- a/modules/benchpress/src/sample_description.ts +++ b/modules/benchpress/src/sample_description.ts @@ -1,4 +1,4 @@ -import {StringMapWrapper, ListWrapper, List, StringMap} from 'angular2/src/facade/collection'; +import {StringMapWrapper, ListWrapper, List, StringMap} from 'angular2/src/core/facade/collection'; import {bind, Binding, OpaqueToken} from 'angular2/di'; import {Validator} from './validator'; import {Metric} from './metric'; diff --git a/modules/benchpress/src/sampler.ts b/modules/benchpress/src/sampler.ts index 783fe85d54..23fac334f1 100644 --- a/modules/benchpress/src/sampler.ts +++ b/modules/benchpress/src/sampler.ts @@ -1,6 +1,6 @@ -import {isPresent, isBlank, Date, DateWrapper} from 'angular2/src/facade/lang'; -import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; -import {StringMapWrapper, StringMap, List, ListWrapper} from 'angular2/src/facade/collection'; +import {isPresent, isBlank, Date, DateWrapper} from 'angular2/src/core/facade/lang'; +import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async'; +import {StringMapWrapper, StringMap, List, ListWrapper} from 'angular2/src/core/facade/collection'; import {bind, Binding, OpaqueToken} from 'angular2/di'; import {Metric} from './metric'; diff --git a/modules/benchpress/src/statistic.ts b/modules/benchpress/src/statistic.ts index 8fcb86930f..c1fc69b016 100644 --- a/modules/benchpress/src/statistic.ts +++ b/modules/benchpress/src/statistic.ts @@ -1,5 +1,5 @@ -import {Math} from 'angular2/src/facade/math'; -import {ListWrapper, List} from 'angular2/src/facade/collection'; +import {Math} from 'angular2/src/core/facade/math'; +import {ListWrapper, List} from 'angular2/src/core/facade/collection'; export class Statistic { static calculateCoefficientOfVariation(sample, mean) { diff --git a/modules/benchpress/src/validator.ts b/modules/benchpress/src/validator.ts index e0e1a955ba..3c2213173e 100644 --- a/modules/benchpress/src/validator.ts +++ b/modules/benchpress/src/validator.ts @@ -1,6 +1,6 @@ import {bind, Binding} from 'angular2/di'; -import {List, StringMap} from 'angular2/src/facade/collection'; -import {ABSTRACT, BaseException} from 'angular2/src/facade/lang'; +import {List, StringMap} from 'angular2/src/core/facade/collection'; +import {ABSTRACT, BaseException} from 'angular2/src/core/facade/lang'; import {MeasureValues} from './measure_values'; diff --git a/modules/benchpress/src/validator/regression_slope_validator.ts b/modules/benchpress/src/validator/regression_slope_validator.ts index 0b560c4099..ac247922c8 100644 --- a/modules/benchpress/src/validator/regression_slope_validator.ts +++ b/modules/benchpress/src/validator/regression_slope_validator.ts @@ -1,4 +1,4 @@ -import {List, ListWrapper, StringMap} from 'angular2/src/facade/collection'; +import {List, ListWrapper, StringMap} from 'angular2/src/core/facade/collection'; import {bind, Binding, OpaqueToken} from 'angular2/di'; import {Validator} from '../validator'; diff --git a/modules/benchpress/src/validator/size_validator.ts b/modules/benchpress/src/validator/size_validator.ts index 3f407f9ad5..a06285bb3c 100644 --- a/modules/benchpress/src/validator/size_validator.ts +++ b/modules/benchpress/src/validator/size_validator.ts @@ -1,4 +1,4 @@ -import {List, ListWrapper, StringMap} from 'angular2/src/facade/collection'; +import {List, ListWrapper, StringMap} from 'angular2/src/core/facade/collection'; import {bind, Binding, OpaqueToken} from 'angular2/di'; import {Validator} from '../validator'; diff --git a/modules/benchpress/src/web_driver_adapter.ts b/modules/benchpress/src/web_driver_adapter.ts index 1499da2395..e04cbc2ee7 100644 --- a/modules/benchpress/src/web_driver_adapter.ts +++ b/modules/benchpress/src/web_driver_adapter.ts @@ -1,7 +1,7 @@ import {bind, Binding} from 'angular2/di'; -import {Promise} from 'angular2/src/facade/async'; -import {BaseException, ABSTRACT} from 'angular2/src/facade/lang'; -import {List, Map} from 'angular2/src/facade/collection'; +import {Promise} from 'angular2/src/core/facade/async'; +import {BaseException, ABSTRACT} from 'angular2/src/core/facade/lang'; +import {List, Map} from 'angular2/src/core/facade/collection'; /** * A WebDriverAdapter bridges API differences between different WebDriver clients, diff --git a/modules/benchpress/src/web_driver_extension.ts b/modules/benchpress/src/web_driver_extension.ts index a9295d65c3..ea82171541 100644 --- a/modules/benchpress/src/web_driver_extension.ts +++ b/modules/benchpress/src/web_driver_extension.ts @@ -1,8 +1,8 @@ import {bind, Binding, Injector, OpaqueToken} from 'angular2/di'; -import {BaseException, ABSTRACT, isBlank, isPresent} from 'angular2/src/facade/lang'; -import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; -import {List, ListWrapper, StringMap} from 'angular2/src/facade/collection'; +import {BaseException, ABSTRACT, isBlank, isPresent} from 'angular2/src/core/facade/lang'; +import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async'; +import {List, ListWrapper, StringMap} from 'angular2/src/core/facade/collection'; import {Options} from './common_options'; diff --git a/modules/benchpress/src/webdriver/async_webdriver_adapter.dart b/modules/benchpress/src/webdriver/async_webdriver_adapter.dart index 6826930d08..bd97c7b520 100644 --- a/modules/benchpress/src/webdriver/async_webdriver_adapter.dart +++ b/modules/benchpress/src/webdriver/async_webdriver_adapter.dart @@ -1,7 +1,7 @@ library benchpress.src.webdriver.async_webdriver_adapter_dart; import 'package:webdriver/webdriver.dart' show WebDriver, LogEntry; -import 'package:angular2/src/facade/async.dart' show Future; +import 'package:angular2/src/core/facade/async.dart' show Future; import '../web_driver_adapter.dart' show WebDriverAdapter; class AsyncWebDriverAdapter extends WebDriverAdapter { diff --git a/modules/benchpress/src/webdriver/chrome_driver_extension.ts b/modules/benchpress/src/webdriver/chrome_driver_extension.ts index 6482e53a3c..a153fcf1b4 100644 --- a/modules/benchpress/src/webdriver/chrome_driver_extension.ts +++ b/modules/benchpress/src/webdriver/chrome_driver_extension.ts @@ -1,5 +1,5 @@ import {bind, Binding} from 'angular2/di'; -import {ListWrapper, StringMapWrapper, StringMap} from 'angular2/src/facade/collection'; +import {ListWrapper, StringMapWrapper, StringMap} from 'angular2/src/core/facade/collection'; import { Json, isPresent, @@ -8,11 +8,11 @@ import { StringWrapper, BaseException, NumberWrapper -} from 'angular2/src/facade/lang'; +} from 'angular2/src/core/facade/lang'; import {WebDriverExtension, PerfLogFeatures} from '../web_driver_extension'; import {WebDriverAdapter} from '../web_driver_adapter'; -import {Promise} from 'angular2/src/facade/async'; +import {Promise} from 'angular2/src/core/facade/async'; /** * Set the following 'traceCategories' to collect metrics in Chrome: diff --git a/modules/benchpress/src/webdriver/firefox_driver_extension.ts b/modules/benchpress/src/webdriver/firefox_driver_extension.ts index 63d3b0a3ee..f37df77db3 100644 --- a/modules/benchpress/src/webdriver/firefox_driver_extension.ts +++ b/modules/benchpress/src/webdriver/firefox_driver_extension.ts @@ -1,8 +1,8 @@ import {bind, Binding} from 'angular2/di'; -import {isPresent, StringWrapper} from 'angular2/src/facade/lang'; +import {isPresent, StringWrapper} from 'angular2/src/core/facade/lang'; import {WebDriverExtension, PerfLogFeatures} from '../web_driver_extension'; import {WebDriverAdapter} from '../web_driver_adapter'; -import {Promise} from 'angular2/src/facade/async'; +import {Promise} from 'angular2/src/core/facade/async'; export class FirefoxDriverExtension extends WebDriverExtension { static get BINDINGS(): List { return _BINDINGS; } diff --git a/modules/benchpress/src/webdriver/ios_driver_extension.ts b/modules/benchpress/src/webdriver/ios_driver_extension.ts index 0bbc216d9b..7411d58bcf 100644 --- a/modules/benchpress/src/webdriver/ios_driver_extension.ts +++ b/modules/benchpress/src/webdriver/ios_driver_extension.ts @@ -1,5 +1,5 @@ import {bind, Binding} from 'angular2/di'; -import {ListWrapper, StringMap} from 'angular2/src/facade/collection'; +import {ListWrapper, StringMap} from 'angular2/src/core/facade/collection'; import { Json, isPresent, @@ -7,11 +7,11 @@ import { RegExpWrapper, StringWrapper, BaseException -} from 'angular2/src/facade/lang'; +} from 'angular2/src/core/facade/lang'; import {WebDriverExtension, PerfLogFeatures} from '../web_driver_extension'; import {WebDriverAdapter} from '../web_driver_adapter'; -import {Promise} from 'angular2/src/facade/async'; +import {Promise} from 'angular2/src/core/facade/async'; export class IOsDriverExtension extends WebDriverExtension { // TODO(tbosch): use static values when our transpiler supports them diff --git a/modules/benchpress/src/webdriver/selenium_webdriver_adapter.ts b/modules/benchpress/src/webdriver/selenium_webdriver_adapter.ts index 74803879ab..4e398a7796 100644 --- a/modules/benchpress/src/webdriver/selenium_webdriver_adapter.ts +++ b/modules/benchpress/src/webdriver/selenium_webdriver_adapter.ts @@ -1,4 +1,4 @@ -import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; +import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async'; import {bind, Binding} from 'angular2/di'; import {WebDriverAdapter} from '../web_driver_adapter'; diff --git a/modules/benchpress/test/metric/multi_metric_spec.ts b/modules/benchpress/test/metric/multi_metric_spec.ts index fe460adfe5..8f2c323e67 100644 --- a/modules/benchpress/test/metric/multi_metric_spec.ts +++ b/modules/benchpress/test/metric/multi_metric_spec.ts @@ -11,8 +11,8 @@ import { xit, } from 'angular2/test_lib'; -import {List, ListWrapper, StringMap} from 'angular2/src/facade/collection'; -import {PromiseWrapper, Promise} from 'angular2/src/facade/async'; +import {List, ListWrapper, StringMap} from 'angular2/src/core/facade/collection'; +import {PromiseWrapper, Promise} from 'angular2/src/core/facade/async'; import {Metric, MultiMetric, bind, Injector} from 'benchpress/common'; diff --git a/modules/benchpress/test/metric/perflog_metric_spec.ts b/modules/benchpress/test/metric/perflog_metric_spec.ts index 2acc5be18e..02d76eae4a 100644 --- a/modules/benchpress/test/metric/perflog_metric_spec.ts +++ b/modules/benchpress/test/metric/perflog_metric_spec.ts @@ -11,9 +11,9 @@ import { xit, } from 'angular2/test_lib'; -import {List, ListWrapper, StringMapWrapper} from 'angular2/src/facade/collection'; -import {PromiseWrapper, Promise} from 'angular2/src/facade/async'; -import {isPresent, isBlank} from 'angular2/src/facade/lang'; +import {List, ListWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection'; +import {PromiseWrapper, Promise} from 'angular2/src/core/facade/async'; +import {isPresent, isBlank} from 'angular2/src/core/facade/lang'; import { Metric, diff --git a/modules/benchpress/test/reporter/console_reporter_spec.ts b/modules/benchpress/test/reporter/console_reporter_spec.ts index 69631052e4..e2a73e147e 100644 --- a/modules/benchpress/test/reporter/console_reporter_spec.ts +++ b/modules/benchpress/test/reporter/console_reporter_spec.ts @@ -1,7 +1,7 @@ import {describe, ddescribe, it, iit, xit, expect, beforeEach, afterEach} from 'angular2/test_lib'; -import {isBlank, isPresent, Date, DateWrapper} from 'angular2/src/facade/lang'; -import {List, ListWrapper} from 'angular2/src/facade/collection'; +import {isBlank, isPresent, Date, DateWrapper} from 'angular2/src/core/facade/lang'; +import {List, ListWrapper} from 'angular2/src/core/facade/collection'; import { SampleState, diff --git a/modules/benchpress/test/reporter/json_file_reporter_spec.ts b/modules/benchpress/test/reporter/json_file_reporter_spec.ts index fc699957f4..532283f091 100644 --- a/modules/benchpress/test/reporter/json_file_reporter_spec.ts +++ b/modules/benchpress/test/reporter/json_file_reporter_spec.ts @@ -11,8 +11,8 @@ import { xit, } from 'angular2/test_lib'; -import {DateWrapper, Json, RegExpWrapper, isPresent} from 'angular2/src/facade/lang'; -import {PromiseWrapper} from 'angular2/src/facade/async'; +import {DateWrapper, Json, RegExpWrapper, isPresent} from 'angular2/src/core/facade/lang'; +import {PromiseWrapper} from 'angular2/src/core/facade/async'; import {bind, Injector, SampleDescription, MeasureValues, Options} from 'benchpress/common'; diff --git a/modules/benchpress/test/reporter/multi_reporter_spec.ts b/modules/benchpress/test/reporter/multi_reporter_spec.ts index 85cc3f0445..3caaaae01c 100644 --- a/modules/benchpress/test/reporter/multi_reporter_spec.ts +++ b/modules/benchpress/test/reporter/multi_reporter_spec.ts @@ -11,9 +11,9 @@ import { xit, } from 'angular2/test_lib'; -import {List, ListWrapper, StringMap} from 'angular2/src/facade/collection'; -import {PromiseWrapper, Promise} from 'angular2/src/facade/async'; -import {DateWrapper} from 'angular2/src/facade/lang'; +import {List, ListWrapper, StringMap} from 'angular2/src/core/facade/collection'; +import {PromiseWrapper, Promise} from 'angular2/src/core/facade/async'; +import {DateWrapper} from 'angular2/src/core/facade/lang'; import {Reporter, MultiReporter, bind, Injector, MeasureValues} from 'benchpress/common'; diff --git a/modules/benchpress/test/runner_spec.ts b/modules/benchpress/test/runner_spec.ts index 4756ce8b68..c596f0f292 100644 --- a/modules/benchpress/test/runner_spec.ts +++ b/modules/benchpress/test/runner_spec.ts @@ -22,8 +22,8 @@ import { WebDriverAdapter, SampleState } from 'benchpress/common'; -import {isBlank} from 'angular2/src/facade/lang'; -import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; +import {isBlank} from 'angular2/src/core/facade/lang'; +import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async'; export function main() { describe('runner', () => { diff --git a/modules/benchpress/test/sampler_spec.ts b/modules/benchpress/test/sampler_spec.ts index 4720a28a4e..b15c0f267b 100644 --- a/modules/benchpress/test/sampler_spec.ts +++ b/modules/benchpress/test/sampler_spec.ts @@ -18,9 +18,9 @@ import { stringify, Date, DateWrapper -} from 'angular2/src/facade/lang'; -import {ListWrapper, List} from 'angular2/src/facade/collection'; -import {PromiseWrapper, Promise} from 'angular2/src/facade/async'; +} from 'angular2/src/core/facade/lang'; +import {ListWrapper, List} from 'angular2/src/core/facade/collection'; +import {PromiseWrapper, Promise} from 'angular2/src/core/facade/async'; import { Sampler, diff --git a/modules/benchpress/test/statistic_spec.ts b/modules/benchpress/test/statistic_spec.ts index 3a8986f4d5..7009690728 100644 --- a/modules/benchpress/test/statistic_spec.ts +++ b/modules/benchpress/test/statistic_spec.ts @@ -2,7 +2,7 @@ import {describe, ddescribe, it, iit, xit, expect, beforeEach, afterEach} from ' import {Statistic} from 'benchpress/src/statistic'; -import {NaN} from 'angular2/src/facade/math'; +import {NaN} from 'angular2/src/core/facade/math'; export function main() { describe('statistic', () => { diff --git a/modules/benchpress/test/trace_event_factory.ts b/modules/benchpress/test/trace_event_factory.ts index c7d074e558..9dcd3705fd 100644 --- a/modules/benchpress/test/trace_event_factory.ts +++ b/modules/benchpress/test/trace_event_factory.ts @@ -1,4 +1,4 @@ -import {isPresent} from 'angular2/src/facade/lang'; +import {isPresent} from 'angular2/src/core/facade/lang'; export class TraceEventFactory { private _cat: string; diff --git a/modules/benchpress/test/validator/regression_slope_validator_spec.ts b/modules/benchpress/test/validator/regression_slope_validator_spec.ts index ec4c0a2a5b..ddc9d2022e 100644 --- a/modules/benchpress/test/validator/regression_slope_validator_spec.ts +++ b/modules/benchpress/test/validator/regression_slope_validator_spec.ts @@ -1,6 +1,6 @@ import {describe, ddescribe, it, iit, xit, expect, beforeEach, afterEach} from 'angular2/test_lib'; -import {Date, DateWrapper} from 'angular2/src/facade/lang'; -import {ListWrapper} from 'angular2/src/facade/collection'; +import {Date, DateWrapper} from 'angular2/src/core/facade/lang'; +import {ListWrapper} from 'angular2/src/core/facade/collection'; import { Validator, diff --git a/modules/benchpress/test/validator/size_validator_spec.ts b/modules/benchpress/test/validator/size_validator_spec.ts index 4261d086cd..d96a350966 100644 --- a/modules/benchpress/test/validator/size_validator_spec.ts +++ b/modules/benchpress/test/validator/size_validator_spec.ts @@ -1,6 +1,6 @@ import {describe, ddescribe, it, iit, xit, expect, beforeEach, afterEach} from 'angular2/test_lib'; -import {Date, DateWrapper} from 'angular2/src/facade/lang'; -import {ListWrapper} from 'angular2/src/facade/collection'; +import {Date, DateWrapper} from 'angular2/src/core/facade/lang'; +import {ListWrapper} from 'angular2/src/core/facade/collection'; import {Validator, SizeValidator, Injector, bind, MeasureValues} from 'benchpress/common'; diff --git a/modules/benchpress/test/web_driver_extension_spec.ts b/modules/benchpress/test/web_driver_extension_spec.ts index c8b3e09b8b..61b24c7e14 100644 --- a/modules/benchpress/test/web_driver_extension_spec.ts +++ b/modules/benchpress/test/web_driver_extension_spec.ts @@ -11,9 +11,9 @@ import { xit, } from 'angular2/test_lib'; -import {StringMap, ListWrapper} from 'angular2/src/facade/collection'; -import {isPresent, StringWrapper} from 'angular2/src/facade/lang'; -import {PromiseWrapper} from 'angular2/src/facade/async'; +import {StringMap, ListWrapper} from 'angular2/src/core/facade/collection'; +import {isPresent, StringWrapper} from 'angular2/src/core/facade/lang'; +import {PromiseWrapper} from 'angular2/src/core/facade/async'; import {WebDriverExtension, bind, Injector, Options} from 'benchpress/common'; diff --git a/modules/benchpress/test/webdriver/chrome_driver_extension_spec.ts b/modules/benchpress/test/webdriver/chrome_driver_extension_spec.ts index a51141abd4..4924213ab6 100644 --- a/modules/benchpress/test/webdriver/chrome_driver_extension_spec.ts +++ b/modules/benchpress/test/webdriver/chrome_driver_extension_spec.ts @@ -11,8 +11,8 @@ import { xit, } from 'angular2/test_lib'; -import {PromiseWrapper} from 'angular2/src/facade/async'; -import {Json, isBlank} from 'angular2/src/facade/lang'; +import {PromiseWrapper} from 'angular2/src/core/facade/async'; +import {Json, isBlank} from 'angular2/src/core/facade/lang'; import { WebDriverExtension, diff --git a/modules/benchpress/test/webdriver/ios_driver_extension_spec.ts b/modules/benchpress/test/webdriver/ios_driver_extension_spec.ts index e854f9ebe6..852c88cfd1 100644 --- a/modules/benchpress/test/webdriver/ios_driver_extension_spec.ts +++ b/modules/benchpress/test/webdriver/ios_driver_extension_spec.ts @@ -11,8 +11,8 @@ import { xit, } from 'angular2/test_lib'; -import {PromiseWrapper} from 'angular2/src/facade/async'; -import {Json, isBlank, isPresent} from 'angular2/src/facade/lang'; +import {PromiseWrapper} from 'angular2/src/core/facade/async'; +import {Json, isBlank, isPresent} from 'angular2/src/core/facade/lang'; import { WebDriverExtension, diff --git a/modules/examples/e2e_test/http/http_spec.ts b/modules/examples/e2e_test/http/http_spec.ts index 450e6579d3..cbb2c3a217 100644 --- a/modules/examples/e2e_test/http/http_spec.ts +++ b/modules/examples/e2e_test/http/http_spec.ts @@ -11,7 +11,7 @@ describe('http', function() { it('should fetch and display people', function() { browser.get(URL); - + browser.sleep(200); expect(getComponentText('http-app', '.people')).toEqual('hello, Jeff'); }); }); diff --git a/modules/examples/e2e_test/jsonp/jsonp_spec.ts b/modules/examples/e2e_test/jsonp/jsonp_spec.ts index bd1e722941..851374fba1 100644 --- a/modules/examples/e2e_test/jsonp/jsonp_spec.ts +++ b/modules/examples/e2e_test/jsonp/jsonp_spec.ts @@ -11,7 +11,7 @@ describe('jsonp', function() { it('should fetch and display people', function() { browser.get(URL); - + browser.sleep(200); expect(getComponentText('jsonp-app', '.people')).toEqual('hello, caitp'); }); }); diff --git a/modules/examples/e2e_test/message_broker/message_broker_spec.ts b/modules/examples/e2e_test/message_broker/message_broker_spec.ts index 777e82c60e..331ad3dc13 100644 --- a/modules/examples/e2e_test/message_broker/message_broker_spec.ts +++ b/modules/examples/e2e_test/message_broker/message_broker_spec.ts @@ -1,5 +1,5 @@ import {verifyNoBrowserErrors} from 'angular2/src/test_lib/e2e_util'; -import {PromiseWrapper} from "angular2/src/facade/async"; +import {PromiseWrapper} from "angular2/src/core/facade/async"; var URL = 'examples/src/message_broker/index.html'; diff --git a/modules/examples/e2e_test/routing/routing_spec.ts b/modules/examples/e2e_test/routing/routing_spec.ts index 821705af61..f61406bfeb 100644 --- a/modules/examples/e2e_test/routing/routing_spec.ts +++ b/modules/examples/e2e_test/routing/routing_spec.ts @@ -1,5 +1,5 @@ import {verifyNoBrowserErrors} from 'angular2/src/test_lib/e2e_util'; -import {Promise} from 'angular2/src/facade/async'; +import {Promise} from 'angular2/src/core/facade/async'; function waitForElement(selector) { var EC = (protractor).ExpectedConditions; diff --git a/modules/examples/e2e_test/web_workers/kitchen_sink/kitchen_sink_spec.ts b/modules/examples/e2e_test/web_workers/kitchen_sink/kitchen_sink_spec.ts index b1ef9d41e2..ddf78c329c 100644 --- a/modules/examples/e2e_test/web_workers/kitchen_sink/kitchen_sink_spec.ts +++ b/modules/examples/e2e_test/web_workers/kitchen_sink/kitchen_sink_spec.ts @@ -1,5 +1,5 @@ import {verifyNoBrowserErrors} from 'angular2/src/test_lib/e2e_util'; -import {Promise} from 'angular2/src/facade/async'; +import {Promise} from 'angular2/src/core/facade/async'; describe('WebWorkers Kitchen Sink', function() { afterEach(verifyNoBrowserErrors); diff --git a/modules/examples/e2e_test/web_workers/todo/todo_spec.ts b/modules/examples/e2e_test/web_workers/todo/todo_spec.ts index 0cb839b089..10f4c6a44b 100644 --- a/modules/examples/e2e_test/web_workers/todo/todo_spec.ts +++ b/modules/examples/e2e_test/web_workers/todo/todo_spec.ts @@ -1,5 +1,5 @@ import {verifyNoBrowserErrors} from 'angular2/src/test_lib/e2e_util'; -import {Promise} from 'angular2/src/facade/async'; +import {Promise} from 'angular2/src/core/facade/async'; describe('WebWorkers Todo', function() { afterEach(verifyNoBrowserErrors); diff --git a/modules/examples/src/async/index.ts b/modules/examples/src/async/index.ts index 7107cda187..3ae389f088 100644 --- a/modules/examples/src/async/index.ts +++ b/modules/examples/src/async/index.ts @@ -1,5 +1,5 @@ import {NgIf, bootstrap, Component, View} from 'angular2/bootstrap'; -import {TimerWrapper} from 'angular2/src/facade/async'; +import {TimerWrapper} from 'angular2/src/core/facade/async'; @Component({selector: 'async-app'}) diff --git a/modules/examples/src/http/http_comp.ts b/modules/examples/src/http/http_comp.ts index 7ab71d45e8..fac8537b47 100644 --- a/modules/examples/src/http/http_comp.ts +++ b/modules/examples/src/http/http_comp.ts @@ -1,6 +1,6 @@ import {Component, View, NgFor} from 'angular2/angular2'; -import {Http, Response} from 'http/http'; -import {ObservableWrapper} from 'angular2/src/facade/async'; +import {Http, Response} from 'angular2/http'; +import {ObservableWrapper} from 'angular2/src/core/facade/async'; @Component({selector: 'http-app'}) @View({ diff --git a/modules/examples/src/http/index.ts b/modules/examples/src/http/index.ts index e5cfae78b5..6890344b35 100644 --- a/modules/examples/src/http/index.ts +++ b/modules/examples/src/http/index.ts @@ -1,7 +1,7 @@ /// import {bootstrap} from 'angular2/bootstrap'; -import {HTTP_BINDINGS} from 'http/http'; +import {HTTP_BINDINGS} from 'angular2/http'; import {HttpCmp} from './http_comp'; export function main() { diff --git a/modules/examples/src/http/index_dynamic.ts b/modules/examples/src/http/index_dynamic.ts index 96e5beab65..2b0ea394c3 100644 --- a/modules/examples/src/http/index_dynamic.ts +++ b/modules/examples/src/http/index_dynamic.ts @@ -1,6 +1,6 @@ import {HttpCmp} from './http_comp'; import {bootstrap} from 'angular2/bootstrap'; -import {HTTP_BINDINGS} from 'http/http'; +import {HTTP_BINDINGS} from 'angular2/http'; export function main() { // This entry point is not transformed and exists for testing dynamic mode. diff --git a/modules/examples/src/jsonp/index.ts b/modules/examples/src/jsonp/index.ts index 663303fd5d..623a3f9b7d 100644 --- a/modules/examples/src/jsonp/index.ts +++ b/modules/examples/src/jsonp/index.ts @@ -1,7 +1,7 @@ /// import {bootstrap} from 'angular2/bootstrap'; -import {JSONP_BINDINGS} from 'http/http'; +import {JSONP_BINDINGS} from 'angular2/http'; import {JsonpCmp} from './jsonp_comp'; export function main() { diff --git a/modules/examples/src/jsonp/index_dynamic.ts b/modules/examples/src/jsonp/index_dynamic.ts index 787959501e..6aea11ac74 100644 --- a/modules/examples/src/jsonp/index_dynamic.ts +++ b/modules/examples/src/jsonp/index_dynamic.ts @@ -1,6 +1,6 @@ import {JsonpCmp} from './jsonp_comp'; import {bootstrap} from 'angular2/bootstrap'; -import {JSONP_BINDINGS} from 'http/http'; +import {JSONP_BINDINGS} from 'angular2/http'; export function main() { bootstrap(JsonpCmp, [JSONP_BINDINGS]); diff --git a/modules/examples/src/jsonp/jsonp_comp.ts b/modules/examples/src/jsonp/jsonp_comp.ts index 23163e908e..9292ff28e8 100644 --- a/modules/examples/src/jsonp/jsonp_comp.ts +++ b/modules/examples/src/jsonp/jsonp_comp.ts @@ -1,6 +1,6 @@ import {Component, View, NgFor} from 'angular2/angular2'; -import {Jsonp, Response} from 'http/http'; -import {ObservableWrapper} from 'angular2/src/facade/async'; +import {Jsonp, Response} from 'angular2/http'; +import {ObservableWrapper} from 'angular2/src/core/facade/async'; @Component({selector: 'jsonp-app'}) @View({ diff --git a/modules/examples/src/key_events/index.ts b/modules/examples/src/key_events/index.ts index a7ecad450a..f5a23aedaf 100644 --- a/modules/examples/src/key_events/index.ts +++ b/modules/examples/src/key_events/index.ts @@ -1,5 +1,5 @@ import {bootstrap, Component, View} from 'angular2/bootstrap'; -import {KeyEventsPlugin} from 'angular2/src/render/dom/events/key_events'; +import {KeyEventsPlugin} from 'angular2/src/core/render/dom/events/key_events'; @Component({selector: 'key-events-app'}) @View({ diff --git a/modules/examples/src/material/button/index.ts b/modules/examples/src/material/button/index.ts index e96c904a1e..2fe9a9f4d8 100644 --- a/modules/examples/src/material/button/index.ts +++ b/modules/examples/src/material/button/index.ts @@ -1,6 +1,6 @@ import {bootstrap, Component, View, NgFor, ViewEncapsulation} from 'angular2/bootstrap'; import {MdButton, MdAnchor} from 'angular2_material/src/components/button/button'; -import {UrlResolver} from 'angular2/src/services/url_resolver'; +import {UrlResolver} from 'angular2/src/core/services/url_resolver'; import {commonDemoSetup, DemoUrlResolver} from '../demo_common'; import {bind} from 'angular2/di'; diff --git a/modules/examples/src/material/checkbox/index.ts b/modules/examples/src/material/checkbox/index.ts index a89a57e8a3..8f258cceb7 100644 --- a/modules/examples/src/material/checkbox/index.ts +++ b/modules/examples/src/material/checkbox/index.ts @@ -1,6 +1,6 @@ import {bootstrap, Component, Directive, View, ViewEncapsulation} from 'angular2/bootstrap'; import {MdCheckbox} from 'angular2_material/src/components/checkbox/checkbox'; -import {UrlResolver} from 'angular2/src/services/url_resolver'; +import {UrlResolver} from 'angular2/src/core/services/url_resolver'; import {commonDemoSetup, DemoUrlResolver} from '../demo_common'; import {bind} from 'angular2/di'; diff --git a/modules/examples/src/material/demo_common.dart b/modules/examples/src/material/demo_common.dart index b0f8ebed29..47e7f4e3fb 100644 --- a/modules/examples/src/material/demo_common.dart +++ b/modules/examples/src/material/demo_common.dart @@ -1,7 +1,7 @@ library angular2_examples.material.demo_common; -import 'package:angular2/src/dom/browser_adapter.dart'; -import 'package:angular2/src/services/url_resolver.dart'; +import 'package:angular2/src/core/dom/browser_adapter.dart'; +import 'package:angular2/src/core/services/url_resolver.dart'; void commonDemoSetup() { BrowserDomAdapter.makeCurrent(); diff --git a/modules/examples/src/material/demo_common.ts b/modules/examples/src/material/demo_common.ts index 55ae50943a..cbe2774d6b 100644 --- a/modules/examples/src/material/demo_common.ts +++ b/modules/examples/src/material/demo_common.ts @@ -1,15 +1,15 @@ -import {IMPLEMENTS, print} from 'angular2/src/facade/lang'; -import {UrlResolver} from 'angular2/src/services/url_resolver'; +import {IMPLEMENTS, print} from 'angular2/src/core/facade/lang'; +import {UrlResolver} from 'angular2/src/core/services/url_resolver'; import { isPresent, isBlank, RegExpWrapper, StringWrapper, BaseException -} from 'angular2/src/facade/lang'; -import {DOM} from 'angular2/src/dom/dom_adapter'; +} from 'angular2/src/core/facade/lang'; +import {DOM} from 'angular2/src/core/dom/dom_adapter'; import {Injectable} from 'angular2/di'; -import {BrowserDomAdapter} from 'angular2/src/dom/browser_adapter'; +import {BrowserDomAdapter} from 'angular2/src/core/dom/browser_adapter'; export function commonDemoSetup(): void { diff --git a/modules/examples/src/material/dialog/index.ts b/modules/examples/src/material/dialog/index.ts index 99296b5b35..a220f6ef05 100644 --- a/modules/examples/src/material/dialog/index.ts +++ b/modules/examples/src/material/dialog/index.ts @@ -11,10 +11,10 @@ import { MdDialogRef, MdDialogConfig } from 'angular2_material/src/components/dialog/dialog'; -import {UrlResolver} from 'angular2/src/services/url_resolver'; +import {UrlResolver} from 'angular2/src/core/services/url_resolver'; import {commonDemoSetup, DemoUrlResolver} from '../demo_common'; import {bind} from 'angular2/di'; -import {isPresent} from 'angular2/src/facade/lang'; +import {isPresent} from 'angular2/src/core/facade/lang'; @Component({ diff --git a/modules/examples/src/material/grid_list/index.ts b/modules/examples/src/material/grid_list/index.ts index 9e15a5580c..21b7d8eea1 100644 --- a/modules/examples/src/material/grid_list/index.ts +++ b/modules/examples/src/material/grid_list/index.ts @@ -1,6 +1,6 @@ import {bootstrap, Component, View, ViewEncapsulation} from 'angular2/bootstrap'; import {MdGridList, MdGridTile} from 'angular2_material/src/components/grid_list/grid_list'; -import {UrlResolver} from 'angular2/src/services/url_resolver'; +import {UrlResolver} from 'angular2/src/core/services/url_resolver'; import {commonDemoSetup, DemoUrlResolver} from '../demo_common'; import {bind} from 'angular2/di'; diff --git a/modules/examples/src/material/input/index.ts b/modules/examples/src/material/input/index.ts index 7fcf5519ed..fa23b8bbce 100644 --- a/modules/examples/src/material/input/index.ts +++ b/modules/examples/src/material/input/index.ts @@ -1,6 +1,6 @@ import {bootstrap, Component, View, ViewEncapsulation} from 'angular2/bootstrap'; import {MdInputContainer, MdInput} from 'angular2_material/src/components/input/input'; -import {UrlResolver} from 'angular2/src/services/url_resolver'; +import {UrlResolver} from 'angular2/src/core/services/url_resolver'; import {commonDemoSetup, DemoUrlResolver} from '../demo_common'; import {bind} from 'angular2/di'; diff --git a/modules/examples/src/material/progress-linear/index.ts b/modules/examples/src/material/progress-linear/index.ts index 23ea964176..1be1ce1bf0 100644 --- a/modules/examples/src/material/progress-linear/index.ts +++ b/modules/examples/src/material/progress-linear/index.ts @@ -1,6 +1,6 @@ import {bootstrap, Component, View, ViewEncapsulation} from 'angular2/bootstrap'; import {MdProgressLinear} from 'angular2_material/src/components/progress-linear/progress_linear'; -import {UrlResolver} from 'angular2/src/services/url_resolver'; +import {UrlResolver} from 'angular2/src/core/services/url_resolver'; import {commonDemoSetup, DemoUrlResolver} from '../demo_common'; import {bind} from 'angular2/di'; diff --git a/modules/examples/src/material/radio/index.ts b/modules/examples/src/material/radio/index.ts index fb98c7eaf0..a44a4a24f7 100644 --- a/modules/examples/src/material/radio/index.ts +++ b/modules/examples/src/material/radio/index.ts @@ -1,7 +1,7 @@ import {bootstrap, Component, View, ViewEncapsulation} from 'angular2/bootstrap'; import {MdRadioButton, MdRadioGroup} from 'angular2_material/src/components/radio/radio_button'; import {MdRadioDispatcher} from 'angular2_material/src/components/radio/radio_dispatcher'; -import {UrlResolver} from 'angular2/src/services/url_resolver'; +import {UrlResolver} from 'angular2/src/core/services/url_resolver'; import {commonDemoSetup, DemoUrlResolver} from '../demo_common'; import {bind} from 'angular2/di'; diff --git a/modules/examples/src/material/switcher/index.ts b/modules/examples/src/material/switcher/index.ts index faac46d8f1..588f8c0fe9 100644 --- a/modules/examples/src/material/switcher/index.ts +++ b/modules/examples/src/material/switcher/index.ts @@ -1,6 +1,6 @@ import {bootstrap, Component, View, ViewEncapsulation} from 'angular2/bootstrap'; import {MdSwitch} from 'angular2_material/src/components/switcher/switch'; -import {UrlResolver} from 'angular2/src/services/url_resolver'; +import {UrlResolver} from 'angular2/src/core/services/url_resolver'; import {commonDemoSetup, DemoUrlResolver} from '../demo_common'; import {bind} from 'angular2/di'; diff --git a/modules/examples/src/message_broker/background_index.dart b/modules/examples/src/message_broker/background_index.dart index b8c55a4df7..e3871fd701 100644 --- a/modules/examples/src/message_broker/background_index.dart +++ b/modules/examples/src/message_broker/background_index.dart @@ -7,7 +7,7 @@ import "package:angular2/src/web_workers/shared/serializer.dart" import "package:angular2/src/web_workers/shared/isolate_message_bus.dart"; import "package:angular2/src/web_workers/worker/application.dart" show WebWorkerMessageBusSink; -import "package:angular2/src/facade/async.dart"; +import "package:angular2/src/core/facade/async.dart"; import "dart:isolate"; main(List args, SendPort replyTo) { diff --git a/modules/examples/src/message_broker/background_index.ts b/modules/examples/src/message_broker/background_index.ts index ce3954b474..77442449d8 100644 --- a/modules/examples/src/message_broker/background_index.ts +++ b/modules/examples/src/message_broker/background_index.ts @@ -3,7 +3,7 @@ import { PostMessageBusSink, PostMessageBusSource } from 'angular2/src/web_workers/shared/post_message_bus'; -import {ObservableWrapper} from 'angular2/src/facade/async'; +import {ObservableWrapper} from 'angular2/src/core/facade/async'; import { ClientMessageBroker, UiArguments diff --git a/modules/examples/src/message_broker/index.dart b/modules/examples/src/message_broker/index.dart index 6ea90733d3..8ea97d2f75 100644 --- a/modules/examples/src/message_broker/index.dart +++ b/modules/examples/src/message_broker/index.dart @@ -2,7 +2,7 @@ library angular2.examples.message_broker.index; import "package:angular2/src/web_workers/ui/application.dart" show spawnWebWorker; -import "package:angular2/src/facade/async.dart"; +import "package:angular2/src/core/facade/async.dart"; import "dart:html"; main() { diff --git a/modules/examples/src/message_broker/index.ts b/modules/examples/src/message_broker/index.ts index 2701e90d5b..07ba361c67 100644 --- a/modules/examples/src/message_broker/index.ts +++ b/modules/examples/src/message_broker/index.ts @@ -3,7 +3,7 @@ import { PostMessageBusSink, PostMessageBusSource } from 'angular2/src/web_workers/shared/post_message_bus'; -import {ObservableWrapper} from 'angular2/src/facade/async'; +import {ObservableWrapper} from 'angular2/src/core/facade/async'; var webWorker = new Worker("loader.js"); var sink = new PostMessageBusSink(webWorker); diff --git a/modules/examples/src/model_driven_forms/index.ts b/modules/examples/src/model_driven_forms/index.ts index 2c122693db..96a5563933 100644 --- a/modules/examples/src/model_driven_forms/index.ts +++ b/modules/examples/src/model_driven_forms/index.ts @@ -1,7 +1,7 @@ import {bootstrap, NgIf, NgFor, Component, Directive, View, Host} from 'angular2/bootstrap'; import {FORM_DIRECTIVES, NgControl, Validators, NgFormModel, FormBuilder} from 'angular2/forms'; -import {RegExpWrapper, print, isPresent} from 'angular2/src/facade/lang'; +import {RegExpWrapper, print, isPresent} from 'angular2/src/core/facade/lang'; /** * Custom validator. diff --git a/modules/examples/src/observable_models/app.dart b/modules/examples/src/observable_models/app.dart index 86badd307c..d7236e0736 100644 --- a/modules/examples/src/observable_models/app.dart +++ b/modules/examples/src/observable_models/app.dart @@ -1,10 +1,10 @@ library benchmarks.src.naive_infinite_scroll.app; -import "package:angular2/src/facade/collection.dart" show List, ListWrapper; +import "package:angular2/src/core/facade/collection.dart" show List, ListWrapper; import "package:angular2/directives.dart" show NgIf, NgFor; import "scroll_area.dart" show ScrollAreaComponent; import "package:angular2/angular2.dart" show Component, Directive, View, IterableDiffers, SkipSelf, Binding; -import "package:angular2/src/directives/observable_list_diff.dart" show ObservableListDiffFactory; +import "package:angular2/src/core/directives/observable_list_diff.dart" show ObservableListDiffFactory; import 'package:observe/observe.dart' show ObservableList; createDiffers(IterableDiffers parent) { diff --git a/modules/examples/src/observable_models/cells.dart b/modules/examples/src/observable_models/cells.dart index 064f126391..0fec223628 100644 --- a/modules/examples/src/observable_models/cells.dart +++ b/modules/examples/src/observable_models/cells.dart @@ -1,6 +1,6 @@ library benchmarks.src.naive_infinite_scroll.cells; -import "package:angular2/src/facade/collection.dart" +import "package:angular2/src/core/facade/collection.dart" show List, ListWrapper, Map; import "common.dart" show Company, Opportunity, Offering, Account, CustomDate, STATUS_LIST; diff --git a/modules/examples/src/observable_models/common.dart b/modules/examples/src/observable_models/common.dart index 2da81ed071..718bd16d81 100644 --- a/modules/examples/src/observable_models/common.dart +++ b/modules/examples/src/observable_models/common.dart @@ -1,7 +1,7 @@ library benchmarks.src.naive_infinite_scroll.common; -import "package:angular2/src/facade/math.dart" show Math; -import "package:angular2/src/facade/collection.dart"; +import "package:angular2/src/core/facade/math.dart" show Math; +import "package:angular2/src/core/facade/collection.dart"; import 'package:observe/observe.dart'; import 'dart:collection'; import 'dart:async'; diff --git a/modules/examples/src/observable_models/random_data.dart b/modules/examples/src/observable_models/random_data.dart index 5c74edaa56..1fe4707e81 100644 --- a/modules/examples/src/observable_models/random_data.dart +++ b/modules/examples/src/observable_models/random_data.dart @@ -1,7 +1,7 @@ library benchmarks.src.naive_infinite_scroll.random_data; -import "package:angular2/src/facade/lang.dart" show StringWrapper; -import "package:angular2/src/facade/collection.dart" show List, ListWrapper; +import "package:angular2/src/core/facade/lang.dart" show StringWrapper; +import "package:angular2/src/core/facade/collection.dart" show List, ListWrapper; import "common.dart" show CustomDate, diff --git a/modules/examples/src/observable_models/scroll_area.dart b/modules/examples/src/observable_models/scroll_area.dart index 0171163f2b..76c92337fb 100644 --- a/modules/examples/src/observable_models/scroll_area.dart +++ b/modules/examples/src/observable_models/scroll_area.dart @@ -1,7 +1,7 @@ library benchmarks.src.naive_infinite_scroll.scroll_area; -import "package:angular2/src/facade/collection.dart" show ListWrapper; -import "package:angular2/src/facade/math.dart" show Math; +import "package:angular2/src/core/facade/collection.dart" show ListWrapper; +import "package:angular2/src/core/facade/math.dart" show Math; import "package:angular2/angular2.dart" show Component, Directive, View; import "common.dart" show diff --git a/modules/examples/src/order_management/index.ts b/modules/examples/src/order_management/index.ts index 498ed22ef3..5ed87047d4 100644 --- a/modules/examples/src/order_management/index.ts +++ b/modules/examples/src/order_management/index.ts @@ -16,7 +16,7 @@ import {Injectable} from 'angular2/di'; import {FORM_DIRECTIVES} from 'angular2/forms'; -import {ListWrapper} from 'angular2/src/facade/collection'; +import {ListWrapper} from 'angular2/src/core/facade/collection'; /** * You can find the Angular 1 implementation of this example here: diff --git a/modules/examples/src/person_management/index.ts b/modules/examples/src/person_management/index.ts index 7285132e05..a4fc646a94 100644 --- a/modules/examples/src/person_management/index.ts +++ b/modules/examples/src/person_management/index.ts @@ -15,7 +15,7 @@ import {Injectable} from 'angular2/di'; import {FORM_DIRECTIVES} from 'angular2/forms'; -import {CONST_EXPR} from 'angular2/src/facade/lang'; +import {CONST_EXPR} from 'angular2/src/core/facade/lang'; /** diff --git a/modules/examples/src/routing/inbox-app.ts b/modules/examples/src/routing/inbox-app.ts index 3f8d810df6..16fb696cdb 100644 --- a/modules/examples/src/routing/inbox-app.ts +++ b/modules/examples/src/routing/inbox-app.ts @@ -9,9 +9,9 @@ import { RouteParams } from 'angular2/router'; import * as db from './data'; -import {ObservableWrapper, PromiseWrapper} from 'angular2/src/facade/async'; -import {ListWrapper} from 'angular2/src/facade/collection'; -import {isPresent} from 'angular2/src/facade/lang'; +import {ObservableWrapper, PromiseWrapper} from 'angular2/src/core/facade/async'; +import {ListWrapper} from 'angular2/src/core/facade/collection'; +import {isPresent} from 'angular2/src/core/facade/lang'; class InboxRecord { id: string = ''; diff --git a/modules/examples/src/routing/index.ts b/modules/examples/src/routing/index.ts index f77ab4c146..11fbecb0dc 100644 --- a/modules/examples/src/routing/index.ts +++ b/modules/examples/src/routing/index.ts @@ -3,8 +3,8 @@ import {bind} from 'angular2/angular2'; import {bootstrap} from 'angular2/bootstrap'; import {ROUTER_BINDINGS, HashLocationStrategy, LocationStrategy} from 'angular2/router'; -import {reflector} from 'angular2/src/reflection/reflection'; -import {ReflectionCapabilities} from 'angular2/src/reflection/reflection_capabilities'; +import {reflector} from 'angular2/src/core/reflection/reflection'; +import {ReflectionCapabilities} from 'angular2/src/core/reflection/reflection_capabilities'; export function main() { reflector.reflectionCapabilities = new ReflectionCapabilities(); diff --git a/modules/examples/src/sourcemap/index.ts b/modules/examples/src/sourcemap/index.ts index baf9fb96f5..5c5fb965b0 100644 --- a/modules/examples/src/sourcemap/index.ts +++ b/modules/examples/src/sourcemap/index.ts @@ -1,4 +1,4 @@ -import {BaseException} from 'angular2/src/facade/lang'; +import {BaseException} from 'angular2/src/core/facade/lang'; import {bootstrap, Component, View} from 'angular2/bootstrap'; @Component({ diff --git a/modules/examples/src/template_driven_forms/index.ts b/modules/examples/src/template_driven_forms/index.ts index 18d384018d..be61219911 100644 --- a/modules/examples/src/template_driven_forms/index.ts +++ b/modules/examples/src/template_driven_forms/index.ts @@ -12,7 +12,7 @@ import { } from 'angular2/bootstrap'; import {FORM_DIRECTIVES, NgControl, Validators, NgForm} from 'angular2/forms'; -import {RegExpWrapper, print, isPresent, CONST_EXPR} from 'angular2/src/facade/lang'; +import {RegExpWrapper, print, isPresent, CONST_EXPR} from 'angular2/src/core/facade/lang'; /** * A domain model we are binding the form controls to. diff --git a/modules/examples/src/todo/services/TodoStore.ts b/modules/examples/src/todo/services/TodoStore.ts index 6d9721d496..585277d18a 100644 --- a/modules/examples/src/todo/services/TodoStore.ts +++ b/modules/examples/src/todo/services/TodoStore.ts @@ -1,5 +1,5 @@ import {Injectable} from 'angular2/angular2'; -import {ListWrapper, Predicate} from 'angular2/src/facade/collection'; +import {ListWrapper, Predicate} from 'angular2/src/core/facade/collection'; // base model for RecordStore export class KeyModel { diff --git a/modules/examples/src/web_workers/images/background_index.dart b/modules/examples/src/web_workers/images/background_index.dart index b8e3609dd6..0532379b03 100644 --- a/modules/examples/src/web_workers/images/background_index.dart +++ b/modules/examples/src/web_workers/images/background_index.dart @@ -4,8 +4,8 @@ import "index_common.dart" show ImageDemo; import "dart:isolate"; import "package:angular2/src/web_workers/worker/application.dart" show bootstrapWebWorker; -import "package:angular2/src/reflection/reflection_capabilities.dart"; -import "package:angular2/src/reflection/reflection.dart"; +import "package:angular2/src/core/reflection/reflection_capabilities.dart"; +import "package:angular2/src/core/reflection/reflection.dart"; main(List args, SendPort replyTo) { reflector.reflectionCapabilities = new ReflectionCapabilities(); diff --git a/modules/examples/src/web_workers/images/index.dart b/modules/examples/src/web_workers/images/index.dart index 6a3356c08a..48c6470600 100644 --- a/modules/examples/src/web_workers/images/index.dart +++ b/modules/examples/src/web_workers/images/index.dart @@ -1,8 +1,8 @@ library angular2.examples.web_workers.images.index; import "package:angular2/src/web_workers/ui/application.dart" show bootstrap; -import "package:angular2/src/reflection/reflection_capabilities.dart"; -import "package:angular2/src/reflection/reflection.dart"; +import "package:angular2/src/core/reflection/reflection_capabilities.dart"; +import "package:angular2/src/core/reflection/reflection.dart"; main() { reflector.reflectionCapabilities = new ReflectionCapabilities(); diff --git a/modules/examples/src/web_workers/images/index_common.ts b/modules/examples/src/web_workers/images/index_common.ts index 97cb02d551..23064b40bd 100644 --- a/modules/examples/src/web_workers/images/index_common.ts +++ b/modules/examples/src/web_workers/images/index_common.ts @@ -1,8 +1,8 @@ import {NgZone, NgFor, Component, View, NgIf, FORM_DIRECTIVES} from 'angular2/angular2'; import {BitmapService} from './services/bitmap'; -import {EventListener} from 'angular2/src/facade/browser'; +import {EventListener} from 'angular2/src/core/facade/browser'; import {FileReader, Uint8ArrayWrapper} from './file_api'; -import {TimerWrapper} from 'angular2/src/facade/async'; +import {TimerWrapper} from 'angular2/src/core/facade/async'; @Component({selector: 'image-demo', viewBindings: [BitmapService]}) @View({templateUrl: 'image_demo.html', directives: [NgFor, NgIf, FORM_DIRECTIVES]}) diff --git a/modules/examples/src/web_workers/kitchen_sink/background_index.dart b/modules/examples/src/web_workers/kitchen_sink/background_index.dart index 808b85bd3c..a1627b8d70 100644 --- a/modules/examples/src/web_workers/kitchen_sink/background_index.dart +++ b/modules/examples/src/web_workers/kitchen_sink/background_index.dart @@ -4,8 +4,8 @@ import "index_common.dart" show HelloCmp; import "dart:isolate"; import "package:angular2/src/web_workers/worker/application.dart" show bootstrapWebWorker; -import "package:angular2/src/reflection/reflection_capabilities.dart"; -import "package:angular2/src/reflection/reflection.dart"; +import "package:angular2/src/core/reflection/reflection_capabilities.dart"; +import "package:angular2/src/core/reflection/reflection.dart"; main(List args, SendPort replyTo) { reflector.reflectionCapabilities = new ReflectionCapabilities(); diff --git a/modules/examples/src/web_workers/kitchen_sink/index.dart b/modules/examples/src/web_workers/kitchen_sink/index.dart index 3d44ecab0e..58cd33b420 100644 --- a/modules/examples/src/web_workers/kitchen_sink/index.dart +++ b/modules/examples/src/web_workers/kitchen_sink/index.dart @@ -1,8 +1,8 @@ library angular2.examples.web_workers.kitchen_sink.index; import "package:angular2/src/web_workers/ui/application.dart" show bootstrap; -import "package:angular2/src/reflection/reflection_capabilities.dart"; -import "package:angular2/src/reflection/reflection.dart"; +import "package:angular2/src/core/reflection/reflection_capabilities.dart"; +import "package:angular2/src/core/reflection/reflection.dart"; main() { reflector.reflectionCapabilities = new ReflectionCapabilities(); diff --git a/modules/examples/src/web_workers/kitchen_sink/index_common.ts b/modules/examples/src/web_workers/kitchen_sink/index_common.ts index aa0ff95adc..ac3ee18cf0 100644 --- a/modules/examples/src/web_workers/kitchen_sink/index_common.ts +++ b/modules/examples/src/web_workers/kitchen_sink/index_common.ts @@ -1,5 +1,5 @@ import {ElementRef, Component, Directive, View, Injectable, Renderer} from 'angular2/angular2'; -import {StringWrapper} from 'angular2/src/facade/lang'; +import {StringWrapper} from 'angular2/src/core/facade/lang'; // A service available to the Injector, used by the HelloCmp component. @Injectable() diff --git a/modules/examples/src/web_workers/todo/background_index.dart b/modules/examples/src/web_workers/todo/background_index.dart index 7b8f6614e4..8646db3ae7 100644 --- a/modules/examples/src/web_workers/todo/background_index.dart +++ b/modules/examples/src/web_workers/todo/background_index.dart @@ -4,8 +4,8 @@ import "index_common.dart" show TodoApp; import "dart:isolate"; import "package:angular2/src/web_workers/worker/application.dart" show bootstrapWebWorker; -import "package:angular2/src/reflection/reflection_capabilities.dart"; -import "package:angular2/src/reflection/reflection.dart"; +import "package:angular2/src/core/reflection/reflection_capabilities.dart"; +import "package:angular2/src/core/reflection/reflection.dart"; main(List args, SendPort replyTo) { reflector.reflectionCapabilities = new ReflectionCapabilities(); diff --git a/modules/examples/src/web_workers/todo/index.dart b/modules/examples/src/web_workers/todo/index.dart index 5190de91b0..52aa72e9f2 100644 --- a/modules/examples/src/web_workers/todo/index.dart +++ b/modules/examples/src/web_workers/todo/index.dart @@ -1,8 +1,8 @@ library angular2.examples.web_workers.todo.index; import "package:angular2/src/web_workers/ui/application.dart" show bootstrap; -import "package:angular2/src/reflection/reflection_capabilities.dart"; -import "package:angular2/src/reflection/reflection.dart"; +import "package:angular2/src/core/reflection/reflection_capabilities.dart"; +import "package:angular2/src/core/reflection/reflection.dart"; main() { reflector.reflectionCapabilities = new ReflectionCapabilities(); diff --git a/modules/examples/src/web_workers/todo/services/TodoStore.ts b/modules/examples/src/web_workers/todo/services/TodoStore.ts index 7060f1302f..04d3f1c646 100644 --- a/modules/examples/src/web_workers/todo/services/TodoStore.ts +++ b/modules/examples/src/web_workers/todo/services/TodoStore.ts @@ -1,5 +1,5 @@ import {Injectable} from 'angular2/angular2'; -import {ListWrapper, Predicate} from 'angular2/src/facade/collection'; +import {ListWrapper, Predicate} from 'angular2/src/core/facade/collection'; // base model for RecordStore export class KeyModel { diff --git a/modules/examples/src/zippy_component/zippy.ts b/modules/examples/src/zippy_component/zippy.ts index 641674f7ac..bf2af1fb28 100644 --- a/modules/examples/src/zippy_component/zippy.ts +++ b/modules/examples/src/zippy_component/zippy.ts @@ -1,5 +1,5 @@ import {Component, View, EventEmitter} from 'angular2/angular2'; -import {ObservableWrapper} from 'angular2/src/facade/async'; +import {ObservableWrapper} from 'angular2/src/core/facade/async'; @Component({ selector: 'zippy', diff --git a/modules_dart/analyzer_plugin/lib/src/tasks.dart b/modules_dart/analyzer_plugin/lib/src/tasks.dart index 6267c1be5a..58bb1a6a54 100644 --- a/modules_dart/analyzer_plugin/lib/src/tasks.dart +++ b/modules_dart/analyzer_plugin/lib/src/tasks.dart @@ -5,7 +5,7 @@ import 'package:analyzer/src/generated/engine.dart'; import 'package:analyzer/src/task/general.dart'; import 'package:analyzer/task/dart.dart'; import 'package:analyzer/task/model.dart'; -import 'package:angular2/src/render/api.dart'; +import 'package:angular2/src/core/render/api.dart'; import 'package:angular2/src/transform/common/directive_metadata_reader.dart'; diff --git a/modules_dart/analyzer_plugin/test/tasks_test.server.spec.dart b/modules_dart/analyzer_plugin/test/tasks_test.server.spec.dart index 7833c992d8..507b3757bc 100644 --- a/modules_dart/analyzer_plugin/test/tasks_test.server.spec.dart +++ b/modules_dart/analyzer_plugin/test/tasks_test.server.spec.dart @@ -11,7 +11,7 @@ import 'package:analyzer/src/generated/source.dart'; import 'package:analyzer/src/task/driver.dart'; import 'package:analyzer/task/dart.dart'; import 'package:analyzer/task/model.dart'; -import 'package:angular2/src/render/api.dart'; +import 'package:angular2/src/core/render/api.dart'; import 'package:angular2_analyzer_plugin/src/tasks.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; import 'package:unittest/unittest.dart'; diff --git a/modules_dart/transform/lib/src/transform/common/annotation_matcher.dart b/modules_dart/transform/lib/src/transform/common/annotation_matcher.dart index 8813b8a95c..d8a7d60765 100644 --- a/modules_dart/transform/lib/src/transform/common/annotation_matcher.dart +++ b/modules_dart/transform/lib/src/transform/common/annotation_matcher.dart @@ -11,7 +11,7 @@ export 'class_matcher_base.dart' show ClassDescriptor; /// the possible libraries which could provide them. const INJECTABLES = const [ const ClassDescriptor( - 'Injectable', 'package:angular2/src/di/decorators.dart'), + 'Injectable', 'package:angular2/src/core/di/decorators.dart'), const ClassDescriptor('Injectable', 'package:angular2/di.dart'), const ClassDescriptor('Injectable', 'package:angular2/angular2.dart'), const ClassDescriptor('Injectable', 'package:angular2/bootstrap_static.dart'), diff --git a/modules_dart/transform/lib/src/transform/common/directive_metadata_reader.dart b/modules_dart/transform/lib/src/transform/common/directive_metadata_reader.dart index 3c36a50b65..d942d3b6b7 100644 --- a/modules_dart/transform/lib/src/transform/common/directive_metadata_reader.dart +++ b/modules_dart/transform/lib/src/transform/common/directive_metadata_reader.dart @@ -2,7 +2,7 @@ library angular2.transform.common.directive_metadata_reader; import 'package:analyzer/analyzer.dart'; import 'package:analyzer/src/generated/element.dart'; -import 'package:angular2/src/render/api.dart'; +import 'package:angular2/src/core/render/api.dart'; /// Reads [RenderDirectiveMetadata] from the `node`. `node` is expected to be an /// instance of [Annotation], [NodeList], ListLiteral, or diff --git a/modules_dart/transform/lib/src/transform/common/ng_meta.dart b/modules_dart/transform/lib/src/transform/common/ng_meta.dart index a5978dd0df..b9e3f4696e 100644 --- a/modules_dart/transform/lib/src/transform/common/ng_meta.dart +++ b/modules_dart/transform/lib/src/transform/common/ng_meta.dart @@ -1,7 +1,7 @@ library angular2.transform.common.ng_meta; -import 'package:angular2/src/render/api.dart'; -import 'package:angular2/src/render/dom/convert.dart'; +import 'package:angular2/src/core/render/api.dart'; +import 'package:angular2/src/core/render/dom/convert.dart'; import 'logging.dart'; /// Metadata about directives and directive aliases. diff --git a/modules_dart/transform/lib/src/transform/common/registered_type.dart b/modules_dart/transform/lib/src/transform/common/registered_type.dart index 0cdc5e67bf..2250194f70 100644 --- a/modules_dart/transform/lib/src/transform/common/registered_type.dart +++ b/modules_dart/transform/lib/src/transform/common/registered_type.dart @@ -1,7 +1,7 @@ library angular2.transform.common.registered_type; import 'package:analyzer/analyzer.dart'; -import 'package:angular2/src/render/api.dart'; +import 'package:angular2/src/core/render/api.dart'; import 'package:angular2/src/transform/common/directive_metadata_reader.dart'; import 'package:angular2/src/transform/common/logging.dart'; import 'package:angular2/src/transform/common/names.dart'; diff --git a/modules_dart/transform/lib/src/transform/common/xhr_impl.dart b/modules_dart/transform/lib/src/transform/common/xhr_impl.dart index a930181aa0..d1d23f422f 100644 --- a/modules_dart/transform/lib/src/transform/common/xhr_impl.dart +++ b/modules_dart/transform/lib/src/transform/common/xhr_impl.dart @@ -1,7 +1,7 @@ library angular2.transform.template_compiler.xhr_impl; import 'dart:async'; -import 'package:angular2/src/render/xhr.dart' show XHR; +import 'package:angular2/src/core/render/xhr.dart' show XHR; import 'package:angular2/src/transform/common/asset_reader.dart'; import 'package:angular2/src/transform/common/logging.dart'; import 'package:barback/barback.dart'; diff --git a/modules_dart/transform/lib/src/transform/directive_processor/rewriter.dart b/modules_dart/transform/lib/src/transform/directive_processor/rewriter.dart index 422fcf4afc..a5a930addf 100644 --- a/modules_dart/transform/lib/src/transform/directive_processor/rewriter.dart +++ b/modules_dart/transform/lib/src/transform/directive_processor/rewriter.dart @@ -4,7 +4,7 @@ import 'dart:async'; import 'package:analyzer/analyzer.dart'; import 'package:analyzer/src/generated/java_core.dart'; -import 'package:angular2/src/render/xhr.dart' show XHR; +import 'package:angular2/src/core/render/xhr.dart' show XHR; import 'package:angular2/src/transform/common/annotation_matcher.dart'; import 'package:angular2/src/transform/common/asset_reader.dart'; import 'package:angular2/src/transform/common/async_string_writer.dart'; @@ -446,4 +446,4 @@ class _NgDepsDeclarationsVisitor extends Object with SimpleAstVisitor { } const _REF_PREFIX = '_ngRef'; -const _REFLECTOR_IMPORT = 'package:angular2/src/reflection/reflection.dart'; +const _REFLECTOR_IMPORT = 'package:angular2/src/core/reflection/reflection.dart'; diff --git a/modules_dart/transform/lib/src/transform/directive_processor/visitors.dart b/modules_dart/transform/lib/src/transform/directive_processor/visitors.dart index fea0a55a63..5ce2071d28 100644 --- a/modules_dart/transform/lib/src/transform/directive_processor/visitors.dart +++ b/modules_dart/transform/lib/src/transform/directive_processor/visitors.dart @@ -4,7 +4,7 @@ import 'dart:async'; import 'package:analyzer/analyzer.dart'; import 'package:analyzer/src/generated/java_core.dart'; import 'package:angular2/metadata.dart' show LifecycleEvent; -import 'package:angular2/src/render/xhr.dart' show XHR; +import 'package:angular2/src/core/render/xhr.dart' show XHR; import 'package:angular2/src/transform/common/annotation_matcher.dart'; import 'package:angular2/src/transform/common/async_string_writer.dart'; import 'package:angular2/src/transform/common/interface_matcher.dart'; diff --git a/modules_dart/transform/lib/src/transform/reflection_remover/ast_tester.dart b/modules_dart/transform/lib/src/transform/reflection_remover/ast_tester.dart index cf2a258342..f50dc5a77e 100644 --- a/modules_dart/transform/lib/src/transform/reflection_remover/ast_tester.dart +++ b/modules_dart/transform/lib/src/transform/reflection_remover/ast_tester.dart @@ -14,7 +14,7 @@ class AstTester { bool isReflectionCapabilitiesImport(ImportDirective node) { return node.uri.stringValue == - "package:angular2/src/reflection/reflection_capabilities.dart"; + "package:angular2/src/core/reflection/reflection_capabilities.dart"; } bool isBootstrapImport(ImportDirective node) { diff --git a/modules_dart/transform/lib/src/transform/template_compiler/change_detector_codegen.dart b/modules_dart/transform/lib/src/transform/template_compiler/change_detector_codegen.dart index 25a78bff2e..1a937b529f 100644 --- a/modules_dart/transform/lib/src/transform/template_compiler/change_detector_codegen.dart +++ b/modules_dart/transform/lib/src/transform/template_compiler/change_detector_codegen.dart @@ -1,17 +1,17 @@ library angular2.transform.template_compiler.change_detector_codegen; -import 'package:angular2/src/change_detection/change_detection_util.dart'; -import 'package:angular2/src/change_detection/codegen_facade.dart'; -import 'package:angular2/src/change_detection/codegen_logic_util.dart'; -import 'package:angular2/src/change_detection/codegen_name_util.dart'; -import 'package:angular2/src/change_detection/directive_record.dart'; -import 'package:angular2/src/change_detection/interfaces.dart'; -import 'package:angular2/src/change_detection/proto_change_detector.dart'; -import 'package:angular2/src/change_detection/proto_record.dart'; -import 'package:angular2/src/change_detection/event_binding.dart'; -import 'package:angular2/src/change_detection/binding_record.dart'; -import 'package:angular2/src/change_detection/codegen_facade.dart' show codify; -import 'package:angular2/src/facade/lang.dart' show BaseException; +import 'package:angular2/src/core/change_detection/change_detection_util.dart'; +import 'package:angular2/src/core/change_detection/codegen_facade.dart'; +import 'package:angular2/src/core/change_detection/codegen_logic_util.dart'; +import 'package:angular2/src/core/change_detection/codegen_name_util.dart'; +import 'package:angular2/src/core/change_detection/directive_record.dart'; +import 'package:angular2/src/core/change_detection/interfaces.dart'; +import 'package:angular2/src/core/change_detection/proto_change_detector.dart'; +import 'package:angular2/src/core/change_detection/proto_record.dart'; +import 'package:angular2/src/core/change_detection/event_binding.dart'; +import 'package:angular2/src/core/change_detection/binding_record.dart'; +import 'package:angular2/src/core/change_detection/codegen_facade.dart' show codify; +import 'package:angular2/src/core/facade/lang.dart' show BaseException; /// Responsible for generating change detector classes for Angular 2. /// @@ -493,5 +493,5 @@ const _IDENTICAL_CHECK_FN = '$_GEN_PREFIX.looseIdentical'; const _NOT_IDENTICAL_CHECK_FN = '$_GEN_PREFIX.looseNotIdentical'; const _IS_CHANGED_LOCAL = 'isChanged'; const _PREGEN_PROTO_CHANGE_DETECTOR_IMPORT = - 'package:angular2/src/change_detection/pregen_proto_change_detector.dart'; + 'package:angular2/src/core/change_detection/pregen_proto_change_detector.dart'; const _UTIL = '$_GEN_PREFIX.ChangeDetectionUtil'; diff --git a/modules_dart/transform/lib/src/transform/template_compiler/compile_step_factory.dart b/modules_dart/transform/lib/src/transform/template_compiler/compile_step_factory.dart index c665cbdcd5..90a79ac88f 100644 --- a/modules_dart/transform/lib/src/transform/template_compiler/compile_step_factory.dart +++ b/modules_dart/transform/lib/src/transform/template_compiler/compile_step_factory.dart @@ -1,14 +1,14 @@ library angular2.transform.template_compiler.compile_step_factory; -import 'package:angular2/src/change_detection/parser/parser.dart' as ng; -import 'package:angular2/src/render/api.dart'; -import 'package:angular2/src/render/dom/compiler/compile_step.dart'; -import 'package:angular2/src/render/dom/compiler/compile_step_factory.dart' +import 'package:angular2/src/core/change_detection/parser/parser.dart' as ng; +import 'package:angular2/src/core/render/api.dart'; +import 'package:angular2/src/core/render/dom/compiler/compile_step.dart'; +import 'package:angular2/src/core/render/dom/compiler/compile_step_factory.dart' as base; -import 'package:angular2/src/render/dom/compiler/directive_parser.dart'; -import 'package:angular2/src/render/dom/compiler/property_binding_parser.dart'; -import 'package:angular2/src/render/dom/compiler/text_interpolation_parser.dart'; -import 'package:angular2/src/render/dom/compiler/view_splitter.dart'; +import 'package:angular2/src/core/render/dom/compiler/directive_parser.dart'; +import 'package:angular2/src/core/render/dom/compiler/property_binding_parser.dart'; +import 'package:angular2/src/core/render/dom/compiler/text_interpolation_parser.dart'; +import 'package:angular2/src/core/render/dom/compiler/view_splitter.dart'; class CompileStepFactory implements base.CompileStepFactory { final ng.Parser _parser; diff --git a/modules_dart/transform/lib/src/transform/template_compiler/generator.dart b/modules_dart/transform/lib/src/transform/template_compiler/generator.dart index 6f4997fe07..10c3bc8f6a 100644 --- a/modules_dart/transform/lib/src/transform/template_compiler/generator.dart +++ b/modules_dart/transform/lib/src/transform/template_compiler/generator.dart @@ -2,25 +2,25 @@ library angular2.transform.template_compiler.generator; import 'dart:async'; -import 'package:angular2/src/change_detection/parser/lexer.dart' as ng; -import 'package:angular2/src/change_detection/parser/parser.dart' as ng; -import 'package:angular2/src/change_detection/interfaces.dart'; +import 'package:angular2/src/core/change_detection/parser/lexer.dart' as ng; +import 'package:angular2/src/core/change_detection/parser/parser.dart' as ng; +import 'package:angular2/src/core/change_detection/interfaces.dart'; import 'package:angular2/src/core/compiler/proto_view_factory.dart'; -import 'package:angular2/src/dom/dom_adapter.dart'; -import 'package:angular2/src/render/api.dart'; -import 'package:angular2/src/render/dom/compiler/compile_pipeline.dart'; -import 'package:angular2/src/render/dom/compiler/style_inliner.dart'; -import 'package:angular2/src/render/dom/compiler/style_url_resolver.dart'; -import 'package:angular2/src/render/dom/compiler/view_loader.dart'; -import 'package:angular2/src/render/dom/schema/element_schema_registry.dart'; -import 'package:angular2/src/render/dom/schema/dom_element_schema_registry.dart'; -import 'package:angular2/src/render/dom/template_cloner.dart'; -import 'package:angular2/src/render/xhr.dart' show XHR; -import 'package:angular2/src/reflection/reflection.dart'; -import 'package:angular2/src/services/url_resolver.dart'; +import 'package:angular2/src/core/dom/dom_adapter.dart'; +import 'package:angular2/src/core/render/api.dart'; +import 'package:angular2/src/core/render/dom/compiler/compile_pipeline.dart'; +import 'package:angular2/src/core/render/dom/compiler/style_inliner.dart'; +import 'package:angular2/src/core/render/dom/compiler/style_url_resolver.dart'; +import 'package:angular2/src/core/render/dom/compiler/view_loader.dart'; +import 'package:angular2/src/core/render/dom/schema/element_schema_registry.dart'; +import 'package:angular2/src/core/render/dom/schema/dom_element_schema_registry.dart'; +import 'package:angular2/src/core/render/dom/template_cloner.dart'; +import 'package:angular2/src/core/render/xhr.dart' show XHR; +import 'package:angular2/src/core/reflection/reflection.dart'; +import 'package:angular2/src/core/services/url_resolver.dart'; import 'package:angular2/src/transform/common/asset_reader.dart'; import 'package:angular2/src/transform/common/xhr_impl.dart'; -import 'package:angular2/src/facade/lang.dart'; +import 'package:angular2/src/core/facade/lang.dart'; import 'package:barback/barback.dart'; import 'change_detector_codegen.dart' as change; diff --git a/modules_dart/transform/lib/src/transform/template_compiler/reflection/model.dart b/modules_dart/transform/lib/src/transform/template_compiler/reflection/model.dart index 30297d4b85..51522ef045 100644 --- a/modules_dart/transform/lib/src/transform/template_compiler/reflection/model.dart +++ b/modules_dart/transform/lib/src/transform/template_compiler/reflection/model.dart @@ -1,6 +1,6 @@ library angular2.transform.template_compiler.reflection.model; -import 'package:angular2/src/render/dom/util.dart'; +import 'package:angular2/src/core/render/dom/util.dart'; /// Defines the names of getters, setters, and methods which need to be /// available to Angular 2 via the `reflector` at runtime. diff --git a/modules_dart/transform/lib/src/transform/template_compiler/reflection/processor.dart b/modules_dart/transform/lib/src/transform/template_compiler/reflection/processor.dart index 0bd87d3ab0..d1540111a5 100644 --- a/modules_dart/transform/lib/src/transform/template_compiler/reflection/processor.dart +++ b/modules_dart/transform/lib/src/transform/template_compiler/reflection/processor.dart @@ -1,7 +1,7 @@ library angular2.transform.template_compiler.reflection.processor; -import 'package:angular2/src/change_detection/parser/ast.dart'; -import 'package:angular2/src/render/api.dart'; +import 'package:angular2/src/core/change_detection/parser/ast.dart'; +import 'package:angular2/src/core/render/api.dart'; import 'package:angular2/src/transform/template_compiler/view_definition_creator.dart'; import 'model.dart'; diff --git a/modules_dart/transform/lib/src/transform/template_compiler/reflection/reflection_capabilities.dart b/modules_dart/transform/lib/src/transform/template_compiler/reflection/reflection_capabilities.dart index 50fcc118ba..308aeb52c7 100644 --- a/modules_dart/transform/lib/src/transform/template_compiler/reflection/reflection_capabilities.dart +++ b/modules_dart/transform/lib/src/transform/template_compiler/reflection/reflection_capabilities.dart @@ -1,7 +1,7 @@ library angular2.transform.template_compiler.reflection.reflection_capabilities; -import 'package:angular2/src/reflection/reflection_capabilities.dart'; -import 'package:angular2/src/reflection/types.dart'; +import 'package:angular2/src/core/reflection/reflection_capabilities.dart'; +import 'package:angular2/src/core/reflection/types.dart'; /// ReflectionCapabilities object that responds to all requests for `getter`s, /// `setter`s, and `method`s with `null`. diff --git a/modules_dart/transform/lib/src/transform/template_compiler/transformer.dart b/modules_dart/transform/lib/src/transform/template_compiler/transformer.dart index 6135cf64c7..f58d9f1d07 100644 --- a/modules_dart/transform/lib/src/transform/template_compiler/transformer.dart +++ b/modules_dart/transform/lib/src/transform/template_compiler/transformer.dart @@ -2,7 +2,7 @@ library angular2.transform.template_compiler.transformer; import 'dart:async'; -import 'package:angular2/src/dom/html_adapter.dart'; +import 'package:angular2/src/core/dom/html_adapter.dart'; import 'package:angular2/src/transform/common/asset_reader.dart'; import 'package:angular2/src/transform/common/formatter.dart'; import 'package:angular2/src/transform/common/logging.dart' as log; diff --git a/modules_dart/transform/lib/src/transform/template_compiler/view_definition_creator.dart b/modules_dart/transform/lib/src/transform/template_compiler/view_definition_creator.dart index 71ec630bc6..a54578e399 100644 --- a/modules_dart/transform/lib/src/transform/template_compiler/view_definition_creator.dart +++ b/modules_dart/transform/lib/src/transform/template_compiler/view_definition_creator.dart @@ -4,7 +4,7 @@ import 'dart:async'; import 'dart:convert'; import 'package:analyzer/analyzer.dart'; -import 'package:angular2/src/render/api.dart'; +import 'package:angular2/src/core/render/api.dart'; import 'package:angular2/src/transform/common/asset_reader.dart'; import 'package:angular2/src/transform/common/logging.dart'; import 'package:angular2/src/transform/common/names.dart'; diff --git a/modules_dart/transform/test/transform/common/ng_meta_test.dart b/modules_dart/transform/test/transform/common/ng_meta_test.dart index 701ab7a2a8..fca70c75a9 100644 --- a/modules_dart/transform/test/transform/common/ng_meta_test.dart +++ b/modules_dart/transform/test/transform/common/ng_meta_test.dart @@ -1,6 +1,6 @@ library angular2.test.transform.common.annotation_matcher_test; -import 'package:angular2/src/render/api.dart'; +import 'package:angular2/src/core/render/api.dart'; import 'package:angular2/src/transform/common/ng_meta.dart'; import 'package:guinness/guinness.dart'; diff --git a/modules_dart/transform/test/transform/common/reflection_capabilities.dart b/modules_dart/transform/test/transform/common/reflection_capabilities.dart index f54f6457b5..5aabb94df0 100644 --- a/modules_dart/transform/test/transform/common/reflection_capabilities.dart +++ b/modules_dart/transform/test/transform/common/reflection_capabilities.dart @@ -4,6 +4,6 @@ library angular2.test.transform; /// Mocked out version of {@link ReflectionCapabilities}, defined in -/// src/reflection/reflection_capabilities.dart. Importing the actual file in +/// src/core/reflection/reflection_capabilities.dart. Importing the actual file in /// tests causes issues with resolution due to transitive dependencies. class ReflectionCapabilities {} diff --git a/modules_dart/transform/test/transform/deferred_rewriter/complex_deferred_example/expected/index.dart b/modules_dart/transform/test/transform/deferred_rewriter/complex_deferred_example/expected/index.dart index 2ad478aba8..6b8542cf52 100644 --- a/modules_dart/transform/test/transform/deferred_rewriter/complex_deferred_example/expected/index.dart +++ b/modules_dart/transform/test/transform/deferred_rewriter/complex_deferred_example/expected/index.dart @@ -1,8 +1,8 @@ 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 'package:angular2/src/core/reflection/reflection.dart'; +import 'package:angular2/src/core/reflection/reflection_capabilities.dart'; import 'hello.ng_deps.dart' deferred as a; // ng_deps. Should be rewritten. import 'b.dart' deferred as b; // No ng_deps. Shouldn't be rewritten. diff --git a/modules_dart/transform/test/transform/deferred_rewriter/complex_deferred_example/hello.ng_deps.dart b/modules_dart/transform/test/transform/deferred_rewriter/complex_deferred_example/hello.ng_deps.dart index aca33a376e..9843cbf09b 100644 --- a/modules_dart/transform/test/transform/deferred_rewriter/complex_deferred_example/hello.ng_deps.dart +++ b/modules_dart/transform/test/transform/deferred_rewriter/complex_deferred_example/hello.ng_deps.dart @@ -2,7 +2,7 @@ library examples.src.hello_world.absolute_url_expression_files.ng_deps.dart; import 'hello.dart'; export 'hello.dart'; -import 'package:angular2/src/reflection/reflection.dart' as _ngRef; +import 'package:angular2/src/core/reflection/reflection.dart' as _ngRef; import 'package:angular2/angular2.dart' show bootstrap, Component, Directive, View, NgElement; diff --git a/modules_dart/transform/test/transform/deferred_rewriter/complex_deferred_example/index.dart b/modules_dart/transform/test/transform/deferred_rewriter/complex_deferred_example/index.dart index a4941949ad..ca2f2196a1 100644 --- a/modules_dart/transform/test/transform/deferred_rewriter/complex_deferred_example/index.dart +++ b/modules_dart/transform/test/transform/deferred_rewriter/complex_deferred_example/index.dart @@ -1,8 +1,8 @@ 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 'package:angular2/src/core/reflection/reflection.dart'; +import 'package:angular2/src/core/reflection/reflection_capabilities.dart'; import 'hello.dart' deferred as a; // ng_deps. Should be rewritten. import 'b.dart' deferred as b; // No ng_deps. Shouldn't be rewritten. diff --git a/modules_dart/transform/test/transform/deferred_rewriter/deferred_example_no_ng_deps/index.dart b/modules_dart/transform/test/transform/deferred_rewriter/deferred_example_no_ng_deps/index.dart index b61b30826f..7d93631551 100644 --- a/modules_dart/transform/test/transform/deferred_rewriter/deferred_example_no_ng_deps/index.dart +++ b/modules_dart/transform/test/transform/deferred_rewriter/deferred_example_no_ng_deps/index.dart @@ -1,8 +1,8 @@ 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 'package:angular2/src/core/reflection/reflection.dart'; +import 'package:angular2/src/core/reflection/reflection_capabilities.dart'; import 'hello.dart' deferred as a; void main() { diff --git a/modules_dart/transform/test/transform/deferred_rewriter/no_deferred_libraries/index.dart b/modules_dart/transform/test/transform/deferred_rewriter/no_deferred_libraries/index.dart index 45363b8a19..7df32a51a0 100644 --- a/modules_dart/transform/test/transform/deferred_rewriter/no_deferred_libraries/index.dart +++ b/modules_dart/transform/test/transform/deferred_rewriter/no_deferred_libraries/index.dart @@ -1,8 +1,8 @@ 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 'package:angular2/src/core/reflection/reflection.dart'; +import 'package:angular2/src/core/reflection/reflection_capabilities.dart'; void main() { reflector.reflectionCapabilities = new ReflectionCapabilities(); diff --git a/modules_dart/transform/test/transform/deferred_rewriter/no_ng_deps_libraries/index.dart b/modules_dart/transform/test/transform/deferred_rewriter/no_ng_deps_libraries/index.dart index d06a2bb8f5..768de29c23 100644 --- a/modules_dart/transform/test/transform/deferred_rewriter/no_ng_deps_libraries/index.dart +++ b/modules_dart/transform/test/transform/deferred_rewriter/no_ng_deps_libraries/index.dart @@ -1,8 +1,8 @@ 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 'package:angular2/src/core/reflection/reflection.dart'; +import 'package:angular2/src/core/reflection/reflection_capabilities.dart'; import 'a.dart' deferred as a; void main() { diff --git a/modules_dart/transform/test/transform/deferred_rewriter/simple_deferred_example/expected/index.dart b/modules_dart/transform/test/transform/deferred_rewriter/simple_deferred_example/expected/index.dart index a9119cb6f1..9dfb31e98b 100644 --- a/modules_dart/transform/test/transform/deferred_rewriter/simple_deferred_example/expected/index.dart +++ b/modules_dart/transform/test/transform/deferred_rewriter/simple_deferred_example/expected/index.dart @@ -1,8 +1,8 @@ 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 'package:angular2/src/core/reflection/reflection.dart'; +import 'package:angular2/src/core/reflection/reflection_capabilities.dart'; import 'hello.ng_deps.dart' deferred as a; void main() { diff --git a/modules_dart/transform/test/transform/deferred_rewriter/simple_deferred_example/hello.ng_deps.dart b/modules_dart/transform/test/transform/deferred_rewriter/simple_deferred_example/hello.ng_deps.dart index 876f2aad86..8db375de78 100644 --- a/modules_dart/transform/test/transform/deferred_rewriter/simple_deferred_example/hello.ng_deps.dart +++ b/modules_dart/transform/test/transform/deferred_rewriter/simple_deferred_example/hello.ng_deps.dart @@ -2,7 +2,7 @@ library examples.src.hello_world.absolute_url_expression_files.ng_deps.dart; import 'hello.dart'; export 'hello.dart'; -import 'package:angular2/src/reflection/reflection.dart' as _ngRef; +import 'package:angular2/src/core/reflection/reflection.dart' as _ngRef; import 'package:angular2/angular2.dart' show bootstrap, Component, Directive, View, NgElement; diff --git a/modules_dart/transform/test/transform/deferred_rewriter/simple_deferred_example/index.dart b/modules_dart/transform/test/transform/deferred_rewriter/simple_deferred_example/index.dart index b61b30826f..7d93631551 100644 --- a/modules_dart/transform/test/transform/deferred_rewriter/simple_deferred_example/index.dart +++ b/modules_dart/transform/test/transform/deferred_rewriter/simple_deferred_example/index.dart @@ -1,8 +1,8 @@ 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 'package:angular2/src/core/reflection/reflection.dart'; +import 'package:angular2/src/core/reflection/reflection_capabilities.dart'; import 'hello.dart' deferred as a; void main() { diff --git a/modules_dart/transform/test/transform/directive_linker/simple_export_files/bar.ng_deps.dart b/modules_dart/transform/test/transform/directive_linker/simple_export_files/bar.ng_deps.dart index 6702aa4f65..2012465d9a 100644 --- a/modules_dart/transform/test/transform/directive_linker/simple_export_files/bar.ng_deps.dart +++ b/modules_dart/transform/test/transform/directive_linker/simple_export_files/bar.ng_deps.dart @@ -2,7 +2,7 @@ library bar.ng_deps.dart; import 'bar.dart'; export 'bar.dart'; -import 'package:angular2/src/reflection/reflection.dart' as _ngRef; +import 'package:angular2/src/core/reflection/reflection.dart' as _ngRef; import 'package:angular2/src/core/metadata.dart'; export 'foo.dart'; diff --git a/modules_dart/transform/test/transform/directive_linker/simple_export_files/expected/bar.ng_deps.dart b/modules_dart/transform/test/transform/directive_linker/simple_export_files/expected/bar.ng_deps.dart index f1b90531f3..2ef4869c97 100644 --- a/modules_dart/transform/test/transform/directive_linker/simple_export_files/expected/bar.ng_deps.dart +++ b/modules_dart/transform/test/transform/directive_linker/simple_export_files/expected/bar.ng_deps.dart @@ -2,7 +2,7 @@ library bar.ng_deps.dart; import 'bar.dart'; export 'bar.dart'; -import 'package:angular2/src/reflection/reflection.dart' as _ngRef; +import 'package:angular2/src/core/reflection/reflection.dart' as _ngRef; import 'package:angular2/src/core/metadata.dart'; export 'foo.dart'; import 'foo.ng_deps.dart' as i0; diff --git a/modules_dart/transform/test/transform/directive_linker/simple_export_files/expected/foo.ng_deps.dart b/modules_dart/transform/test/transform/directive_linker/simple_export_files/expected/foo.ng_deps.dart index 644072db8f..b7831829a3 100644 --- a/modules_dart/transform/test/transform/directive_linker/simple_export_files/expected/foo.ng_deps.dart +++ b/modules_dart/transform/test/transform/directive_linker/simple_export_files/expected/foo.ng_deps.dart @@ -2,7 +2,7 @@ library foo.ng_deps.dart; import 'foo.dart'; export 'foo.dart'; -import 'package:angular2/src/reflection/reflection.dart' as _ngRef; +import 'package:angular2/src/core/reflection/reflection.dart' as _ngRef; import 'package:angular2/src/core/metadata.dart'; var _visited = false; diff --git a/modules_dart/transform/test/transform/directive_linker/simple_export_files/expected/index.ng_deps.dart b/modules_dart/transform/test/transform/directive_linker/simple_export_files/expected/index.ng_deps.dart index 43bed972c8..39d81e09b9 100644 --- a/modules_dart/transform/test/transform/directive_linker/simple_export_files/expected/index.ng_deps.dart +++ b/modules_dart/transform/test/transform/directive_linker/simple_export_files/expected/index.ng_deps.dart @@ -1,8 +1,8 @@ library web_foo.ng_deps.dart; -import 'package:angular2/src/reflection/reflection.dart' as _ngRef; +import 'package:angular2/src/core/reflection/reflection.dart' as _ngRef; import 'package:angular2/bootstrap_static.dart'; -import 'package:angular2/src/reflection/reflection_capabilities.dart'; +import 'package:angular2/src/core/reflection/reflection_capabilities.dart'; import 'bar.dart'; import 'bar.ng_deps.dart' as i0; diff --git a/modules_dart/transform/test/transform/directive_linker/simple_export_files/foo.ng_deps.dart b/modules_dart/transform/test/transform/directive_linker/simple_export_files/foo.ng_deps.dart index 644072db8f..b7831829a3 100644 --- a/modules_dart/transform/test/transform/directive_linker/simple_export_files/foo.ng_deps.dart +++ b/modules_dart/transform/test/transform/directive_linker/simple_export_files/foo.ng_deps.dart @@ -2,7 +2,7 @@ library foo.ng_deps.dart; import 'foo.dart'; export 'foo.dart'; -import 'package:angular2/src/reflection/reflection.dart' as _ngRef; +import 'package:angular2/src/core/reflection/reflection.dart' as _ngRef; import 'package:angular2/src/core/metadata.dart'; var _visited = false; diff --git a/modules_dart/transform/test/transform/directive_linker/simple_export_files/index.ng_deps.dart b/modules_dart/transform/test/transform/directive_linker/simple_export_files/index.ng_deps.dart index 949838af34..5bdb4ad284 100644 --- a/modules_dart/transform/test/transform/directive_linker/simple_export_files/index.ng_deps.dart +++ b/modules_dart/transform/test/transform/directive_linker/simple_export_files/index.ng_deps.dart @@ -1,8 +1,8 @@ library web_foo.ng_deps.dart; -import 'package:angular2/src/reflection/reflection.dart' as _ngRef; +import 'package:angular2/src/core/reflection/reflection.dart' as _ngRef; import 'package:angular2/bootstrap_static.dart'; -import 'package:angular2/src/reflection/reflection_capabilities.dart'; +import 'package:angular2/src/core/reflection/reflection_capabilities.dart'; import 'bar.dart'; var _visited = false; diff --git a/modules_dart/transform/test/transform/directive_linker/simple_files/bar.ng_deps.dart b/modules_dart/transform/test/transform/directive_linker/simple_files/bar.ng_deps.dart index 99c5f982ef..96cd3be310 100644 --- a/modules_dart/transform/test/transform/directive_linker/simple_files/bar.ng_deps.dart +++ b/modules_dart/transform/test/transform/directive_linker/simple_files/bar.ng_deps.dart @@ -2,7 +2,7 @@ library bar.ng_deps.dart; import 'bar.dart'; export 'bar.dart'; -import 'package:angular2/src/reflection/reflection.dart' as _ngRef; +import 'package:angular2/src/core/reflection/reflection.dart' as _ngRef; import 'package:angular2/src/core/metadata.dart'; import 'foo.dart' as dep; diff --git a/modules_dart/transform/test/transform/directive_linker/simple_files/expected/bar.ng_deps.dart b/modules_dart/transform/test/transform/directive_linker/simple_files/expected/bar.ng_deps.dart index 64501aa3a9..c9ef1973bf 100644 --- a/modules_dart/transform/test/transform/directive_linker/simple_files/expected/bar.ng_deps.dart +++ b/modules_dart/transform/test/transform/directive_linker/simple_files/expected/bar.ng_deps.dart @@ -2,7 +2,7 @@ library bar.ng_deps.dart; import 'bar.dart'; export 'bar.dart'; -import 'package:angular2/src/reflection/reflection.dart' as _ngRef; +import 'package:angular2/src/core/reflection/reflection.dart' as _ngRef; import 'package:angular2/src/core/metadata.dart'; import 'foo.dart' as dep; import 'foo.ng_deps.dart' as i0; diff --git a/modules_dart/transform/test/transform/directive_linker/simple_files/expected/foo.ng_deps.dart b/modules_dart/transform/test/transform/directive_linker/simple_files/expected/foo.ng_deps.dart index 644072db8f..b7831829a3 100644 --- a/modules_dart/transform/test/transform/directive_linker/simple_files/expected/foo.ng_deps.dart +++ b/modules_dart/transform/test/transform/directive_linker/simple_files/expected/foo.ng_deps.dart @@ -2,7 +2,7 @@ library foo.ng_deps.dart; import 'foo.dart'; export 'foo.dart'; -import 'package:angular2/src/reflection/reflection.dart' as _ngRef; +import 'package:angular2/src/core/reflection/reflection.dart' as _ngRef; import 'package:angular2/src/core/metadata.dart'; var _visited = false; diff --git a/modules_dart/transform/test/transform/directive_linker/simple_files/expected/index.ng_deps.dart b/modules_dart/transform/test/transform/directive_linker/simple_files/expected/index.ng_deps.dart index 43bed972c8..39d81e09b9 100644 --- a/modules_dart/transform/test/transform/directive_linker/simple_files/expected/index.ng_deps.dart +++ b/modules_dart/transform/test/transform/directive_linker/simple_files/expected/index.ng_deps.dart @@ -1,8 +1,8 @@ library web_foo.ng_deps.dart; -import 'package:angular2/src/reflection/reflection.dart' as _ngRef; +import 'package:angular2/src/core/reflection/reflection.dart' as _ngRef; import 'package:angular2/bootstrap_static.dart'; -import 'package:angular2/src/reflection/reflection_capabilities.dart'; +import 'package:angular2/src/core/reflection/reflection_capabilities.dart'; import 'bar.dart'; import 'bar.ng_deps.dart' as i0; diff --git a/modules_dart/transform/test/transform/directive_linker/simple_files/foo.ng_deps.dart b/modules_dart/transform/test/transform/directive_linker/simple_files/foo.ng_deps.dart index 644072db8f..b7831829a3 100644 --- a/modules_dart/transform/test/transform/directive_linker/simple_files/foo.ng_deps.dart +++ b/modules_dart/transform/test/transform/directive_linker/simple_files/foo.ng_deps.dart @@ -2,7 +2,7 @@ library foo.ng_deps.dart; import 'foo.dart'; export 'foo.dart'; -import 'package:angular2/src/reflection/reflection.dart' as _ngRef; +import 'package:angular2/src/core/reflection/reflection.dart' as _ngRef; import 'package:angular2/src/core/metadata.dart'; var _visited = false; diff --git a/modules_dart/transform/test/transform/directive_linker/simple_files/index.ng_deps.dart b/modules_dart/transform/test/transform/directive_linker/simple_files/index.ng_deps.dart index 949838af34..5bdb4ad284 100644 --- a/modules_dart/transform/test/transform/directive_linker/simple_files/index.ng_deps.dart +++ b/modules_dart/transform/test/transform/directive_linker/simple_files/index.ng_deps.dart @@ -1,8 +1,8 @@ library web_foo.ng_deps.dart; -import 'package:angular2/src/reflection/reflection.dart' as _ngRef; +import 'package:angular2/src/core/reflection/reflection.dart' as _ngRef; import 'package:angular2/bootstrap_static.dart'; -import 'package:angular2/src/reflection/reflection_capabilities.dart'; +import 'package:angular2/src/core/reflection/reflection_capabilities.dart'; import 'bar.dart'; var _visited = false; diff --git a/modules_dart/transform/test/transform/directive_metadata_extractor/all_tests.dart b/modules_dart/transform/test/transform/directive_metadata_extractor/all_tests.dart index 0f697513b4..36f41d5710 100644 --- a/modules_dart/transform/test/transform/directive_metadata_extractor/all_tests.dart +++ b/modules_dart/transform/test/transform/directive_metadata_extractor/all_tests.dart @@ -1,8 +1,8 @@ library angular2.test.transform.directive_metadata_extractor.all_tests; import 'dart:async'; -import 'package:angular2/src/render/api.dart'; -import 'package:angular2/src/render/dom/convert.dart'; +import 'package:angular2/src/core/render/api.dart'; +import 'package:angular2/src/core/render/dom/convert.dart'; import 'package:angular2/src/transform/common/directive_metadata_reader.dart'; import 'package:angular2/src/transform/common/logging.dart'; import 'package:angular2/src/transform/common/ng_deps.dart'; diff --git a/modules_dart/transform/test/transform/directive_processor/absolute_url_expression_files/expected/hello.ng_deps.dart b/modules_dart/transform/test/transform/directive_processor/absolute_url_expression_files/expected/hello.ng_deps.dart index 3190acc6fe..f3d3bbf549 100644 --- a/modules_dart/transform/test/transform/directive_processor/absolute_url_expression_files/expected/hello.ng_deps.dart +++ b/modules_dart/transform/test/transform/directive_processor/absolute_url_expression_files/expected/hello.ng_deps.dart @@ -2,7 +2,7 @@ library examples.src.hello_world.absolute_url_expression_files.ng_deps.dart; import 'hello.dart'; export 'hello.dart'; -import 'package:angular2/src/reflection/reflection.dart' as _ngRef; +import 'package:angular2/src/core/reflection/reflection.dart' as _ngRef; import 'package:angular2/angular2.dart' show Component, Directive, View, NgElement; diff --git a/modules_dart/transform/test/transform/directive_processor/custom_metadata/expected/package_soup.ng_deps.dart b/modules_dart/transform/test/transform/directive_processor/custom_metadata/expected/package_soup.ng_deps.dart index 7c784c5d0e..eef81b8b42 100644 --- a/modules_dart/transform/test/transform/directive_processor/custom_metadata/expected/package_soup.ng_deps.dart +++ b/modules_dart/transform/test/transform/directive_processor/custom_metadata/expected/package_soup.ng_deps.dart @@ -2,7 +2,7 @@ library dinner.package_soup.ng_deps.dart; import 'package_soup.dart'; export 'package_soup.dart'; -import 'package:angular2/src/reflection/reflection.dart' as _ngRef; +import 'package:angular2/src/core/reflection/reflection.dart' as _ngRef; import 'package:soup/soup.dart'; var _visited = false; diff --git a/modules_dart/transform/test/transform/directive_processor/custom_metadata/expected/relative_soup.ng_deps.dart b/modules_dart/transform/test/transform/directive_processor/custom_metadata/expected/relative_soup.ng_deps.dart index a4a100a52d..0a42db0821 100644 --- a/modules_dart/transform/test/transform/directive_processor/custom_metadata/expected/relative_soup.ng_deps.dart +++ b/modules_dart/transform/test/transform/directive_processor/custom_metadata/expected/relative_soup.ng_deps.dart @@ -2,7 +2,7 @@ library dinner.relative_soup.ng_deps.dart; import 'relative_soup.dart'; export 'relative_soup.dart'; -import 'package:angular2/src/reflection/reflection.dart' as _ngRef; +import 'package:angular2/src/core/reflection/reflection.dart' as _ngRef; import 'annotations/soup.dart'; var _visited = false; diff --git a/modules_dart/transform/test/transform/directive_processor/directive_aliases_files/expected/hello.ng_deps.dart b/modules_dart/transform/test/transform/directive_processor/directive_aliases_files/expected/hello.ng_deps.dart index 480aea055a..663bff3da9 100644 --- a/modules_dart/transform/test/transform/directive_processor/directive_aliases_files/expected/hello.ng_deps.dart +++ b/modules_dart/transform/test/transform/directive_processor/directive_aliases_files/expected/hello.ng_deps.dart @@ -2,7 +2,7 @@ library examples.src.hello_world.absolute_url_expression_files.ng_deps.dart; import 'hello.dart'; export 'hello.dart'; -import 'package:angular2/src/reflection/reflection.dart' as _ngRef; +import 'package:angular2/src/core/reflection/reflection.dart' as _ngRef; import 'package:angular2/angular2.dart' show bootstrap, Component, Directive, View, NgElement; export 'a.dart' show alias3; diff --git a/modules_dart/transform/test/transform/directive_processor/expected/hello.ng_deps.dart b/modules_dart/transform/test/transform/directive_processor/expected/hello.ng_deps.dart index a6afaf11e9..435ccb9b55 100644 --- a/modules_dart/transform/test/transform/directive_processor/expected/hello.ng_deps.dart +++ b/modules_dart/transform/test/transform/directive_processor/expected/hello.ng_deps.dart @@ -2,7 +2,7 @@ library examples.src.hello_world.index_common_dart.ng_deps.dart; import 'hello.dart'; export 'hello.dart'; -import 'package:angular2/src/reflection/reflection.dart' as _ngRef; +import 'package:angular2/src/core/reflection/reflection.dart' as _ngRef; import 'package:angular2/angular2.dart' show Component, Directive, View, NgElement; diff --git a/modules_dart/transform/test/transform/directive_processor/interface_chain_files/expected/soup.ng_deps.dart b/modules_dart/transform/test/transform/directive_processor/interface_chain_files/expected/soup.ng_deps.dart index c6b9ea0a55..de56149629 100644 --- a/modules_dart/transform/test/transform/directive_processor/interface_chain_files/expected/soup.ng_deps.dart +++ b/modules_dart/transform/test/transform/directive_processor/interface_chain_files/expected/soup.ng_deps.dart @@ -2,7 +2,7 @@ library dinner.soup.ng_deps.dart; import 'soup.dart'; export 'soup.dart'; -import 'package:angular2/src/reflection/reflection.dart' as _ngRef; +import 'package:angular2/src/core/reflection/reflection.dart' as _ngRef; import 'package:angular2/src/core/metadata.dart'; var _visited = false; diff --git a/modules_dart/transform/test/transform/directive_processor/interface_lifecycle_files/expected/soup.ng_deps.dart b/modules_dart/transform/test/transform/directive_processor/interface_lifecycle_files/expected/soup.ng_deps.dart index 66664dfcdb..7bc356cee4 100644 --- a/modules_dart/transform/test/transform/directive_processor/interface_lifecycle_files/expected/soup.ng_deps.dart +++ b/modules_dart/transform/test/transform/directive_processor/interface_lifecycle_files/expected/soup.ng_deps.dart @@ -2,7 +2,7 @@ library dinner.soup.ng_deps.dart; import 'soup.dart'; export 'soup.dart'; -import 'package:angular2/src/reflection/reflection.dart' as _ngRef; +import 'package:angular2/src/core/reflection/reflection.dart' as _ngRef; import 'package:angular2/metadata.dart'; var _visited = false; diff --git a/modules_dart/transform/test/transform/directive_processor/interfaces_files/expected/soup.ng_deps.dart b/modules_dart/transform/test/transform/directive_processor/interfaces_files/expected/soup.ng_deps.dart index 7f19cb2399..eb75d2bcb4 100644 --- a/modules_dart/transform/test/transform/directive_processor/interfaces_files/expected/soup.ng_deps.dart +++ b/modules_dart/transform/test/transform/directive_processor/interfaces_files/expected/soup.ng_deps.dart @@ -2,7 +2,7 @@ library dinner.soup.ng_deps.dart; import 'soup.dart'; export 'soup.dart'; -import 'package:angular2/src/reflection/reflection.dart' as _ngRef; +import 'package:angular2/src/core/reflection/reflection.dart' as _ngRef; import 'package:angular2/src/core/metadata.dart'; var _visited = false; diff --git a/modules_dart/transform/test/transform/directive_processor/invalid_url_files/expected/hello.ng_deps.dart b/modules_dart/transform/test/transform/directive_processor/invalid_url_files/expected/hello.ng_deps.dart index ddd0870cc5..d1fefa49ef 100644 --- a/modules_dart/transform/test/transform/directive_processor/invalid_url_files/expected/hello.ng_deps.dart +++ b/modules_dart/transform/test/transform/directive_processor/invalid_url_files/expected/hello.ng_deps.dart @@ -2,7 +2,7 @@ library test.transform.directive_processor.invalid_url_files.hello.ng_deps.dart; import 'hello.dart'; export 'hello.dart'; -import 'package:angular2/src/reflection/reflection.dart' as _ngRef; +import 'package:angular2/src/core/reflection/reflection.dart' as _ngRef; import 'package:angular2/angular2.dart' show Component, Directive, View, NgElement; diff --git a/modules_dart/transform/test/transform/directive_processor/multiple_interface_lifecycle_files/expected/soup.ng_deps.dart b/modules_dart/transform/test/transform/directive_processor/multiple_interface_lifecycle_files/expected/soup.ng_deps.dart index 8c61d88628..350e756e61 100644 --- a/modules_dart/transform/test/transform/directive_processor/multiple_interface_lifecycle_files/expected/soup.ng_deps.dart +++ b/modules_dart/transform/test/transform/directive_processor/multiple_interface_lifecycle_files/expected/soup.ng_deps.dart @@ -2,7 +2,7 @@ library dinner.soup.ng_deps.dart; import 'soup.dart'; export 'soup.dart'; -import 'package:angular2/src/reflection/reflection.dart' as _ngRef; +import 'package:angular2/src/core/reflection/reflection.dart' as _ngRef; import 'package:angular2/metadata.dart'; var _visited = false; diff --git a/modules_dart/transform/test/transform/directive_processor/multiple_part_files/expected/main.ng_deps.dart b/modules_dart/transform/test/transform/directive_processor/multiple_part_files/expected/main.ng_deps.dart index fb867afad4..07a8e854c0 100644 --- a/modules_dart/transform/test/transform/directive_processor/multiple_part_files/expected/main.ng_deps.dart +++ b/modules_dart/transform/test/transform/directive_processor/multiple_part_files/expected/main.ng_deps.dart @@ -2,7 +2,7 @@ library main.ng_deps.dart; import 'main.dart'; export 'main.dart'; -import 'package:angular2/src/reflection/reflection.dart' as _ngRef; +import 'package:angular2/src/core/reflection/reflection.dart' as _ngRef; import 'package:angular2/src/core/metadata.dart'; var _visited = false; diff --git a/modules_dart/transform/test/transform/directive_processor/multiple_style_urls_files/expected/hello.ng_deps.dart b/modules_dart/transform/test/transform/directive_processor/multiple_style_urls_files/expected/hello.ng_deps.dart index f863ef1f99..b794919fa5 100644 --- a/modules_dart/transform/test/transform/directive_processor/multiple_style_urls_files/expected/hello.ng_deps.dart +++ b/modules_dart/transform/test/transform/directive_processor/multiple_style_urls_files/expected/hello.ng_deps.dart @@ -2,7 +2,7 @@ library examples.src.hello_world.multiple_style_urls_files.ng_deps.dart; import 'hello.dart'; export 'hello.dart'; -import 'package:angular2/src/reflection/reflection.dart' as _ngRef; +import 'package:angular2/src/core/reflection/reflection.dart' as _ngRef; import 'package:angular2/angular2.dart' show Component, Directive, View, NgElement; diff --git a/modules_dart/transform/test/transform/directive_processor/multiple_style_urls_not_inlined_files/expected/hello.ng_deps.dart b/modules_dart/transform/test/transform/directive_processor/multiple_style_urls_not_inlined_files/expected/hello.ng_deps.dart index 0a74af9b54..96f9ea6036 100644 --- a/modules_dart/transform/test/transform/directive_processor/multiple_style_urls_not_inlined_files/expected/hello.ng_deps.dart +++ b/modules_dart/transform/test/transform/directive_processor/multiple_style_urls_not_inlined_files/expected/hello.ng_deps.dart @@ -2,7 +2,7 @@ library examples.src.hello_world.multiple_style_urls_not_inlined_files.ng_deps.d import 'hello.dart'; export 'hello.dart'; -import 'package:angular2/src/reflection/reflection.dart' as _ngRef; +import 'package:angular2/src/core/reflection/reflection.dart' as _ngRef; import 'package:angular2/angular2.dart' show Component, Directive, View, NgElement; diff --git a/modules_dart/transform/test/transform/directive_processor/parameter_metadata/expected/soup.ng_deps.dart b/modules_dart/transform/test/transform/directive_processor/parameter_metadata/expected/soup.ng_deps.dart index 0425212175..0f04c85ad2 100644 --- a/modules_dart/transform/test/transform/directive_processor/parameter_metadata/expected/soup.ng_deps.dart +++ b/modules_dart/transform/test/transform/directive_processor/parameter_metadata/expected/soup.ng_deps.dart @@ -2,7 +2,7 @@ library dinner.soup.ng_deps.dart; import 'soup.dart'; export 'soup.dart'; -import 'package:angular2/src/reflection/reflection.dart' as _ngRef; +import 'package:angular2/src/core/reflection/reflection.dart' as _ngRef; import 'package:angular2/src/core/metadata.dart'; var _visited = false; diff --git a/modules_dart/transform/test/transform/directive_processor/part_files/expected/main.ng_deps.dart b/modules_dart/transform/test/transform/directive_processor/part_files/expected/main.ng_deps.dart index c5d8a7c096..fb4a9816ae 100644 --- a/modules_dart/transform/test/transform/directive_processor/part_files/expected/main.ng_deps.dart +++ b/modules_dart/transform/test/transform/directive_processor/part_files/expected/main.ng_deps.dart @@ -2,7 +2,7 @@ library main.ng_deps.dart; import 'main.dart'; export 'main.dart'; -import 'package:angular2/src/reflection/reflection.dart' as _ngRef; +import 'package:angular2/src/core/reflection/reflection.dart' as _ngRef; import 'package:angular2/src/core/metadata.dart'; var _visited = false; diff --git a/modules_dart/transform/test/transform/directive_processor/prefixed_interface_lifecycle_files/expected/soup.ng_deps.dart b/modules_dart/transform/test/transform/directive_processor/prefixed_interface_lifecycle_files/expected/soup.ng_deps.dart index f1bca12019..c49f20736d 100644 --- a/modules_dart/transform/test/transform/directive_processor/prefixed_interface_lifecycle_files/expected/soup.ng_deps.dart +++ b/modules_dart/transform/test/transform/directive_processor/prefixed_interface_lifecycle_files/expected/soup.ng_deps.dart @@ -2,7 +2,7 @@ library dinner.soup.ng_deps.dart; import 'soup.dart'; export 'soup.dart'; -import 'package:angular2/src/reflection/reflection.dart' as _ngRef; +import 'package:angular2/src/core/reflection/reflection.dart' as _ngRef; import 'package:angular2/metadata.dart' as prefix; var _visited = false; diff --git a/modules_dart/transform/test/transform/directive_processor/split_url_expression_files/expected/hello.ng_deps.dart b/modules_dart/transform/test/transform/directive_processor/split_url_expression_files/expected/hello.ng_deps.dart index a502a11d12..729787d93a 100644 --- a/modules_dart/transform/test/transform/directive_processor/split_url_expression_files/expected/hello.ng_deps.dart +++ b/modules_dart/transform/test/transform/directive_processor/split_url_expression_files/expected/hello.ng_deps.dart @@ -2,7 +2,7 @@ library examples.src.hello_world.split_url_expression_files.ng_deps.dart; import 'hello.dart'; export 'hello.dart'; -import 'package:angular2/src/reflection/reflection.dart' as _ngRef; +import 'package:angular2/src/core/reflection/reflection.dart' as _ngRef; import 'package:angular2/angular2.dart' show Component, Directive, View, NgElement; diff --git a/modules_dart/transform/test/transform/directive_processor/static_function_files/expected/hello.ng_deps.dart b/modules_dart/transform/test/transform/directive_processor/static_function_files/expected/hello.ng_deps.dart index 4abe3f9f95..cf8b144f0f 100644 --- a/modules_dart/transform/test/transform/directive_processor/static_function_files/expected/hello.ng_deps.dart +++ b/modules_dart/transform/test/transform/directive_processor/static_function_files/expected/hello.ng_deps.dart @@ -2,7 +2,7 @@ library static_function_files.hello.ng_deps.dart; import 'hello.dart'; export 'hello.dart'; -import 'package:angular2/src/reflection/reflection.dart' as _ngRef; +import 'package:angular2/src/core/reflection/reflection.dart' as _ngRef; import 'package:angular2/angular2.dart'; var _visited = false; diff --git a/modules_dart/transform/test/transform/directive_processor/superclass_files/expected/soup.ng_deps.dart b/modules_dart/transform/test/transform/directive_processor/superclass_files/expected/soup.ng_deps.dart index e24e6ae43d..9053640c79 100644 --- a/modules_dart/transform/test/transform/directive_processor/superclass_files/expected/soup.ng_deps.dart +++ b/modules_dart/transform/test/transform/directive_processor/superclass_files/expected/soup.ng_deps.dart @@ -2,7 +2,7 @@ library dinner.soup.ng_deps.dart; import 'soup.dart'; export 'soup.dart'; -import 'package:angular2/src/reflection/reflection.dart' as _ngRef; +import 'package:angular2/src/core/reflection/reflection.dart' as _ngRef; import 'package:angular2/src/core/metadata.dart'; var _visited = false; diff --git a/modules_dart/transform/test/transform/directive_processor/superclass_lifecycle_files/expected/soup.ng_deps.dart b/modules_dart/transform/test/transform/directive_processor/superclass_lifecycle_files/expected/soup.ng_deps.dart index 66afb7c653..f61eed5646 100644 --- a/modules_dart/transform/test/transform/directive_processor/superclass_lifecycle_files/expected/soup.ng_deps.dart +++ b/modules_dart/transform/test/transform/directive_processor/superclass_lifecycle_files/expected/soup.ng_deps.dart @@ -2,7 +2,7 @@ library dinner.soup.ng_deps.dart; import 'soup.dart'; export 'soup.dart'; -import 'package:angular2/src/reflection/reflection.dart' as _ngRef; +import 'package:angular2/src/core/reflection/reflection.dart' as _ngRef; import 'package:angular2/metadata.dart'; var _visited = false; diff --git a/modules_dart/transform/test/transform/directive_processor/url_expression_files/expected/hello.ng_deps.dart b/modules_dart/transform/test/transform/directive_processor/url_expression_files/expected/hello.ng_deps.dart index 155b083575..39c0f51489 100644 --- a/modules_dart/transform/test/transform/directive_processor/url_expression_files/expected/hello.ng_deps.dart +++ b/modules_dart/transform/test/transform/directive_processor/url_expression_files/expected/hello.ng_deps.dart @@ -2,7 +2,7 @@ library examples.src.hello_world.url_expression_files.ng_deps.dart; import 'hello.dart'; export 'hello.dart'; -import 'package:angular2/src/reflection/reflection.dart' as _ngRef; +import 'package:angular2/src/core/reflection/reflection.dart' as _ngRef; import 'package:angular2/angular2.dart' show Component, Directive, View, NgElement; diff --git a/modules_dart/transform/test/transform/integration/all_tests.dart b/modules_dart/transform/test/transform/integration/all_tests.dart index 8ffae1be11..a91a7fabfb 100644 --- a/modules_dart/transform/test/transform/integration/all_tests.dart +++ b/modules_dart/transform/test/transform/integration/all_tests.dart @@ -1,6 +1,6 @@ library angular2.test.transform.integration; -import 'package:angular2/src/dom/html_adapter.dart'; +import 'package:angular2/src/core/dom/html_adapter.dart'; import 'package:angular2/transformer.dart'; import 'package:code_transformers/tests.dart'; import 'package:dart_style/dart_style.dart'; @@ -42,11 +42,11 @@ void allTests() { 'angular2|lib/src/core/metadata.dart': '../../../lib/src/core/metadata.dart', 'angular2|lib/src/core/application.dart': '../common/application.dart', - 'angular2|lib/src/reflection/reflection_capabilities.dart': + 'angular2|lib/src/core/reflection/reflection_capabilities.dart': '../common/reflection_capabilities.dart', 'angular2|lib/di.dart': '../../../lib/di.dart', - 'angular2|lib/src/di/decorators.dart': - '../../../lib/src/di/decorators.dart', + 'angular2|lib/src/core/di/decorators.dart': + '../../../lib/src/core/di/decorators.dart', }; var tests = [ diff --git a/modules_dart/transform/test/transform/integration/list_of_types_files/expected/bar.ng_deps.dart b/modules_dart/transform/test/transform/integration/list_of_types_files/expected/bar.ng_deps.dart index 45eaa03716..6322dc644d 100644 --- a/modules_dart/transform/test/transform/integration/list_of_types_files/expected/bar.ng_deps.dart +++ b/modules_dart/transform/test/transform/integration/list_of_types_files/expected/bar.ng_deps.dart @@ -2,7 +2,7 @@ library bar.ng_deps.dart; import 'bar.dart'; export 'bar.dart'; -import 'package:angular2/src/reflection/reflection.dart' as _ngRef; +import 'package:angular2/src/core/reflection/reflection.dart' as _ngRef; import 'package:angular2/src/core/metadata.dart'; import 'foo.dart'; diff --git a/modules_dart/transform/test/transform/integration/list_of_types_files/index.dart b/modules_dart/transform/test/transform/integration/list_of_types_files/index.dart index e95dce6c25..d37306e2ad 100644 --- a/modules_dart/transform/test/transform/integration/list_of_types_files/index.dart +++ b/modules_dart/transform/test/transform/integration/list_of_types_files/index.dart @@ -1,7 +1,7 @@ library web_foo; import 'package:angular2/bootstrap.dart'; -import 'package:angular2/src/reflection/reflection_capabilities.dart'; +import 'package:angular2/src/core/reflection/reflection_capabilities.dart'; import 'bar.dart'; void main() { diff --git a/modules_dart/transform/test/transform/integration/simple_annotation_files/expected/bar.ng_deps.dart b/modules_dart/transform/test/transform/integration/simple_annotation_files/expected/bar.ng_deps.dart index ff61b24d8d..542e1d1011 100644 --- a/modules_dart/transform/test/transform/integration/simple_annotation_files/expected/bar.ng_deps.dart +++ b/modules_dart/transform/test/transform/integration/simple_annotation_files/expected/bar.ng_deps.dart @@ -2,7 +2,7 @@ library bar.ng_deps.dart; import 'bar.dart'; export 'bar.dart'; -import 'package:angular2/src/reflection/reflection.dart' as _ngRef; +import 'package:angular2/src/core/reflection/reflection.dart' as _ngRef; import 'package:angular2/src/core/metadata.dart'; var _visited = false; diff --git a/modules_dart/transform/test/transform/integration/simple_annotation_files/expected/index.ng_deps.dart b/modules_dart/transform/test/transform/integration/simple_annotation_files/expected/index.ng_deps.dart index 54b422fdf8..00c97390ed 100644 --- a/modules_dart/transform/test/transform/integration/simple_annotation_files/expected/index.ng_deps.dart +++ b/modules_dart/transform/test/transform/integration/simple_annotation_files/expected/index.ng_deps.dart @@ -2,10 +2,10 @@ library web_foo.ng_deps.dart; import 'index.dart'; export 'index.dart'; -import 'package:angular2/src/reflection/reflection.dart' as _ngRef; +import 'package:angular2/src/core/reflection/reflection.dart' as _ngRef; import 'package:angular2/bootstrap_static.dart'; import 'index.ng_deps.dart' as ngStaticInit0; -import 'package:angular2/src/reflection/reflection.dart'; +import 'package:angular2/src/core/reflection/reflection.dart'; import 'bar.dart'; import 'bar.ng_deps.dart' as i0; diff --git a/modules_dart/transform/test/transform/integration/simple_annotation_files/index.dart b/modules_dart/transform/test/transform/integration/simple_annotation_files/index.dart index 86dd24b7f3..069954df44 100644 --- a/modules_dart/transform/test/transform/integration/simple_annotation_files/index.dart +++ b/modules_dart/transform/test/transform/integration/simple_annotation_files/index.dart @@ -1,8 +1,8 @@ library web_foo; import 'package:angular2/bootstrap.dart'; -import 'package:angular2/src/reflection/reflection.dart'; -import 'package:angular2/src/reflection/reflection_capabilities.dart'; +import 'package:angular2/src/core/reflection/reflection.dart'; +import 'package:angular2/src/core/reflection/reflection_capabilities.dart'; import 'bar.dart'; void main() { diff --git a/modules_dart/transform/test/transform/integration/synthetic_ctor_files/expected/bar.ng_deps.dart b/modules_dart/transform/test/transform/integration/synthetic_ctor_files/expected/bar.ng_deps.dart index ff61b24d8d..542e1d1011 100644 --- a/modules_dart/transform/test/transform/integration/synthetic_ctor_files/expected/bar.ng_deps.dart +++ b/modules_dart/transform/test/transform/integration/synthetic_ctor_files/expected/bar.ng_deps.dart @@ -2,7 +2,7 @@ library bar.ng_deps.dart; import 'bar.dart'; export 'bar.dart'; -import 'package:angular2/src/reflection/reflection.dart' as _ngRef; +import 'package:angular2/src/core/reflection/reflection.dart' as _ngRef; import 'package:angular2/src/core/metadata.dart'; var _visited = false; diff --git a/modules_dart/transform/test/transform/integration/synthetic_ctor_files/index.dart b/modules_dart/transform/test/transform/integration/synthetic_ctor_files/index.dart index e95dce6c25..d37306e2ad 100644 --- a/modules_dart/transform/test/transform/integration/synthetic_ctor_files/index.dart +++ b/modules_dart/transform/test/transform/integration/synthetic_ctor_files/index.dart @@ -1,7 +1,7 @@ library web_foo; import 'package:angular2/bootstrap.dart'; -import 'package:angular2/src/reflection/reflection_capabilities.dart'; +import 'package:angular2/src/core/reflection/reflection_capabilities.dart'; import 'bar.dart'; void main() { diff --git a/modules_dart/transform/test/transform/integration/two_annotations_files/expected/bar.ng_deps.dart b/modules_dart/transform/test/transform/integration/two_annotations_files/expected/bar.ng_deps.dart index de351bfc19..32b11c8597 100644 --- a/modules_dart/transform/test/transform/integration/two_annotations_files/expected/bar.ng_deps.dart +++ b/modules_dart/transform/test/transform/integration/two_annotations_files/expected/bar.ng_deps.dart @@ -1,11 +1,11 @@ library bar.ng_deps.dart; -import 'package:angular2/src/change_detection/pregen_proto_change_detector.dart' +import 'package:angular2/src/core/change_detection/pregen_proto_change_detector.dart' as _gen; import 'bar.dart'; export 'bar.dart'; -import 'package:angular2/src/reflection/reflection.dart' as _ngRef; +import 'package:angular2/src/core/reflection/reflection.dart' as _ngRef; import 'package:angular2/src/core/metadata.dart'; var _visited = false; diff --git a/modules_dart/transform/test/transform/integration/two_annotations_files/index.dart b/modules_dart/transform/test/transform/integration/two_annotations_files/index.dart index e95dce6c25..d37306e2ad 100644 --- a/modules_dart/transform/test/transform/integration/two_annotations_files/index.dart +++ b/modules_dart/transform/test/transform/integration/two_annotations_files/index.dart @@ -1,7 +1,7 @@ library web_foo; import 'package:angular2/bootstrap.dart'; -import 'package:angular2/src/reflection/reflection_capabilities.dart'; +import 'package:angular2/src/core/reflection/reflection_capabilities.dart'; import 'bar.dart'; void main() { diff --git a/modules_dart/transform/test/transform/integration/two_deps_files/expected/bar.ng_deps.dart b/modules_dart/transform/test/transform/integration/two_deps_files/expected/bar.ng_deps.dart index 89ac6d7fd6..0edeea6251 100644 --- a/modules_dart/transform/test/transform/integration/two_deps_files/expected/bar.ng_deps.dart +++ b/modules_dart/transform/test/transform/integration/two_deps_files/expected/bar.ng_deps.dart @@ -2,7 +2,7 @@ library bar.ng_deps.dart; import 'bar.dart'; export 'bar.dart'; -import 'package:angular2/src/reflection/reflection.dart' as _ngRef; +import 'package:angular2/src/core/reflection/reflection.dart' as _ngRef; import 'package:angular2/src/core/metadata.dart'; import 'foo.dart' as prefix; diff --git a/modules_dart/transform/test/transform/integration/two_deps_files/index.dart b/modules_dart/transform/test/transform/integration/two_deps_files/index.dart index e95dce6c25..d37306e2ad 100644 --- a/modules_dart/transform/test/transform/integration/two_deps_files/index.dart +++ b/modules_dart/transform/test/transform/integration/two_deps_files/index.dart @@ -1,7 +1,7 @@ library web_foo; import 'package:angular2/bootstrap.dart'; -import 'package:angular2/src/reflection/reflection_capabilities.dart'; +import 'package:angular2/src/core/reflection/reflection_capabilities.dart'; import 'bar.dart'; void main() { diff --git a/modules_dart/transform/test/transform/reflection_remover/debug_files/expected/index.dart b/modules_dart/transform/test/transform/reflection_remover/debug_files/expected/index.dart index b489cd1cfd..2bffd403b9 100644 --- a/modules_dart/transform/test/transform/reflection_remover/debug_files/expected/index.dart +++ b/modules_dart/transform/test/transform/reflection_remover/debug_files/expected/index.dart @@ -12,8 +12,8 @@ var code = """ library web_foo; import 'package:angular2/bootstrap.dart';import 'index.ng_deps.dart' as ngStaticInit0; -import 'package:angular2/src/reflection/reflection.dart'; -import 'package:angular2/src/reflection/debug_reflection_capabilities.dart'; +import 'package:angular2/src/core/reflection/reflection.dart'; +import 'package:angular2/src/core/reflection/debug_reflection_capabilities.dart'; void main() { reflector.reflectionCapabilities = new ReflectionCapabilities(); diff --git a/modules_dart/transform/test/transform/reflection_remover/debug_files/index.dart b/modules_dart/transform/test/transform/reflection_remover/debug_files/index.dart index b44a42089c..a377ea07f5 100644 --- a/modules_dart/transform/test/transform/reflection_remover/debug_files/index.dart +++ b/modules_dart/transform/test/transform/reflection_remover/debug_files/index.dart @@ -1,8 +1,8 @@ library web_foo; import 'package:angular2/bootstrap.dart'; -import 'package:angular2/src/reflection/reflection.dart'; -import 'package:angular2/src/reflection/reflection_capabilities.dart'; +import 'package:angular2/src/core/reflection/reflection.dart'; +import 'package:angular2/src/core/reflection/reflection_capabilities.dart'; void main() { reflector.reflectionCapabilities = new ReflectionCapabilities(); diff --git a/modules_dart/transform/test/transform/reflection_remover/debug_mirrors_files/expected/index.dart b/modules_dart/transform/test/transform/reflection_remover/debug_mirrors_files/expected/index.dart index ab2f6f72e7..a85e64968a 100644 --- a/modules_dart/transform/test/transform/reflection_remover/debug_mirrors_files/expected/index.dart +++ b/modules_dart/transform/test/transform/reflection_remover/debug_mirrors_files/expected/index.dart @@ -12,8 +12,8 @@ var code = """ library web_foo; import 'package:angular2/bootstrap_static.dart';import 'index.ng_deps.dart' as ngStaticInit0; -import 'package:angular2/src/reflection/reflection.dart'; -import 'package:angular2/src/reflection/debug_reflection_capabilities.dart'; +import 'package:angular2/src/core/reflection/reflection.dart'; +import 'package:angular2/src/core/reflection/debug_reflection_capabilities.dart'; void main() { ngStaticInit0.initReflector();reflector.reflectionCapabilities = new ReflectionCapabilities(); diff --git a/modules_dart/transform/test/transform/reflection_remover/debug_mirrors_files/index.dart b/modules_dart/transform/test/transform/reflection_remover/debug_mirrors_files/index.dart index b44a42089c..a377ea07f5 100644 --- a/modules_dart/transform/test/transform/reflection_remover/debug_mirrors_files/index.dart +++ b/modules_dart/transform/test/transform/reflection_remover/debug_mirrors_files/index.dart @@ -1,8 +1,8 @@ library web_foo; import 'package:angular2/bootstrap.dart'; -import 'package:angular2/src/reflection/reflection.dart'; -import 'package:angular2/src/reflection/reflection_capabilities.dart'; +import 'package:angular2/src/core/reflection/reflection.dart'; +import 'package:angular2/src/core/reflection/reflection_capabilities.dart'; void main() { reflector.reflectionCapabilities = new ReflectionCapabilities(); diff --git a/modules_dart/transform/test/transform/reflection_remover/index.dart b/modules_dart/transform/test/transform/reflection_remover/index.dart index b44a42089c..a377ea07f5 100644 --- a/modules_dart/transform/test/transform/reflection_remover/index.dart +++ b/modules_dart/transform/test/transform/reflection_remover/index.dart @@ -1,8 +1,8 @@ library web_foo; import 'package:angular2/bootstrap.dart'; -import 'package:angular2/src/reflection/reflection.dart'; -import 'package:angular2/src/reflection/reflection_capabilities.dart'; +import 'package:angular2/src/core/reflection/reflection.dart'; +import 'package:angular2/src/core/reflection/reflection_capabilities.dart'; void main() { reflector.reflectionCapabilities = new ReflectionCapabilities(); diff --git a/modules_dart/transform/test/transform/reflection_remover/log_mirrors_files/expected/index.dart b/modules_dart/transform/test/transform/reflection_remover/log_mirrors_files/expected/index.dart index b463d28e1b..14f6142e56 100644 --- a/modules_dart/transform/test/transform/reflection_remover/log_mirrors_files/expected/index.dart +++ b/modules_dart/transform/test/transform/reflection_remover/log_mirrors_files/expected/index.dart @@ -12,8 +12,8 @@ var code = """ library web_foo; import 'package:angular2/bootstrap.dart'; -import 'package:angular2/src/reflection/reflection.dart'; -/*import 'package:angular2/src/reflection/reflection_capabilities.dart';*/ +import 'package:angular2/src/core/reflection/reflection.dart'; +/*import 'package:angular2/src/core/reflection/reflection_capabilities.dart';*/ void main() { /*reflector.reflectionCapabilities = new ReflectionCapabilities();*/ diff --git a/modules_dart/transform/test/transform/reflection_remover/log_mirrors_files/index.dart b/modules_dart/transform/test/transform/reflection_remover/log_mirrors_files/index.dart index b44a42089c..a377ea07f5 100644 --- a/modules_dart/transform/test/transform/reflection_remover/log_mirrors_files/index.dart +++ b/modules_dart/transform/test/transform/reflection_remover/log_mirrors_files/index.dart @@ -1,8 +1,8 @@ library web_foo; import 'package:angular2/bootstrap.dart'; -import 'package:angular2/src/reflection/reflection.dart'; -import 'package:angular2/src/reflection/reflection_capabilities.dart'; +import 'package:angular2/src/core/reflection/reflection.dart'; +import 'package:angular2/src/core/reflection/reflection_capabilities.dart'; void main() { reflector.reflectionCapabilities = new ReflectionCapabilities(); diff --git a/modules_dart/transform/test/transform/reflection_remover/reflection_remover_files/expected/index.dart b/modules_dart/transform/test/transform/reflection_remover/reflection_remover_files/expected/index.dart index dec140d9d0..156285f1f1 100644 --- a/modules_dart/transform/test/transform/reflection_remover/reflection_remover_files/expected/index.dart +++ b/modules_dart/transform/test/transform/reflection_remover/reflection_remover_files/expected/index.dart @@ -12,8 +12,8 @@ var code = """ library web_foo; import 'package:angular2/bootstrap_static.dart';import 'index.ng_deps.dart' as ngStaticInit0; -import 'package:angular2/src/reflection/reflection.dart'; -/*import 'package:angular2/src/reflection/reflection_capabilities.dart';*/ +import 'package:angular2/src/core/reflection/reflection.dart'; +/*import 'package:angular2/src/core/reflection/reflection_capabilities.dart';*/ void main() { ngStaticInit0.initReflector();/*reflector.reflectionCapabilities = new ReflectionCapabilities();*/ diff --git a/modules_dart/transform/test/transform/reflection_remover/reflection_remover_files/index.dart b/modules_dart/transform/test/transform/reflection_remover/reflection_remover_files/index.dart index b44a42089c..a377ea07f5 100644 --- a/modules_dart/transform/test/transform/reflection_remover/reflection_remover_files/index.dart +++ b/modules_dart/transform/test/transform/reflection_remover/reflection_remover_files/index.dart @@ -1,8 +1,8 @@ library web_foo; import 'package:angular2/bootstrap.dart'; -import 'package:angular2/src/reflection/reflection.dart'; -import 'package:angular2/src/reflection/reflection_capabilities.dart'; +import 'package:angular2/src/core/reflection/reflection.dart'; +import 'package:angular2/src/core/reflection/reflection_capabilities.dart'; void main() { reflector.reflectionCapabilities = new ReflectionCapabilities(); diff --git a/modules_dart/transform/test/transform/reflection_remover/verbose_files/expected/index.dart b/modules_dart/transform/test/transform/reflection_remover/verbose_files/expected/index.dart index e08af4f0a3..4c8f957bc2 100644 --- a/modules_dart/transform/test/transform/reflection_remover/verbose_files/expected/index.dart +++ b/modules_dart/transform/test/transform/reflection_remover/verbose_files/expected/index.dart @@ -12,8 +12,8 @@ var code = """ library web_foo; import 'package:angular2/bootstrap_static.dart';import 'index.ng_deps.dart' as ngStaticInit0; -import 'package:angular2/src/reflection/reflection.dart'; -import 'package:angular2/src/reflection/debug_reflection_capabilities.dart'; +import 'package:angular2/src/core/reflection/reflection.dart'; +import 'package:angular2/src/core/reflection/debug_reflection_capabilities.dart'; void main() { ngStaticInit0.initReflector();reflector.reflectionCapabilities = new ReflectionCapabilities(verbose: true); diff --git a/modules_dart/transform/test/transform/template_compiler/all_tests.dart b/modules_dart/transform/test/transform/template_compiler/all_tests.dart index 4345133dc9..d9fc46a84e 100644 --- a/modules_dart/transform/test/transform/template_compiler/all_tests.dart +++ b/modules_dart/transform/test/transform/template_compiler/all_tests.dart @@ -2,7 +2,7 @@ library angular2.test.transform.template_compiler.all_tests; import 'dart:async'; import 'package:barback/barback.dart'; -import 'package:angular2/src/dom/html_adapter.dart'; +import 'package:angular2/src/core/dom/html_adapter.dart'; import 'package:angular2/src/transform/common/asset_reader.dart'; import 'package:angular2/src/transform/common/logging.dart'; import 'package:angular2/src/transform/template_compiler/generator.dart'; diff --git a/test-init.dart b/test-init.dart index 7e1096de8f..232c8568c5 100644 --- a/test-init.dart +++ b/test-init.dart @@ -1,4 +1,4 @@ -import 'package:angular2/src/dom/browser_adapter.dart'; +import 'package:angular2/src/core/dom/browser_adapter.dart'; main() { BrowserDomAdapter.makeCurrent(); diff --git a/test-main.js b/test-main.js index a79bd05460..9ee8182fa5 100644 --- a/test-main.js +++ b/test-main.js @@ -13,14 +13,13 @@ System.config({ paths: { 'benchpress/*': 'dist/js/dev/es5/benchpress/*.js', 'angular2/*': 'dist/js/dev/es5/angular2/*.js', - 'http/*': 'dist/js/dev/es5/http/*.js', 'rtts_assert/*': 'dist/js/dev/es5/rtts_assert/*.js', 'rx': 'node_modules/rx/dist/rx.js' } }); // Import all the specs, execute their `main()` method and kick off Karma (Jasmine). -System.import('angular2/src/dom/browser_adapter').then(function(browser_adapter) { +System.import('angular2/src/core/dom/browser_adapter').then(function(browser_adapter) { browser_adapter.BrowserDomAdapter.makeCurrent(); }).then(function() { return Promise.all( diff --git a/tools/broccoli/trees/dart_tree.ts b/tools/broccoli/trees/dart_tree.ts index b482b82559..df21d0996c 100644 --- a/tools/broccoli/trees/dart_tree.ts +++ b/tools/broccoli/trees/dart_tree.ts @@ -15,7 +15,9 @@ import replace from '../broccoli-replace'; var global_excludes = [ 'rtts_assert/**/*', - 'http/**/*', + 'angular2/http*', + 'angular2/src/http/**/*', + 'angular2/test/http/**/*', 'examples/src/http/**/*', 'examples/test/http/**/*', 'examples/src/jsonp/**/*', @@ -147,7 +149,8 @@ function getDocsTree() { var licenses = new MultiCopy('', { srcPath: 'LICENSE', targetPatterns: ['modules/*'], - exclude: ['*/rtts_assert', '*/http', '*/upgrade', '*/angular1_router'] // Not in dart. + exclude: + ['*/rtts_assert', '*/angular2/src/http', '*/upgrade', '*/angular1_router'] // Not in dart. }); licenses = stew.rename(licenses, stripModulePrefix); diff --git a/tools/broccoli/trees/node_tree.ts b/tools/broccoli/trees/node_tree.ts index 4d7fcad5a2..6696a75ec8 100644 --- a/tools/broccoli/trees/node_tree.ts +++ b/tools/broccoli/trees/node_tree.ts @@ -14,15 +14,15 @@ var projectRootDir = path.normalize(path.join(__dirname, '..', '..', '..', '..') module.exports = function makeNodeTree(destinationPath) { // list of npm packages that this build will create - var outputPackages = ['angular2', 'http', 'benchpress', 'rtts_assert']; + var outputPackages = ['angular2', 'benchpress', 'rtts_assert']; var modulesTree = new Funnel('modules', { - include: ['angular2/**', 'http/**', 'benchpress/**', 'rtts_assert/**', '**/e2e_test/**'], + include: ['angular2/**', 'benchpress/**', 'rtts_assert/**', '**/e2e_test/**'], exclude: [ // the following code and tests are not compatible with CJS/node environment 'angular2/test/core/zone/**', 'angular2/test/test_lib/fake_async_spec.ts', - 'angular2/test/render/xhr_impl_spec.ts', + 'angular2/test/core/render/xhr_impl_spec.ts', 'angular2/test/forms/**', 'angular1_router/**' ] @@ -85,13 +85,13 @@ module.exports = function makeNodeTree(destinationPath) { files: ['**/test/**/*_spec.js'], patterns: [ { - match: /$/, - replacement: function(_, relativePath) { - return "\r\n main(); \n\r" + - "var parse5Adapter = require('angular2/src/dom/parse5_adapter'); " + - "parse5Adapter.Parse5DomAdapter.makeCurrent();"; + match: /^/, + replacement: function() { + return `var parse5Adapter = require('angular2/src/core/dom/parse5_adapter');\n\r + parse5Adapter.Parse5DomAdapter.makeCurrent();` } - } + }, + {match: /$/, replacement: function(_, relativePath) { return "\r\n main(); \n\r"; }} ] }); diff --git a/tools/transpiler/spec/annotations_spec.js b/tools/transpiler/spec/annotations_spec.js index 13e0e1d7d9..2486385fca 100644 --- a/tools/transpiler/spec/annotations_spec.js +++ b/tools/transpiler/spec/annotations_spec.js @@ -1,6 +1,6 @@ import {describe, it, expect, iit} from 'angular2/test_lib'; import {readFirstAnnotation} from './fixtures/annotations'; -import {CONST} from 'angular2/src/facade/lang'; +import {CONST} from 'angular2/src/core/facade/lang'; class Inject {} class Bar {}