From 5d12cb9fdf41f2ed58beee0f268452c5041ccd66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matias=20Niemel=C3=A4?= Date: Tue, 17 Sep 2019 14:51:28 -0700 Subject: [PATCH] refactor(ivy): move `styling/interfaces.ts` to `interfaces/styling.ts` (#32731) PR Close #32731 --- packages/core/src/debug/debug_node.ts | 2 +- .../src/render3/instructions/class_map_interpolation.ts | 3 ++- packages/core/src/render3/instructions/element.ts | 4 ++-- .../core/src/render3/instructions/element_container.ts | 2 +- packages/core/src/render3/instructions/lview_debug.ts | 2 +- .../src/render3/instructions/style_prop_interpolation.ts | 4 +++- packages/core/src/render3/instructions/styling.ts | 9 ++++----- packages/core/src/render3/interfaces/node.ts | 2 +- .../{styling/interfaces.ts => interfaces/styling.ts} | 4 ++-- packages/core/src/render3/styling/bindings.ts | 2 +- packages/core/src/render3/styling/map_based_bindings.ts | 2 +- packages/core/src/render3/styling/styling_debug.ts | 2 +- packages/core/src/render3/styling/util.ts | 4 +--- 13 files changed, 21 insertions(+), 21 deletions(-) rename packages/core/src/render3/{styling/interfaces.ts => interfaces/styling.ts} (99%) diff --git a/packages/core/src/debug/debug_node.ts b/packages/core/src/debug/debug_node.ts index 5e3a546491..313ebb163f 100644 --- a/packages/core/src/debug/debug_node.ts +++ b/packages/core/src/debug/debug_node.ts @@ -10,9 +10,9 @@ import {Injector} from '../di'; import {getViewComponent} from '../render3/global_utils_api'; import {CONTAINER_HEADER_OFFSET, LContainer, NATIVE} from '../render3/interfaces/container'; import {TElementNode, TNode, TNodeFlags, TNodeType} from '../render3/interfaces/node'; +import {StylingMapArray, TStylingContext} from '../render3/interfaces/styling'; import {isComponentHost, isLContainer} from '../render3/interfaces/type_checks'; import {LView, PARENT, TData, TVIEW, T_HOST} from '../render3/interfaces/view'; -import {StylingMapArray, TStylingContext} from '../render3/styling/interfaces'; import {NodeStylingDebug} from '../render3/styling/styling_debug'; import {isStylingContext, stylingMapToStringMap} from '../render3/styling/util'; import {getComponent, getContext, getInjectionTokens, getInjector, getListeners, getLocalRefs, isBrowserEvents, loadLContext} from '../render3/util/discovery_utils'; diff --git a/packages/core/src/render3/instructions/class_map_interpolation.ts b/packages/core/src/render3/instructions/class_map_interpolation.ts index 4841a603e8..d1a59cf1b8 100644 --- a/packages/core/src/render3/instructions/class_map_interpolation.ts +++ b/packages/core/src/render3/instructions/class_map_interpolation.ts @@ -7,8 +7,9 @@ */ import {getLView, getSelectedIndex} from '../state'; -import {classMapInternal} from './styling'; + import {interpolation1, interpolation2, interpolation3, interpolation4, interpolation5, interpolation6, interpolation7, interpolation8, interpolationV} from './interpolation'; +import {classMapInternal} from './styling'; diff --git a/packages/core/src/render3/instructions/element.ts b/packages/core/src/render3/instructions/element.ts index 6aa76d436c..294ed48f89 100644 --- a/packages/core/src/render3/instructions/element.ts +++ b/packages/core/src/render3/instructions/element.ts @@ -12,18 +12,18 @@ import {attachPatchData} from '../context_discovery'; import {registerPostOrderHooks} from '../hooks'; import {TAttributes, TNodeFlags, TNodeType} from '../interfaces/node'; import {RElement} from '../interfaces/renderer'; +import {StylingMapArray, TStylingContext} from '../interfaces/styling'; import {isContentQueryHost, isDirectiveHost} from '../interfaces/type_checks'; import {BINDING_INDEX, HEADER_OFFSET, LView, RENDERER, TVIEW, T_HOST} from '../interfaces/view'; import {assertNodeType} from '../node_assert'; import {appendChild} from '../node_manipulation'; import {decreaseElementDepthCount, getElementDepthCount, getIsParent, getLView, getNamespace, getPreviousOrParentTNode, getSelectedIndex, increaseElementDepthCount, setIsNotParent, setPreviousOrParentTNode} from '../state'; -import {registerInitialStylingOnTNode} from './styling'; -import {StylingMapArray, TStylingContext} from '../styling/interfaces'; import {getInitialStylingValue, hasClassInput, hasStyleInput} from '../styling/util'; import {setUpAttributes} from '../util/attrs_utils'; import {getNativeByTNode, getTNode} from '../util/view_utils'; import {createDirectivesInstances, elementCreate, executeContentQueries, getOrCreateTNode, renderInitialStyling, resolveDirectives, saveResolvedLocalsInData, setInputsForProperty} from './shared'; +import {registerInitialStylingOnTNode} from './styling'; diff --git a/packages/core/src/render3/instructions/element_container.ts b/packages/core/src/render3/instructions/element_container.ts index 21fba86731..b977bb016f 100644 --- a/packages/core/src/render3/instructions/element_container.ts +++ b/packages/core/src/render3/instructions/element_container.ts @@ -15,9 +15,9 @@ import {BINDING_INDEX, HEADER_OFFSET, RENDERER, TVIEW, T_HOST} from '../interfac import {assertNodeType} from '../node_assert'; import {appendChild} from '../node_manipulation'; import {getIsParent, getLView, getPreviousOrParentTNode, setIsNotParent, setPreviousOrParentTNode} from '../state'; -import {registerInitialStylingOnTNode} from './styling'; import {createDirectivesInstances, executeContentQueries, getOrCreateTNode, resolveDirectives, saveResolvedLocalsInData} from './shared'; +import {registerInitialStylingOnTNode} from './styling'; diff --git a/packages/core/src/render3/instructions/lview_debug.ts b/packages/core/src/render3/instructions/lview_debug.ts index 326a08a49e..2f9671f2bc 100644 --- a/packages/core/src/render3/instructions/lview_debug.ts +++ b/packages/core/src/render3/instructions/lview_debug.ts @@ -18,8 +18,8 @@ import {PropertyAliases, TContainerNode, TElementNode, TNode as ITNode, TNode, T import {SelectorFlags} from '../interfaces/projection'; import {TQueries} from '../interfaces/query'; import {RComment, RElement, RNode} from '../interfaces/renderer'; +import {TStylingContext} from '../interfaces/styling'; import {BINDING_INDEX, CHILD_HEAD, CHILD_TAIL, CLEANUP, CONTEXT, DECLARATION_VIEW, ExpandoInstructions, FLAGS, HEADER_OFFSET, HOST, HookData, INJECTOR, LView, LViewFlags, NEXT, PARENT, QUERIES, RENDERER, RENDERER_FACTORY, SANITIZER, TData, TVIEW, TView as ITView, TView, T_HOST} from '../interfaces/view'; -import {TStylingContext} from '../styling/interfaces'; import {DebugStyling as DebugNewStyling, NodeStylingDebug} from '../styling/styling_debug'; import {isStylingContext} from '../styling/util'; import {attachDebugObject} from '../util/debug_utils'; diff --git a/packages/core/src/render3/instructions/style_prop_interpolation.ts b/packages/core/src/render3/instructions/style_prop_interpolation.ts index 1a9fc99c78..7f03b9081e 100644 --- a/packages/core/src/render3/instructions/style_prop_interpolation.ts +++ b/packages/core/src/render3/instructions/style_prop_interpolation.ts @@ -6,9 +6,11 @@ * found in the LICENSE file at https://angular.io/license */ import {getLView, getSelectedIndex} from '../state'; -import {stylePropInternal} from './styling'; + import {interpolation1, interpolation2, interpolation3, interpolation4, interpolation5, interpolation6, interpolation7, interpolation8, interpolationV} from './interpolation'; import {TsickleIssue1009} from './shared'; +import {stylePropInternal} from './styling'; + /** diff --git a/packages/core/src/render3/instructions/styling.ts b/packages/core/src/render3/instructions/styling.ts index a6551babce..7bbdf0bd28 100644 --- a/packages/core/src/render3/instructions/styling.ts +++ b/packages/core/src/render3/instructions/styling.ts @@ -10,17 +10,16 @@ import {StyleSanitizeFn} from '../../sanitization/style_sanitizer'; import {setInputsForProperty} from '../instructions/shared'; import {AttributeMarker, TAttributes, TNode, TNodeType} from '../interfaces/node'; import {RElement} from '../interfaces/renderer'; +import {StylingMapArray, StylingMapArrayIndex, TStylingContext} from '../interfaces/styling'; import {BINDING_INDEX, LView, RENDERER} from '../interfaces/view'; import {getActiveDirectiveId, getCurrentStyleSanitizer, getLView, getSelectedIndex, setCurrentStyleSanitizer, setElementExitFn} from '../state'; -import {NO_CHANGE} from '../tokens'; -import {renderStringify} from '../util/misc_utils'; -import {getNativeByTNode, getTNode} from '../util/view_utils'; - import {applyStylingMapDirectly, applyStylingValueDirectly, flushStyling, setClass, setStyle, updateClassViaContext, updateStyleViaContext} from '../styling/bindings'; -import {StylingMapArray, StylingMapArrayIndex, TStylingContext} from '../styling/interfaces'; import {activateStylingMapFeature} from '../styling/map_based_bindings'; import {attachStylingDebugObject} from '../styling/styling_debug'; import {addItemToStylingMap, allocStylingMapArray, allocTStylingContext, allowDirectStyling, concatString, forceClassesAsString, forceStylesAsString, getInitialStylingValue, getStylingMapArray, hasClassInput, hasStyleInput, hasValueChanged, isContextLocked, isHostStylingActive, isStylingContext, normalizeIntoStylingMap, setValue, stylingMapToString} from '../styling/util'; +import {NO_CHANGE} from '../tokens'; +import {renderStringify} from '../util/misc_utils'; +import {getNativeByTNode, getTNode} from '../util/view_utils'; diff --git a/packages/core/src/render3/interfaces/node.ts b/packages/core/src/render3/interfaces/node.ts index a8dff1faf6..ec563f633b 100644 --- a/packages/core/src/render3/interfaces/node.ts +++ b/packages/core/src/render3/interfaces/node.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import {StylingMapArray, TStylingContext} from '../styling/interfaces'; +import {StylingMapArray, TStylingContext} from '../interfaces/styling'; import {CssSelector} from './projection'; import {RNode} from './renderer'; import {LView, TView} from './view'; diff --git a/packages/core/src/render3/styling/interfaces.ts b/packages/core/src/render3/interfaces/styling.ts similarity index 99% rename from packages/core/src/render3/styling/interfaces.ts rename to packages/core/src/render3/interfaces/styling.ts index b6a14e692e..ba108f90cb 100644 --- a/packages/core/src/render3/styling/interfaces.ts +++ b/packages/core/src/render3/interfaces/styling.ts @@ -6,8 +6,8 @@ * found in the LICENSE file at https://angular.io/license */ import {StyleSanitizeFn} from '../../sanitization/style_sanitizer'; -import {ProceduralRenderer3, RElement, Renderer3} from '../interfaces/renderer'; -import {LView} from '../interfaces/view'; +import {ProceduralRenderer3, RElement, Renderer3} from './renderer'; +import {LView} from './view'; /** * -------- diff --git a/packages/core/src/render3/styling/bindings.ts b/packages/core/src/render3/styling/bindings.ts index e75f464699..bf72b8b1bb 100644 --- a/packages/core/src/render3/styling/bindings.ts +++ b/packages/core/src/render3/styling/bindings.ts @@ -8,9 +8,9 @@ import {SafeValue, unwrapSafeValue} from '../../sanitization/bypass'; import {StyleSanitizeFn, StyleSanitizeMode} from '../../sanitization/style_sanitizer'; import {ProceduralRenderer3, RElement, Renderer3, RendererStyleFlags3, isProceduralRenderer} from '../interfaces/renderer'; +import {ApplyStylingFn, LStylingData, StylingMapArray, StylingMapArrayIndex, StylingMapsSyncMode, SyncStylingMapsFn, TStylingConfig, TStylingContext, TStylingContextIndex, TStylingContextPropConfigFlags} from '../interfaces/styling'; import {NO_CHANGE} from '../tokens'; -import {ApplyStylingFn, LStylingData, StylingMapArray, StylingMapArrayIndex, StylingMapsSyncMode, SyncStylingMapsFn, TStylingConfig, TStylingContext, TStylingContextIndex, TStylingContextPropConfigFlags} from './interfaces'; import {getStylingState, resetStylingState} from './state'; import {DEFAULT_BINDING_INDEX, DEFAULT_BINDING_VALUE, DEFAULT_GUARD_MASK_VALUE, MAP_BASED_ENTRY_PROP_NAME, getBindingValue, getConfig, getDefaultValue, getGuardMask, getMapProp, getMapValue, getProp, getPropValuesStartPosition, getStylingMapArray, getTotalSources, getValue, getValuesCount, hasConfig, hasValueChanged, isContextLocked, isHostStylingActive, isSanitizationRequired, isStylingValueDefined, lockContext, patchConfig, setDefaultValue, setGuardMask, setMapAsDirty, setValue} from './util'; diff --git a/packages/core/src/render3/styling/map_based_bindings.ts b/packages/core/src/render3/styling/map_based_bindings.ts index 44f0230f8f..38f3c61d41 100644 --- a/packages/core/src/render3/styling/map_based_bindings.ts +++ b/packages/core/src/render3/styling/map_based_bindings.ts @@ -8,9 +8,9 @@ import {unwrapSafeValue} from '../../sanitization/bypass'; import {StyleSanitizeFn, StyleSanitizeMode} from '../../sanitization/style_sanitizer'; import {ProceduralRenderer3, RElement, Renderer3} from '../interfaces/renderer'; +import {ApplyStylingFn, LStylingData, StylingMapArray, StylingMapArrayIndex, StylingMapsSyncMode, SyncStylingMapsFn, TStylingContext, TStylingContextIndex} from '../interfaces/styling'; import {setStylingMapsSyncFn} from './bindings'; -import {ApplyStylingFn, LStylingData, StylingMapArray, StylingMapArrayIndex, StylingMapsSyncMode, SyncStylingMapsFn, TStylingContext, TStylingContextIndex} from './interfaces'; import {getBindingValue, getMapProp, getMapValue, getValue, getValuesCount, isStylingValueDefined} from './util'; diff --git a/packages/core/src/render3/styling/styling_debug.ts b/packages/core/src/render3/styling/styling_debug.ts index 652ad0be3f..0c7c1504be 100644 --- a/packages/core/src/render3/styling/styling_debug.ts +++ b/packages/core/src/render3/styling/styling_debug.ts @@ -7,11 +7,11 @@ */ import {StyleSanitizeFn} from '../../sanitization/style_sanitizer'; import {RElement} from '../interfaces/renderer'; +import {ApplyStylingFn, LStylingData, TStylingConfig, TStylingContext, TStylingContextIndex} from '../interfaces/styling'; import {getCurrentStyleSanitizer} from '../state'; import {attachDebugObject} from '../util/debug_utils'; import {applyStylingViaContext} from './bindings'; -import {ApplyStylingFn, LStylingData, TStylingConfig, TStylingContext, TStylingContextIndex} from './interfaces'; import {activateStylingMapFeature} from './map_based_bindings'; import {allowDirectStyling as _allowDirectStyling, getDefaultValue, getGuardMask, getProp, getPropValuesStartPosition, getValuesCount, hasConfig, isContextLocked, isMapBased, isSanitizationRequired} from './util'; diff --git a/packages/core/src/render3/styling/util.ts b/packages/core/src/render3/styling/util.ts index 5a26befaed..6b7bb8376d 100644 --- a/packages/core/src/render3/styling/util.ts +++ b/packages/core/src/render3/styling/util.ts @@ -5,12 +5,10 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import {unwrapSafeValue} from '../../sanitization/bypass'; import {TNode, TNodeFlags} from '../interfaces/node'; +import {LStylingData, StylingMapArray, StylingMapArrayIndex, TStylingConfig, TStylingContext, TStylingContextIndex, TStylingContextPropConfigFlags} from '../interfaces/styling'; import {NO_CHANGE} from '../tokens'; -import {LStylingData, StylingMapArray, StylingMapArrayIndex, TStylingConfig, TStylingContext, TStylingContextIndex, TStylingContextPropConfigFlags} from './interfaces'; - export const MAP_BASED_ENTRY_PROP_NAME = '[MAP]'; export const TEMPLATE_DIRECTIVE_INDEX = 0;