From 5c93a8800a3f6688f21afc446622d8a5ab2c5bf9 Mon Sep 17 00:00:00 2001 From: vikerman Date: Tue, 23 Aug 2016 16:18:11 -0700 Subject: [PATCH] fix(core): Share private types through an exported interface. (#11009) Instead of using declare namespace to share the types. This allows the generated code to be compiled with closure with full optimizations. --- .../@angular/compiler-cli/src/core_private.ts | 18 +- modules/@angular/compiler/core_private.ts | 153 ++++++++--------- .../@angular/compiler/core_private_testing.ts | 12 +- modules/@angular/core/private_export.ts | 154 ++++++++---------- .../@angular/core/private_export_testing.ts | 8 +- .../platform-browser-dynamic/core_private.ts | 8 +- .../platform_browser_private.ts | 6 +- .../private_export_testing.ts | 5 +- .../@angular/platform-browser/core_private.ts | 52 +++--- .../platform-browser/private_export.ts | 24 +-- .../@angular/platform-server/core_private.ts | 10 +- ...latform_browser_dynamic_testing_private.ts | 4 +- .../platform_browser_private.ts | 35 ++-- 13 files changed, 235 insertions(+), 254 deletions(-) diff --git a/modules/@angular/compiler-cli/src/core_private.ts b/modules/@angular/compiler-cli/src/core_private.ts index dc5a0f9009..d70deb659a 100644 --- a/modules/@angular/compiler-cli/src/core_private.ts +++ b/modules/@angular/compiler-cli/src/core_private.ts @@ -6,15 +6,17 @@ * found in the LICENSE file at https://angular.io/license */ -import {__core_private__ as r, __core_private_types__ as t} from '@angular/core'; +import {__core_private__ as r, __core_private_types__ as types} from '@angular/core'; -export type ReflectorReader = t.ReflectorReader; -export var ReflectorReader: typeof t.ReflectorReader = r.ReflectorReader; +export declare let _compiler_cli_core_private_types: types; -export type ReflectionCapabilities = t.ReflectionCapabilities; -export var ReflectionCapabilities: typeof t.ReflectionCapabilities = r.ReflectionCapabilities; +export type ReflectorReader = typeof _compiler_cli_core_private_types.ReflectorReader; +export var ReflectorReader: typeof r.ReflectorReader = r.ReflectorReader; -export type Console = t.Console; -export var Console: typeof t.Console = r.Console; +export type ReflectionCapabilities = typeof _compiler_cli_core_private_types.ReflectionCapabilities; +export var ReflectionCapabilities: typeof r.ReflectionCapabilities = r.ReflectionCapabilities; -export var reflector: typeof t.reflector = r.reflector; +export type Console = typeof _compiler_cli_core_private_types.Console; +export var Console: typeof r.Console = r.Console; + +export var reflector: typeof r.reflector = r.reflector; diff --git a/modules/@angular/compiler/core_private.ts b/modules/@angular/compiler/core_private.ts index baf44a2b4e..82cd3c0576 100644 --- a/modules/@angular/compiler/core_private.ts +++ b/modules/@angular/compiler/core_private.ts @@ -6,91 +6,94 @@ * found in the LICENSE file at https://angular.io/license */ -import {__core_private__ as r, __core_private_types__ as t} from '@angular/core'; +import {__core_private_DebugAppView__, __core_private_TemplateRef__, __core_private__ as r, __core_private_types__ as types} from '@angular/core'; -export var isDefaultChangeDetectionStrategy: typeof t.isDefaultChangeDetectionStrategy = +export declare let _compiler_core_private_types: types; + +export var isDefaultChangeDetectionStrategy: typeof r.isDefaultChangeDetectionStrategy = r.isDefaultChangeDetectionStrategy; -export type ChangeDetectorStatus = t.ChangeDetectorStatus; -export var ChangeDetectorStatus: typeof t.ChangeDetectorStatus = r.ChangeDetectorStatus; -export var CHANGE_DETECTION_STRATEGY_VALUES: typeof t.CHANGE_DETECTION_STRATEGY_VALUES = +export type ChangeDetectorStatus = typeof _compiler_core_private_types.ChangeDetectorStatus; +export var ChangeDetectorStatus: typeof r.ChangeDetectorStatus = r.ChangeDetectorStatus; +export var CHANGE_DETECTION_STRATEGY_VALUES: typeof r.CHANGE_DETECTION_STRATEGY_VALUES = r.CHANGE_DETECTION_STRATEGY_VALUES; -export var constructDependencies: typeof t.constructDependencies = r.constructDependencies; -export type LifecycleHooks = t.LifecycleHooks; -export var LifecycleHooks: typeof t.LifecycleHooks = r.LifecycleHooks; -export var LIFECYCLE_HOOKS_VALUES: typeof t.LIFECYCLE_HOOKS_VALUES = r.LIFECYCLE_HOOKS_VALUES; -export type ReflectorReader = t.ReflectorReader; -export var ReflectorReader: typeof t.ReflectorReader = r.ReflectorReader; -export type AppElement = t.AppElement; -export var AppElement: typeof t.AppElement = r.AppElement; -export var CodegenComponentFactoryResolver: typeof t.CodegenComponentFactoryResolver = +export var constructDependencies: typeof r.constructDependencies = r.constructDependencies; +export type LifecycleHooks = typeof _compiler_core_private_types.LifecycleHooks; +export var LifecycleHooks: typeof r.LifecycleHooks = r.LifecycleHooks; +export var LIFECYCLE_HOOKS_VALUES: typeof r.LIFECYCLE_HOOKS_VALUES = r.LIFECYCLE_HOOKS_VALUES; +export type ReflectorReader = typeof _compiler_core_private_types.ReflectorReader; +export var ReflectorReader: typeof r.ReflectorReader = r.ReflectorReader; +export type AppElement = typeof _compiler_core_private_types.AppElement; +export var AppElement: typeof r.AppElement = r.AppElement; +export var CodegenComponentFactoryResolver: typeof r.CodegenComponentFactoryResolver = r.CodegenComponentFactoryResolver; -export var AppView: typeof t.AppView = r.AppView; -export type DebugAppView = t.DebugAppView; -export var DebugAppView: typeof t.DebugAppView = r.DebugAppView; -export var NgModuleInjector: typeof t.NgModuleInjector = r.NgModuleInjector; -export type ViewType = t.ViewType; -export var ViewType: typeof t.ViewType = r.ViewType; -export var MAX_INTERPOLATION_VALUES: typeof t.MAX_INTERPOLATION_VALUES = r.MAX_INTERPOLATION_VALUES; -export var checkBinding: typeof t.checkBinding = r.checkBinding; -export var flattenNestedViewRenderNodes: typeof t.flattenNestedViewRenderNodes = +export var AppView: typeof r.AppView = r.AppView; +export type DebugAppView = __core_private_DebugAppView__; +export var DebugAppView: typeof r.DebugAppView = r.DebugAppView; +export var NgModuleInjector: typeof r.NgModuleInjector = r.NgModuleInjector; +export type ViewType = typeof _compiler_core_private_types.ViewType; +export var ViewType: typeof r.ViewType = r.ViewType; +export var MAX_INTERPOLATION_VALUES: typeof r.MAX_INTERPOLATION_VALUES = r.MAX_INTERPOLATION_VALUES; +export var checkBinding: typeof r.checkBinding = r.checkBinding; +export var flattenNestedViewRenderNodes: typeof r.flattenNestedViewRenderNodes = r.flattenNestedViewRenderNodes; -export var interpolate: typeof t.interpolate = r.interpolate; -export var ViewUtils: typeof t.ViewUtils = r.ViewUtils; -export var VIEW_ENCAPSULATION_VALUES: typeof t.VIEW_ENCAPSULATION_VALUES = +export var interpolate: typeof r.interpolate = r.interpolate; +export var ViewUtils: typeof r.ViewUtils = r.ViewUtils; +export var VIEW_ENCAPSULATION_VALUES: typeof r.VIEW_ENCAPSULATION_VALUES = r.VIEW_ENCAPSULATION_VALUES; -export var DebugContext: typeof t.DebugContext = r.DebugContext; -export var StaticNodeDebugInfo: typeof t.StaticNodeDebugInfo = r.StaticNodeDebugInfo; -export var devModeEqual: typeof t.devModeEqual = r.devModeEqual; -export var UNINITIALIZED: typeof t.UNINITIALIZED = r.UNINITIALIZED; -export var ValueUnwrapper: typeof t.ValueUnwrapper = r.ValueUnwrapper; -export var TemplateRef_: typeof t.TemplateRef_ = r.TemplateRef_; -export type RenderDebugInfo = t.RenderDebugInfo; -export var RenderDebugInfo: typeof t.RenderDebugInfo = r.RenderDebugInfo; -export var EMPTY_ARRAY: typeof t.EMPTY_ARRAY = r.EMPTY_ARRAY; -export var EMPTY_MAP: typeof t.EMPTY_MAP = r.EMPTY_MAP; -export var pureProxy1: typeof t.pureProxy1 = r.pureProxy1; -export var pureProxy2: typeof t.pureProxy2 = r.pureProxy2; -export var pureProxy3: typeof t.pureProxy3 = r.pureProxy3; -export var pureProxy4: typeof t.pureProxy4 = r.pureProxy4; -export var pureProxy5: typeof t.pureProxy5 = r.pureProxy5; -export var pureProxy6: typeof t.pureProxy6 = r.pureProxy6; -export var pureProxy7: typeof t.pureProxy7 = r.pureProxy7; -export var pureProxy8: typeof t.pureProxy8 = r.pureProxy8; -export var pureProxy9: typeof t.pureProxy9 = r.pureProxy9; -export var pureProxy10: typeof t.pureProxy10 = r.pureProxy10; -export var castByValue: typeof t.castByValue = r.castByValue; -export type Console = t.Console; -export var Console: typeof t.Console = r.Console; -export var reflector: t.Reflector = r.reflector; -export var Reflector: typeof t.Reflector = r.Reflector; -export type Reflector = t.Reflector; -export var ReflectionCapabilities: typeof t.ReflectionCapabilities = r.ReflectionCapabilities; -export type ReflectionCapabilities = t.ReflectionCapabilities; -export type NoOpAnimationPlayer = t.NoOpAnimationPlayer; -export var NoOpAnimationPlayer: typeof t.NoOpAnimationPlayer = r.NoOpAnimationPlayer; -export type AnimationPlayer = t.AnimationPlayer; -export var AnimationPlayer: typeof t.AnimationPlayer = r.AnimationPlayer; -export type AnimationSequencePlayer = t.AnimationSequencePlayer; -export var AnimationSequencePlayer: typeof t.AnimationSequencePlayer = r.AnimationSequencePlayer; -export type AnimationGroupPlayer = t.AnimationGroupPlayer; -export var AnimationGroupPlayer: typeof t.AnimationGroupPlayer = r.AnimationGroupPlayer; -export type AnimationKeyframe = t.AnimationKeyframe; -export var AnimationKeyframe: typeof t.AnimationKeyframe = r.AnimationKeyframe; -export type AnimationStyles = t.AnimationStyles; -export var AnimationStyles: typeof t.AnimationStyles = r.AnimationStyles; -export type AnimationOutput = t.AnimationOutput; -export var AnimationOutput: typeof t.AnimationOutput = r.AnimationOutput; +export var DebugContext: typeof r.DebugContext = r.DebugContext; +export var StaticNodeDebugInfo: typeof r.StaticNodeDebugInfo = r.StaticNodeDebugInfo; +export var devModeEqual: typeof r.devModeEqual = r.devModeEqual; +export var UNINITIALIZED: typeof r.UNINITIALIZED = r.UNINITIALIZED; +export var ValueUnwrapper: typeof _compiler_core_private_types.ValueUnwrapper = r.ValueUnwrapper; +export type TemplateRef_ = __core_private_TemplateRef__; +export var TemplateRef_: typeof r.TemplateRef_ = r.TemplateRef_; +export type RenderDebugInfo = typeof _compiler_core_private_types.RenderDebugInfo; +export var RenderDebugInfo: typeof r.RenderDebugInfo = r.RenderDebugInfo; +export var EMPTY_ARRAY: typeof r.EMPTY_ARRAY = r.EMPTY_ARRAY; +export var EMPTY_MAP: typeof r.EMPTY_MAP = r.EMPTY_MAP; +export var pureProxy1: typeof r.pureProxy1 = r.pureProxy1; +export var pureProxy2: typeof r.pureProxy2 = r.pureProxy2; +export var pureProxy3: typeof r.pureProxy3 = r.pureProxy3; +export var pureProxy4: typeof r.pureProxy4 = r.pureProxy4; +export var pureProxy5: typeof r.pureProxy5 = r.pureProxy5; +export var pureProxy6: typeof r.pureProxy6 = r.pureProxy6; +export var pureProxy7: typeof r.pureProxy7 = r.pureProxy7; +export var pureProxy8: typeof r.pureProxy8 = r.pureProxy8; +export var pureProxy9: typeof r.pureProxy9 = r.pureProxy9; +export var pureProxy10: typeof r.pureProxy10 = r.pureProxy10; +export var castByValue: typeof r.castByValue = r.castByValue; +export type Console = typeof _compiler_core_private_types.Console; +export var Console: typeof r.Console = r.Console; +export var reflector: typeof _compiler_core_private_types.Reflector = r.reflector; +export var Reflector: typeof r.Reflector = r.Reflector; +export type Reflector = typeof _compiler_core_private_types.Reflector; +export type ReflectionCapabilities = typeof _compiler_core_private_types.ReflectionCapabilities; +export var ReflectionCapabilities: typeof r.ReflectionCapabilities = r.ReflectionCapabilities; +export type NoOpAnimationPlayer = typeof _compiler_core_private_types.NoOpAnimationPlayer; +export var NoOpAnimationPlayer: typeof r.NoOpAnimationPlayer = r.NoOpAnimationPlayer; +export type AnimationPlayer = typeof _compiler_core_private_types.AnimationPlayer; +export var AnimationPlayer: typeof r.AnimationPlayer = r.AnimationPlayer; +export type AnimationSequencePlayer = typeof _compiler_core_private_types.AnimationSequencePlayer; +export var AnimationSequencePlayer: typeof r.AnimationSequencePlayer = r.AnimationSequencePlayer; +export type AnimationGroupPlayer = typeof _compiler_core_private_types.AnimationGroupPlayer; +export var AnimationGroupPlayer: typeof r.AnimationGroupPlayer = r.AnimationGroupPlayer; +export type AnimationKeyframe = typeof _compiler_core_private_types.AnimationKeyframe; +export var AnimationKeyframe: typeof r.AnimationKeyframe = r.AnimationKeyframe; +export type AnimationStyles = typeof _compiler_core_private_types.AnimationStyles; +export var AnimationStyles: typeof r.AnimationStyles = r.AnimationStyles; +export type AnimationOutput = typeof _compiler_core_private_types.AnimationOutput; +export var AnimationOutput: typeof r.AnimationOutput = r.AnimationOutput; export var ANY_STATE = r.ANY_STATE; export var DEFAULT_STATE = r.DEFAULT_STATE; export var EMPTY_STATE = r.EMPTY_STATE; export var FILL_STYLE_FLAG = r.FILL_STYLE_FLAG; -export var prepareFinalAnimationStyles: typeof t.prepareFinalAnimationStyles = +export var prepareFinalAnimationStyles: typeof r.prepareFinalAnimationStyles = r.prepareFinalAnimationStyles; -export var balanceAnimationKeyframes: typeof t.balanceAnimationKeyframes = +export var balanceAnimationKeyframes: typeof r.balanceAnimationKeyframes = r.balanceAnimationKeyframes; -export var flattenStyles: typeof t.flattenStyles = r.flattenStyles; -export var clearStyles: typeof t.clearStyles = r.clearStyles; +export var flattenStyles: typeof r.flattenStyles = r.flattenStyles; +export var clearStyles: typeof r.clearStyles = r.clearStyles; export var collectAndResolveStyles: typeof r.collectAndResolveStyles = r.collectAndResolveStyles; -export var renderStyles: typeof t.renderStyles = r.renderStyles; -export type ViewMetadata = t.ViewMetadata; -export var ViewMetadata: typeof t.ViewMetadata = r.ViewMetadata; +export var renderStyles: typeof r.renderStyles = r.renderStyles; +export type ViewMetadata = typeof _compiler_core_private_types.ViewMetadata; +export var ViewMetadata: typeof r.ViewMetadata = r.ViewMetadata; diff --git a/modules/@angular/compiler/core_private_testing.ts b/modules/@angular/compiler/core_private_testing.ts index 75fa5a1b6c..ec976f1f2f 100644 --- a/modules/@angular/compiler/core_private_testing.ts +++ b/modules/@angular/compiler/core_private_testing.ts @@ -6,10 +6,12 @@ * found in the LICENSE file at https://angular.io/license */ -import {__core_private_testing__ as r, __core_private_testing_types__ as t} from '@angular/core/testing'; +import {__core_private_testing__ as r, __core_private_testing_types__ as types} from '@angular/core/testing'; -export type TestingCompiler = t.TestingCompiler; -export var TestingCompiler: typeof t.TestingCompiler = r.TestingCompiler; +export declare let _compiler_core_testing_types: types; -export type TestingCompilerFactory = t.TestingCompilerFactory; -export var TestingCompilerFactory: typeof t.TestingCompilerFactory = r.TestingCompilerFactory; +export type TestingCompiler = typeof _compiler_core_testing_types.TestingCompiler; +export var TestingCompiler: typeof r.TestingCompiler = r.TestingCompiler; + +export type TestingCompilerFactory = typeof _compiler_core_testing_types.TestingCompilerFactory; +export var TestingCompilerFactory: typeof r.TestingCompilerFactory = r.TestingCompilerFactory; diff --git a/modules/@angular/core/private_export.ts b/modules/@angular/core/private_export.ts index 4498690100..8935111c2c 100644 --- a/modules/@angular/core/private_export.ts +++ b/modules/@angular/core/private_export.ts @@ -40,92 +40,76 @@ import * as api from './src/render/api'; import * as security from './src/security'; import * as decorators from './src/util/decorators'; -export declare namespace __core_private_types__ { - export var isDefaultChangeDetectionStrategy: typeof constants.isDefaultChangeDetectionStrategy; - export type ChangeDetectorStatus = constants.ChangeDetectorStatus; - export var ChangeDetectorStatus: typeof constants.ChangeDetectorStatus; - export var CHANGE_DETECTION_STRATEGY_VALUES: typeof constants.CHANGE_DETECTION_STRATEGY_VALUES; - export var constructDependencies: typeof reflective_provider.constructDependencies; - export type LifecycleHooks = lifecycle_hooks.LifecycleHooks; - export var LifecycleHooks: typeof lifecycle_hooks.LifecycleHooks; - export var LIFECYCLE_HOOKS_VALUES: typeof lifecycle_hooks.LIFECYCLE_HOOKS_VALUES; - export type ReflectorReader = reflector_reader.ReflectorReader; - export var ReflectorReader: typeof reflector_reader.ReflectorReader; - export var CodegenComponentFactoryResolver: +// These generic types can't be exported within the __core_private_types__ +// interface because the generic type info will be lost. So just exporting +// them separately. +export type __core_private_DebugAppView__ = view.DebugAppView; +export type __core_private_TemplateRef__ = template_ref.TemplateRef_; + +export interface __core_private_types__ { + isDefaultChangeDetectionStrategy: typeof constants.isDefaultChangeDetectionStrategy; + ChangeDetectorStatus: constants.ChangeDetectorStatus; + CHANGE_DETECTION_STRATEGY_VALUES: typeof constants.CHANGE_DETECTION_STRATEGY_VALUES; + constructDependencies: typeof reflective_provider.constructDependencies; + LifecycleHooks: lifecycle_hooks.LifecycleHooks; + LIFECYCLE_HOOKS_VALUES: typeof lifecycle_hooks.LIFECYCLE_HOOKS_VALUES; + ReflectorReader: reflector_reader.ReflectorReader; + CodegenComponentFactoryResolver: typeof component_factory_resolver.CodegenComponentFactoryResolver; - export type AppElement = element.AppElement; - export var AppElement: typeof element.AppElement; - export var AppView: typeof view.AppView; - export var NgModuleInjector: typeof ng_module_factory.NgModuleInjector; - export type DebugAppView = view.DebugAppView; - export var DebugAppView: typeof view.DebugAppView; - export type ViewType = view_type.ViewType; - export var ViewType: typeof view_type.ViewType; - export var MAX_INTERPOLATION_VALUES: typeof view_utils.MAX_INTERPOLATION_VALUES; - export var checkBinding: typeof view_utils.checkBinding; - export var flattenNestedViewRenderNodes: typeof view_utils.flattenNestedViewRenderNodes; - export var interpolate: typeof view_utils.interpolate; - export var ViewUtils: typeof view_utils.ViewUtils; - export var VIEW_ENCAPSULATION_VALUES: typeof metadata_view.VIEW_ENCAPSULATION_VALUES; - export type ViewMetadata = metadata_view.ViewMetadata; - export var ViewMetadata: typeof metadata_view.ViewMetadata; - export var DebugContext: typeof debug_context.DebugContext; - export var StaticNodeDebugInfo: typeof debug_context.StaticNodeDebugInfo; - export var devModeEqual: typeof change_detection_util.devModeEqual; - export var UNINITIALIZED: typeof change_detection_util.UNINITIALIZED; - export var ValueUnwrapper: typeof change_detection_util.ValueUnwrapper; - export type RenderDebugInfo = api.RenderDebugInfo; - export var RenderDebugInfo: typeof api.RenderDebugInfo; - export type TemplateRef_ = template_ref.TemplateRef_; - export var TemplateRef_: typeof template_ref.TemplateRef_; - export var wtfInit: typeof wtf_init.wtfInit; - export type ReflectionCapabilities = reflection_capabilities.ReflectionCapabilities; - export var ReflectionCapabilities: typeof reflection_capabilities.ReflectionCapabilities; - export var makeDecorator: typeof decorators.makeDecorator; - export type DebugDomRootRenderer = debug.DebugDomRootRenderer; - export var DebugDomRootRenderer: typeof debug.DebugDomRootRenderer; - export var EMPTY_ARRAY: typeof view_utils.EMPTY_ARRAY; - export var EMPTY_MAP: typeof view_utils.EMPTY_MAP; - export var pureProxy1: typeof view_utils.pureProxy1; - export var pureProxy2: typeof view_utils.pureProxy2; - export var pureProxy3: typeof view_utils.pureProxy3; - export var pureProxy4: typeof view_utils.pureProxy4; - export var pureProxy5: typeof view_utils.pureProxy5; - export var pureProxy6: typeof view_utils.pureProxy6; - export var pureProxy7: typeof view_utils.pureProxy7; - export var pureProxy8: typeof view_utils.pureProxy8; - export var pureProxy9: typeof view_utils.pureProxy9; - export var pureProxy10: typeof view_utils.pureProxy10; - export var castByValue: typeof view_utils.castByValue; - export type Console = console.Console; - export var Console: typeof console.Console; - export var reflector: typeof reflection.reflector; - export type Reflector = reflection.Reflector; - export var Reflector: typeof reflection.Reflector; - export type NoOpAnimationPlayer = NoOpAnimationPlayer_; - export var NoOpAnimationPlayer: typeof NoOpAnimationPlayer_; - export type AnimationPlayer = AnimationPlayer_; - export var AnimationPlayer: typeof AnimationPlayer_; - export type AnimationSequencePlayer = AnimationSequencePlayer_; - export var AnimationSequencePlayer: typeof AnimationSequencePlayer_; - export type AnimationGroupPlayer = AnimationGroupPlayer_; - export var AnimationGroupPlayer: typeof AnimationGroupPlayer_; - export type AnimationKeyframe = AnimationKeyframe_; - export var AnimationKeyframe: typeof AnimationKeyframe_; - export var prepareFinalAnimationStyles: typeof animationUtils.prepareFinalAnimationStyles; - export var balanceAnimationKeyframes: typeof animationUtils.balanceAnimationKeyframes; - export var flattenStyles: typeof animationUtils.flattenStyles; - export var clearStyles: typeof animationUtils.clearStyles; - export var renderStyles: typeof animationUtils.renderStyles; - export var collectAndResolveStyles: typeof animationUtils.collectAndResolveStyles; - export type AnimationStyles = AnimationStyles_; - export var AnimationStyles: typeof AnimationStyles_; - export type AnimationOutput = AnimationOutput_; - export var AnimationOutput: typeof AnimationOutput_; - export var ANY_STATE: typeof ANY_STATE_; - export var DEFAULT_STATE: typeof DEFAULT_STATE_; - export var EMPTY_STATE: typeof EMPTY_STATE_; - export var FILL_STYLE_FLAG: typeof FILL_STYLE_FLAG_; + AppElement: element.AppElement; + AppView: typeof view.AppView; + NgModuleInjector: typeof ng_module_factory.NgModuleInjector; + ViewType: view_type.ViewType; + MAX_INTERPOLATION_VALUES: typeof view_utils.MAX_INTERPOLATION_VALUES; + checkBinding: typeof view_utils.checkBinding; + flattenNestedViewRenderNodes: typeof view_utils.flattenNestedViewRenderNodes; + interpolate: typeof view_utils.interpolate; + ViewUtils: typeof view_utils.ViewUtils; + VIEW_ENCAPSULATION_VALUES: typeof metadata_view.VIEW_ENCAPSULATION_VALUES; + ViewMetadata: metadata_view.ViewMetadata; + DebugContext: typeof debug_context.DebugContext; + StaticNodeDebugInfo: typeof debug_context.StaticNodeDebugInfo; + devModeEqual: typeof change_detection_util.devModeEqual; + UNINITIALIZED: typeof change_detection_util.UNINITIALIZED; + ValueUnwrapper: typeof change_detection_util.ValueUnwrapper; + RenderDebugInfo: api.RenderDebugInfo; + wtfInit: typeof wtf_init.wtfInit; + ReflectionCapabilities: reflection_capabilities.ReflectionCapabilities; + makeDecorator: typeof decorators.makeDecorator; + DebugDomRootRenderer: debug.DebugDomRootRenderer; + EMPTY_ARRAY: typeof view_utils.EMPTY_ARRAY; + EMPTY_MAP: typeof view_utils.EMPTY_MAP; + pureProxy1: typeof view_utils.pureProxy1; + pureProxy2: typeof view_utils.pureProxy2; + pureProxy3: typeof view_utils.pureProxy3; + pureProxy4: typeof view_utils.pureProxy4; + pureProxy5: typeof view_utils.pureProxy5; + pureProxy6: typeof view_utils.pureProxy6; + pureProxy7: typeof view_utils.pureProxy7; + pureProxy8: typeof view_utils.pureProxy8; + pureProxy9: typeof view_utils.pureProxy9; + pureProxy10: typeof view_utils.pureProxy10; + castByValue: typeof view_utils.castByValue; + Console: console.Console; + reflector: typeof reflection.reflector; + Reflector: reflection.Reflector; + NoOpAnimationPlayer: NoOpAnimationPlayer_; + AnimationPlayer: AnimationPlayer_; + AnimationSequencePlayer: AnimationSequencePlayer_; + AnimationGroupPlayer: AnimationGroupPlayer_; + AnimationKeyframe: AnimationKeyframe_; + prepareFinalAnimationStyles: typeof animationUtils.prepareFinalAnimationStyles; + balanceAnimationKeyframes: typeof animationUtils.balanceAnimationKeyframes; + flattenStyles: typeof animationUtils.flattenStyles; + clearStyles: typeof animationUtils.clearStyles; + renderStyles: typeof animationUtils.renderStyles; + collectAndResolveStyles: typeof animationUtils.collectAndResolveStyles; + AnimationStyles: AnimationStyles_; + AnimationOutput: AnimationOutput_; + ANY_STATE: typeof ANY_STATE_; + DEFAULT_STATE: typeof DEFAULT_STATE_; + EMPTY_STATE: typeof EMPTY_STATE_; + FILL_STYLE_FLAG: typeof FILL_STYLE_FLAG_; } export var __core_private__ = { diff --git a/modules/@angular/core/private_export_testing.ts b/modules/@angular/core/private_export_testing.ts index 574e8fd57c..31990693d8 100644 --- a/modules/@angular/core/private_export_testing.ts +++ b/modules/@angular/core/private_export_testing.ts @@ -8,11 +8,9 @@ import * as test_compiler from './testing/test_compiler'; -export declare namespace __core_private_testing_types__ { - export type TestingCompiler = test_compiler.TestingCompiler; - export var TestingCompiler: typeof test_compiler.TestingCompiler; - export type TestingCompilerFactory = test_compiler.TestingCompilerFactory; - export var TestingCompilerFactory: typeof test_compiler.TestingCompilerFactory; +export interface __core_private_testing_types__ { + TestingCompiler: test_compiler.TestingCompiler; + TestingCompilerFactory: test_compiler.TestingCompilerFactory; } export var __core_private_testing__ = { diff --git a/modules/@angular/platform-browser-dynamic/core_private.ts b/modules/@angular/platform-browser-dynamic/core_private.ts index 34fa169aba..c6560ea960 100644 --- a/modules/@angular/platform-browser-dynamic/core_private.ts +++ b/modules/@angular/platform-browser-dynamic/core_private.ts @@ -6,8 +6,8 @@ * found in the LICENSE file at https://angular.io/license */ -import {__core_private__ as r, __core_private_types__ as t} from '@angular/core'; +import {__core_private__ as r} from '@angular/core'; -export var ReflectionCapabilities: typeof t.ReflectionCapabilities = r.ReflectionCapabilities; -export var reflector: typeof t.reflector = r.reflector; -export var Console: typeof t.Console = r.Console; +export var ReflectionCapabilities: typeof r.ReflectionCapabilities = r.ReflectionCapabilities; +export var reflector: typeof r.reflector = r.reflector; +export var Console: typeof r.Console = r.Console; diff --git a/modules/@angular/platform-browser-dynamic/platform_browser_private.ts b/modules/@angular/platform-browser-dynamic/platform_browser_private.ts index 8b69a84aa4..c18ea498eb 100644 --- a/modules/@angular/platform-browser-dynamic/platform_browser_private.ts +++ b/modules/@angular/platform-browser-dynamic/platform_browser_private.ts @@ -6,8 +6,8 @@ * found in the LICENSE file at https://angular.io/license */ -import {__platform_browser_private__ as r, __platform_browser_private__ as t} from '@angular/platform-browser'; +import {__platform_browser_private__ as r} from '@angular/platform-browser'; -export var INTERNAL_BROWSER_PLATFORM_PROVIDERS: typeof t.INTERNAL_BROWSER_PLATFORM_PROVIDERS = +export var INTERNAL_BROWSER_PLATFORM_PROVIDERS: typeof r.INTERNAL_BROWSER_PLATFORM_PROVIDERS = r.INTERNAL_BROWSER_PLATFORM_PROVIDERS; -export var getDOM: typeof t.getDOM = r.getDOM; +export var getDOM: typeof r.getDOM = r.getDOM; diff --git a/modules/@angular/platform-browser-dynamic/private_export_testing.ts b/modules/@angular/platform-browser-dynamic/private_export_testing.ts index 8dcd2345dd..eecee77e58 100644 --- a/modules/@angular/platform-browser-dynamic/private_export_testing.ts +++ b/modules/@angular/platform-browser-dynamic/private_export_testing.ts @@ -8,9 +8,8 @@ import * as testing from './testing/dom_test_component_renderer'; -export declare namespace __platform_browser_dynamic_private_types__ { - export type DOMTestComponentRenderer = testing.DOMTestComponentRenderer; - export var DOMTestComponentRenderer: typeof testing.DOMTestComponentRenderer; +export interface __platform_browser_dynamic_private_types__ { + DOMTestComponentRenderer: testing.DOMTestComponentRenderer; } export var __platform_browser_dynamic_private__ = { diff --git a/modules/@angular/platform-browser/core_private.ts b/modules/@angular/platform-browser/core_private.ts index a65f6b94a8..8348494109 100644 --- a/modules/@angular/platform-browser/core_private.ts +++ b/modules/@angular/platform-browser/core_private.ts @@ -6,34 +6,36 @@ * found in the LICENSE file at https://angular.io/license */ -import {__core_private__ as r, __core_private_types__ as t} from '@angular/core'; +import {__core_private__ as r, __core_private_types__ as types} from '@angular/core'; -export type RenderDebugInfo = t.RenderDebugInfo; -export var RenderDebugInfo: typeof t.RenderDebugInfo = r.RenderDebugInfo; -export var wtfInit: typeof t.wtfInit = r.wtfInit; -export var ReflectionCapabilities: typeof t.ReflectionCapabilities = r.ReflectionCapabilities; -export var VIEW_ENCAPSULATION_VALUES: typeof t.VIEW_ENCAPSULATION_VALUES = +export declare let _browser_core_private_types: types; + +export type RenderDebugInfo = typeof _browser_core_private_types.RenderDebugInfo; +export var RenderDebugInfo: typeof r.RenderDebugInfo = r.RenderDebugInfo; +export var wtfInit: typeof r.wtfInit = r.wtfInit; +export var ReflectionCapabilities: typeof r.ReflectionCapabilities = r.ReflectionCapabilities; +export var VIEW_ENCAPSULATION_VALUES: typeof r.VIEW_ENCAPSULATION_VALUES = r.VIEW_ENCAPSULATION_VALUES; -export type DebugDomRootRenderer = t.DebugDomRootRenderer; -export var DebugDomRootRenderer: typeof t.DebugDomRootRenderer = r.DebugDomRootRenderer; -export var reflector: typeof t.reflector = r.reflector; +export type DebugDomRootRenderer = typeof _browser_core_private_types.DebugDomRootRenderer; +export var DebugDomRootRenderer: typeof r.DebugDomRootRenderer = r.DebugDomRootRenderer; +export var reflector: typeof r.reflector = r.reflector; -export type NoOpAnimationPlayer = t.NoOpAnimationPlayer; -export var NoOpAnimationPlayer: typeof t.NoOpAnimationPlayer = r.NoOpAnimationPlayer; -export type AnimationPlayer = t.AnimationPlayer; -export var AnimationPlayer: typeof t.AnimationPlayer = r.AnimationPlayer; -export type AnimationSequencePlayer = t.AnimationSequencePlayer; -export var AnimationSequencePlayer: typeof t.AnimationSequencePlayer = r.AnimationSequencePlayer; -export type AnimationGroupPlayer = t.AnimationGroupPlayer; -export var AnimationGroupPlayer: typeof t.AnimationGroupPlayer = r.AnimationGroupPlayer; -export type AnimationKeyframe = t.AnimationKeyframe; -export var AnimationKeyframe: typeof t.AnimationKeyframe = r.AnimationKeyframe; -export type AnimationStyles = t.AnimationStyles; -export var AnimationStyles: typeof t.AnimationStyles = r.AnimationStyles; -export var prepareFinalAnimationStyles: typeof t.prepareFinalAnimationStyles = +export type NoOpAnimationPlayer = typeof _browser_core_private_types.NoOpAnimationPlayer; +export var NoOpAnimationPlayer: typeof r.NoOpAnimationPlayer = r.NoOpAnimationPlayer; +export type AnimationPlayer = typeof _browser_core_private_types.AnimationPlayer; +export var AnimationPlayer: typeof r.AnimationPlayer = r.AnimationPlayer; +export type AnimationSequencePlayer = typeof _browser_core_private_types.AnimationSequencePlayer; +export var AnimationSequencePlayer: typeof r.AnimationSequencePlayer = r.AnimationSequencePlayer; +export type AnimationGroupPlayer = typeof _browser_core_private_types.AnimationGroupPlayer; +export var AnimationGroupPlayer: typeof r.AnimationGroupPlayer = r.AnimationGroupPlayer; +export type AnimationKeyframe = typeof _browser_core_private_types.AnimationKeyframe; +export var AnimationKeyframe: typeof r.AnimationKeyframe = r.AnimationKeyframe; +export type AnimationStyles = typeof _browser_core_private_types.AnimationStyles; +export var AnimationStyles: typeof r.AnimationStyles = r.AnimationStyles; +export var prepareFinalAnimationStyles: typeof r.prepareFinalAnimationStyles = r.prepareFinalAnimationStyles; -export var balanceAnimationKeyframes: typeof t.balanceAnimationKeyframes = +export var balanceAnimationKeyframes: typeof r.balanceAnimationKeyframes = r.balanceAnimationKeyframes; -export var flattenStyles: typeof t.flattenStyles = r.flattenStyles; -export var clearStyles: typeof t.clearStyles = r.clearStyles; +export var flattenStyles: typeof r.flattenStyles = r.flattenStyles; +export var clearStyles: typeof r.clearStyles = r.clearStyles; export var collectAndResolveStyles: typeof r.collectAndResolveStyles = r.collectAndResolveStyles; diff --git a/modules/@angular/platform-browser/private_export.ts b/modules/@angular/platform-browser/private_export.ts index 1df8836424..dc9abb91b8 100644 --- a/modules/@angular/platform-browser/private_export.ts +++ b/modules/@angular/platform-browser/private_export.ts @@ -15,23 +15,13 @@ import * as dom_renderer from './src/dom/dom_renderer'; import * as dom_events from './src/dom/events/dom_events'; import * as shared_styles_host from './src/dom/shared_styles_host'; -export declare namespace __platform_browser_private_types__ { - export type DomAdapter = dom_adapter.DomAdapter; - export var DomAdapter: typeof dom_adapter.DomAdapter; - export var getDOM: typeof dom_adapter.getDOM; - export var setRootDomAdapter: typeof dom_adapter.setRootDomAdapter; - export type DomRootRenderer = dom_renderer.DomRootRenderer; - export var DomRootRenderer: typeof dom_renderer.DomRootRenderer; - export type DomRootRenderer_ = dom_renderer.DomRootRenderer_; - export var DomRootRenderer_: typeof dom_renderer.DomRootRenderer_; - export type DomSharedStylesHost = shared_styles_host.DomSharedStylesHost; - export var DomSharedStylesHost: typeof shared_styles_host.DomSharedStylesHost; - export type SharedStylesHost = shared_styles_host.SharedStylesHost; - export var SharedStylesHost: typeof shared_styles_host.SharedStylesHost; - export var ELEMENT_PROBE_PROVIDERS: typeof ng_proble.ELEMENT_PROBE_PROVIDERS; - export type DomEventsPlugin = dom_events.DomEventsPlugin; - export var DomEventsPlugin: typeof dom_events.DomEventsPlugin; - export var initDomAdapter: typeof browser.initDomAdapter; +export interface __platform_browser_private_types__ { + DomAdapter: dom_adapter.DomAdapter; + DomRootRenderer: dom_renderer.DomRootRenderer; + DomRootRenderer_: dom_renderer.DomRootRenderer_; + DomSharedStylesHost: shared_styles_host.DomSharedStylesHost; + SharedStylesHost: shared_styles_host.SharedStylesHost; + DomEventsPlugin: dom_events.DomEventsPlugin; } export var __platform_browser_private__ = { diff --git a/modules/@angular/platform-server/core_private.ts b/modules/@angular/platform-server/core_private.ts index accc782e52..7bda5be195 100644 --- a/modules/@angular/platform-server/core_private.ts +++ b/modules/@angular/platform-server/core_private.ts @@ -6,9 +6,9 @@ * found in the LICENSE file at https://angular.io/license */ -import {__core_private__ as r, __core_private_types__ as t} from '@angular/core'; +import {__core_private__ as r} from '@angular/core'; -export var reflector: typeof t.reflector = r.reflector; -export var ReflectionCapabilities: typeof t.ReflectionCapabilities = r.ReflectionCapabilities; -export var wtfInit: typeof t.wtfInit = r.wtfInit; -export var Console: typeof t.Console = r.Console; +export var reflector: typeof r.reflector = r.reflector; +export var ReflectionCapabilities: typeof r.ReflectionCapabilities = r.ReflectionCapabilities; +export var wtfInit: typeof r.wtfInit = r.wtfInit; +export var Console: typeof r.Console = r.Console; diff --git a/modules/@angular/platform-server/platform_browser_dynamic_testing_private.ts b/modules/@angular/platform-server/platform_browser_dynamic_testing_private.ts index c53d9e93c9..dda86a93e7 100644 --- a/modules/@angular/platform-server/platform_browser_dynamic_testing_private.ts +++ b/modules/@angular/platform-server/platform_browser_dynamic_testing_private.ts @@ -6,6 +6,6 @@ * found in the LICENSE file at https://angular.io/license */ -import {__platform_browser_dynamic_private__ as r, __platform_browser_dynamic_private_types__ as t} from '@angular/platform-browser-dynamic/testing'; +import {__platform_browser_dynamic_private__ as r} from '@angular/platform-browser-dynamic/testing'; -export var DOMTestComponentRenderer: typeof t.DOMTestComponentRenderer = r.DOMTestComponentRenderer; +export var DOMTestComponentRenderer: typeof r.DOMTestComponentRenderer = r.DOMTestComponentRenderer; diff --git a/modules/@angular/platform-server/platform_browser_private.ts b/modules/@angular/platform-server/platform_browser_private.ts index 56dea7c77f..8656575dbd 100644 --- a/modules/@angular/platform-server/platform_browser_private.ts +++ b/modules/@angular/platform-server/platform_browser_private.ts @@ -6,21 +6,22 @@ * found in the LICENSE file at https://angular.io/license */ -import {__platform_browser_private__ as r, __platform_browser_private_types__ as t} from '@angular/platform-browser'; +import {__platform_browser_private__ as r, __platform_browser_private_types__ as types} from '@angular/platform-browser'; -export type DomAdapter = typeof t.DomAdapter; -export var DomAdapter: typeof t.DomAdapter = r.DomAdapter; -export var setRootDomAdapter: typeof t.setRootDomAdapter = r.setRootDomAdapter; -export var getDOM: typeof t.getDOM = r.getDOM; -export type DomRootRenderer = typeof t.DomRootRenderer; -export var DomRootRenderer: typeof t.DomRootRenderer = r.DomRootRenderer; -export type DomRootRenderer_ = typeof t.DomRootRenderer_; -export var DomRootRenderer_: typeof t.DomRootRenderer_ = r.DomRootRenderer_; -export type DomSharedStylesHost = typeof t.DomSharedStylesHost; -export var DomSharedStylesHost: typeof t.DomSharedStylesHost = r.DomSharedStylesHost; -export type SharedStylesHost = typeof t.SharedStylesHost; -export var SharedStylesHost: typeof t.SharedStylesHost = r.SharedStylesHost; -export type ELEMENT_PROBE_PROVIDERS = typeof t.ELEMENT_PROBE_PROVIDERS; -export var ELEMENT_PROBE_PROVIDERS: typeof t.ELEMENT_PROBE_PROVIDERS = r.ELEMENT_PROBE_PROVIDERS; -export type DomEventsPlugin = typeof t.DomEventsPlugin; -export var DomEventsPlugin: typeof t.DomEventsPlugin = r.DomEventsPlugin; +export declare let _server_platform_browser_private_types: types; + +export type DomAdapter = typeof _server_platform_browser_private_types.DomAdapter; +export var DomAdapter: typeof r.DomAdapter = r.DomAdapter; +export var setRootDomAdapter: typeof r.setRootDomAdapter = r.setRootDomAdapter; +export var getDOM: typeof r.getDOM = r.getDOM; +export type DomRootRenderer = typeof _server_platform_browser_private_types.DomRootRenderer; +export var DomRootRenderer: typeof r.DomRootRenderer = r.DomRootRenderer; +export type DomRootRenderer_ = typeof _server_platform_browser_private_types.DomRootRenderer_; +export var DomRootRenderer_: typeof r.DomRootRenderer_ = r.DomRootRenderer_; +export type DomSharedStylesHost = typeof _server_platform_browser_private_types.DomSharedStylesHost; +export var DomSharedStylesHost: typeof r.DomSharedStylesHost = r.DomSharedStylesHost; +export type SharedStylesHost = typeof _server_platform_browser_private_types.SharedStylesHost; +export var SharedStylesHost: typeof r.SharedStylesHost = r.SharedStylesHost; +export var ELEMENT_PROBE_PROVIDERS: typeof r.ELEMENT_PROBE_PROVIDERS = r.ELEMENT_PROBE_PROVIDERS; +export type DomEventsPlugin = typeof _server_platform_browser_private_types.DomEventsPlugin; +export var DomEventsPlugin: typeof r.DomEventsPlugin = r.DomEventsPlugin;