Skip to content

Commit bbbe477

Browse files
josephperrottpkozlowski-opensource
josephperrott
authored and
pkozlowski-opensource
committed
refactor: migrate animations to prettier formatting (#53977)
Migrate formatting to prettier for animations from clang-format PR Close #53977
1 parent 711cb41 commit bbbe477

File tree

52 files changed

+4059
-2600
lines changed

Some content is hidden

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

52 files changed

+4059
-2600
lines changed

‎.ng-dev/format.mts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ export const format: FormatConfig = {
1111
'tools/**/*.{js,ts}',
1212
'modules/**/*.{js,ts}',
1313
'scripts/**/*.{js,ts}',
14+
'packages/animations/**/*.{js,ts}',
1415
],
1516
},
1617
'clang-format': {
@@ -43,6 +44,7 @@ export const format: FormatConfig = {
4344
'!tools/**/*.{js,ts}',
4445
'!modules/**/*.{js,ts}',
4546
'!scripts/**/*.{js,ts}',
47+
'!packages/animations/**/*.{js,ts}',
4648
],
4749
},
4850
'buildifier': true,

‎packages/animations/browser/src/create_engine.ts‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,24 @@ import {AnimationEngine} from './render/animation_engine_next';
1515
import {WebAnimationsDriver} from './render/web_animations/web_animations_driver';
1616

1717
export function createEngine(
18-
type: 'animations'|'noop', doc: Document,
19-
scheduler: ChangeDetectionScheduler|null): AnimationEngine {
18+
type: 'animations' | 'noop',
19+
doc: Document,
20+
scheduler: ChangeDetectionScheduler | null,
21+
): AnimationEngine {
2022
// TODO: find a way to make this tree shakable.
2123
if (type === 'noop') {
2224
return new AnimationEngine(
23-
doc, new NoopAnimationDriver(), new NoopAnimationStyleNormalizer(), scheduler);
25+
doc,
26+
new NoopAnimationDriver(),
27+
new NoopAnimationStyleNormalizer(),
28+
scheduler,
29+
);
2430
}
2531

2632
return new AnimationEngine(
27-
doc, new WebAnimationsDriver(), new WebAnimationsStyleNormalizer(), scheduler);
33+
doc,
34+
new WebAnimationsDriver(),
35+
new WebAnimationsStyleNormalizer(),
36+
scheduler,
37+
);
2838
}

‎packages/animations/browser/src/dsl/animation.ts‎

Lines changed: 33 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,12 @@
55
* Use of this source code is governed by an MIT-style license that can be
66
* found in the LICENSE file at https://angular.io/license
77
*/
8-
import {AnimationMetadata, AnimationMetadataType, AnimationOptions, ɵStyleDataMap} from '@angular/animations';
8+
import {
9+
AnimationMetadata,
10+
AnimationMetadataType,
11+
AnimationOptions,
12+
ɵStyleDataMap,
13+
} from '@angular/animations';
914

1015
import {buildingFailed, validationFailed} from '../error_helpers';
1116
import {AnimationDriver} from '../render/animation_driver';
@@ -20,7 +25,10 @@ import {ElementInstructionMap} from './element_instruction_map';
2025

2126
export class Animation {
2227
private _animationAst: Ast<AnimationMetadataType>;
23-
constructor(private _driver: AnimationDriver, input: AnimationMetadata|AnimationMetadata[]) {
28+
constructor(
29+
private _driver: AnimationDriver,
30+
input: AnimationMetadata | AnimationMetadata[],
31+
) {
2432
const errors: Error[] = [];
2533
const warnings: string[] = [];
2634
const ast = buildAnimationAst(_driver, input, errors, warnings);
@@ -34,18 +42,32 @@ export class Animation {
3442
}
3543

3644
buildTimelines(
37-
element: any, startingStyles: ɵStyleDataMap|Array<ɵStyleDataMap>,
38-
destinationStyles: ɵStyleDataMap|Array<ɵStyleDataMap>, options: AnimationOptions,
39-
subInstructions?: ElementInstructionMap): AnimationTimelineInstruction[] {
40-
const start = Array.isArray(startingStyles) ? normalizeStyles(startingStyles) :
41-
<ɵStyleDataMap>startingStyles;
42-
const dest = Array.isArray(destinationStyles) ? normalizeStyles(destinationStyles) :
43-
<ɵStyleDataMap>destinationStyles;
45+
element: any,
46+
startingStyles: ɵStyleDataMap | Array<ɵStyleDataMap>,
47+
destinationStyles: ɵStyleDataMap | Array<ɵStyleDataMap>,
48+
options: AnimationOptions,
49+
subInstructions?: ElementInstructionMap,
50+
): AnimationTimelineInstruction[] {
51+
const start = Array.isArray(startingStyles)
52+
? normalizeStyles(startingStyles)
53+
: <ɵStyleDataMap>startingStyles;
54+
const dest = Array.isArray(destinationStyles)
55+
? normalizeStyles(destinationStyles)
56+
: <ɵStyleDataMap>destinationStyles;
4457
const errors: any = [];
4558
subInstructions = subInstructions || new ElementInstructionMap();
4659
const result = buildAnimationTimelines(
47-
this._driver, element, this._animationAst, ENTER_CLASSNAME, LEAVE_CLASSNAME, start, dest,
48-
options, subInstructions, errors);
60+
this._driver,
61+
element,
62+
this._animationAst,
63+
ENTER_CLASSNAME,
64+
LEAVE_CLASSNAME,
65+
start,
66+
dest,
67+
options,
68+
subInstructions,
69+
errors,
70+
);
4971
if (errors.length) {
5072
throw buildingFailed(errors);
5173
}

‎packages/animations/browser/src/dsl/animation_ast.ts‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,12 @@
55
* Use of this source code is governed by an MIT-style license that can be
66
* found in the LICENSE file at https://angular.io/license
77
*/
8-
import {AnimateTimings, AnimationMetadataType, AnimationOptions, ɵStyleDataMap} from '@angular/animations';
8+
import {
9+
AnimateTimings,
10+
AnimationMetadataType,
11+
AnimationOptions,
12+
ɵStyleDataMap,
13+
} from '@angular/animations';
914

1015
const EMPTY_ANIMATION_OPTIONS: AnimationOptions = {};
1116

@@ -27,7 +32,7 @@ export interface AstVisitor {
2732

2833
export interface Ast<T extends AnimationMetadataType> {
2934
type: T;
30-
options: AnimationOptions|null;
35+
options: AnimationOptions | null;
3136
}
3237

3338
export interface TriggerAst extends Ast<AnimationMetadataType.Trigger> {
@@ -46,8 +51,9 @@ export interface StateAst extends Ast<AnimationMetadataType.State> {
4651
}
4752

4853
export interface TransitionAst extends Ast<AnimationMetadataType.Transition> {
49-
matchers: Array<(
50-
(fromState: string, toState: string, element: any, params: {[key: string]: any}) => boolean)>;
54+
matchers: Array<
55+
(fromState: string, toState: string, element: any, params: {[key: string]: any}) => boolean
56+
>;
5157
animation: Ast<AnimationMetadataType>;
5258
queryCount: number;
5359
depCount: number;
@@ -63,13 +69,13 @@ export interface GroupAst extends Ast<AnimationMetadataType.Group> {
6369

6470
export interface AnimateAst extends Ast<AnimationMetadataType.Animate> {
6571
timings: TimingAst;
66-
style: StyleAst|KeyframesAst;
72+
style: StyleAst | KeyframesAst;
6773
}
6874

6975
export interface StyleAst extends Ast<AnimationMetadataType.Style> {
70-
styles: Array<(ɵStyleDataMap | string)>;
71-
easing: string|null;
72-
offset: number|null;
76+
styles: Array<ɵStyleDataMap | string>;
77+
easing: string | null;
78+
offset: number | null;
7379
containsDynamicStyles: boolean;
7480
isEmptyStep?: boolean;
7581
}
@@ -105,7 +111,7 @@ export interface StaggerAst extends Ast<AnimationMetadataType.Stagger> {
105111
export interface TimingAst {
106112
duration: number;
107113
delay: number;
108-
easing: string|null;
114+
easing: string | null;
109115
dynamic?: boolean;
110116
}
111117

0 commit comments

Comments
 (0)