Skip to content

Commit d5e3f2c

Browse files
committed
refactor(ivy): move instructions into separate directory (angular#29292)
PR Close angular#29292
1 parent bc99b77 commit d5e3f2c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+92
-84
lines changed

packages/core/src/render3/component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import {assertComponentType} from './assert';
1717
import {getComponentDef} from './definition';
1818
import {diPublicInInjector, getOrCreateNodeInjectorForNode} from './di';
1919
import {registerPostOrderHooks, registerPreOrderHooks} from './hooks';
20-
import {CLEAN_PROMISE, addToViewTree, createLView, createNodeAtIndex, createTView, getOrCreateTView, initNodeFlags, instantiateRootComponent, invokeHostBindingsInCreationMode, locateHostElement, queueComponentIndexForCheck, refreshDescendantViews} from './instructions';
20+
import {CLEAN_PROMISE, addToViewTree, createLView, createNodeAtIndex, createTView, getOrCreateTView, initNodeFlags, instantiateRootComponent, invokeHostBindingsInCreationMode, locateHostElement, queueComponentIndexForCheck, refreshDescendantViews} from './instructions/all';
2121
import {ComponentDef, ComponentType, RenderFlags} from './interfaces/definition';
2222
import {TElementNode, TNode, TNodeFlags, TNodeType} from './interfaces/node';
2323
import {PlayerHandler} from './interfaces/player';

packages/core/src/render3/component_ref.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import {assertComponentType} from './assert';
2626
import {LifecycleHooksFeature, createRootComponent, createRootComponentView, createRootContext} from './component';
2727
import {getComponentDef} from './definition';
2828
import {NodeInjector} from './di';
29-
import {addToViewTree, assignTViewNodeToLView, createLView, createTView, elementCreate, locateHostElement, refreshDescendantViews} from './instructions';
29+
import {addToViewTree, assignTViewNodeToLView, createLView, createTView, elementCreate, locateHostElement, refreshDescendantViews} from './instructions/all';
3030
import {ComponentDef} from './interfaces/definition';
3131
import {TContainerNode, TElementContainerNode, TElementNode} from './interfaces/node';
3232
import {RNode, RendererFactory3, domRendererFactory3, isProceduralRenderer} from './interfaces/renderer';

packages/core/src/render3/di_setup.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {isClassProvider, isTypeProvider, providerToFactory} from '../di/r3_injec
1313

1414
import {DirectiveDef} from '.';
1515
import {diPublicInInjector, getNodeInjectable, getOrCreateNodeInjectorForNode} from './di';
16-
import {directiveInject} from './instructions';
16+
import {directiveInject} from './instructions/all';
1717
import {NodeInjectorFactory} from './interfaces/injector';
1818
import {TContainerNode, TElementContainerNode, TElementNode, TNodeFlags, TNodeProviderIndexes} from './interfaces/node';
1919
import {LView, TData, TVIEW, TView} from './interfaces/view';

packages/core/src/render3/global_utils_api.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515
* file in the public_api_guard test.
1616
*/
1717

18-
export {markDirty} from './instructions';
18+
export {markDirty} from './instructions/all';
1919
export {getPlayers} from './players';
2020
export {getComponent, getContext, getDirectives, getHostElement, getInjector, getListeners, getRootComponents, getViewComponent} from './util/discovery_utils';

packages/core/src/render3/i18n.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {InertBodyHelper} from '../sanitization/inert_body';
1111
import {_sanitizeUrl, sanitizeSrcset} from '../sanitization/url_sanitizer';
1212
import {assertDefined, assertEqual, assertGreaterThan} from '../util/assert';
1313
import {attachPatchData} from './context_discovery';
14-
import {allocExpando, createNodeAtIndex, elementAttribute, load, textBinding} from './instructions';
14+
import {allocExpando, createNodeAtIndex, elementAttribute, load, textBinding} from './instructions/all';
1515
import {LContainer, NATIVE} from './interfaces/container';
1616
import {COMMENT_MARKER, ELEMENT_MARKER, I18nMutateOpCode, I18nMutateOpCodes, I18nUpdateOpCode, I18nUpdateOpCodes, IcuType, TI18n, TIcu} from './interfaces/i18n';
1717
import {TElementNode, TIcuContainerNode, TNode, TNodeType} from './interfaces/node';

packages/core/src/render3/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ export {
8686
injectAttribute,
8787

8888
getCurrentView
89-
} from './instructions';
89+
} from './instructions/all';
9090

9191
export {
9292
restoreView,
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
/**
2+
* @license
3+
* Copyright Google Inc. All Rights Reserved.
4+
*
5+
* Use of this source code is governed by an MIT-style license that can be
6+
* found in the LICENSE file at https://angular.io/license
7+
*/
8+
export * from './instructions';

packages/core/src/render3/instructions.ts renamed to packages/core/src/render3/instructions/instructions.ts

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -6,49 +6,49 @@
66
* found in the LICENSE file at https://angular.io/license
77
*/
88

9-
import {InjectFlags, InjectionToken, Injector} from '../di';
10-
import {resolveForwardRef} from '../di/forward_ref';
11-
import {ErrorHandler} from '../error_handler';
12-
import {Type} from '../interface/type';
13-
import {CUSTOM_ELEMENTS_SCHEMA, NO_ERRORS_SCHEMA, SchemaMetadata} from '../metadata/schema';
14-
import {validateAgainstEventAttributes, validateAgainstEventProperties} from '../sanitization/sanitization';
15-
import {Sanitizer} from '../sanitization/security';
16-
import {StyleSanitizeFn} from '../sanitization/style_sanitizer';
17-
import {assertDataInRange, assertDefined, assertDomNode, assertEqual, assertLessThan, assertNotEqual} from '../util/assert';
18-
import {isObservable} from '../util/lang';
19-
import {normalizeDebugBindingName, normalizeDebugBindingValue} from '../util/ng_reflect';
20-
21-
import {assertHasParent, assertLContainerOrUndefined, assertLView, assertPreviousIsParent} from './assert';
22-
import {bindingUpdated, bindingUpdated2, bindingUpdated3, bindingUpdated4} from './bindings';
23-
import {attachPatchData, getComponentViewByInstance} from './context_discovery';
24-
import {attachLContainerDebug, attachLViewDebug} from './debug';
25-
import {diPublicInInjector, getNodeInjectable, getOrCreateInjectable, getOrCreateNodeInjectorForNode, injectAttributeImpl} from './di';
26-
import {throwMultipleComponentError} from './errors';
27-
import {executeHooks, executePreOrderHooks, registerPostOrderHooks, registerPreOrderHooks} from './hooks';
28-
import {ACTIVE_INDEX, LContainer, VIEWS} from './interfaces/container';
29-
import {ComponentDef, ComponentTemplate, DirectiveDef, DirectiveDefListOrFactory, PipeDefListOrFactory, RenderFlags, ViewQueriesFunction} from './interfaces/definition';
30-
import {INJECTOR_BLOOM_PARENT_SIZE, NodeInjectorFactory} from './interfaces/injector';
31-
import {AttributeMarker, InitialInputData, InitialInputs, LocalRefExtractor, PropertyAliasValue, PropertyAliases, TAttributes, TContainerNode, TElementContainerNode, TElementNode, TIcuContainerNode, TNode, TNodeFlags, TNodeProviderIndexes, TNodeType, TProjectionNode, TViewNode} from './interfaces/node';
32-
import {PlayerFactory} from './interfaces/player';
33-
import {CssSelectorList} from './interfaces/projection';
34-
import {LQueries} from './interfaces/query';
35-
import {GlobalTargetResolver, RComment, RElement, RText, Renderer3, RendererFactory3, isProceduralRenderer} from './interfaces/renderer';
36-
import {SanitizerFn} from './interfaces/sanitization';
37-
import {StylingContext} from './interfaces/styling';
38-
import {BINDING_INDEX, CHILD_HEAD, CHILD_TAIL, CLEANUP, CONTEXT, DECLARATION_VIEW, ExpandoInstructions, FLAGS, HEADER_OFFSET, HOST, INJECTOR, InitPhaseState, LView, LViewFlags, NEXT, OpaqueViewState, PARENT, QUERIES, RENDERER, RENDERER_FACTORY, RootContext, RootContextFlags, SANITIZER, TData, TVIEW, TView, T_HOST} from './interfaces/view';
39-
import {assertNodeOfPossibleTypes, assertNodeType} from './node_assert';
40-
import {appendChild, appendProjectedNodes, createTextNode, insertView, removeView} from './node_manipulation';
41-
import {isNodeMatchingSelectorList, matchingProjectionSelectorIndex} from './node_selector_matcher';
42-
import {applyOnCreateInstructions} from './node_util';
43-
import {decreaseElementDepthCount, enterView, getBindingsEnabled, getCheckNoChangesMode, getContextLView, getCurrentDirectiveDef, getElementDepthCount, getIsParent, getLView, getPreviousOrParentTNode, increaseElementDepthCount, isCreationMode, leaveView, nextContextImpl, resetComponentState, setBindingRoot, setCheckNoChangesMode, setCurrentDirectiveDef, setCurrentQueryIndex, setIsParent, setPreviousOrParentTNode} from './state';
44-
import {getInitialClassNameValue, getInitialStyleStringValue, initializeStaticContext as initializeStaticStylingContext, patchContextWithStaticAttrs, renderInitialClasses, renderInitialStyles, renderStyling, updateClassProp as updateElementClassProp, updateContextWithBindings, updateStyleProp as updateElementStyleProp, updateStylingMap} from './styling/class_and_style_bindings';
45-
import {BoundPlayerFactory} from './styling/player_factory';
46-
import {ANIMATION_PROP_PREFIX, allocateDirectiveIntoContext, createEmptyStylingContext, forceClassesAsString, forceStylesAsString, getStylingContext, hasClassInput, hasStyleInput, isAnimationProp} from './styling/util';
47-
import {NO_CHANGE} from './tokens';
48-
import {attrsStylingIndexOf, setUpAttributes} from './util/attrs_utils';
49-
import {INTERPOLATION_DELIMITER, renderStringify} from './util/misc_utils';
50-
import {findComponentView, getLViewParent, getRootContext, getRootView} from './util/view_traversal_utils';
51-
import {getComponentViewByIndex, getNativeByIndex, getNativeByTNode, getTNode, isComponent, isComponentDef, isContentQueryHost, isRootView, loadInternal, readPatchedLView, resetPreOrderHookFlags, unwrapRNode, viewAttachedToChangeDetector} from './util/view_utils';
9+
import {InjectFlags, InjectionToken, Injector} from '../../di';
10+
import {resolveForwardRef} from '../../di/forward_ref';
11+
import {ErrorHandler} from '../../error_handler';
12+
import {Type} from '../../interface/type';
13+
import {CUSTOM_ELEMENTS_SCHEMA, NO_ERRORS_SCHEMA, SchemaMetadata} from '../../metadata/schema';
14+
import {validateAgainstEventAttributes, validateAgainstEventProperties} from '../../sanitization/sanitization';
15+
import {Sanitizer} from '../../sanitization/security';
16+
import {StyleSanitizeFn} from '../../sanitization/style_sanitizer';
17+
import {assertDataInRange, assertDefined, assertDomNode, assertEqual, assertLessThan, assertNotEqual} from '../../util/assert';
18+
import {isObservable} from '../../util/lang';
19+
import {normalizeDebugBindingName, normalizeDebugBindingValue} from '../../util/ng_reflect';
20+
21+
import {assertHasParent, assertLContainerOrUndefined, assertLView, assertPreviousIsParent} from '../assert';
22+
import {bindingUpdated, bindingUpdated2, bindingUpdated3, bindingUpdated4} from '../bindings';
23+
import {attachPatchData, getComponentViewByInstance} from '../context_discovery';
24+
import {attachLContainerDebug, attachLViewDebug} from '../debug';
25+
import {diPublicInInjector, getNodeInjectable, getOrCreateInjectable, getOrCreateNodeInjectorForNode, injectAttributeImpl} from '../di';
26+
import {throwMultipleComponentError} from '../errors';
27+
import {executeHooks, executePreOrderHooks, registerPostOrderHooks, registerPreOrderHooks} from '../hooks';
28+
import {ACTIVE_INDEX, LContainer, VIEWS} from '../interfaces/container';
29+
import {ComponentDef, ComponentTemplate, DirectiveDef, DirectiveDefListOrFactory, PipeDefListOrFactory, RenderFlags, ViewQueriesFunction} from '../interfaces/definition';
30+
import {INJECTOR_BLOOM_PARENT_SIZE, NodeInjectorFactory} from '../interfaces/injector';
31+
import {AttributeMarker, InitialInputData, InitialInputs, LocalRefExtractor, PropertyAliasValue, PropertyAliases, TAttributes, TContainerNode, TElementContainerNode, TElementNode, TIcuContainerNode, TNode, TNodeFlags, TNodeProviderIndexes, TNodeType, TProjectionNode, TViewNode} from '../interfaces/node';
32+
import {PlayerFactory} from '../interfaces/player';
33+
import {CssSelectorList} from '../interfaces/projection';
34+
import {LQueries} from '../interfaces/query';
35+
import {GlobalTargetResolver, RComment, RElement, RText, Renderer3, RendererFactory3, isProceduralRenderer} from '../interfaces/renderer';
36+
import {SanitizerFn} from '../interfaces/sanitization';
37+
import {StylingContext} from '../interfaces/styling';
38+
import {BINDING_INDEX, CHILD_HEAD, CHILD_TAIL, CLEANUP, CONTEXT, DECLARATION_VIEW, ExpandoInstructions, FLAGS, HEADER_OFFSET, HOST, INJECTOR, InitPhaseState, LView, LViewFlags, NEXT, OpaqueViewState, PARENT, QUERIES, RENDERER, RENDERER_FACTORY, RootContext, RootContextFlags, SANITIZER, TData, TVIEW, TView, T_HOST} from '../interfaces/view';
39+
import {assertNodeOfPossibleTypes, assertNodeType} from '../node_assert';
40+
import {appendChild, appendProjectedNodes, createTextNode, insertView, removeView} from '../node_manipulation';
41+
import {isNodeMatchingSelectorList, matchingProjectionSelectorIndex} from '../node_selector_matcher';
42+
import {applyOnCreateInstructions} from '../node_util';
43+
import {decreaseElementDepthCount, enterView, getBindingsEnabled, getCheckNoChangesMode, getContextLView, getCurrentDirectiveDef, getElementDepthCount, getIsParent, getLView, getPreviousOrParentTNode, increaseElementDepthCount, isCreationMode, leaveView, nextContextImpl, resetComponentState, setBindingRoot, setCheckNoChangesMode, setCurrentDirectiveDef, setCurrentQueryIndex, setIsParent, setPreviousOrParentTNode} from '../state';
44+
import {getInitialClassNameValue, getInitialStyleStringValue, initializeStaticContext as initializeStaticStylingContext, patchContextWithStaticAttrs, renderInitialClasses, renderInitialStyles, renderStyling, updateClassProp as updateElementClassProp, updateContextWithBindings, updateStyleProp as updateElementStyleProp, updateStylingMap} from '../styling/class_and_style_bindings';
45+
import {BoundPlayerFactory} from '../styling/player_factory';
46+
import {ANIMATION_PROP_PREFIX, allocateDirectiveIntoContext, createEmptyStylingContext, forceClassesAsString, forceStylesAsString, getStylingContext, hasClassInput, hasStyleInput, isAnimationProp} from '../styling/util';
47+
import {NO_CHANGE} from '../tokens';
48+
import {attrsStylingIndexOf, setUpAttributes} from '../util/attrs_utils';
49+
import {INTERPOLATION_DELIMITER, renderStringify} from '../util/misc_utils';
50+
import {findComponentView, getLViewParent, getRootContext, getRootView} from '../util/view_traversal_utils';
51+
import {getComponentViewByIndex, getNativeByIndex, getNativeByTNode, getTNode, isComponent, isComponentDef, isContentQueryHost, isRootView, loadInternal, readPatchedLView, resetPreOrderHookFlags, unwrapRNode, viewAttachedToChangeDetector} from '../util/view_utils';
5252

5353

5454

packages/core/src/render3/pipe.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import {WrappedValue} from '../change_detection/change_detection_util';
1010
import {PipeTransform} from '../change_detection/pipe_transform';
1111

12-
import {load, store} from './instructions';
12+
import {load, store} from './instructions/all';
1313
import {PipeDef, PipeDefList} from './interfaces/definition';
1414
import {BINDING_INDEX, HEADER_OFFSET, TVIEW} from './interfaces/view';
1515
import {pureFunction1, pureFunction2, pureFunction3, pureFunction4, pureFunctionV} from './pure_function';

packages/core/src/render3/players.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import '../util/ng_dev_mode';
99

1010
import {getLContext} from './context_discovery';
11-
import {scheduleTick} from './instructions';
11+
import {scheduleTick} from './instructions/all';
1212
import {ComponentInstance, DirectiveInstance, Player} from './interfaces/player';
1313
import {RootContextFlags} from './interfaces/view';
1414
import {addPlayerInternal, getOrCreatePlayerContext, getPlayerContext, getPlayersInternal, getStylingContext, throwInvalidRefError} from './styling/util';

packages/core/src/render3/query.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import {assertDataInRange, assertDefined, assertEqual} from '../util/assert';
1818
import {assertPreviousIsParent} from './assert';
1919
import {getNodeInjectable, locateDirectiveOrProvider} from './di';
2020
import {NG_ELEMENT_ID} from './fields';
21-
import {load, store, storeCleanupWithContext} from './instructions';
21+
import {load, store, storeCleanupWithContext} from './instructions/all';
2222
import {unusedValueExportToPlacateAjd as unused1} from './interfaces/definition';
2323
import {unusedValueExportToPlacateAjd as unused2} from './interfaces/injector';
2424
import {TContainerNode, TElementContainerNode, TElementNode, TNode, TNodeType, unusedValueExportToPlacateAjd as unused3} from './interfaces/node';

packages/core/src/render3/view_engine_compatibility.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import {Renderer2} from '../render/api';
1818
import {assertDefined, assertGreaterThan, assertLessThan} from '../util/assert';
1919

2020
import {NodeInjector, getParentInjectorLocation} from './di';
21-
import {addToViewTree, createEmbeddedViewAndNode, createLContainer, renderEmbeddedTemplate} from './instructions';
21+
import {addToViewTree, createEmbeddedViewAndNode, createLContainer, renderEmbeddedTemplate} from './instructions/all';
2222
import {ACTIVE_INDEX, LContainer, NATIVE, VIEWS} from './interfaces/container';
2323
import {TContainerNode, TElementContainerNode, TElementNode, TNode, TNodeType, TViewNode} from './interfaces/node';
2424
import {RComment, RElement, isProceduralRenderer} from './interfaces/renderer';

packages/core/src/render3/view_ref.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {ChangeDetectorRef as viewEngine_ChangeDetectorRef} from '../change_detec
1111
import {ViewContainerRef as viewEngine_ViewContainerRef} from '../linker/view_container_ref';
1212
import {EmbeddedViewRef as viewEngine_EmbeddedViewRef, InternalViewRef as viewEngine_InternalViewRef} from '../linker/view_ref';
1313

14-
import {checkNoChangesInRootView, checkNoChangesInternal, detectChangesInRootView, detectChangesInternal, markViewDirty, storeCleanupFn} from './instructions';
14+
import {checkNoChangesInRootView, checkNoChangesInternal, detectChangesInRootView, detectChangesInternal, markViewDirty, storeCleanupFn} from './instructions/all';
1515
import {TElementNode, TNode, TNodeType, TViewNode} from './interfaces/node';
1616
import {FLAGS, HOST, LView, LViewFlags, T_HOST} from './interfaces/view';
1717
import {destroyLView, renderDetachView} from './node_manipulation';

packages/core/test/render3/basic_perf.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88

99
import {defineComponent} from '../../src/render3/index';
10-
import {container, containerRefreshEnd, containerRefreshStart, elementEnd, elementStart, embeddedViewEnd, embeddedViewStart, text} from '../../src/render3/instructions';
10+
import {container, containerRefreshEnd, containerRefreshStart, elementEnd, elementStart, embeddedViewEnd, embeddedViewStart, text} from '../../src/render3/instructions/all';
1111
import {RenderFlags} from '../../src/render3/interfaces/definition';
1212
import {document, renderComponent} from './render_util';
1313

packages/core/test/render3/change_detection_spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {ChangeDetectionStrategy, ChangeDetectorRef, DoCheck, RendererType2} from
1313
import {whenRendered} from '../../src/render3/component';
1414
import {LifecycleHooksFeature, NgOnChangesFeature, defineComponent, defineDirective, getCurrentView, getRenderedText, templateRefExtractor} from '../../src/render3/index';
1515

16-
import {bind, container, containerRefreshEnd, containerRefreshStart, detectChanges, directiveInject, element, elementEnd, elementProperty, elementStart, embeddedViewEnd, embeddedViewStart, interpolation1, interpolation2, listener, markDirty, reference, text, template, textBinding, tick} from '../../src/render3/instructions';
16+
import {bind, container, containerRefreshEnd, containerRefreshStart, detectChanges, directiveInject, element, elementEnd, elementProperty, elementStart, embeddedViewEnd, embeddedViewStart, interpolation1, interpolation2, listener, markDirty, reference, text, template, textBinding, tick} from '../../src/render3/instructions/all';
1717
import {RenderFlags} from '../../src/render3/interfaces/definition';
1818
import {RElement, Renderer3, RendererFactory3} from '../../src/render3/interfaces/renderer';
1919
import {FLAGS, LViewFlags} from '../../src/render3/interfaces/view';

packages/core/test/render3/common_integration_spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {NgForOfContext} from '@angular/common';
1010

1111
import {AttributeMarker, defineComponent, element, getCurrentView, templateRefExtractor} from '../../src/render3/index';
1212

13-
import {bind, template, elementEnd, elementProperty, elementStart, interpolation1, interpolation2, interpolation3, interpolationV, listener, load, nextContext, text, textBinding, elementContainerStart, elementContainerEnd, reference} from '../../src/render3/instructions';
13+
import {bind, template, elementEnd, elementProperty, elementStart, interpolation1, interpolation2, interpolation3, interpolationV, listener, load, nextContext, text, textBinding, elementContainerStart, elementContainerEnd, reference} from '../../src/render3/instructions/all';
1414
import {RenderFlags} from '../../src/render3/interfaces/definition';
1515
import {restoreView} from '../../src/render3/state';
1616

0 commit comments

Comments
 (0)