@angular/core 13.0.0-next.7 → 13.0.0-rc.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/core.d.ts +599 -963
- package/esm2020/core.mjs +5 -0
- package/{esm2015/index.js → esm2020/index.mjs} +0 -0
- package/{esm2015/public_api.js → esm2020/public_api.mjs} +0 -0
- package/esm2020/src/application_init.mjs +140 -0
- package/esm2020/src/application_module.mjs +135 -0
- package/esm2020/src/application_ref.mjs +738 -0
- package/{esm2015/src/application_tokens.js → esm2020/src/application_tokens.mjs} +0 -0
- package/esm2020/src/change_detection/change_detection.mjs +31 -0
- package/esm2020/src/change_detection/change_detection_util.mjs +64 -0
- package/esm2020/src/change_detection/change_detector_ref.mjs +89 -0
- package/{esm2015/src/change_detection/constants.js → esm2020/src/change_detection/constants.mjs} +0 -0
- package/esm2020/src/change_detection/differs/default_iterable_differ.mjs +666 -0
- package/{esm2015/src/change_detection/differs/default_keyvalue_differ.js → esm2020/src/change_detection/differs/default_keyvalue_differ.mjs} +0 -0
- package/{esm2015/src/change_detection/differs/iterable_differs.js → esm2020/src/change_detection/differs/iterable_differs.mjs} +0 -0
- package/{esm2015/src/change_detection/differs/keyvalue_differs.js → esm2020/src/change_detection/differs/keyvalue_differs.mjs} +0 -0
- package/{esm2015/src/change_detection/pipe_transform.js → esm2020/src/change_detection/pipe_transform.mjs} +0 -0
- package/esm2020/src/change_detection.mjs +14 -0
- package/esm2020/src/codegen_private_exports.mjs +11 -0
- package/{esm2015/src/compiler/compiler_facade.js → esm2020/src/compiler/compiler_facade.mjs} +0 -0
- package/{esm2015/src/compiler/compiler_facade_interface.js → esm2020/src/compiler/compiler_facade_interface.mjs} +1 -1
- package/esm2020/src/console.mjs +26 -0
- package/esm2020/src/core.mjs +52 -0
- package/esm2020/src/core_private_export.mjs +34 -0
- package/esm2020/src/core_render3_private_export.mjs +46 -0
- package/esm2020/src/debug/debug_node.mjs +625 -0
- package/{esm2015/src/debug/proxy.js → esm2020/src/debug/proxy.mjs} +0 -0
- package/{esm2015/src/di/forward_ref.js → esm2020/src/di/forward_ref.mjs} +0 -0
- package/{esm2015/src/di/index.js → esm2020/src/di/index.mjs} +0 -0
- package/{esm2015/src/di/inject_switch.js → esm2020/src/di/inject_switch.mjs} +0 -0
- package/esm2020/src/di/injectable.mjs +27 -0
- package/esm2020/src/di/injection_token.mjs +82 -0
- package/esm2020/src/di/injector.mjs +323 -0
- package/esm2020/src/di/injector_compatibility.mjs +185 -0
- package/{esm2015/src/di/injector_marker.js → esm2020/src/di/injector_marker.mjs} +0 -0
- package/{esm2015/src/di/injector_token.js → esm2020/src/di/injector_token.mjs} +0 -0
- package/{esm2015/src/di/interface/defs.js → esm2020/src/di/interface/defs.mjs} +0 -0
- package/{esm2015/src/di/interface/injector.js → esm2020/src/di/interface/injector.mjs} +0 -0
- package/{esm2015/src/di/interface/provider.js → esm2020/src/di/interface/provider.mjs} +0 -0
- package/{esm2015/src/di/jit/environment.js → esm2020/src/di/jit/environment.mjs} +0 -0
- package/esm2020/src/di/jit/injectable.mjs +94 -0
- package/{esm2015/src/di/jit/util.js → esm2020/src/di/jit/util.mjs} +0 -0
- package/esm2020/src/di/metadata.mjs +60 -0
- package/esm2020/src/di/metadata_attr.mjs +24 -0
- package/{esm2015/src/di/null_injector.js → esm2020/src/di/null_injector.mjs} +0 -0
- package/{esm2015/src/di/provider_token.js → esm2020/src/di/provider_token.mjs} +0 -0
- package/{esm2015/src/di/r3_injector.js → esm2020/src/di/r3_injector.mjs} +0 -0
- package/{esm2015/src/di/reflective_errors.js → esm2020/src/di/reflective_errors.mjs} +0 -0
- package/{esm2015/src/di/reflective_injector.js → esm2020/src/di/reflective_injector.mjs} +0 -0
- package/{esm2015/src/di/reflective_key.js → esm2020/src/di/reflective_key.mjs} +0 -0
- package/{esm2015/src/di/reflective_provider.js → esm2020/src/di/reflective_provider.mjs} +0 -0
- package/{esm2015/src/di/scope.js → esm2020/src/di/scope.mjs} +0 -0
- package/esm2020/src/di/util.mjs +51 -0
- package/{esm2015/src/di.js → esm2020/src/di.mjs} +0 -0
- package/{esm2015/src/error_handler.js → esm2020/src/error_handler.mjs} +0 -0
- package/{esm2015/src/errors.js → esm2020/src/errors.mjs} +0 -0
- package/esm2020/src/event_emitter.mjs +53 -0
- package/esm2020/src/i18n/locale_data_api.mjs +132 -0
- package/esm2020/src/i18n/locale_en.mjs +17 -0
- package/{esm2015/src/i18n/localization.js → esm2020/src/i18n/localization.mjs} +0 -0
- package/{esm2015/src/i18n/tokens.js → esm2020/src/i18n/tokens.mjs} +6 -6
- package/{esm2015/src/interface/lifecycle_hooks.js → esm2020/src/interface/lifecycle_hooks.mjs} +0 -0
- package/{esm2015/src/interface/simple_change.js → esm2020/src/interface/simple_change.mjs} +0 -0
- package/{esm2015/src/interface/type.js → esm2020/src/interface/type.mjs} +0 -0
- package/{esm2015/src/ivy_switch.js → esm2020/src/ivy_switch.mjs} +2 -2
- package/esm2020/src/linker/compiler.mjs +136 -0
- package/{esm2015/src/linker/component_factory.js → esm2020/src/linker/component_factory.mjs} +0 -0
- package/{esm2015/src/linker/component_factory_resolver.js → esm2020/src/linker/component_factory_resolver.mjs} +0 -0
- package/esm2020/src/linker/element_ref.mjs +59 -0
- package/esm2020/src/linker/ng_module_factory.mjs +29 -0
- package/esm2020/src/linker/ng_module_factory_loader.mjs +42 -0
- package/esm2020/src/linker/ng_module_factory_loader_impl.mjs +10 -0
- package/{esm2015/src/linker/ng_module_factory_registration.js → esm2020/src/linker/ng_module_factory_registration.mjs} +2 -2
- package/{esm2015/src/linker/query_list.js → esm2020/src/linker/query_list.mjs} +0 -0
- package/{esm2015/src/linker/template_ref.js → esm2020/src/linker/template_ref.mjs} +2 -2
- package/esm2020/src/linker/view_container_ref.mjs +283 -0
- package/{esm2015/src/linker/view_ref.js → esm2020/src/linker/view_ref.mjs} +0 -0
- package/esm2020/src/linker.mjs +19 -0
- package/esm2020/src/metadata/di.mjs +108 -0
- package/esm2020/src/metadata/directives.mjs +112 -0
- package/{esm2015/src/metadata/do_boostrap.js → esm2020/src/metadata/do_boostrap.mjs} +0 -0
- package/esm2020/src/metadata/ng_module.mjs +42 -0
- package/{esm2015/src/metadata/ng_module_def.js → esm2020/src/metadata/ng_module_def.mjs} +0 -0
- package/{esm2015/src/metadata/resource_loading.js → esm2020/src/metadata/resource_loading.mjs} +0 -0
- package/{esm2015/src/metadata/schema.js → esm2020/src/metadata/schema.mjs} +0 -0
- package/{esm2015/src/metadata/view.js → esm2020/src/metadata/view.mjs} +0 -0
- package/{esm2015/src/metadata.js → esm2020/src/metadata.mjs} +0 -0
- package/{esm2015/src/platform_core_providers.js → esm2020/src/platform_core_providers.mjs} +0 -0
- package/{esm2015/src/r3_symbols.js → esm2020/src/r3_symbols.mjs} +0 -0
- package/{esm2015/src/reflection/platform_reflection_capabilities.js → esm2020/src/reflection/platform_reflection_capabilities.mjs} +0 -0
- package/{esm2015/src/reflection/reflection.js → esm2020/src/reflection/reflection.mjs} +0 -0
- package/{esm2015/src/reflection/reflection_capabilities.js → esm2020/src/reflection/reflection_capabilities.mjs} +3 -3
- package/{esm2015/src/reflection/reflector.js → esm2020/src/reflection/reflector.mjs} +0 -0
- package/{esm2015/src/reflection/types.js → esm2020/src/reflection/types.mjs} +0 -0
- package/{esm2015/src/render/api.js → esm2020/src/render/api.mjs} +2 -2
- package/{esm2015/src/render/api_flags.js → esm2020/src/render/api_flags.mjs} +0 -0
- package/{esm2015/src/render.js → esm2020/src/render.mjs} +0 -0
- package/{esm2015/src/render3/assert.js → esm2020/src/render3/assert.mjs} +0 -0
- package/{esm2015/src/render3/bindings.js → esm2020/src/render3/bindings.mjs} +0 -0
- package/{esm2015/src/render3/collect_native_nodes.js → esm2020/src/render3/collect_native_nodes.mjs} +0 -0
- package/esm2020/src/render3/component.mjs +204 -0
- package/{esm2015/src/render3/component_ref.js → esm2020/src/render3/component_ref.mjs} +2 -2
- package/{esm2015/src/render3/context_discovery.js → esm2020/src/render3/context_discovery.mjs} +0 -0
- package/{esm2015/src/render3/definition.js → esm2020/src/render3/definition.mjs} +0 -0
- package/{esm2015/src/render3/definition_factory.js → esm2020/src/render3/definition_factory.mjs} +0 -0
- package/{esm2015/src/render3/di.js → esm2020/src/render3/di.mjs} +0 -0
- package/{esm2015/src/render3/di_setup.js → esm2020/src/render3/di_setup.mjs} +0 -0
- package/{esm2015/src/render3/error_code.js → esm2020/src/render3/error_code.mjs} +0 -0
- package/{esm2015/src/render3/errors.js → esm2020/src/render3/errors.mjs} +0 -0
- package/{esm2015/src/render3/errors_di.js → esm2020/src/render3/errors_di.mjs} +0 -0
- package/{esm2015/src/render3/features/copy_definition_feature.js → esm2020/src/render3/features/copy_definition_feature.mjs} +0 -0
- package/{esm2015/src/render3/features/inherit_definition_feature.js → esm2020/src/render3/features/inherit_definition_feature.mjs} +0 -0
- package/esm2020/src/render3/features/ng_onchanges_feature.mjs +92 -0
- package/{esm2015/src/render3/features/providers_feature.js → esm2020/src/render3/features/providers_feature.mjs} +0 -0
- package/{esm2015/src/render3/fields.js → esm2020/src/render3/fields.mjs} +0 -0
- package/{esm2015/src/render3/global_utils_api.js → esm2020/src/render3/global_utils_api.mjs} +0 -0
- package/{esm2015/src/render3/hooks.js → esm2020/src/render3/hooks.mjs} +0 -0
- package/{esm2015/src/render3/i18n/i18n_apply.js → esm2020/src/render3/i18n/i18n_apply.mjs} +0 -0
- package/{esm2015/src/render3/i18n/i18n_debug.js → esm2020/src/render3/i18n/i18n_debug.mjs} +0 -0
- package/{esm2015/src/render3/i18n/i18n_insert_before_index.js → esm2020/src/render3/i18n/i18n_insert_before_index.mjs} +0 -0
- package/{esm2015/src/render3/i18n/i18n_locale_id.js → esm2020/src/render3/i18n/i18n_locale_id.mjs} +0 -0
- package/{esm2015/src/render3/i18n/i18n_parse.js → esm2020/src/render3/i18n/i18n_parse.mjs} +0 -0
- package/{esm2015/src/render3/i18n/i18n_postprocess.js → esm2020/src/render3/i18n/i18n_postprocess.mjs} +0 -0
- package/{esm2015/src/render3/i18n/i18n_tree_shaking.js → esm2020/src/render3/i18n/i18n_tree_shaking.mjs} +0 -0
- package/{esm2015/src/render3/i18n/i18n_util.js → esm2020/src/render3/i18n/i18n_util.mjs} +0 -0
- package/{esm2015/src/render3/index.js → esm2020/src/render3/index.mjs} +0 -0
- package/{esm2015/src/render3/instructions/advance.js → esm2020/src/render3/instructions/advance.mjs} +0 -0
- package/{esm2015/src/render3/instructions/all.js → esm2020/src/render3/instructions/all.mjs} +0 -0
- package/{esm2015/src/render3/instructions/attribute.js → esm2020/src/render3/instructions/attribute.mjs} +0 -0
- package/{esm2015/src/render3/instructions/attribute_interpolation.js → esm2020/src/render3/instructions/attribute_interpolation.mjs} +0 -0
- package/{esm2015/src/render3/instructions/change_detection.js → esm2020/src/render3/instructions/change_detection.mjs} +0 -0
- package/{esm2015/src/render3/instructions/class_map_interpolation.js → esm2020/src/render3/instructions/class_map_interpolation.mjs} +0 -0
- package/{esm2015/src/render3/instructions/di.js → esm2020/src/render3/instructions/di.mjs} +0 -0
- package/{esm2015/src/render3/instructions/di_attr.js → esm2020/src/render3/instructions/di_attr.mjs} +0 -0
- package/{esm2015/src/render3/instructions/element.js → esm2020/src/render3/instructions/element.mjs} +0 -0
- package/{esm2015/src/render3/instructions/element_container.js → esm2020/src/render3/instructions/element_container.mjs} +0 -0
- package/{esm2015/src/render3/instructions/get_current_view.js → esm2020/src/render3/instructions/get_current_view.mjs} +0 -0
- package/{esm2015/src/render3/instructions/host_property.js → esm2020/src/render3/instructions/host_property.mjs} +0 -0
- package/{esm2015/src/render3/instructions/i18n.js → esm2020/src/render3/instructions/i18n.mjs} +0 -0
- package/{esm2015/src/render3/instructions/i18n_icu_container_visitor.js → esm2020/src/render3/instructions/i18n_icu_container_visitor.mjs} +0 -0
- package/{esm2015/src/render3/instructions/interpolation.js → esm2020/src/render3/instructions/interpolation.mjs} +0 -0
- package/{esm2015/src/render3/instructions/listener.js → esm2020/src/render3/instructions/listener.mjs} +0 -0
- package/{esm2015/src/render3/instructions/lview_debug.js → esm2020/src/render3/instructions/lview_debug.mjs} +0 -0
- package/{esm2015/src/render3/instructions/namespace.js → esm2020/src/render3/instructions/namespace.mjs} +0 -0
- package/{esm2015/src/render3/instructions/next_context.js → esm2020/src/render3/instructions/next_context.mjs} +0 -0
- package/{esm2015/src/render3/instructions/projection.js → esm2020/src/render3/instructions/projection.mjs} +0 -0
- package/{esm2015/src/render3/instructions/property.js → esm2020/src/render3/instructions/property.mjs} +0 -0
- package/{esm2015/src/render3/instructions/property_interpolation.js → esm2020/src/render3/instructions/property_interpolation.mjs} +0 -0
- package/esm2020/src/render3/instructions/shared.mjs +1811 -0
- package/{esm2015/src/render3/instructions/storage.js → esm2020/src/render3/instructions/storage.mjs} +0 -0
- package/{esm2015/src/render3/instructions/style_map_interpolation.js → esm2020/src/render3/instructions/style_map_interpolation.mjs} +0 -0
- package/{esm2015/src/render3/instructions/style_prop_interpolation.js → esm2020/src/render3/instructions/style_prop_interpolation.mjs} +0 -0
- package/{esm2015/src/render3/instructions/styling.js → esm2020/src/render3/instructions/styling.mjs} +0 -0
- package/{esm2015/src/render3/instructions/template.js → esm2020/src/render3/instructions/template.mjs} +0 -0
- package/{esm2015/src/render3/instructions/text.js → esm2020/src/render3/instructions/text.mjs} +0 -0
- package/{esm2015/src/render3/instructions/text_interpolation.js → esm2020/src/render3/instructions/text_interpolation.mjs} +0 -0
- package/{esm2015/src/render3/interfaces/container.js → esm2020/src/render3/interfaces/container.mjs} +0 -0
- package/{esm2015/src/render3/interfaces/context.js → esm2020/src/render3/interfaces/context.mjs} +0 -0
- package/{esm2015/src/render3/interfaces/definition.js → esm2020/src/render3/interfaces/definition.mjs} +0 -0
- package/{esm2015/src/render3/interfaces/document.js → esm2020/src/render3/interfaces/document.mjs} +0 -0
- package/{esm2015/src/render3/interfaces/i18n.js → esm2020/src/render3/interfaces/i18n.mjs} +0 -0
- package/{esm2015/src/render3/interfaces/injector.js → esm2020/src/render3/interfaces/injector.mjs} +0 -0
- package/{esm2015/src/render3/interfaces/node.js → esm2020/src/render3/interfaces/node.mjs} +0 -0
- package/{esm2015/src/render3/interfaces/player.js → esm2020/src/render3/interfaces/player.mjs} +0 -0
- package/{esm2015/src/render3/interfaces/projection.js → esm2020/src/render3/interfaces/projection.mjs} +0 -0
- package/{esm2015/src/render3/interfaces/public_definitions.js → esm2020/src/render3/interfaces/public_definitions.mjs} +0 -0
- package/{esm2015/src/render3/interfaces/query.js → esm2020/src/render3/interfaces/query.mjs} +0 -0
- package/esm2020/src/render3/interfaces/renderer.mjs +27 -0
- package/{esm2015/src/render3/interfaces/renderer_dom.js → esm2020/src/render3/interfaces/renderer_dom.mjs} +0 -0
- package/{esm2015/src/render3/interfaces/sanitization.js → esm2020/src/render3/interfaces/sanitization.mjs} +0 -0
- package/{esm2015/src/render3/interfaces/styling.js → esm2020/src/render3/interfaces/styling.mjs} +0 -0
- package/{esm2015/src/render3/interfaces/type_checks.js → esm2020/src/render3/interfaces/type_checks.mjs} +0 -0
- package/{esm2015/src/render3/interfaces/view.js → esm2020/src/render3/interfaces/view.mjs} +0 -0
- package/esm2020/src/render3/jit/directive.mjs +325 -0
- package/esm2020/src/render3/jit/environment.mjs +165 -0
- package/{esm2015/src/render3/jit/jit_options.js → esm2020/src/render3/jit/jit_options.mjs} +0 -0
- package/{esm2015/src/render3/jit/module.js → esm2020/src/render3/jit/module.mjs} +0 -0
- package/esm2020/src/render3/jit/partial.mjs +104 -0
- package/{esm2015/src/render3/jit/pipe.js → esm2020/src/render3/jit/pipe.mjs} +0 -0
- package/esm2020/src/render3/metadata.mjs +49 -0
- package/{esm2015/src/render3/namespaces.js → esm2020/src/render3/namespaces.mjs} +0 -0
- package/esm2020/src/render3/ng_module_ref.mjs +122 -0
- package/{esm2015/src/render3/node_assert.js → esm2020/src/render3/node_assert.mjs} +0 -0
- package/{esm2015/src/render3/node_manipulation.js → esm2020/src/render3/node_manipulation.mjs} +0 -0
- package/{esm2015/src/render3/node_manipulation_i18n.js → esm2020/src/render3/node_manipulation_i18n.mjs} +0 -0
- package/{esm2015/src/render3/node_selector_matcher.js → esm2020/src/render3/node_selector_matcher.mjs} +0 -0
- package/esm2020/src/render3/pipe.mjs +184 -0
- package/{esm2015/src/render3/profiler.js → esm2020/src/render3/profiler.mjs} +0 -0
- package/{esm2015/src/render3/pure_function.js → esm2020/src/render3/pure_function.mjs} +0 -0
- package/{esm2015/src/render3/query.js → esm2020/src/render3/query.mjs} +0 -0
- package/{esm2015/src/render3/state.js → esm2020/src/render3/state.mjs} +0 -0
- package/{esm2015/src/render3/styling/class_differ.js → esm2020/src/render3/styling/class_differ.mjs} +0 -0
- package/{esm2015/src/render3/styling/static_styling.js → esm2020/src/render3/styling/static_styling.mjs} +0 -0
- package/{esm2015/src/render3/styling/style_binding_list.js → esm2020/src/render3/styling/style_binding_list.mjs} +0 -0
- package/{esm2015/src/render3/styling/styling_parser.js → esm2020/src/render3/styling/styling_parser.mjs} +0 -0
- package/{esm2015/src/render3/tokens.js → esm2020/src/render3/tokens.mjs} +0 -0
- package/{esm2015/src/render3/util/attrs_utils.js → esm2020/src/render3/util/attrs_utils.mjs} +0 -0
- package/{esm2015/src/render3/util/change_detection_utils.js → esm2020/src/render3/util/change_detection_utils.mjs} +0 -0
- package/{esm2015/src/render3/util/debug_utils.js → esm2020/src/render3/util/debug_utils.mjs} +0 -0
- package/esm2020/src/render3/util/discovery_utils.mjs +411 -0
- package/esm2020/src/render3/util/global_utils.mjs +77 -0
- package/{esm2015/src/render3/util/injector_utils.js → esm2020/src/render3/util/injector_utils.mjs} +0 -0
- package/esm2020/src/render3/util/misc_utils.mjs +61 -0
- package/{esm2015/src/render3/util/stringify_utils.js → esm2020/src/render3/util/stringify_utils.mjs} +0 -0
- package/{esm2015/src/render3/util/view_traversal_utils.js → esm2020/src/render3/util/view_traversal_utils.mjs} +0 -0
- package/{esm2015/src/render3/util/view_utils.js → esm2020/src/render3/util/view_utils.mjs} +0 -0
- package/{esm2015/src/render3/view_engine_compatibility_prebound.js → esm2020/src/render3/view_engine_compatibility_prebound.mjs} +1 -1
- package/{esm2015/src/render3/view_ref.js → esm2020/src/render3/view_ref.mjs} +0 -0
- package/{esm2015/src/sanitization/bypass.js → esm2020/src/sanitization/bypass.mjs} +0 -0
- package/{esm2015/src/sanitization/html_sanitizer.js → esm2020/src/sanitization/html_sanitizer.mjs} +0 -0
- package/{esm2015/src/sanitization/inert_body.js → esm2020/src/sanitization/inert_body.mjs} +3 -3
- package/{esm2015/src/sanitization/sanitization.js → esm2020/src/sanitization/sanitization.mjs} +0 -0
- package/{esm2015/src/sanitization/sanitizer.js → esm2020/src/sanitization/sanitizer.mjs} +0 -0
- package/{esm2015/src/sanitization/security.js → esm2020/src/sanitization/security.mjs} +0 -0
- package/{esm2015/src/sanitization/url_sanitizer.js → esm2020/src/sanitization/url_sanitizer.mjs} +0 -0
- package/esm2020/src/testability/testability.mjs +258 -0
- package/{esm2015/src/util/array_utils.js → esm2020/src/util/array_utils.mjs} +0 -0
- package/{esm2015/src/util/assert.js → esm2020/src/util/assert.mjs} +0 -0
- package/{esm2015/src/util/char_code.js → esm2020/src/util/char_code.mjs} +0 -0
- package/{esm2015/src/util/closure.js → esm2020/src/util/closure.mjs} +0 -0
- package/{esm2015/src/util/comparison.js → esm2020/src/util/comparison.mjs} +0 -0
- package/{esm2015/src/util/decorators.js → esm2020/src/util/decorators.mjs} +0 -0
- package/{esm2015/src/util/dom.js → esm2020/src/util/dom.mjs} +0 -0
- package/{esm2015/src/util/empty.js → esm2020/src/util/empty.mjs} +0 -0
- package/{esm2015/src/util/errors.js → esm2020/src/util/errors.mjs} +0 -0
- package/{esm2015/src/util/global.js → esm2020/src/util/global.mjs} +0 -0
- package/{esm2015/src/util/is_dev_mode.js → esm2020/src/util/is_dev_mode.mjs} +0 -0
- package/{esm2015/src/util/iterable.js → esm2020/src/util/iterable.mjs} +0 -0
- package/{esm2015/src/util/lang.js → esm2020/src/util/lang.mjs} +0 -0
- package/{esm2015/src/util/microtask.js → esm2020/src/util/microtask.mjs} +0 -0
- package/{esm2015/src/util/named_array_type.js → esm2020/src/util/named_array_type.mjs} +0 -0
- package/{esm2015/src/util/ng_dev_mode.js → esm2020/src/util/ng_dev_mode.mjs} +0 -0
- package/{esm2015/src/util/ng_i18n_closure_mode.js → esm2020/src/util/ng_i18n_closure_mode.mjs} +0 -0
- package/{esm2015/src/util/ng_jit_mode.js → esm2020/src/util/ng_jit_mode.mjs} +0 -0
- package/{esm2015/src/util/ng_reflect.js → esm2020/src/util/ng_reflect.mjs} +0 -0
- package/{esm2015/src/util/noop.js → esm2020/src/util/noop.mjs} +0 -0
- package/{esm2015/src/util/property.js → esm2020/src/util/property.mjs} +0 -0
- package/{esm2015/src/util/raf.js → esm2020/src/util/raf.mjs} +0 -0
- package/{esm2015/src/util/security/trusted_type_defs.js → esm2020/src/util/security/trusted_type_defs.mjs} +0 -0
- package/esm2020/src/util/security/trusted_types.mjs +130 -0
- package/esm2020/src/util/security/trusted_types_bypass.mjs +83 -0
- package/{esm2015/src/util/stringify.js → esm2020/src/util/stringify.mjs} +0 -0
- package/{esm2015/src/util/symbol.js → esm2020/src/util/symbol.mjs} +0 -0
- package/{esm2015/src/version.js → esm2020/src/version.mjs} +1 -1
- package/{esm2015/src/view/element.js → esm2020/src/view/element.mjs} +0 -0
- package/{esm2015/src/view/entrypoint.js → esm2020/src/view/entrypoint.mjs} +0 -0
- package/{esm2015/src/view/errors.js → esm2020/src/view/errors.mjs} +0 -0
- package/{esm2015/src/view/index.js → esm2020/src/view/index.mjs} +2 -2
- package/{esm2015/src/view/ng_content.js → esm2020/src/view/ng_content.mjs} +0 -0
- package/{esm2015/src/view/ng_module.js → esm2020/src/view/ng_module.mjs} +0 -0
- package/esm2020/src/view/provider.mjs +490 -0
- package/esm2020/src/view/provider_flags.mjs +26 -0
- package/{esm2015/src/view/pure_expression.js → esm2020/src/view/pure_expression.mjs} +0 -0
- package/{esm2015/src/view/query.js → esm2020/src/view/query.mjs} +0 -0
- package/esm2020/src/view/refs.mjs +369 -0
- package/{esm2015/src/view/services.js → esm2020/src/view/services.mjs} +0 -0
- package/{esm2015/src/view/text.js → esm2020/src/view/text.mjs} +0 -0
- package/{esm2015/src/view/types.js → esm2020/src/view/types.mjs} +0 -0
- package/esm2020/src/view/util.mjs +369 -0
- package/{esm2015/src/view/view.js → esm2020/src/view/view.mjs} +0 -0
- package/{esm2015/src/view/view_attach.js → esm2020/src/view/view_attach.mjs} +0 -0
- package/{esm2015/src/zone/ng_zone.js → esm2020/src/zone/ng_zone.mjs} +0 -0
- package/{esm2015/src/zone.js → esm2020/src/zone.mjs} +0 -0
- package/{esm2015/testing/index.js → esm2020/testing/index.mjs} +0 -0
- package/{esm2015/testing/public_api.js → esm2020/testing/public_api.mjs} +0 -0
- package/{esm2015/testing/src/async.js → esm2020/testing/src/async.mjs} +0 -0
- package/{esm2015/testing/src/component_fixture.js → esm2020/testing/src/component_fixture.mjs} +0 -0
- package/{esm2015/testing/src/fake_async.js → esm2020/testing/src/fake_async.mjs} +0 -0
- package/{esm2015/testing/src/lang_utils.js → esm2020/testing/src/lang_utils.mjs} +0 -0
- package/esm2020/testing/src/logger.mjs +34 -0
- package/{esm2015/testing/src/metadata_override.js → esm2020/testing/src/metadata_override.mjs} +0 -0
- package/{esm2015/testing/src/metadata_overrider.js → esm2020/testing/src/metadata_overrider.mjs} +0 -0
- package/esm2020/testing/src/ng_zone_mock.mjs +33 -0
- package/{esm2015/testing/src/private_export_testing.js → esm2020/testing/src/private_export_testing.mjs} +0 -0
- package/esm2020/testing/src/r3_test_bed.mjs +397 -0
- package/esm2020/testing/src/r3_test_bed_compiler.mjs +735 -0
- package/{esm2015/testing/src/resolvers.js → esm2020/testing/src/resolvers.mjs} +1 -1
- package/{esm2015/testing/src/styling.js → esm2020/testing/src/styling.mjs} +0 -0
- package/esm2020/testing/src/test_bed.mjs +614 -0
- package/esm2020/testing/src/test_bed_common.mjs +28 -0
- package/esm2020/testing/src/test_compiler.mjs +69 -0
- package/{esm2015/testing/src/test_hooks.js → esm2020/testing/src/test_hooks.mjs} +0 -0
- package/{esm2015/testing/src/testing.js → esm2020/testing/src/testing.mjs} +0 -0
- package/{esm2015/testing/src/testing_internal.js → esm2020/testing/src/testing_internal.mjs} +0 -0
- package/esm2020/testing/testing.mjs +5 -0
- package/fesm2015/{core.js → core.mjs} +8674 -8756
- package/fesm2015/core.mjs.map +1 -0
- package/fesm2015/{testing.js → testing.mjs} +50 -61
- package/fesm2015/testing.mjs.map +1 -0
- package/fesm2020/core.mjs +33107 -0
- package/fesm2020/core.mjs.map +1 -0
- package/fesm2020/testing.mjs +2635 -0
- package/fesm2020/testing.mjs.map +1 -0
- package/package.json +34 -9
- package/schematics/migrations/abstract-control-parent/index.js +6 -6
- package/schematics/migrations/abstract-control-parent/util.d.ts +1 -1
- package/schematics/migrations/abstract-control-parent/util.js +11 -8
- package/schematics/migrations/activated-route-snapshot-fragment/index.js +12 -9
- package/schematics/migrations/activated-route-snapshot-fragment/util.d.ts +1 -1
- package/schematics/migrations/activated-route-snapshot-fragment/util.js +10 -7
- package/schematics/migrations/can-activate-with-redirect-to/index.js +13 -10
- package/schematics/migrations/can-activate-with-redirect-to/util.d.ts +1 -1
- package/schematics/migrations/can-activate-with-redirect-to/util.js +13 -10
- package/schematics/migrations/deep-shadow-piercing-selector/index.js +3 -3
- package/schematics/migrations/dynamic-queries/index.js +13 -10
- package/schematics/migrations/dynamic-queries/util.d.ts +1 -1
- package/schematics/migrations/dynamic-queries/util.js +12 -9
- package/schematics/migrations/initial-navigation/collector.d.ts +1 -1
- package/schematics/migrations/initial-navigation/collector.js +23 -20
- package/schematics/migrations/initial-navigation/index.js +5 -5
- package/schematics/migrations/initial-navigation/transform.d.ts +1 -1
- package/schematics/migrations/initial-navigation/transform.js +11 -8
- package/schematics/migrations/initial-navigation/update_recorder.d.ts +1 -1
- package/schematics/migrations/initial-navigation/update_recorder.js +1 -1
- package/schematics/migrations/initial-navigation/util.d.ts +1 -1
- package/schematics/migrations/initial-navigation/util.js +10 -7
- package/schematics/migrations/missing-injectable/definition_collector.d.ts +1 -1
- package/schematics/migrations/missing-injectable/definition_collector.js +16 -13
- package/schematics/migrations/missing-injectable/index.js +26 -12
- package/schematics/migrations/missing-injectable/providers_evaluator.d.ts +9 -19
- package/schematics/migrations/missing-injectable/providers_evaluator.js +47 -40
- package/schematics/migrations/missing-injectable/transform.d.ts +3 -2
- package/schematics/migrations/missing-injectable/transform.js +18 -16
- package/schematics/migrations/missing-injectable/update_recorder.d.ts +1 -1
- package/schematics/migrations/missing-injectable/update_recorder.js +1 -1
- package/schematics/migrations/module-with-providers/collector.d.ts +1 -1
- package/schematics/migrations/module-with-providers/collector.js +12 -9
- package/schematics/migrations/module-with-providers/index.js +26 -12
- package/schematics/migrations/module-with-providers/transform.d.ts +4 -3
- package/schematics/migrations/module-with-providers/transform.js +23 -22
- package/schematics/migrations/module-with-providers/util.d.ts +1 -1
- package/schematics/migrations/module-with-providers/util.js +10 -7
- package/schematics/migrations/move-document/document_import_visitor.d.ts +1 -1
- package/schematics/migrations/move-document/document_import_visitor.js +7 -4
- package/schematics/migrations/move-document/index.js +8 -8
- package/schematics/migrations/move-document/move-import.d.ts +1 -1
- package/schematics/migrations/move-document/move-import.js +27 -24
- package/schematics/migrations/native-view-encapsulation/index.js +6 -6
- package/schematics/migrations/native-view-encapsulation/util.d.ts +1 -1
- package/schematics/migrations/native-view-encapsulation/util.js +8 -5
- package/schematics/migrations/navigation-extras-omissions/index.js +13 -10
- package/schematics/migrations/navigation-extras-omissions/util.d.ts +1 -1
- package/schematics/migrations/navigation-extras-omissions/util.js +17 -14
- package/schematics/migrations/relative-link-resolution/collector.d.ts +1 -1
- package/schematics/migrations/relative-link-resolution/collector.js +17 -14
- package/schematics/migrations/relative-link-resolution/index.js +5 -5
- package/schematics/migrations/relative-link-resolution/transform.d.ts +1 -1
- package/schematics/migrations/relative-link-resolution/transform.js +12 -9
- package/schematics/migrations/relative-link-resolution/update_recorder.d.ts +1 -1
- package/schematics/migrations/relative-link-resolution/update_recorder.js +1 -1
- package/schematics/migrations/relative-link-resolution/util.d.ts +1 -1
- package/schematics/migrations/relative-link-resolution/util.js +10 -7
- package/schematics/migrations/renderer-to-renderer2/helpers.d.ts +1 -1
- package/schematics/migrations/renderer-to-renderer2/helpers.js +92 -89
- package/schematics/migrations/renderer-to-renderer2/index.js +20 -17
- package/schematics/migrations/renderer-to-renderer2/migration.d.ts +1 -1
- package/schematics/migrations/renderer-to-renderer2/migration.js +33 -30
- package/schematics/migrations/renderer-to-renderer2/util.d.ts +1 -1
- package/schematics/migrations/renderer-to-renderer2/util.js +23 -20
- package/schematics/migrations/router-link-empty-expression/analyze_template.d.ts +2 -2
- package/schematics/migrations/router-link-empty-expression/analyze_template.js +6 -7
- package/schematics/migrations/router-link-empty-expression/angular/html_routerlink_empty_expr_visitor.d.ts +7 -6
- package/schematics/migrations/router-link-empty-expression/angular/html_routerlink_empty_expr_visitor.js +10 -11
- package/schematics/migrations/router-link-empty-expression/index.js +27 -16
- package/schematics/migrations/router-preserve-query-params/index.js +13 -10
- package/schematics/migrations/router-preserve-query-params/util.d.ts +1 -1
- package/schematics/migrations/router-preserve-query-params/util.js +19 -16
- package/schematics/migrations/static-queries/angular/directive_inputs.d.ts +1 -1
- package/schematics/migrations/static-queries/angular/directive_inputs.js +14 -11
- package/schematics/migrations/static-queries/angular/ng_query_visitor.d.ts +1 -1
- package/schematics/migrations/static-queries/angular/ng_query_visitor.js +17 -14
- package/schematics/migrations/static-queries/angular/query-definition.d.ts +1 -1
- package/schematics/migrations/static-queries/angular/query-definition.js +1 -1
- package/schematics/migrations/static-queries/angular/super_class.d.ts +1 -1
- package/schematics/migrations/static-queries/angular/super_class.js +1 -1
- package/schematics/migrations/static-queries/index.js +43 -18
- package/schematics/migrations/static-queries/strategies/template_strategy/template_strategy.d.ts +6 -3
- package/schematics/migrations/static-queries/strategies/template_strategy/template_strategy.js +44 -48
- package/schematics/migrations/static-queries/strategies/usage_strategy/declaration_usage_visitor.d.ts +1 -1
- package/schematics/migrations/static-queries/strategies/usage_strategy/declaration_usage_visitor.js +41 -38
- package/schematics/migrations/static-queries/strategies/usage_strategy/super_class_context.d.ts +1 -1
- package/schematics/migrations/static-queries/strategies/usage_strategy/super_class_context.js +10 -7
- package/schematics/migrations/static-queries/strategies/usage_strategy/template_usage_visitor.d.ts +10 -9
- package/schematics/migrations/static-queries/strategies/usage_strategy/template_usage_visitor.js +35 -36
- package/schematics/migrations/static-queries/strategies/usage_strategy/usage_strategy.d.ts +3 -2
- package/schematics/migrations/static-queries/strategies/usage_strategy/usage_strategy.js +14 -10
- package/schematics/migrations/static-queries/transform.d.ts +1 -1
- package/schematics/migrations/static-queries/transform.js +14 -11
- package/schematics/migrations/template-var-assignment/analyze_template.d.ts +2 -2
- package/schematics/migrations/template-var-assignment/analyze_template.js +6 -7
- package/schematics/migrations/template-var-assignment/angular/html_variable_assignment_visitor.d.ts +7 -6
- package/schematics/migrations/template-var-assignment/angular/html_variable_assignment_visitor.js +31 -30
- package/schematics/migrations/template-var-assignment/index.js +20 -9
- package/schematics/migrations/testbed-teardown/index.d.ts +11 -0
- package/schematics/migrations/testbed-teardown/index.js +92 -0
- package/schematics/migrations/testbed-teardown/util.d.ts +35 -0
- package/schematics/migrations/testbed-teardown/util.js +188 -0
- package/schematics/migrations/undecorated-classes-with-decorated-fields/index.js +26 -12
- package/schematics/migrations/undecorated-classes-with-decorated-fields/transform.d.ts +3 -2
- package/schematics/migrations/undecorated-classes-with-decorated-fields/transform.js +23 -21
- package/schematics/migrations/undecorated-classes-with-decorated-fields/update_recorder.d.ts +1 -1
- package/schematics/migrations/undecorated-classes-with-decorated-fields/update_recorder.js +1 -1
- package/schematics/migrations/undecorated-classes-with-di/create_ngc_program.d.ts +4 -4
- package/schematics/migrations/undecorated-classes-with-di/create_ngc_program.js +5 -6
- package/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/convert_directive_metadata.d.ts +3 -3
- package/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/convert_directive_metadata.js +18 -16
- package/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/decorator_rewriter.d.ts +3 -5
- package/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/decorator_rewriter.js +13 -11
- package/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/import_rewrite_visitor.d.ts +2 -2
- package/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/import_rewrite_visitor.js +18 -15
- package/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/path_format.js +2 -2
- package/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/source_file_exports.d.ts +1 -1
- package/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/source_file_exports.js +16 -13
- package/schematics/migrations/undecorated-classes-with-di/index.js +64 -22
- package/schematics/migrations/undecorated-classes-with-di/ng_declaration_collector.d.ts +4 -4
- package/schematics/migrations/undecorated-classes-with-di/ng_declaration_collector.js +28 -35
- package/schematics/migrations/undecorated-classes-with-di/transform.d.ts +5 -5
- package/schematics/migrations/undecorated-classes-with-di/transform.js +29 -26
- package/schematics/migrations/undecorated-classes-with-di/update_recorder.d.ts +1 -1
- package/schematics/migrations/undecorated-classes-with-di/update_recorder.js +1 -1
- package/schematics/migrations/wait-for-async/index.js +16 -13
- package/schematics/migrations/wait-for-async/util.d.ts +1 -1
- package/schematics/migrations/wait-for-async/util.js +9 -6
- package/schematics/migrations/xhr-factory/index.js +13 -10
- package/schematics/migrations.json +6 -1
- package/schematics/package.json +3 -0
- package/schematics/utils/import_manager.d.ts +1 -1
- package/schematics/utils/import_manager.js +24 -21
- package/schematics/utils/load_esm.d.ts +32 -0
- package/schematics/utils/load_esm.js +79 -0
- package/schematics/utils/ng_component_template.d.ts +1 -1
- package/schematics/utils/ng_component_template.js +21 -18
- package/schematics/utils/ng_decorators.d.ts +1 -1
- package/schematics/utils/ng_decorators.js +2 -2
- package/schematics/utils/parse_html.d.ts +2 -2
- package/schematics/utils/parse_html.js +4 -5
- package/schematics/utils/project_tsconfig_paths.js +3 -3
- package/schematics/utils/template_ast_visitor.d.ts +55 -0
- package/schematics/utils/template_ast_visitor.js +73 -0
- package/schematics/utils/typescript/class_declaration.d.ts +1 -1
- package/schematics/utils/typescript/class_declaration.js +10 -7
- package/schematics/utils/typescript/compiler_host.d.ts +1 -1
- package/schematics/utils/typescript/compiler_host.js +11 -8
- package/schematics/utils/typescript/decorators.d.ts +1 -1
- package/schematics/utils/typescript/decorators.js +8 -5
- package/schematics/utils/typescript/find_base_classes.d.ts +1 -1
- package/schematics/utils/typescript/find_base_classes.js +7 -4
- package/schematics/utils/typescript/functions.d.ts +1 -1
- package/schematics/utils/typescript/functions.js +9 -6
- package/schematics/utils/typescript/imports.d.ts +1 -1
- package/schematics/utils/typescript/imports.js +12 -9
- package/schematics/utils/typescript/nodes.d.ts +1 -1
- package/schematics/utils/typescript/nodes.js +11 -8
- package/schematics/utils/typescript/parse_tsconfig.d.ts +1 -1
- package/schematics/utils/typescript/parse_tsconfig.js +31 -9
- package/schematics/utils/typescript/property_name.d.ts +1 -1
- package/schematics/utils/typescript/property_name.js +7 -4
- package/schematics/utils/typescript/symbol.d.ts +1 -1
- package/schematics/utils/typescript/symbol.js +15 -12
- package/testing/package.json +5 -5
- package/testing/testing.d.ts +57 -339
- package/bundles/core-testing.umd.js +0 -3179
- package/bundles/core-testing.umd.js.map +0 -1
- package/bundles/core.umd.js +0 -34488
- package/bundles/core.umd.js.map +0 -1
- package/core.metadata.json +0 -1
- package/esm2015/core.externs.js +0 -6
- package/esm2015/core.js +0 -38
- package/esm2015/src/application_init.js +0 -142
- package/esm2015/src/application_module.js +0 -134
- package/esm2015/src/application_ref.js +0 -735
- package/esm2015/src/change_detection/change_detection.js +0 -31
- package/esm2015/src/change_detection/change_detection_util.js +0 -105
- package/esm2015/src/change_detection/change_detector_ref.js +0 -96
- package/esm2015/src/change_detection/differs/default_iterable_differ.js +0 -668
- package/esm2015/src/change_detection.js +0 -14
- package/esm2015/src/codegen_private_exports.js +0 -11
- package/esm2015/src/compiler/compiler.externs.js +0 -0
- package/esm2015/src/console.js +0 -23
- package/esm2015/src/core.js +0 -50
- package/esm2015/src/core_private_export.js +0 -35
- package/esm2015/src/core_render3_private_export.js +0 -45
- package/esm2015/src/debug/debug_node.js +0 -632
- package/esm2015/src/di/injectable.js +0 -36
- package/esm2015/src/di/injection_token.js +0 -75
- package/esm2015/src/di/injector.js +0 -326
- package/esm2015/src/di/injector_compatibility.js +0 -187
- package/esm2015/src/di/interface/interface.externs.js +0 -0
- package/esm2015/src/di/jit/injectable.js +0 -96
- package/esm2015/src/di/metadata.js +0 -62
- package/esm2015/src/di/metadata_attr.js +0 -24
- package/esm2015/src/di/util.js +0 -53
- package/esm2015/src/event_emitter.js +0 -54
- package/esm2015/src/i18n/locale_data_api.js +0 -131
- package/esm2015/src/i18n/locale_en.js +0 -17
- package/esm2015/src/interface/interface.externs.js +0 -0
- package/esm2015/src/linker/compiler.js +0 -118
- package/esm2015/src/linker/element_ref.js +0 -66
- package/esm2015/src/linker/ng_module_factory.js +0 -21
- package/esm2015/src/linker/ng_module_factory_loader.js +0 -41
- package/esm2015/src/linker/system_js_ng_module_factory_loader.js +0 -77
- package/esm2015/src/linker/view_container_ref.js +0 -252
- package/esm2015/src/linker.js +0 -20
- package/esm2015/src/metadata/di.js +0 -99
- package/esm2015/src/metadata/directives.js +0 -120
- package/esm2015/src/metadata/ng_module.js +0 -44
- package/esm2015/src/reflection/reflection.externs.js +0 -0
- package/esm2015/src/render3/component.js +0 -206
- package/esm2015/src/render3/features/ng_onchanges_feature.js +0 -92
- package/esm2015/src/render3/instructions/shared.js +0 -1813
- package/esm2015/src/render3/interfaces/renderer.js +0 -29
- package/esm2015/src/render3/jit/directive.js +0 -312
- package/esm2015/src/render3/jit/environment.js +0 -167
- package/esm2015/src/render3/jit/partial.js +0 -105
- package/esm2015/src/render3/metadata.js +0 -49
- package/esm2015/src/render3/ng_module_ref.js +0 -108
- package/esm2015/src/render3/pipe.js +0 -202
- package/esm2015/src/render3/util/discovery_utils.js +0 -411
- package/esm2015/src/render3/util/global_utils.js +0 -78
- package/esm2015/src/render3/util/misc_utils.js +0 -63
- package/esm2015/src/testability/testability.js +0 -256
- package/esm2015/src/util/security/trusted_types.js +0 -133
- package/esm2015/src/util/security/trusted_types_bypass.js +0 -86
- package/esm2015/src/util/util.externs.js +0 -0
- package/esm2015/src/view/provider.js +0 -507
- package/esm2015/src/view/refs.js +0 -362
- package/esm2015/src/view/util.js +0 -378
- package/esm2015/testing/src/logger.js +0 -32
- package/esm2015/testing/src/ng_zone_mock.js +0 -31
- package/esm2015/testing/src/r3_test_bed.js +0 -397
- package/esm2015/testing/src/r3_test_bed_compiler.js +0 -744
- package/esm2015/testing/src/test_bed.js +0 -608
- package/esm2015/testing/src/test_bed_common.js +0 -31
- package/esm2015/testing/src/test_compiler.js +0 -66
- package/esm2015/testing/testing.externs.js +0 -6
- package/esm2015/testing/testing.js +0 -7
- package/fesm2015/core.js.map +0 -1
- package/fesm2015/testing.js.map +0 -1
- package/src/r3_symbols.d.ts +0 -1025
- package/testing/testing.metadata.json +0 -1
- package/testing.d.ts +0 -7
- package/testing.metadata.json +0 -1
|
@@ -14,6 +14,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
14
14
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
15
15
|
});
|
|
16
16
|
};
|
|
17
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
18
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
19
|
+
};
|
|
17
20
|
(function (factory) {
|
|
18
21
|
if (typeof module === "object" && typeof module.exports === "object") {
|
|
19
22
|
var v = factory(require, exports);
|
|
@@ -27,7 +30,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
27
30
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
28
31
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
29
32
|
const path_1 = require("path");
|
|
30
|
-
const
|
|
33
|
+
const typescript_1 = __importDefault(require("typescript"));
|
|
31
34
|
const project_tsconfig_paths_1 = require("@angular/core/schematics/utils/project_tsconfig_paths");
|
|
32
35
|
const compiler_host_1 = require("@angular/core/schematics/utils/typescript/compiler_host");
|
|
33
36
|
const imports_1 = require("@angular/core/schematics/utils/typescript/imports");
|
|
@@ -42,7 +45,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
42
45
|
*/
|
|
43
46
|
function default_1() {
|
|
44
47
|
return (tree) => __awaiter(this, void 0, void 0, function* () {
|
|
45
|
-
const { buildPaths, testPaths } = yield project_tsconfig_paths_1.getProjectTsConfigPaths(tree);
|
|
48
|
+
const { buildPaths, testPaths } = yield (0, project_tsconfig_paths_1.getProjectTsConfigPaths)(tree);
|
|
46
49
|
const basePath = process.cwd();
|
|
47
50
|
const allPaths = [...buildPaths, ...testPaths];
|
|
48
51
|
if (!allPaths.length) {
|
|
@@ -58,12 +61,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
58
61
|
// Technically we can get away with using `MODULE_AUGMENTATION_FILENAME` as the path, but as of
|
|
59
62
|
// TS 4.2, the module resolution caching seems to be more aggressive which causes the file to be
|
|
60
63
|
// retained between test runs. We can avoid it by using the full path.
|
|
61
|
-
const augmentedFilePath = path_1.join(basePath, MODULE_AUGMENTATION_FILENAME);
|
|
62
|
-
const { program } = compiler_host_1.createMigrationProgram(tree, tsconfigPath, basePath, fileName => {
|
|
64
|
+
const augmentedFilePath = (0, path_1.join)(basePath, MODULE_AUGMENTATION_FILENAME);
|
|
65
|
+
const { program } = (0, compiler_host_1.createMigrationProgram)(tree, tsconfigPath, basePath, fileName => {
|
|
63
66
|
// In case the module augmentation file has been requested, we return a source file that
|
|
64
67
|
// augments "@angular/core" to include a named export called "Renderer". This ensures that
|
|
65
68
|
// we can rely on the type checker for this migration in v9 where "Renderer" has been removed.
|
|
66
|
-
if (path_1.basename(fileName) === MODULE_AUGMENTATION_FILENAME) {
|
|
69
|
+
if ((0, path_1.basename)(fileName) === MODULE_AUGMENTATION_FILENAME) {
|
|
67
70
|
return `
|
|
68
71
|
import '@angular/core';
|
|
69
72
|
declare module "@angular/core" {
|
|
@@ -74,23 +77,23 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
74
77
|
return undefined;
|
|
75
78
|
}, [augmentedFilePath]);
|
|
76
79
|
const typeChecker = program.getTypeChecker();
|
|
77
|
-
const printer =
|
|
78
|
-
const sourceFiles = program.getSourceFiles().filter(sourceFile => compiler_host_1.canMigrateFile(basePath, sourceFile, program));
|
|
80
|
+
const printer = typescript_1.default.createPrinter();
|
|
81
|
+
const sourceFiles = program.getSourceFiles().filter(sourceFile => (0, compiler_host_1.canMigrateFile)(basePath, sourceFile, program));
|
|
79
82
|
sourceFiles.forEach(sourceFile => {
|
|
80
|
-
const rendererImportSpecifier = imports_1.getImportSpecifier(sourceFile, '@angular/core', 'Renderer');
|
|
83
|
+
const rendererImportSpecifier = (0, imports_1.getImportSpecifier)(sourceFile, '@angular/core', 'Renderer');
|
|
81
84
|
const rendererImport = rendererImportSpecifier ?
|
|
82
|
-
nodes_1.closestNode(rendererImportSpecifier,
|
|
85
|
+
(0, nodes_1.closestNode)(rendererImportSpecifier, typescript_1.default.SyntaxKind.NamedImports) :
|
|
83
86
|
null;
|
|
84
87
|
// If there are no imports for the `Renderer`, we can exit early.
|
|
85
88
|
if (!rendererImportSpecifier || !rendererImport) {
|
|
86
89
|
return;
|
|
87
90
|
}
|
|
88
|
-
const { typedNodes, methodCalls, forwardRefs } = util_1.findRendererReferences(sourceFile, typeChecker, rendererImportSpecifier);
|
|
89
|
-
const update = tree.beginUpdate(path_1.relative(basePath, sourceFile.fileName));
|
|
91
|
+
const { typedNodes, methodCalls, forwardRefs } = (0, util_1.findRendererReferences)(sourceFile, typeChecker, rendererImportSpecifier);
|
|
92
|
+
const update = tree.beginUpdate((0, path_1.relative)(basePath, sourceFile.fileName));
|
|
90
93
|
const helpersToAdd = new Set();
|
|
91
94
|
// Change the `Renderer` import to `Renderer2`.
|
|
92
95
|
update.remove(rendererImport.getStart(), rendererImport.getWidth());
|
|
93
|
-
update.insertRight(rendererImport.getStart(), printer.printNode(
|
|
96
|
+
update.insertRight(rendererImport.getStart(), printer.printNode(typescript_1.default.EmitHint.Unspecified, (0, imports_1.replaceImport)(rendererImport, 'Renderer', 'Renderer2'), sourceFile));
|
|
94
97
|
// Change the method parameter and property types to `Renderer2`.
|
|
95
98
|
typedNodes.forEach(node => {
|
|
96
99
|
const type = node.type;
|
|
@@ -106,13 +109,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
106
109
|
});
|
|
107
110
|
// Migrate all of the method calls.
|
|
108
111
|
methodCalls.forEach(call => {
|
|
109
|
-
const { node, requiredHelpers } = migration_1.migrateExpression(call, typeChecker);
|
|
112
|
+
const { node, requiredHelpers } = (0, migration_1.migrateExpression)(call, typeChecker);
|
|
110
113
|
if (node) {
|
|
111
114
|
// If we migrated the node to a new expression, replace only the call expression.
|
|
112
115
|
update.remove(call.getStart(), call.getWidth());
|
|
113
|
-
update.insertRight(call.getStart(), printer.printNode(
|
|
116
|
+
update.insertRight(call.getStart(), printer.printNode(typescript_1.default.EmitHint.Unspecified, node, sourceFile));
|
|
114
117
|
}
|
|
115
|
-
else if (call.parent &&
|
|
118
|
+
else if (call.parent && typescript_1.default.isExpressionStatement(call.parent)) {
|
|
116
119
|
// Otherwise if the call is inside an expression statement, drop the entire statement.
|
|
117
120
|
// This takes care of any trailing semicolons. We only need to drop nodes for cases like
|
|
118
121
|
// `setBindingDebugInfo` which have been noop for a while so they can be removed safely.
|
|
@@ -126,10 +129,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
126
129
|
// The safest way to do so is to declare helper functions similar to the ones emitted by TS
|
|
127
130
|
// which encapsulate the extra "glue" logic. We should only emit these functions once per file.
|
|
128
131
|
helpersToAdd.forEach(helperName => {
|
|
129
|
-
update.insertLeft(sourceFile.endOfFileToken.getStart(), helpers_1.getHelper(helperName, sourceFile, printer));
|
|
132
|
+
update.insertLeft(sourceFile.endOfFileToken.getStart(), (0, helpers_1.getHelper)(helperName, sourceFile, printer));
|
|
130
133
|
});
|
|
131
134
|
tree.commitUpdate(update);
|
|
132
135
|
});
|
|
133
136
|
}
|
|
134
137
|
});
|
|
135
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/core/schematics/migrations/renderer-to-renderer2/index.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @license\n * Copyright Google LLC All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\n\nimport {Rule, SchematicsException, Tree} from '@angular-devkit/schematics';\nimport {basename, join, relative} from 'path';\nimport * as ts from 'typescript';\n\nimport {getProjectTsConfigPaths} from '../../utils/project_tsconfig_paths';\nimport {canMigrateFile, createMigrationProgram} from '../../utils/typescript/compiler_host';\nimport {getImportSpecifier, replaceImport} from '../../utils/typescript/imports';\nimport {closestNode} from '../../utils/typescript/nodes';\n\nimport {getHelper, HelperFunction} from './helpers';\nimport {migrateExpression} from './migration';\nimport {findRendererReferences} from './util';\n\nconst MODULE_AUGMENTATION_FILENAME = 'ɵɵRENDERER_MIGRATION_CORE_AUGMENTATION.d.ts';\n\n/**\n * Migration that switches from `Renderer` to `Renderer2`. More information on how it works:\n * https://hackmd.angular.io/UTzUZTnPRA-cSa_4mHyfYw\n */\nexport default function(): Rule {\n  return async (tree: Tree) => {\n    const {buildPaths, testPaths} = await getProjectTsConfigPaths(tree);\n    const basePath = process.cwd();\n    const allPaths = [...buildPaths, ...testPaths];\n\n    if (!allPaths.length) {\n      throw new SchematicsException(\n          'Could not find any tsconfig file. Cannot migrate Renderer usages to Renderer2.');\n    }\n\n    for (const tsconfigPath of allPaths) {\n      runRendererToRenderer2Migration(tree, tsconfigPath, basePath);\n    }\n  };\n}\n\nfunction runRendererToRenderer2Migration(tree: Tree, tsconfigPath: string, basePath: string) {\n  // Technically we can get away with using `MODULE_AUGMENTATION_FILENAME` as the path, but as of\n  // TS 4.2, the module resolution caching seems to be more aggressive which causes the file to be\n  // retained between test runs. We can avoid it by using the full path.\n  const augmentedFilePath = join(basePath, MODULE_AUGMENTATION_FILENAME);\n  const {program} = createMigrationProgram(tree, tsconfigPath, basePath, fileName => {\n    // In case the module augmentation file has been requested, we return a source file that\n    // augments \"@angular/core\" to include a named export called \"Renderer\". This ensures that\n    // we can rely on the type checker for this migration in v9 where \"Renderer\" has been removed.\n    if (basename(fileName) === MODULE_AUGMENTATION_FILENAME) {\n      return `\n        import '@angular/core';\n        declare module \"@angular/core\" {\n          class Renderer {}\n        }\n      `;\n    }\n    return undefined;\n  }, [augmentedFilePath]);\n  const typeChecker = program.getTypeChecker();\n  const printer = ts.createPrinter();\n  const sourceFiles =\n      program.getSourceFiles().filter(sourceFile => canMigrateFile(basePath, sourceFile, program));\n\n  sourceFiles.forEach(sourceFile => {\n    const rendererImportSpecifier = getImportSpecifier(sourceFile, '@angular/core', 'Renderer');\n    const rendererImport = rendererImportSpecifier ?\n        closestNode<ts.NamedImports>(rendererImportSpecifier, ts.SyntaxKind.NamedImports) :\n        null;\n\n    // If there are no imports for the `Renderer`, we can exit early.\n    if (!rendererImportSpecifier || !rendererImport) {\n      return;\n    }\n\n    const {typedNodes, methodCalls, forwardRefs} =\n        findRendererReferences(sourceFile, typeChecker, rendererImportSpecifier);\n    const update = tree.beginUpdate(relative(basePath, sourceFile.fileName));\n    const helpersToAdd = new Set<HelperFunction>();\n\n    // Change the `Renderer` import to `Renderer2`.\n    update.remove(rendererImport.getStart(), rendererImport.getWidth());\n    update.insertRight(\n        rendererImport.getStart(),\n        printer.printNode(\n            ts.EmitHint.Unspecified, replaceImport(rendererImport, 'Renderer', 'Renderer2'),\n            sourceFile));\n\n    // Change the method parameter and property types to `Renderer2`.\n    typedNodes.forEach(node => {\n      const type = node.type;\n\n      if (type) {\n        update.remove(type.getStart(), type.getWidth());\n        update.insertRight(type.getStart(), 'Renderer2');\n      }\n    });\n\n    // Change all identifiers inside `forwardRef` referring to the `Renderer`.\n    forwardRefs.forEach(identifier => {\n      update.remove(identifier.getStart(), identifier.getWidth());\n      update.insertRight(identifier.getStart(), 'Renderer2');\n    });\n\n    // Migrate all of the method calls.\n    methodCalls.forEach(call => {\n      const {node, requiredHelpers} = migrateExpression(call, typeChecker);\n\n      if (node) {\n        // If we migrated the node to a new expression, replace only the call expression.\n        update.remove(call.getStart(), call.getWidth());\n        update.insertRight(\n            call.getStart(), printer.printNode(ts.EmitHint.Unspecified, node, sourceFile));\n      } else if (call.parent && ts.isExpressionStatement(call.parent)) {\n        // Otherwise if the call is inside an expression statement, drop the entire statement.\n        // This takes care of any trailing semicolons. We only need to drop nodes for cases like\n        // `setBindingDebugInfo` which have been noop for a while so they can be removed safely.\n        update.remove(call.parent.getStart(), call.parent.getWidth());\n      }\n\n      if (requiredHelpers) {\n        requiredHelpers.forEach(helperName => helpersToAdd.add(helperName));\n      }\n    });\n\n    // Some of the methods can't be mapped directly to `Renderer2` and need extra logic around them.\n    // The safest way to do so is to declare helper functions similar to the ones emitted by TS\n    // which encapsulate the extra \"glue\" logic. We should only emit these functions once per file.\n    helpersToAdd.forEach(helperName => {\n      update.insertLeft(\n          sourceFile.endOfFileToken.getStart(), getHelper(helperName, sourceFile, printer));\n    });\n\n    tree.commitUpdate(update);\n  });\n}\n"]}
|
|
138
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/core/schematics/migrations/renderer-to-renderer2/index.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @license\n * Copyright Google LLC All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\n\nimport {Rule, SchematicsException, Tree} from '@angular-devkit/schematics';\nimport {basename, join, relative} from 'path';\nimport ts from 'typescript';\n\nimport {getProjectTsConfigPaths} from '../../utils/project_tsconfig_paths';\nimport {canMigrateFile, createMigrationProgram} from '../../utils/typescript/compiler_host';\nimport {getImportSpecifier, replaceImport} from '../../utils/typescript/imports';\nimport {closestNode} from '../../utils/typescript/nodes';\n\nimport {getHelper, HelperFunction} from './helpers';\nimport {migrateExpression} from './migration';\nimport {findRendererReferences} from './util';\n\nconst MODULE_AUGMENTATION_FILENAME = 'ɵɵRENDERER_MIGRATION_CORE_AUGMENTATION.d.ts';\n\n/**\n * Migration that switches from `Renderer` to `Renderer2`. More information on how it works:\n * https://hackmd.angular.io/UTzUZTnPRA-cSa_4mHyfYw\n */\nexport default function(): Rule {\n  return async (tree: Tree) => {\n    const {buildPaths, testPaths} = await getProjectTsConfigPaths(tree);\n    const basePath = process.cwd();\n    const allPaths = [...buildPaths, ...testPaths];\n\n    if (!allPaths.length) {\n      throw new SchematicsException(\n          'Could not find any tsconfig file. Cannot migrate Renderer usages to Renderer2.');\n    }\n\n    for (const tsconfigPath of allPaths) {\n      runRendererToRenderer2Migration(tree, tsconfigPath, basePath);\n    }\n  };\n}\n\nfunction runRendererToRenderer2Migration(tree: Tree, tsconfigPath: string, basePath: string) {\n  // Technically we can get away with using `MODULE_AUGMENTATION_FILENAME` as the path, but as of\n  // TS 4.2, the module resolution caching seems to be more aggressive which causes the file to be\n  // retained between test runs. We can avoid it by using the full path.\n  const augmentedFilePath = join(basePath, MODULE_AUGMENTATION_FILENAME);\n  const {program} = createMigrationProgram(tree, tsconfigPath, basePath, fileName => {\n    // In case the module augmentation file has been requested, we return a source file that\n    // augments \"@angular/core\" to include a named export called \"Renderer\". This ensures that\n    // we can rely on the type checker for this migration in v9 where \"Renderer\" has been removed.\n    if (basename(fileName) === MODULE_AUGMENTATION_FILENAME) {\n      return `\n        import '@angular/core';\n        declare module \"@angular/core\" {\n          class Renderer {}\n        }\n      `;\n    }\n    return undefined;\n  }, [augmentedFilePath]);\n  const typeChecker = program.getTypeChecker();\n  const printer = ts.createPrinter();\n  const sourceFiles =\n      program.getSourceFiles().filter(sourceFile => canMigrateFile(basePath, sourceFile, program));\n\n  sourceFiles.forEach(sourceFile => {\n    const rendererImportSpecifier = getImportSpecifier(sourceFile, '@angular/core', 'Renderer');\n    const rendererImport = rendererImportSpecifier ?\n        closestNode<ts.NamedImports>(rendererImportSpecifier, ts.SyntaxKind.NamedImports) :\n        null;\n\n    // If there are no imports for the `Renderer`, we can exit early.\n    if (!rendererImportSpecifier || !rendererImport) {\n      return;\n    }\n\n    const {typedNodes, methodCalls, forwardRefs} =\n        findRendererReferences(sourceFile, typeChecker, rendererImportSpecifier);\n    const update = tree.beginUpdate(relative(basePath, sourceFile.fileName));\n    const helpersToAdd = new Set<HelperFunction>();\n\n    // Change the `Renderer` import to `Renderer2`.\n    update.remove(rendererImport.getStart(), rendererImport.getWidth());\n    update.insertRight(\n        rendererImport.getStart(),\n        printer.printNode(\n            ts.EmitHint.Unspecified, replaceImport(rendererImport, 'Renderer', 'Renderer2'),\n            sourceFile));\n\n    // Change the method parameter and property types to `Renderer2`.\n    typedNodes.forEach(node => {\n      const type = node.type;\n\n      if (type) {\n        update.remove(type.getStart(), type.getWidth());\n        update.insertRight(type.getStart(), 'Renderer2');\n      }\n    });\n\n    // Change all identifiers inside `forwardRef` referring to the `Renderer`.\n    forwardRefs.forEach(identifier => {\n      update.remove(identifier.getStart(), identifier.getWidth());\n      update.insertRight(identifier.getStart(), 'Renderer2');\n    });\n\n    // Migrate all of the method calls.\n    methodCalls.forEach(call => {\n      const {node, requiredHelpers} = migrateExpression(call, typeChecker);\n\n      if (node) {\n        // If we migrated the node to a new expression, replace only the call expression.\n        update.remove(call.getStart(), call.getWidth());\n        update.insertRight(\n            call.getStart(), printer.printNode(ts.EmitHint.Unspecified, node, sourceFile));\n      } else if (call.parent && ts.isExpressionStatement(call.parent)) {\n        // Otherwise if the call is inside an expression statement, drop the entire statement.\n        // This takes care of any trailing semicolons. We only need to drop nodes for cases like\n        // `setBindingDebugInfo` which have been noop for a while so they can be removed safely.\n        update.remove(call.parent.getStart(), call.parent.getWidth());\n      }\n\n      if (requiredHelpers) {\n        requiredHelpers.forEach(helperName => helpersToAdd.add(helperName));\n      }\n    });\n\n    // Some of the methods can't be mapped directly to `Renderer2` and need extra logic around them.\n    // The safest way to do so is to declare helper functions similar to the ones emitted by TS\n    // which encapsulate the extra \"glue\" logic. We should only emit these functions once per file.\n    helpersToAdd.forEach(helperName => {\n      update.insertLeft(\n          sourceFile.endOfFileToken.getStart(), getHelper(helperName, sourceFile, printer));\n    });\n\n    tree.commitUpdate(update);\n  });\n}\n"]}
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
* found in the LICENSE file at https://angular.io/license
|
|
7
7
|
*/
|
|
8
8
|
/// <amd-module name="@angular/core/schematics/migrations/renderer-to-renderer2/migration" />
|
|
9
|
-
import
|
|
9
|
+
import ts from 'typescript';
|
|
10
10
|
import { HelperFunction } from './helpers';
|
|
11
11
|
/**
|
|
12
12
|
* Migrates a function call expression from `Renderer` to `Renderer2`.
|
|
@@ -5,6 +5,9 @@
|
|
|
5
5
|
* Use of this source code is governed by an MIT-style license that can be
|
|
6
6
|
* found in the LICENSE file at https://angular.io/license
|
|
7
7
|
*/
|
|
8
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
9
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
10
|
+
};
|
|
8
11
|
(function (factory) {
|
|
9
12
|
if (typeof module === "object" && typeof module.exports === "object") {
|
|
10
13
|
var v = factory(require, exports);
|
|
@@ -17,7 +20,7 @@
|
|
|
17
20
|
"use strict";
|
|
18
21
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
19
22
|
exports.migrateExpression = void 0;
|
|
20
|
-
const
|
|
23
|
+
const typescript_1 = __importDefault(require("typescript"));
|
|
21
24
|
/**
|
|
22
25
|
* Migrates a function call expression from `Renderer` to `Renderer2`.
|
|
23
26
|
* Returns null if the expression should be dropped.
|
|
@@ -97,12 +100,12 @@
|
|
|
97
100
|
exports.migrateExpression = migrateExpression;
|
|
98
101
|
/** Checks whether a node is a PropertyAccessExpression. */
|
|
99
102
|
function isPropertyAccessCallExpression(node) {
|
|
100
|
-
return
|
|
103
|
+
return typescript_1.default.isCallExpression(node) && typescript_1.default.isPropertyAccessExpression(node.expression);
|
|
101
104
|
}
|
|
102
105
|
/** Renames a method call while keeping all of the parameters in place. */
|
|
103
106
|
function renameMethodCall(node, newName) {
|
|
104
|
-
const newExpression =
|
|
105
|
-
return
|
|
107
|
+
const newExpression = typescript_1.default.updatePropertyAccess(node.expression, node.expression.expression, typescript_1.default.createIdentifier(newName));
|
|
108
|
+
return typescript_1.default.updateCall(node, newExpression, node.typeArguments, node.arguments);
|
|
106
109
|
}
|
|
107
110
|
/**
|
|
108
111
|
* Migrates a `selectRootElement` call by removing the last argument which is no longer supported.
|
|
@@ -111,7 +114,7 @@
|
|
|
111
114
|
// The only thing we need to do is to drop the last argument
|
|
112
115
|
// (`debugInfo`), if the consumer was passing it in.
|
|
113
116
|
if (node.arguments.length > 1) {
|
|
114
|
-
return
|
|
117
|
+
return typescript_1.default.updateCall(node, node.expression, node.typeArguments, [node.arguments[0]]);
|
|
115
118
|
}
|
|
116
119
|
return node;
|
|
117
120
|
}
|
|
@@ -126,18 +129,18 @@
|
|
|
126
129
|
const isAddArgument = outputMethodArgs.pop();
|
|
127
130
|
const createRendererCall = (isAdd) => {
|
|
128
131
|
const innerExpression = node.expression.expression;
|
|
129
|
-
const topExpression =
|
|
130
|
-
return
|
|
132
|
+
const topExpression = typescript_1.default.createPropertyAccess(innerExpression, isAdd ? 'addClass' : 'removeClass');
|
|
133
|
+
return typescript_1.default.createCall(topExpression, [], node.arguments.slice(0, 2));
|
|
131
134
|
};
|
|
132
135
|
// If the call has the `isAdd` argument as a literal boolean, we can map it directly to
|
|
133
136
|
// `addClass` or `removeClass`. Note that we can't use the type checker here, because it
|
|
134
137
|
// won't tell us whether the value resolves to true or false.
|
|
135
|
-
if (isAddArgument.kind ===
|
|
136
|
-
isAddArgument.kind ===
|
|
137
|
-
return createRendererCall(isAddArgument.kind ===
|
|
138
|
+
if (isAddArgument.kind === typescript_1.default.SyntaxKind.TrueKeyword ||
|
|
139
|
+
isAddArgument.kind === typescript_1.default.SyntaxKind.FalseKeyword) {
|
|
140
|
+
return createRendererCall(isAddArgument.kind === typescript_1.default.SyntaxKind.TrueKeyword);
|
|
138
141
|
}
|
|
139
142
|
// Otherwise create a ternary on the variable.
|
|
140
|
-
return
|
|
143
|
+
return typescript_1.default.createConditional(isAddArgument, createRendererCall(true), createRendererCall(false));
|
|
141
144
|
}
|
|
142
145
|
/**
|
|
143
146
|
* Migrates a call to `setElementStyle` call either to a call to
|
|
@@ -149,7 +152,7 @@
|
|
|
149
152
|
const addMethodName = 'setStyle';
|
|
150
153
|
const removeMethodName = 'removeStyle';
|
|
151
154
|
const lastArgType = args[2] ?
|
|
152
|
-
typeChecker.typeToString(typeChecker.getTypeAtLocation(args[2]), node,
|
|
155
|
+
typeChecker.typeToString(typeChecker.getTypeAtLocation(args[2]), node, typescript_1.default.TypeFormatFlags.AddUndefined) :
|
|
153
156
|
null;
|
|
154
157
|
// Note that for a literal null, TS considers it a `NullKeyword`,
|
|
155
158
|
// whereas a literal `undefined` is just an Identifier.
|
|
@@ -157,14 +160,14 @@
|
|
|
157
160
|
// If we've got a call with two arguments, or one with three arguments where the last one is
|
|
158
161
|
// `undefined` or `null`, we can safely switch to a `removeStyle` call.
|
|
159
162
|
const innerExpression = node.expression.expression;
|
|
160
|
-
const topExpression =
|
|
161
|
-
return
|
|
163
|
+
const topExpression = typescript_1.default.createPropertyAccess(innerExpression, removeMethodName);
|
|
164
|
+
return typescript_1.default.createCall(topExpression, [], args.slice(0, 2));
|
|
162
165
|
}
|
|
163
166
|
else if (args.length === 3) {
|
|
164
167
|
// We need the checks for string literals, because the type of something
|
|
165
168
|
// like `"blue"` is the literal `blue`, not `string`.
|
|
166
|
-
if (lastArgType === 'string' || lastArgType === 'number' ||
|
|
167
|
-
|
|
169
|
+
if (lastArgType === 'string' || lastArgType === 'number' || typescript_1.default.isStringLiteral(args[2]) ||
|
|
170
|
+
typescript_1.default.isNoSubstitutionTemplateLiteral(args[2]) || typescript_1.default.isNumericLiteral(args[2])) {
|
|
168
171
|
// If we've got three arguments and the last one is a string literal or a number, we
|
|
169
172
|
// can safely rename to `setStyle`.
|
|
170
173
|
return renameMethodCall(node, addMethodName);
|
|
@@ -172,9 +175,9 @@
|
|
|
172
175
|
else {
|
|
173
176
|
// Otherwise migrate to a ternary that looks like:
|
|
174
177
|
// `value == null ? removeStyle(el, key) : setStyle(el, key, value)`
|
|
175
|
-
const condition =
|
|
176
|
-
const whenNullCall = renameMethodCall(
|
|
177
|
-
return
|
|
178
|
+
const condition = typescript_1.default.createBinary(args[2], typescript_1.default.SyntaxKind.EqualsEqualsToken, typescript_1.default.createNull());
|
|
179
|
+
const whenNullCall = renameMethodCall(typescript_1.default.createCall(node.expression, [], args.slice(0, 2)), removeMethodName);
|
|
180
|
+
return typescript_1.default.createConditional(condition, whenNullCall, renameMethodCall(node, addMethodName));
|
|
178
181
|
}
|
|
179
182
|
}
|
|
180
183
|
return node;
|
|
@@ -185,21 +188,21 @@
|
|
|
185
188
|
*/
|
|
186
189
|
function migrateInvokeElementMethod(node) {
|
|
187
190
|
const [target, name, args] = node.arguments;
|
|
188
|
-
const isNameStatic =
|
|
189
|
-
const isArgsStatic = !args ||
|
|
191
|
+
const isNameStatic = typescript_1.default.isStringLiteral(name) || typescript_1.default.isNoSubstitutionTemplateLiteral(name);
|
|
192
|
+
const isArgsStatic = !args || typescript_1.default.isArrayLiteralExpression(args);
|
|
190
193
|
if (isNameStatic && isArgsStatic) {
|
|
191
194
|
// If the name is a static string and the arguments are an array literal,
|
|
192
195
|
// we can safely convert the node into a call expression.
|
|
193
|
-
const expression =
|
|
196
|
+
const expression = typescript_1.default.createPropertyAccess(target, name.text);
|
|
194
197
|
const callArguments = args ? args.elements : [];
|
|
195
|
-
return
|
|
198
|
+
return typescript_1.default.createCall(expression, [], callArguments);
|
|
196
199
|
}
|
|
197
200
|
else {
|
|
198
201
|
// Otherwise create an expression in the form of `(target as any)[name].apply(target, args)`.
|
|
199
|
-
const asExpression =
|
|
200
|
-
const elementAccess =
|
|
201
|
-
const applyExpression =
|
|
202
|
-
return
|
|
202
|
+
const asExpression = typescript_1.default.createParen(typescript_1.default.createAsExpression(target, typescript_1.default.createKeywordTypeNode(typescript_1.default.SyntaxKind.AnyKeyword)));
|
|
203
|
+
const elementAccess = typescript_1.default.createElementAccess(asExpression, name);
|
|
204
|
+
const applyExpression = typescript_1.default.createPropertyAccess(elementAccess, 'apply');
|
|
205
|
+
return typescript_1.default.createCall(applyExpression, [], args ? [target, args] : [target]);
|
|
203
206
|
}
|
|
204
207
|
}
|
|
205
208
|
/** Migrates a call to `createViewRoot` to whatever node was passed in as the first argument. */
|
|
@@ -208,7 +211,7 @@
|
|
|
208
211
|
}
|
|
209
212
|
/** Migrates a call to `migrate` a direct call to the helper. */
|
|
210
213
|
function migrateAnimateCall() {
|
|
211
|
-
return
|
|
214
|
+
return typescript_1.default.createCall(typescript_1.default.createIdentifier("__ngRendererAnimateHelper" /* animate */), [], []);
|
|
212
215
|
}
|
|
213
216
|
/**
|
|
214
217
|
* Switches out a call to the `Renderer` to a call to one of our helper functions.
|
|
@@ -219,7 +222,7 @@
|
|
|
219
222
|
* @param args Arguments that should be passed into the helper after the renderer argument.
|
|
220
223
|
*/
|
|
221
224
|
function switchToHelperCall(node, helper, args) {
|
|
222
|
-
return
|
|
225
|
+
return typescript_1.default.createCall(typescript_1.default.createIdentifier(helper), [], [node.expression.expression, ...args]);
|
|
223
226
|
}
|
|
224
227
|
});
|
|
225
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"migration.js","sourceRoot":"","sources":["../../../../../../../../packages/core/schematics/migrations/renderer-to-renderer2/migration.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @license\n * Copyright Google LLC All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\n\nimport * as ts from 'typescript';\n\nimport {HelperFunction} from './helpers';\n\n/** A call expression that is based on a property access. */\ntype PropertyAccessCallExpression = ts.CallExpression&{expression: ts.PropertyAccessExpression};\n\n/**\n * Migrates a function call expression from `Renderer` to `Renderer2`.\n * Returns null if the expression should be dropped.\n */\nexport function migrateExpression(node: ts.CallExpression, typeChecker: ts.TypeChecker):\n    {node: ts.Node|null, requiredHelpers?: HelperFunction[]} {\n  if (isPropertyAccessCallExpression(node)) {\n    switch (node.expression.name.getText()) {\n      case 'setElementProperty':\n        return {node: renameMethodCall(node, 'setProperty')};\n      case 'setText':\n        return {node: renameMethodCall(node, 'setValue')};\n      case 'listenGlobal':\n        return {node: renameMethodCall(node, 'listen')};\n      case 'selectRootElement':\n        return {node: migrateSelectRootElement(node)};\n      case 'setElementClass':\n        return {node: migrateSetElementClass(node)};\n      case 'setElementStyle':\n        return {node: migrateSetElementStyle(node, typeChecker)};\n      case 'invokeElementMethod':\n        return {node: migrateInvokeElementMethod(node)};\n      case 'setBindingDebugInfo':\n        return {node: null};\n      case 'createViewRoot':\n        return {node: migrateCreateViewRoot(node)};\n      case 'setElementAttribute':\n        return {\n          node: switchToHelperCall(node, HelperFunction.setElementAttribute, node.arguments),\n          requiredHelpers: [\n            HelperFunction.any, HelperFunction.splitNamespace, HelperFunction.setElementAttribute\n          ]\n        };\n      case 'createElement':\n        return {\n          node: switchToHelperCall(node, HelperFunction.createElement, node.arguments.slice(0, 2)),\n          requiredHelpers:\n              [HelperFunction.any, HelperFunction.splitNamespace, HelperFunction.createElement]\n        };\n      case 'createText':\n        return {\n          node: switchToHelperCall(node, HelperFunction.createText, node.arguments.slice(0, 2)),\n          requiredHelpers: [HelperFunction.any, HelperFunction.createText]\n        };\n      case 'createTemplateAnchor':\n        return {\n          node: switchToHelperCall(\n              node, HelperFunction.createTemplateAnchor, node.arguments.slice(0, 1)),\n          requiredHelpers: [HelperFunction.any, HelperFunction.createTemplateAnchor]\n        };\n      case 'projectNodes':\n        return {\n          node: switchToHelperCall(node, HelperFunction.projectNodes, node.arguments),\n          requiredHelpers: [HelperFunction.any, HelperFunction.projectNodes]\n        };\n      case 'animate':\n        return {\n          node: migrateAnimateCall(),\n          requiredHelpers: [HelperFunction.any, HelperFunction.animate]\n        };\n      case 'destroyView':\n        return {\n          node: switchToHelperCall(node, HelperFunction.destroyView, [node.arguments[1]]),\n          requiredHelpers: [HelperFunction.any, HelperFunction.destroyView]\n        };\n      case 'detachView':\n        return {\n          node: switchToHelperCall(node, HelperFunction.detachView, [node.arguments[0]]),\n          requiredHelpers: [HelperFunction.any, HelperFunction.detachView]\n        };\n      case 'attachViewAfter':\n        return {\n          node: switchToHelperCall(node, HelperFunction.attachViewAfter, node.arguments),\n          requiredHelpers: [HelperFunction.any, HelperFunction.attachViewAfter]\n        };\n    }\n  }\n\n  return {node};\n}\n\n/** Checks whether a node is a PropertyAccessExpression. */\nfunction isPropertyAccessCallExpression(node: ts.Node): node is PropertyAccessCallExpression {\n  return ts.isCallExpression(node) && ts.isPropertyAccessExpression(node.expression);\n}\n\n/** Renames a method call while keeping all of the parameters in place. */\nfunction renameMethodCall(node: PropertyAccessCallExpression, newName: string): ts.CallExpression {\n  const newExpression = ts.updatePropertyAccess(\n      node.expression, node.expression.expression, ts.createIdentifier(newName));\n\n  return ts.updateCall(node, newExpression, node.typeArguments, node.arguments);\n}\n\n/**\n * Migrates a `selectRootElement` call by removing the last argument which is no longer supported.\n */\nfunction migrateSelectRootElement(node: ts.CallExpression): ts.Node {\n  // The only thing we need to do is to drop the last argument\n  // (`debugInfo`), if the consumer was passing it in.\n  if (node.arguments.length > 1) {\n    return ts.updateCall(node, node.expression, node.typeArguments, [node.arguments[0]]);\n  }\n\n  return node;\n}\n\n/**\n * Migrates a call to `setElementClass` either to a call to `addClass` or `removeClass`, or\n * to an expression like `isAdd ? addClass(el, className) : removeClass(el, className)`.\n */\nfunction migrateSetElementClass(node: PropertyAccessCallExpression): ts.Node {\n  // Clone so we don't mutate by accident. Note that we assume that\n  // the user's code is providing all three required arguments.\n  const outputMethodArgs = node.arguments.slice();\n  const isAddArgument = outputMethodArgs.pop()!;\n  const createRendererCall = (isAdd: boolean) => {\n    const innerExpression = node.expression.expression;\n    const topExpression =\n        ts.createPropertyAccess(innerExpression, isAdd ? 'addClass' : 'removeClass');\n    return ts.createCall(topExpression, [], node.arguments.slice(0, 2));\n  };\n\n  // If the call has the `isAdd` argument as a literal boolean, we can map it directly to\n  // `addClass` or `removeClass`. Note that we can't use the type checker here, because it\n  // won't tell us whether the value resolves to true or false.\n  if (isAddArgument.kind === ts.SyntaxKind.TrueKeyword ||\n      isAddArgument.kind === ts.SyntaxKind.FalseKeyword) {\n    return createRendererCall(isAddArgument.kind === ts.SyntaxKind.TrueKeyword);\n  }\n\n  // Otherwise create a ternary on the variable.\n  return ts.createConditional(isAddArgument, createRendererCall(true), createRendererCall(false));\n}\n\n/**\n * Migrates a call to `setElementStyle` call either to a call to\n * `setStyle` or `removeStyle`. or to an expression like\n * `value == null ? removeStyle(el, key) : setStyle(el, key, value)`.\n */\nfunction migrateSetElementStyle(\n    node: PropertyAccessCallExpression, typeChecker: ts.TypeChecker): ts.Node {\n  const args = node.arguments;\n  const addMethodName = 'setStyle';\n  const removeMethodName = 'removeStyle';\n  const lastArgType = args[2] ?\n      typeChecker.typeToString(\n          typeChecker.getTypeAtLocation(args[2]), node, ts.TypeFormatFlags.AddUndefined) :\n      null;\n\n  // Note that for a literal null, TS considers it a `NullKeyword`,\n  // whereas a literal `undefined` is just an Identifier.\n  if (args.length === 2 || lastArgType === 'null' || lastArgType === 'undefined') {\n    // If we've got a call with two arguments, or one with three arguments where the last one is\n    // `undefined` or `null`, we can safely switch to a `removeStyle` call.\n    const innerExpression = node.expression.expression;\n    const topExpression = ts.createPropertyAccess(innerExpression, removeMethodName);\n    return ts.createCall(topExpression, [], args.slice(0, 2));\n  } else if (args.length === 3) {\n    // We need the checks for string literals, because the type of something\n    // like `\"blue\"` is the literal `blue`, not `string`.\n    if (lastArgType === 'string' || lastArgType === 'number' || ts.isStringLiteral(args[2]) ||\n        ts.isNoSubstitutionTemplateLiteral(args[2]) || ts.isNumericLiteral(args[2])) {\n      // If we've got three arguments and the last one is a string literal or a number, we\n      // can safely rename to `setStyle`.\n      return renameMethodCall(node, addMethodName);\n    } else {\n      // Otherwise migrate to a ternary that looks like:\n      // `value == null ? removeStyle(el, key) : setStyle(el, key, value)`\n      const condition = ts.createBinary(args[2], ts.SyntaxKind.EqualsEqualsToken, ts.createNull());\n      const whenNullCall = renameMethodCall(\n          ts.createCall(node.expression, [], args.slice(0, 2)) as PropertyAccessCallExpression,\n          removeMethodName);\n      return ts.createConditional(condition, whenNullCall, renameMethodCall(node, addMethodName));\n    }\n  }\n\n  return node;\n}\n\n/**\n * Migrates a call to `invokeElementMethod(target, method, [arg1, arg2])` either to\n * `target.method(arg1, arg2)` or `(target as any)[method].apply(target, [arg1, arg2])`.\n */\nfunction migrateInvokeElementMethod(node: ts.CallExpression): ts.Node {\n  const [target, name, args] = node.arguments;\n  const isNameStatic = ts.isStringLiteral(name) || ts.isNoSubstitutionTemplateLiteral(name);\n  const isArgsStatic = !args || ts.isArrayLiteralExpression(args);\n\n  if (isNameStatic && isArgsStatic) {\n    // If the name is a static string and the arguments are an array literal,\n    // we can safely convert the node into a call expression.\n    const expression = ts.createPropertyAccess(\n        target, (name as ts.StringLiteral | ts.NoSubstitutionTemplateLiteral).text);\n    const callArguments = args ? (args as ts.ArrayLiteralExpression).elements : [];\n    return ts.createCall(expression, [], callArguments);\n  } else {\n    // Otherwise create an expression in the form of `(target as any)[name].apply(target, args)`.\n    const asExpression = ts.createParen(\n        ts.createAsExpression(target, ts.createKeywordTypeNode(ts.SyntaxKind.AnyKeyword)));\n    const elementAccess = ts.createElementAccess(asExpression, name);\n    const applyExpression = ts.createPropertyAccess(elementAccess, 'apply');\n    return ts.createCall(applyExpression, [], args ? [target, args] : [target]);\n  }\n}\n\n/** Migrates a call to `createViewRoot` to whatever node was passed in as the first argument. */\nfunction migrateCreateViewRoot(node: ts.CallExpression): ts.Node {\n  return node.arguments[0];\n}\n\n/** Migrates a call to `migrate` a direct call to the helper. */\nfunction migrateAnimateCall() {\n  return ts.createCall(ts.createIdentifier(HelperFunction.animate), [], []);\n}\n\n/**\n * Switches out a call to the `Renderer` to a call to one of our helper functions.\n * Most of the helpers accept an instance of `Renderer2` as the first argument and all\n * subsequent arguments differ.\n * @param node Node of the original method call.\n * @param helper Name of the helper with which to replace the original call.\n * @param args Arguments that should be passed into the helper after the renderer argument.\n */\nfunction switchToHelperCall(\n    node: PropertyAccessCallExpression, helper: HelperFunction,\n    args: ts.Expression[]|ts.NodeArray<ts.Expression>): ts.Node {\n  return ts.createCall(ts.createIdentifier(helper), [], [node.expression.expression, ...args]);\n}\n"]}
|
|
228
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"migration.js","sourceRoot":"","sources":["../../../../../../../../packages/core/schematics/migrations/renderer-to-renderer2/migration.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @license\n * Copyright Google LLC All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\n\nimport ts from 'typescript';\n\nimport {HelperFunction} from './helpers';\n\n/** A call expression that is based on a property access. */\ntype PropertyAccessCallExpression = ts.CallExpression&{expression: ts.PropertyAccessExpression};\n\n/**\n * Migrates a function call expression from `Renderer` to `Renderer2`.\n * Returns null if the expression should be dropped.\n */\nexport function migrateExpression(node: ts.CallExpression, typeChecker: ts.TypeChecker):\n    {node: ts.Node|null, requiredHelpers?: HelperFunction[]} {\n  if (isPropertyAccessCallExpression(node)) {\n    switch (node.expression.name.getText()) {\n      case 'setElementProperty':\n        return {node: renameMethodCall(node, 'setProperty')};\n      case 'setText':\n        return {node: renameMethodCall(node, 'setValue')};\n      case 'listenGlobal':\n        return {node: renameMethodCall(node, 'listen')};\n      case 'selectRootElement':\n        return {node: migrateSelectRootElement(node)};\n      case 'setElementClass':\n        return {node: migrateSetElementClass(node)};\n      case 'setElementStyle':\n        return {node: migrateSetElementStyle(node, typeChecker)};\n      case 'invokeElementMethod':\n        return {node: migrateInvokeElementMethod(node)};\n      case 'setBindingDebugInfo':\n        return {node: null};\n      case 'createViewRoot':\n        return {node: migrateCreateViewRoot(node)};\n      case 'setElementAttribute':\n        return {\n          node: switchToHelperCall(node, HelperFunction.setElementAttribute, node.arguments),\n          requiredHelpers: [\n            HelperFunction.any, HelperFunction.splitNamespace, HelperFunction.setElementAttribute\n          ]\n        };\n      case 'createElement':\n        return {\n          node: switchToHelperCall(node, HelperFunction.createElement, node.arguments.slice(0, 2)),\n          requiredHelpers:\n              [HelperFunction.any, HelperFunction.splitNamespace, HelperFunction.createElement]\n        };\n      case 'createText':\n        return {\n          node: switchToHelperCall(node, HelperFunction.createText, node.arguments.slice(0, 2)),\n          requiredHelpers: [HelperFunction.any, HelperFunction.createText]\n        };\n      case 'createTemplateAnchor':\n        return {\n          node: switchToHelperCall(\n              node, HelperFunction.createTemplateAnchor, node.arguments.slice(0, 1)),\n          requiredHelpers: [HelperFunction.any, HelperFunction.createTemplateAnchor]\n        };\n      case 'projectNodes':\n        return {\n          node: switchToHelperCall(node, HelperFunction.projectNodes, node.arguments),\n          requiredHelpers: [HelperFunction.any, HelperFunction.projectNodes]\n        };\n      case 'animate':\n        return {\n          node: migrateAnimateCall(),\n          requiredHelpers: [HelperFunction.any, HelperFunction.animate]\n        };\n      case 'destroyView':\n        return {\n          node: switchToHelperCall(node, HelperFunction.destroyView, [node.arguments[1]]),\n          requiredHelpers: [HelperFunction.any, HelperFunction.destroyView]\n        };\n      case 'detachView':\n        return {\n          node: switchToHelperCall(node, HelperFunction.detachView, [node.arguments[0]]),\n          requiredHelpers: [HelperFunction.any, HelperFunction.detachView]\n        };\n      case 'attachViewAfter':\n        return {\n          node: switchToHelperCall(node, HelperFunction.attachViewAfter, node.arguments),\n          requiredHelpers: [HelperFunction.any, HelperFunction.attachViewAfter]\n        };\n    }\n  }\n\n  return {node};\n}\n\n/** Checks whether a node is a PropertyAccessExpression. */\nfunction isPropertyAccessCallExpression(node: ts.Node): node is PropertyAccessCallExpression {\n  return ts.isCallExpression(node) && ts.isPropertyAccessExpression(node.expression);\n}\n\n/** Renames a method call while keeping all of the parameters in place. */\nfunction renameMethodCall(node: PropertyAccessCallExpression, newName: string): ts.CallExpression {\n  const newExpression = ts.updatePropertyAccess(\n      node.expression, node.expression.expression, ts.createIdentifier(newName));\n\n  return ts.updateCall(node, newExpression, node.typeArguments, node.arguments);\n}\n\n/**\n * Migrates a `selectRootElement` call by removing the last argument which is no longer supported.\n */\nfunction migrateSelectRootElement(node: ts.CallExpression): ts.Node {\n  // The only thing we need to do is to drop the last argument\n  // (`debugInfo`), if the consumer was passing it in.\n  if (node.arguments.length > 1) {\n    return ts.updateCall(node, node.expression, node.typeArguments, [node.arguments[0]]);\n  }\n\n  return node;\n}\n\n/**\n * Migrates a call to `setElementClass` either to a call to `addClass` or `removeClass`, or\n * to an expression like `isAdd ? addClass(el, className) : removeClass(el, className)`.\n */\nfunction migrateSetElementClass(node: PropertyAccessCallExpression): ts.Node {\n  // Clone so we don't mutate by accident. Note that we assume that\n  // the user's code is providing all three required arguments.\n  const outputMethodArgs = node.arguments.slice();\n  const isAddArgument = outputMethodArgs.pop()!;\n  const createRendererCall = (isAdd: boolean) => {\n    const innerExpression = node.expression.expression;\n    const topExpression =\n        ts.createPropertyAccess(innerExpression, isAdd ? 'addClass' : 'removeClass');\n    return ts.createCall(topExpression, [], node.arguments.slice(0, 2));\n  };\n\n  // If the call has the `isAdd` argument as a literal boolean, we can map it directly to\n  // `addClass` or `removeClass`. Note that we can't use the type checker here, because it\n  // won't tell us whether the value resolves to true or false.\n  if (isAddArgument.kind === ts.SyntaxKind.TrueKeyword ||\n      isAddArgument.kind === ts.SyntaxKind.FalseKeyword) {\n    return createRendererCall(isAddArgument.kind === ts.SyntaxKind.TrueKeyword);\n  }\n\n  // Otherwise create a ternary on the variable.\n  return ts.createConditional(isAddArgument, createRendererCall(true), createRendererCall(false));\n}\n\n/**\n * Migrates a call to `setElementStyle` call either to a call to\n * `setStyle` or `removeStyle`. or to an expression like\n * `value == null ? removeStyle(el, key) : setStyle(el, key, value)`.\n */\nfunction migrateSetElementStyle(\n    node: PropertyAccessCallExpression, typeChecker: ts.TypeChecker): ts.Node {\n  const args = node.arguments;\n  const addMethodName = 'setStyle';\n  const removeMethodName = 'removeStyle';\n  const lastArgType = args[2] ?\n      typeChecker.typeToString(\n          typeChecker.getTypeAtLocation(args[2]), node, ts.TypeFormatFlags.AddUndefined) :\n      null;\n\n  // Note that for a literal null, TS considers it a `NullKeyword`,\n  // whereas a literal `undefined` is just an Identifier.\n  if (args.length === 2 || lastArgType === 'null' || lastArgType === 'undefined') {\n    // If we've got a call with two arguments, or one with three arguments where the last one is\n    // `undefined` or `null`, we can safely switch to a `removeStyle` call.\n    const innerExpression = node.expression.expression;\n    const topExpression = ts.createPropertyAccess(innerExpression, removeMethodName);\n    return ts.createCall(topExpression, [], args.slice(0, 2));\n  } else if (args.length === 3) {\n    // We need the checks for string literals, because the type of something\n    // like `\"blue\"` is the literal `blue`, not `string`.\n    if (lastArgType === 'string' || lastArgType === 'number' || ts.isStringLiteral(args[2]) ||\n        ts.isNoSubstitutionTemplateLiteral(args[2]) || ts.isNumericLiteral(args[2])) {\n      // If we've got three arguments and the last one is a string literal or a number, we\n      // can safely rename to `setStyle`.\n      return renameMethodCall(node, addMethodName);\n    } else {\n      // Otherwise migrate to a ternary that looks like:\n      // `value == null ? removeStyle(el, key) : setStyle(el, key, value)`\n      const condition = ts.createBinary(args[2], ts.SyntaxKind.EqualsEqualsToken, ts.createNull());\n      const whenNullCall = renameMethodCall(\n          ts.createCall(node.expression, [], args.slice(0, 2)) as PropertyAccessCallExpression,\n          removeMethodName);\n      return ts.createConditional(condition, whenNullCall, renameMethodCall(node, addMethodName));\n    }\n  }\n\n  return node;\n}\n\n/**\n * Migrates a call to `invokeElementMethod(target, method, [arg1, arg2])` either to\n * `target.method(arg1, arg2)` or `(target as any)[method].apply(target, [arg1, arg2])`.\n */\nfunction migrateInvokeElementMethod(node: ts.CallExpression): ts.Node {\n  const [target, name, args] = node.arguments;\n  const isNameStatic = ts.isStringLiteral(name) || ts.isNoSubstitutionTemplateLiteral(name);\n  const isArgsStatic = !args || ts.isArrayLiteralExpression(args);\n\n  if (isNameStatic && isArgsStatic) {\n    // If the name is a static string and the arguments are an array literal,\n    // we can safely convert the node into a call expression.\n    const expression = ts.createPropertyAccess(\n        target, (name as ts.StringLiteral | ts.NoSubstitutionTemplateLiteral).text);\n    const callArguments = args ? (args as ts.ArrayLiteralExpression).elements : [];\n    return ts.createCall(expression, [], callArguments);\n  } else {\n    // Otherwise create an expression in the form of `(target as any)[name].apply(target, args)`.\n    const asExpression = ts.createParen(\n        ts.createAsExpression(target, ts.createKeywordTypeNode(ts.SyntaxKind.AnyKeyword)));\n    const elementAccess = ts.createElementAccess(asExpression, name);\n    const applyExpression = ts.createPropertyAccess(elementAccess, 'apply');\n    return ts.createCall(applyExpression, [], args ? [target, args] : [target]);\n  }\n}\n\n/** Migrates a call to `createViewRoot` to whatever node was passed in as the first argument. */\nfunction migrateCreateViewRoot(node: ts.CallExpression): ts.Node {\n  return node.arguments[0];\n}\n\n/** Migrates a call to `migrate` a direct call to the helper. */\nfunction migrateAnimateCall() {\n  return ts.createCall(ts.createIdentifier(HelperFunction.animate), [], []);\n}\n\n/**\n * Switches out a call to the `Renderer` to a call to one of our helper functions.\n * Most of the helpers accept an instance of `Renderer2` as the first argument and all\n * subsequent arguments differ.\n * @param node Node of the original method call.\n * @param helper Name of the helper with which to replace the original call.\n * @param args Arguments that should be passed into the helper after the renderer argument.\n */\nfunction switchToHelperCall(\n    node: PropertyAccessCallExpression, helper: HelperFunction,\n    args: ts.Expression[]|ts.NodeArray<ts.Expression>): ts.Node {\n  return ts.createCall(ts.createIdentifier(helper), [], [node.expression.expression, ...args]);\n}\n"]}
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
* found in the LICENSE file at https://angular.io/license
|
|
7
7
|
*/
|
|
8
8
|
/// <amd-module name="@angular/core/schematics/migrations/renderer-to-renderer2/util" />
|
|
9
|
-
import
|
|
9
|
+
import ts from 'typescript';
|
|
10
10
|
/**
|
|
11
11
|
* Finds typed nodes (e.g. function parameters or class properties) that are referencing the old
|
|
12
12
|
* `Renderer`, as well as calls to the `Renderer` methods.
|
|
@@ -5,6 +5,9 @@
|
|
|
5
5
|
* Use of this source code is governed by an MIT-style license that can be
|
|
6
6
|
* found in the LICENSE file at https://angular.io/license
|
|
7
7
|
*/
|
|
8
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
9
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
10
|
+
};
|
|
8
11
|
(function (factory) {
|
|
9
12
|
if (typeof module === "object" && typeof module.exports === "object") {
|
|
10
13
|
var v = factory(require, exports);
|
|
@@ -17,7 +20,7 @@
|
|
|
17
20
|
"use strict";
|
|
18
21
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
19
22
|
exports.findRendererReferences = void 0;
|
|
20
|
-
const
|
|
23
|
+
const typescript_1 = __importDefault(require("typescript"));
|
|
21
24
|
const imports_1 = require("@angular/core/schematics/utils/typescript/imports");
|
|
22
25
|
const symbol_1 = require("@angular/core/schematics/utils/typescript/symbol");
|
|
23
26
|
/**
|
|
@@ -28,25 +31,25 @@
|
|
|
28
31
|
const typedNodes = new Set();
|
|
29
32
|
const methodCalls = new Set();
|
|
30
33
|
const forwardRefs = new Set();
|
|
31
|
-
const forwardRefSpecifier = imports_1.getImportSpecifier(sourceFile, '@angular/core', 'forwardRef');
|
|
32
|
-
|
|
33
|
-
if ((
|
|
34
|
-
symbol_1.isReferenceToImport(typeChecker, node.name, rendererImportSpecifier)) {
|
|
34
|
+
const forwardRefSpecifier = (0, imports_1.getImportSpecifier)(sourceFile, '@angular/core', 'forwardRef');
|
|
35
|
+
typescript_1.default.forEachChild(sourceFile, function visitNode(node) {
|
|
36
|
+
if ((typescript_1.default.isParameter(node) || typescript_1.default.isPropertyDeclaration(node)) &&
|
|
37
|
+
(0, symbol_1.isReferenceToImport)(typeChecker, node.name, rendererImportSpecifier)) {
|
|
35
38
|
typedNodes.add(node);
|
|
36
39
|
}
|
|
37
|
-
else if (
|
|
38
|
-
symbol_1.isReferenceToImport(typeChecker, node.type, rendererImportSpecifier)) {
|
|
40
|
+
else if (typescript_1.default.isAsExpression(node) &&
|
|
41
|
+
(0, symbol_1.isReferenceToImport)(typeChecker, node.type, rendererImportSpecifier)) {
|
|
39
42
|
typedNodes.add(node);
|
|
40
43
|
}
|
|
41
|
-
else if (
|
|
42
|
-
if (
|
|
43
|
-
symbol_1.isReferenceToImport(typeChecker, node.expression.expression, rendererImportSpecifier)) {
|
|
44
|
+
else if (typescript_1.default.isCallExpression(node)) {
|
|
45
|
+
if (typescript_1.default.isPropertyAccessExpression(node.expression) &&
|
|
46
|
+
(0, symbol_1.isReferenceToImport)(typeChecker, node.expression.expression, rendererImportSpecifier)) {
|
|
44
47
|
methodCalls.add(node);
|
|
45
48
|
}
|
|
46
49
|
else if (
|
|
47
50
|
// If we're dealing with a forwardRef that's returning a Renderer.
|
|
48
|
-
forwardRefSpecifier &&
|
|
49
|
-
symbol_1.isReferenceToImport(typeChecker, node.expression, forwardRefSpecifier) &&
|
|
51
|
+
forwardRefSpecifier && typescript_1.default.isIdentifier(node.expression) &&
|
|
52
|
+
(0, symbol_1.isReferenceToImport)(typeChecker, node.expression, forwardRefSpecifier) &&
|
|
50
53
|
node.arguments.length) {
|
|
51
54
|
const rendererIdentifier = findRendererIdentifierInForwardRef(typeChecker, node, rendererImportSpecifier);
|
|
52
55
|
if (rendererIdentifier) {
|
|
@@ -54,7 +57,7 @@
|
|
|
54
57
|
}
|
|
55
58
|
}
|
|
56
59
|
}
|
|
57
|
-
|
|
60
|
+
typescript_1.default.forEachChild(node, visitNode);
|
|
58
61
|
});
|
|
59
62
|
return { typedNodes, methodCalls, forwardRefs };
|
|
60
63
|
}
|
|
@@ -62,17 +65,17 @@
|
|
|
62
65
|
/** Finds the identifier referring to the `Renderer` inside a `forwardRef` call expression. */
|
|
63
66
|
function findRendererIdentifierInForwardRef(typeChecker, node, rendererImport) {
|
|
64
67
|
const firstArg = node.arguments[0];
|
|
65
|
-
if (
|
|
68
|
+
if (typescript_1.default.isArrowFunction(firstArg) && rendererImport) {
|
|
66
69
|
// Check if the function is `forwardRef(() => Renderer)`.
|
|
67
|
-
if (
|
|
68
|
-
symbol_1.isReferenceToImport(typeChecker, firstArg.body, rendererImport)) {
|
|
70
|
+
if (typescript_1.default.isIdentifier(firstArg.body) &&
|
|
71
|
+
(0, symbol_1.isReferenceToImport)(typeChecker, firstArg.body, rendererImport)) {
|
|
69
72
|
return firstArg.body;
|
|
70
73
|
}
|
|
71
|
-
else if (
|
|
74
|
+
else if (typescript_1.default.isBlock(firstArg.body) && typescript_1.default.isReturnStatement(firstArg.body.statements[0])) {
|
|
72
75
|
// Otherwise check if the expression is `forwardRef(() => { return Renderer })`.
|
|
73
76
|
const returnStatement = firstArg.body.statements[0];
|
|
74
|
-
if (returnStatement.expression &&
|
|
75
|
-
symbol_1.isReferenceToImport(typeChecker, returnStatement.expression, rendererImport)) {
|
|
77
|
+
if (returnStatement.expression && typescript_1.default.isIdentifier(returnStatement.expression) &&
|
|
78
|
+
(0, symbol_1.isReferenceToImport)(typeChecker, returnStatement.expression, rendererImport)) {
|
|
76
79
|
return returnStatement.expression;
|
|
77
80
|
}
|
|
78
81
|
}
|
|
@@ -80,4 +83,4 @@
|
|
|
80
83
|
return null;
|
|
81
84
|
}
|
|
82
85
|
});
|
|
83
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
86
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2NvcmUvc2NoZW1hdGljcy9taWdyYXRpb25zL3JlbmRlcmVyLXRvLXJlbmRlcmVyMi91dGlsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7R0FNRzs7Ozs7Ozs7Ozs7Ozs7OztJQUVILDREQUE0QjtJQUU1QiwrRUFBa0U7SUFDbEUsNkVBQWtFO0lBRWxFOzs7T0FHRztJQUNILFNBQWdCLHNCQUFzQixDQUNsQyxVQUF5QixFQUFFLFdBQTJCLEVBQ3RELHVCQUEyQztRQUM3QyxNQUFNLFVBQVUsR0FBRyxJQUFJLEdBQUcsRUFBa0UsQ0FBQztRQUM3RixNQUFNLFdBQVcsR0FBRyxJQUFJLEdBQUcsRUFBcUIsQ0FBQztRQUNqRCxNQUFNLFdBQVcsR0FBRyxJQUFJLEdBQUcsRUFBaUIsQ0FBQztRQUM3QyxNQUFNLG1CQUFtQixHQUFHLElBQUEsNEJBQWtCLEVBQUMsVUFBVSxFQUFFLGVBQWUsRUFBRSxZQUFZLENBQUMsQ0FBQztRQUUxRixvQkFBRSxDQUFDLFlBQVksQ0FBQyxVQUFVLEVBQUUsU0FBUyxTQUFTLENBQUMsSUFBYTtZQUMxRCxJQUFJLENBQUMsb0JBQUUsQ0FBQyxXQUFXLENBQUMsSUFBSSxDQUFDLElBQUksb0JBQUUsQ0FBQyxxQkFBcUIsQ0FBQyxJQUFJLENBQUMsQ0FBQztnQkFDeEQsSUFBQSw0QkFBbUIsRUFBQyxXQUFXLEVBQUUsSUFBSSxDQUFDLElBQUksRUFBRSx1QkFBdUIsQ0FBQyxFQUFFO2dCQUN4RSxVQUFVLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxDQUFDO2FBQ3RCO2lCQUFNLElBQ0gsb0JBQUUsQ0FBQyxjQUFjLENBQUMsSUFBSSxDQUFDO2dCQUN2QixJQUFBLDRCQUFtQixFQUFDLFdBQVcsRUFBRSxJQUFJLENBQUMsSUFBSSxFQUFFLHVCQUF1QixDQUFDLEVBQUU7Z0JBQ3hFLFVBQVUsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUM7YUFDdEI7aUJBQU0sSUFBSSxvQkFBRSxDQUFDLGdCQUFnQixDQUFDLElBQUksQ0FBQyxFQUFFO2dCQUNwQyxJQUFJLG9CQUFFLENBQUMsMEJBQTBCLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQztvQkFDOUMsSUFBQSw0QkFBbUIsRUFBQyxXQUFXLEVBQUUsSUFBSSxDQUFDLFVBQVUsQ0FBQyxVQUFVLEVBQUUsdUJBQXVCLENBQUMsRUFBRTtvQkFDekYsV0FBVyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQztpQkFDdkI7cUJBQU07Z0JBQ0gsa0VBQWtFO2dCQUNsRSxtQkFBbUIsSUFBSSxvQkFBRSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDO29CQUN2RCxJQUFBLDRCQUFtQixFQUFDLFdBQVcsRUFBRSxJQUFJLENBQUMsVUFBVSxFQUFFLG1CQUFtQixDQUFDO29CQUN0RSxJQUFJLENBQUMsU0FBUyxDQUFDLE1BQU0sRUFBRTtvQkFDekIsTUFBTSxrQkFBa0IsR0FDcEIsa0NBQWtDLENBQUMsV0FBVyxFQUFFLElBQUksRUFBRSx1QkFBdUIsQ0FBQyxDQUFDO29CQUNuRixJQUFJLGtCQUFrQixFQUFFO3dCQUN0QixXQUFXLENBQUMsR0FBRyxDQUFDLGtCQUFrQixDQUFDLENBQUM7cUJBQ3JDO2lCQUNGO2FBQ0Y7WUFFRCxvQkFBRSxDQUFDLFlBQVksQ0FBQyxJQUFJLEVBQUUsU0FBUyxDQUFDLENBQUM7UUFDbkMsQ0FBQyxDQUFDLENBQUM7UUFFSCxPQUFPLEVBQUMsVUFBVSxFQUFFLFdBQVcsRUFBRSxXQUFXLEVBQUMsQ0FBQztJQUNoRCxDQUFDO0lBckNELHdEQXFDQztJQUVELDhGQUE4RjtJQUM5RixTQUFTLGtDQUFrQyxDQUN2QyxXQUEyQixFQUFFLElBQXVCLEVBQ3BELGNBQXVDO1FBQ3pDLE1BQU0sUUFBUSxHQUFHLElBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFFbkMsSUFBSSxvQkFBRSxDQUFDLGVBQWUsQ0FBQyxRQUFRLENBQUMsSUFBSSxjQUFjLEVBQUU7WUFDbEQseURBQXlEO1lBQ3pELElBQUksb0JBQUUsQ0FBQyxZQUFZLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQztnQkFDOUIsSUFBQSw0QkFBbUIsRUFBQyxXQUFXLEVBQUUsUUFBUSxDQUFDLElBQUksRUFBRSxjQUFjLENBQUMsRUFBRTtnQkFDbkUsT0FBTyxRQUFRLENBQUMsSUFBSSxDQUFDO2FBQ3RCO2lCQUFNLElBQUksb0JBQUUsQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxJQUFJLG9CQUFFLENBQUMsaUJBQWlCLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRTtnQkFDekYsZ0ZBQWdGO2dCQUNoRixNQUFNLGVBQWUsR0FBRyxRQUFRLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQXVCLENBQUM7Z0JBRTFFLElBQUksZUFBZSxDQUFDLFVBQVUsSUFBSSxvQkFBRSxDQUFDLFlBQVksQ0FBQyxlQUFlLENBQUMsVUFBVSxDQUFDO29CQUN6RSxJQUFBLDRCQUFtQixFQUFDLFdBQVcsRUFBRSxlQUFlLENBQUMsVUFBVSxFQUFFLGNBQWMsQ0FBQyxFQUFFO29CQUNoRixPQUFPLGVBQWUsQ0FBQyxVQUFVLENBQUM7aUJBQ25DO2FBQ0Y7U0FDRjtRQUVELE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogQGxpY2Vuc2VcbiAqIENvcHlyaWdodCBHb29nbGUgTExDIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4gKlxuICogVXNlIG9mIHRoaXMgc291cmNlIGNvZGUgaXMgZ292ZXJuZWQgYnkgYW4gTUlULXN0eWxlIGxpY2Vuc2UgdGhhdCBjYW4gYmVcbiAqIGZvdW5kIGluIHRoZSBMSUNFTlNFIGZpbGUgYXQgaHR0cHM6Ly9hbmd1bGFyLmlvL2xpY2Vuc2VcbiAqL1xuXG5pbXBvcnQgdHMgZnJvbSAndHlwZXNjcmlwdCc7XG5cbmltcG9ydCB7Z2V0SW1wb3J0U3BlY2lmaWVyfSBmcm9tICcuLi8uLi91dGlscy90eXBlc2NyaXB0L2ltcG9ydHMnO1xuaW1wb3J0IHtpc1JlZmVyZW5jZVRvSW1wb3J0fSBmcm9tICcuLi8uLi91dGlscy90eXBlc2NyaXB0L3N5bWJvbCc7XG5cbi8qKlxuICogRmluZHMgdHlwZWQgbm9kZXMgKGUuZy4gZnVuY3Rpb24gcGFyYW1ldGVycyBvciBjbGFzcyBwcm9wZXJ0aWVzKSB0aGF0IGFyZSByZWZlcmVuY2luZyB0aGUgb2xkXG4gKiBgUmVuZGVyZXJgLCBhcyB3ZWxsIGFzIGNhbGxzIHRvIHRoZSBgUmVuZGVyZXJgIG1ldGhvZHMuXG4gKi9cbmV4cG9ydCBmdW5jdGlvbiBmaW5kUmVuZGVyZXJSZWZlcmVuY2VzKFxuICAgIHNvdXJjZUZpbGU6IHRzLlNvdXJjZUZpbGUsIHR5cGVDaGVja2VyOiB0cy5UeXBlQ2hlY2tlcixcbiAgICByZW5kZXJlckltcG9ydFNwZWNpZmllcjogdHMuSW1wb3J0U3BlY2lmaWVyKSB7XG4gIGNvbnN0IHR5cGVkTm9kZXMgPSBuZXcgU2V0PHRzLlBhcmFtZXRlckRlY2xhcmF0aW9ufHRzLlByb3BlcnR5RGVjbGFyYXRpb258dHMuQXNFeHByZXNzaW9uPigpO1xuICBjb25zdCBtZXRob2RDYWxscyA9IG5ldyBTZXQ8dHMuQ2FsbEV4cHJlc3Npb24+KCk7XG4gIGNvbnN0IGZvcndhcmRSZWZzID0gbmV3IFNldDx0cy5JZGVudGlmaWVyPigpO1xuICBjb25zdCBmb3J3YXJkUmVmU3BlY2lmaWVyID0gZ2V0SW1wb3J0U3BlY2lmaWVyKHNvdXJjZUZpbGUsICdAYW5ndWxhci9jb3JlJywgJ2ZvcndhcmRSZWYnKTtcblxuICB0cy5mb3JFYWNoQ2hpbGQoc291cmNlRmlsZSwgZnVuY3Rpb24gdmlzaXROb2RlKG5vZGU6IHRzLk5vZGUpIHtcbiAgICBpZiAoKHRzLmlzUGFyYW1ldGVyKG5vZGUpIHx8IHRzLmlzUHJvcGVydHlEZWNsYXJhdGlvbihub2RlKSkgJiZcbiAgICAgICAgaXNSZWZlcmVuY2VUb0ltcG9ydCh0eXBlQ2hlY2tlciwgbm9kZS5uYW1lLCByZW5kZXJlckltcG9ydFNwZWNpZmllcikpIHtcbiAgICAgIHR5cGVkTm9kZXMuYWRkKG5vZGUpO1xuICAgIH0gZWxzZSBpZiAoXG4gICAgICAgIHRzLmlzQXNFeHByZXNzaW9uKG5vZGUpICYmXG4gICAgICAgIGlzUmVmZXJlbmNlVG9JbXBvcnQodHlwZUNoZWNrZXIsIG5vZGUudHlwZSwgcmVuZGVyZXJJbXBvcnRTcGVjaWZpZXIpKSB7XG4gICAgICB0eXBlZE5vZGVzLmFkZChub2RlKTtcbiAgICB9IGVsc2UgaWYgKHRzLmlzQ2FsbEV4cHJlc3Npb24obm9kZSkpIHtcbiAgICAgIGlmICh0cy5pc1Byb3BlcnR5QWNjZXNzRXhwcmVzc2lvbihub2RlLmV4cHJlc3Npb24pICYmXG4gICAgICAgICAgaXNSZWZlcmVuY2VUb0ltcG9ydCh0eXBlQ2hlY2tlciwgbm9kZS5leHByZXNzaW9uLmV4cHJlc3Npb24sIHJlbmRlcmVySW1wb3J0U3BlY2lmaWVyKSkge1xuICAgICAgICBtZXRob2RDYWxscy5hZGQobm9kZSk7XG4gICAgICB9IGVsc2UgaWYgKFxuICAgICAgICAgIC8vIElmIHdlJ3JlIGRlYWxpbmcgd2l0aCBhIGZvcndhcmRSZWYgdGhhdCdzIHJldHVybmluZyBhIFJlbmRlcmVyLlxuICAgICAgICAgIGZvcndhcmRSZWZTcGVjaWZpZXIgJiYgdHMuaXNJZGVudGlmaWVyKG5vZGUuZXhwcmVzc2lvbikgJiZcbiAgICAgICAgICBpc1JlZmVyZW5jZVRvSW1wb3J0KHR5cGVDaGVja2VyLCBub2RlLmV4cHJlc3Npb24sIGZvcndhcmRSZWZTcGVjaWZpZXIpICYmXG4gICAgICAgICAgbm9kZS5hcmd1bWVudHMubGVuZ3RoKSB7XG4gICAgICAgIGNvbnN0IHJlbmRlcmVySWRlbnRpZmllciA9XG4gICAgICAgICAgICBmaW5kUmVuZGVyZXJJZGVudGlmaWVySW5Gb3J3YXJkUmVmKHR5cGVDaGVja2VyLCBub2RlLCByZW5kZXJlckltcG9ydFNwZWNpZmllcik7XG4gICAgICAgIGlmIChyZW5kZXJlcklkZW50aWZpZXIpIHtcbiAgICAgICAgICBmb3J3YXJkUmVmcy5hZGQocmVuZGVyZXJJZGVudGlmaWVyKTtcbiAgICAgICAgfVxuICAgICAgfVxuICAgIH1cblxuICAgIHRzLmZvckVhY2hDaGlsZChub2RlLCB2aXNpdE5vZGUpO1xuICB9KTtcblxuICByZXR1cm4ge3R5cGVkTm9kZXMsIG1ldGhvZENhbGxzLCBmb3J3YXJkUmVmc307XG59XG5cbi8qKiBGaW5kcyB0aGUgaWRlbnRpZmllciByZWZlcnJpbmcgdG8gdGhlIGBSZW5kZXJlcmAgaW5zaWRlIGEgYGZvcndhcmRSZWZgIGNhbGwgZXhwcmVzc2lvbi4gKi9cbmZ1bmN0aW9uIGZpbmRSZW5kZXJlcklkZW50aWZpZXJJbkZvcndhcmRSZWYoXG4gICAgdHlwZUNoZWNrZXI6IHRzLlR5cGVDaGVja2VyLCBub2RlOiB0cy5DYWxsRXhwcmVzc2lvbixcbiAgICByZW5kZXJlckltcG9ydDogdHMuSW1wb3J0U3BlY2lmaWVyfG51bGwpOiB0cy5JZGVudGlmaWVyfG51bGwge1xuICBjb25zdCBmaXJzdEFyZyA9IG5vZGUuYXJndW1lbnRzWzBdO1xuXG4gIGlmICh0cy5pc0Fycm93RnVuY3Rpb24oZmlyc3RBcmcpICYmIHJlbmRlcmVySW1wb3J0KSB7XG4gICAgLy8gQ2hlY2sgaWYgdGhlIGZ1bmN0aW9uIGlzIGBmb3J3YXJkUmVmKCgpID0+IFJlbmRlcmVyKWAuXG4gICAgaWYgKHRzLmlzSWRlbnRpZmllcihmaXJzdEFyZy5ib2R5KSAmJlxuICAgICAgICBpc1JlZmVyZW5jZVRvSW1wb3J0KHR5cGVDaGVja2VyLCBmaXJzdEFyZy5ib2R5LCByZW5kZXJlckltcG9ydCkpIHtcbiAgICAgIHJldHVybiBmaXJzdEFyZy5ib2R5O1xuICAgIH0gZWxzZSBpZiAodHMuaXNCbG9jayhmaXJzdEFyZy5ib2R5KSAmJiB0cy5pc1JldHVyblN0YXRlbWVudChmaXJzdEFyZy5ib2R5LnN0YXRlbWVudHNbMF0pKSB7XG4gICAgICAvLyBPdGhlcndpc2UgY2hlY2sgaWYgdGhlIGV4cHJlc3Npb24gaXMgYGZvcndhcmRSZWYoKCkgPT4geyByZXR1cm4gUmVuZGVyZXIgfSlgLlxuICAgICAgY29uc3QgcmV0dXJuU3RhdGVtZW50ID0gZmlyc3RBcmcuYm9keS5zdGF0ZW1lbnRzWzBdIGFzIHRzLlJldHVyblN0YXRlbWVudDtcblxuICAgICAgaWYgKHJldHVyblN0YXRlbWVudC5leHByZXNzaW9uICYmIHRzLmlzSWRlbnRpZmllcihyZXR1cm5TdGF0ZW1lbnQuZXhwcmVzc2lvbikgJiZcbiAgICAgICAgICBpc1JlZmVyZW5jZVRvSW1wb3J0KHR5cGVDaGVja2VyLCByZXR1cm5TdGF0ZW1lbnQuZXhwcmVzc2lvbiwgcmVuZGVyZXJJbXBvcnQpKSB7XG4gICAgICAgIHJldHVybiByZXR1cm5TdGF0ZW1lbnQuZXhwcmVzc2lvbjtcbiAgICAgIH1cbiAgICB9XG4gIH1cblxuICByZXR1cm4gbnVsbDtcbn1cbiJdfQ==
|
|
@@ -6,6 +6,6 @@
|
|
|
6
6
|
* found in the LICENSE file at https://angular.io/license
|
|
7
7
|
*/
|
|
8
8
|
/// <amd-module name="@angular/core/schematics/migrations/router-link-empty-expression/analyze_template" />
|
|
9
|
-
import {
|
|
9
|
+
import type { TmplAstBoundAttribute } from '@angular/compiler';
|
|
10
10
|
import { ResolvedTemplate } from '../../utils/ng_component_template';
|
|
11
|
-
export declare function analyzeResolvedTemplate(template: ResolvedTemplate):
|
|
11
|
+
export declare function analyzeResolvedTemplate(template: ResolvedTemplate, compilerModule: typeof import('@angular/compiler')): TmplAstBoundAttribute[] | null;
|