Skip to content

Commit b30ddfb

Browse files
vsavkinvsavkin
committed
chore(router): clang-format
1 parent abfb522 commit b30ddfb

File tree

8 files changed

+110
-77
lines changed

8 files changed

+110
-77
lines changed

‎modules/@angular/router/src/link.ts‎

Lines changed: 25 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ import {isBlank, isPresent, isString, isStringMap} from './facade/lang';
33
import {BaseException} from './facade/exceptions';
44
import {ListWrapper, StringMapWrapper} from './facade/collection';
55

6-
export function link(segment: RouteSegment, routeTree: RouteTree, urlTree: UrlTree, commands: any[]): UrlTree {
6+
export function link(segment: RouteSegment, routeTree: RouteTree, urlTree: UrlTree,
7+
commands: any[]): UrlTree {
78
if (commands.length === 0) return urlTree;
89

910
let normalizedCommands = _normalizeCommands(commands);
@@ -12,20 +13,22 @@ export function link(segment: RouteSegment, routeTree: RouteTree, urlTree: UrlTr
1213
}
1314

1415
let startingNode = _findStartingNode(normalizedCommands, urlTree, segment, routeTree);
15-
let updated = normalizedCommands.commands.length > 0 ?
16-
_updateMany(ListWrapper.clone(startingNode.children), normalizedCommands.commands) : [];
16+
let updated =
17+
normalizedCommands.commands.length > 0 ?
18+
_updateMany(ListWrapper.clone(startingNode.children), normalizedCommands.commands) :
19+
[];
1720
let newRoot = _constructNewTree(rootNode(urlTree), startingNode, updated);
1821

1922
return new UrlTree(newRoot);
2023
}
2124

22-
function _navigateToRoot(normalizedChange:_NormalizedNavigationCommands):boolean {
23-
return normalizedChange.isAbsolute && normalizedChange.commands.length === 1 && normalizedChange.commands[0] == "/";
25+
function _navigateToRoot(normalizedChange: _NormalizedNavigationCommands): boolean {
26+
return normalizedChange.isAbsolute && normalizedChange.commands.length === 1 &&
27+
normalizedChange.commands[0] == "/";
2428
}
2529

2630
class _NormalizedNavigationCommands {
27-
constructor(public isAbsolute: boolean,
28-
public numberOfDoubleDots: number,
31+
constructor(public isAbsolute: boolean, public numberOfDoubleDots: number,
2932
public commands: any[]) {}
3033
}
3134

@@ -52,18 +55,18 @@ function _normalizeCommands(commands: any[]): _NormalizedNavigationCommands {
5255

5356
// first exp is treated in a special way
5457
if (i == 0) {
55-
if (j == 0 && cc == ".") { // './a'
58+
if (j == 0 && cc == ".") { // './a'
5659
// skip it
57-
} else if (j == 0 && cc == "") { // '/a'
60+
} else if (j == 0 && cc == "") { // '/a'
5861
isAbsolute = true;
59-
} else if (cc == "..") { // '../a'
62+
} else if (cc == "..") { // '../a'
6063
numberOfDoubleDots++;
6164
} else if (cc != '') {
6265
res.push(cc);
6366
}
6467

6568
} else {
66-
if (cc != ''){
69+
if (cc != '') {
6770
res.push(cc);
6871
}
6972
}
@@ -73,7 +76,8 @@ function _normalizeCommands(commands: any[]): _NormalizedNavigationCommands {
7376
return new _NormalizedNavigationCommands(isAbsolute, numberOfDoubleDots, res);
7477
}
7578

76-
function _findUrlSegment(segment: RouteSegment, routeTree: RouteTree, urlTree: UrlTree, numberOfDoubleDots: number): UrlSegment {
79+
function _findUrlSegment(segment: RouteSegment, routeTree: RouteTree, urlTree: UrlTree,
80+
numberOfDoubleDots: number): UrlSegment {
7781
let s = segment;
7882
while (s.urlSegments.length === 0) {
7983
s = routeTree.parent(s);
@@ -86,11 +90,13 @@ function _findUrlSegment(segment: RouteSegment, routeTree: RouteTree, urlTree: U
8690
return path[path.length - 1 - numberOfDoubleDots];
8791
}
8892

89-
function _findStartingNode(normalizedChange:_NormalizedNavigationCommands, urlTree:UrlTree, segment:RouteSegment, routeTree:RouteTree):TreeNode<UrlSegment> {
93+
function _findStartingNode(normalizedChange: _NormalizedNavigationCommands, urlTree: UrlTree,
94+
segment: RouteSegment, routeTree: RouteTree): TreeNode<UrlSegment> {
9095
if (normalizedChange.isAbsolute) {
9196
return rootNode(urlTree);
9297
} else {
93-
let urlSegment = _findUrlSegment(segment, routeTree, urlTree, normalizedChange.numberOfDoubleDots);
98+
let urlSegment =
99+
_findUrlSegment(segment, routeTree, urlTree, normalizedChange.numberOfDoubleDots);
94100
return _findMatchingNode(urlSegment, rootNode(urlTree));
95101
}
96102
}
@@ -110,7 +116,7 @@ function _constructNewTree(node: TreeNode<UrlSegment>, original: TreeNode<UrlSeg
110116
return new TreeNode<UrlSegment>(node.value, updated);
111117
} else {
112118
return new TreeNode<UrlSegment>(
113-
node.value, node.children.map(c => _constructNewTree(c, original, updated)));
119+
node.value, node.children.map(c => _constructNewTree(c, original, updated)));
114120
}
115121
}
116122

@@ -140,7 +146,7 @@ function _update(node: TreeNode<UrlSegment>, commands: any[]): TreeNode<UrlSegme
140146
return _recurse(newSegment, node, rest);
141147

142148
// next one is a params command && can reuse the node
143-
} else if (isStringMap(next) && _compare(segment, _stringify(next), node.value)){
149+
} else if (isStringMap(next) && _compare(segment, _stringify(next), node.value)) {
144150
return _recurse(node.value, node, rest.slice(1));
145151

146152
// next one is a params command && cannot reuse the node
@@ -159,7 +165,7 @@ function _update(node: TreeNode<UrlSegment>, commands: any[]): TreeNode<UrlSegme
159165
}
160166
}
161167

162-
function _stringify(params: {[key: string]: any}):{[key: string]: string} {
168+
function _stringify(params: {[key: string]: any}): {[key: string]: string} {
163169
let res = {};
164170
StringMapWrapper.forEach(params, (v, k) => res[k] = v.toString());
165171
return res;
@@ -169,7 +175,8 @@ function _compare(path: string, params: {[key: string]: any}, segment: UrlSegmen
169175
return path == segment.segment && StringMapWrapper.equals(params, segment.parameters);
170176
}
171177

172-
function _recurse(urlSegment: UrlSegment, node: TreeNode<UrlSegment>, rest: any[]): TreeNode<UrlSegment> {
178+
function _recurse(urlSegment: UrlSegment, node: TreeNode<UrlSegment>,
179+
rest: any[]): TreeNode<UrlSegment> {
173180
if (rest.length === 0) {
174181
return new TreeNode<UrlSegment>(urlSegment, []);
175182
}

‎modules/@angular/router/src/metadata/metadata.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import {stringify} from "../facade/lang";
2222
*/
2323
export abstract class RouteMetadata {
2424
abstract get path(): string;
25-
abstract get component(): Type|string;
25+
abstract get component(): Type | string;
2626
}
2727

2828
/**
@@ -31,8 +31,8 @@ export abstract class RouteMetadata {
3131
*/
3232
export class Route implements RouteMetadata {
3333
path: string;
34-
component: Type|string;
35-
constructor({path, component}: {path?: string, component?: Type|string} = {}) {
34+
component: Type | string;
35+
constructor({path, component}: {path?: string, component?: Type | string} = {}) {
3636
this.path = path;
3737
this.component = component;
3838
}

‎modules/@angular/router/src/recognize.ts‎

Lines changed: 56 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
1-
import {RouteSegment, UrlSegment, Tree, TreeNode, rootNode, UrlTree, RouteTree, equalUrlSegments} from './segments';
1+
import {
2+
RouteSegment,
3+
UrlSegment,
4+
Tree,
5+
TreeNode,
6+
rootNode,
7+
UrlTree,
8+
RouteTree,
9+
equalUrlSegments
10+
} from './segments';
211
import {RoutesMetadata, RouteMetadata} from './metadata/metadata';
312
import {Type, isBlank, isPresent, stringify} from './facade/lang';
413
import {ListWrapper, StringMapWrapper} from './facade/collection';
@@ -8,14 +17,16 @@ import {ComponentResolver} from '@angular/core';
817
import {DEFAULT_OUTLET_NAME} from './constants';
918
import {reflector} from '@angular/core';
1019

11-
export function recognize(componentResolver: ComponentResolver, rootComponent: Type,
12-
url: UrlTree, existingTree: RouteTree): Promise<RouteTree> {
20+
export function recognize(componentResolver: ComponentResolver, rootComponent: Type, url: UrlTree,
21+
existingTree: RouteTree): Promise<RouteTree> {
1322
let matched = new _MatchResult(rootComponent, [url.root], {}, rootNode(url).children, []);
14-
return _constructSegment(componentResolver, matched, rootNode(existingTree)).then(roots => new RouteTree(roots[0]));
23+
return _constructSegment(componentResolver, matched, rootNode(existingTree))
24+
.then(roots => new RouteTree(roots[0]));
1525
}
1626

1727
function _recognize(componentResolver: ComponentResolver, parentComponent: Type,
18-
url: TreeNode<UrlSegment>, existingSegments: TreeNode<RouteSegment>[]): Promise<TreeNode<RouteSegment>[]> {
28+
url: TreeNode<UrlSegment>,
29+
existingSegments: TreeNode<RouteSegment>[]): Promise<TreeNode<RouteSegment>[]> {
1930
let metadata = _readMetadata(parentComponent); // should read from the factory instead
2031
if (isBlank(metadata)) {
2132
throw new BaseException(
@@ -30,29 +41,34 @@ function _recognize(componentResolver: ComponentResolver, parentComponent: Type,
3041
}
3142

3243
let segmentsWithRightOutlet = existingSegments.filter(r => r.value.outlet == match.outlet);
33-
let segmentWithRightOutlet = segmentsWithRightOutlet.length > 0 ? segmentsWithRightOutlet[0] : null;
44+
let segmentWithRightOutlet =
45+
segmentsWithRightOutlet.length > 0 ? segmentsWithRightOutlet[0] : null;
3446

3547
let main = _constructSegment(componentResolver, match, segmentWithRightOutlet);
36-
let aux =
37-
_recognizeMany(componentResolver, parentComponent, match.aux, existingSegments).then(_checkOutletNameUniqueness);
48+
let aux = _recognizeMany(componentResolver, parentComponent, match.aux, existingSegments)
49+
.then(_checkOutletNameUniqueness);
3850
return PromiseWrapper.all([main, aux]).then(ListWrapper.flatten);
3951
}
4052

41-
function _recognizeMany(componentResolver: ComponentResolver, parentComponent: Type,
42-
urls: TreeNode<UrlSegment>[], existingSegments: TreeNode<RouteSegment>[]): Promise<TreeNode<RouteSegment>[]> {
43-
let recognized = urls.map(u => _recognize(componentResolver, parentComponent, u, existingSegments));
53+
function _recognizeMany(
54+
componentResolver: ComponentResolver, parentComponent: Type, urls: TreeNode<UrlSegment>[],
55+
existingSegments: TreeNode<RouteSegment>[]): Promise<TreeNode<RouteSegment>[]> {
56+
let recognized =
57+
urls.map(u => _recognize(componentResolver, parentComponent, u, existingSegments));
4458
return PromiseWrapper.all(recognized).then(ListWrapper.flatten);
4559
}
4660

47-
function _constructSegment(componentResolver: ComponentResolver,
48-
matched: _MatchResult, existingSegment: TreeNode<RouteSegment>): Promise<TreeNode<RouteSegment>[]> {
61+
function _constructSegment(
62+
componentResolver: ComponentResolver, matched: _MatchResult,
63+
existingSegment: TreeNode<RouteSegment>): Promise<TreeNode<RouteSegment>[]> {
4964
return componentResolver.resolveComponent(matched.component)
5065
.then(factory => {
5166
let segment = _createOrReuseSegment(matched, factory, existingSegment);
5267
let existingChildren = isPresent(existingSegment) ? existingSegment.children : [];
5368

5469
if (matched.leftOverUrl.length > 0) {
55-
return _recognizeMany(componentResolver, factory.componentType, matched.leftOverUrl, existingChildren)
70+
return _recognizeMany(componentResolver, factory.componentType, matched.leftOverUrl,
71+
existingChildren)
5672
.then(children => [new TreeNode<RouteSegment>(segment, children)]);
5773
} else {
5874
return _recognizeLeftOvers(componentResolver, factory.componentType, existingChildren)
@@ -61,21 +77,23 @@ function _constructSegment(componentResolver: ComponentResolver,
6177
});
6278
}
6379

64-
function _createOrReuseSegment(matched: _MatchResult, factory: ComponentFactory<any>, segmentNode: TreeNode<RouteSegment>): RouteSegment {
80+
function _createOrReuseSegment(matched: _MatchResult, factory: ComponentFactory<any>,
81+
segmentNode: TreeNode<RouteSegment>): RouteSegment {
6582
let segment = isPresent(segmentNode) ? segmentNode.value : null;
6683

67-
if (isPresent(segment) && equalUrlSegments(segment.urlSegments, matched.consumedUrlSegments)
68-
&& StringMapWrapper.equals(segment.parameters, matched.parameters) &&
69-
segment.outlet == matched.outlet && factory.componentType == segment.type) {
84+
if (isPresent(segment) && equalUrlSegments(segment.urlSegments, matched.consumedUrlSegments) &&
85+
StringMapWrapper.equals(segment.parameters, matched.parameters) &&
86+
segment.outlet == matched.outlet && factory.componentType == segment.type) {
7087
return segment;
7188
} else {
7289
return new RouteSegment(matched.consumedUrlSegments, matched.parameters, matched.outlet,
73-
factory.componentType, factory);
90+
factory.componentType, factory);
7491
}
7592
}
7693

77-
function _recognizeLeftOvers(componentResolver: ComponentResolver,
78-
parentComponent: Type, existingSegments: TreeNode<RouteSegment>[]): Promise<TreeNode<RouteSegment>[]> {
94+
function _recognizeLeftOvers(
95+
componentResolver: ComponentResolver, parentComponent: Type,
96+
existingSegments: TreeNode<RouteSegment>[]): Promise<TreeNode<RouteSegment>[]> {
7997
return componentResolver.resolveComponent(parentComponent)
8098
.then(factory => {
8199
let metadata = _readMetadata(factory.componentType);
@@ -87,14 +105,20 @@ function _recognizeLeftOvers(componentResolver: ComponentResolver,
87105
if (r.length === 0) {
88106
return PromiseWrapper.resolve([]);
89107
} else {
90-
let segmentsWithMatchingOutlet = existingSegments.filter(r => r.value.outlet == DEFAULT_OUTLET_NAME);
91-
let segmentWithMatchingOutlet = segmentsWithMatchingOutlet.length > 0 ? segmentsWithMatchingOutlet[0] : null;
92-
let existingChildren = isPresent(segmentWithMatchingOutlet) ? segmentWithMatchingOutlet.children : [];
93-
94-
return _recognizeLeftOvers(componentResolver, r[0].component, existingChildren).then(children => {
108+
let segmentsWithMatchingOutlet =
109+
existingSegments.filter(r => r.value.outlet == DEFAULT_OUTLET_NAME);
110+
let segmentWithMatchingOutlet =
111+
segmentsWithMatchingOutlet.length > 0 ? segmentsWithMatchingOutlet[0] : null;
112+
let existingChildren =
113+
isPresent(segmentWithMatchingOutlet) ? segmentWithMatchingOutlet.children : [];
114+
115+
return _recognizeLeftOvers(componentResolver, r[0].component, existingChildren)
116+
.then(children => {
95117
return componentResolver.resolveComponent(r[0].component)
96118
.then(factory => {
97-
let segment = _createOrReuseSegment(new _MatchResult(r[0].component, [], {}, [], []), factory, segmentWithMatchingOutlet);
119+
let segment =
120+
_createOrReuseSegment(new _MatchResult(r[0].component, [], {}, [], []),
121+
factory, segmentWithMatchingOutlet);
98122
return [new TreeNode<RouteSegment>(segment, children)];
99123
});
100124
});
@@ -177,15 +201,14 @@ function _checkOutletNameUniqueness(nodes: TreeNode<RouteSegment>[]): TreeNode<R
177201
}
178202

179203
class _MatchResult {
180-
constructor(public component: Type|string, public consumedUrlSegments: UrlSegment[],
204+
constructor(public component: Type | string, public consumedUrlSegments: UrlSegment[],
181205
public parameters: {[key: string]: string},
182206
public leftOverUrl: TreeNode<UrlSegment>[], public aux: TreeNode<UrlSegment>[]) {}
183207

184-
get outlet():string {
185-
return this.consumedUrlSegments.length === 0 ||
186-
isBlank(this.consumedUrlSegments[0].outlet) ?
187-
DEFAULT_OUTLET_NAME :
188-
this.consumedUrlSegments[0].outlet;
208+
get outlet(): string {
209+
return this.consumedUrlSegments.length === 0 || isBlank(this.consumedUrlSegments[0].outlet) ?
210+
DEFAULT_OUTLET_NAME :
211+
this.consumedUrlSegments[0].outlet;
189212
}
190213
}
191214

‎modules/@angular/router/src/router.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import {
2020
TreeNode,
2121
UrlSegment,
2222
serializeRouteSegmentTree,
23-
createEmptyRouteTree
23+
createEmptyRouteTree
2424
} from './segments';
2525
import {hasLifecycleHook} from './lifecycle_reflector';
2626
import {DEFAULT_OUTLET_NAME} from './constants';
@@ -240,7 +240,7 @@ class _ActivateSegments {
240240

241241
if (curr === prev) {
242242
this.activateChildSegments(currNode, prevNode, outlet.outletMap,
243-
components.concat([outlet.component]));
243+
components.concat([outlet.component]));
244244
} else {
245245
this.deactivateOutlet(outlet, components);
246246
if (this.performMutation) {

‎modules/@angular/router/src/segments.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ export class RouteSegment {
122122
get stringifiedUrlSegments(): string { return this.urlSegments.map(s => s.toString()).join("/"); }
123123
}
124124

125-
export function createEmptyRouteTree(type:Type): RouteTree {
125+
export function createEmptyRouteTree(type: Type): RouteTree {
126126
let root = new RouteSegment([new UrlSegment("", {}, null)], {}, DEFAULT_OUTLET_NAME, type, null);
127127
return new RouteTree(new TreeNode<RouteSegment>(root, []));
128128
}

‎modules/@angular/router/test/integration_spec.ts‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,8 @@ export function main() {
9696
.toHaveText('team 22 { hello victor, aux: simple }');
9797
})));
9898

99-
it('should deactivate outlets', fakeAsync(inject([Router, TestComponentBuilder], (router, tcb) => {
99+
it('should deactivate outlets',
100+
fakeAsync(inject([Router, TestComponentBuilder], (router, tcb) => {
100101
let fixture = tcb.createFakeAsync(RootCmp);
101102

102103
router.navigateByUrl('/team/22/user/victor(/simple)');
@@ -227,11 +228,11 @@ export function main() {
227228
})));
228229

229230
it("should support top-level link",
230-
fakeAsync(inject([Router, TestComponentBuilder], (router, tcb) => {
231-
let fixture = tcb.createFakeAsync(LinkCmp);
232-
advance(fixture);
233-
expect(fixture.debugElement.nativeElement).toHaveText('link');
234-
})));
231+
fakeAsync(inject([Router, TestComponentBuilder], (router, tcb) => {
232+
let fixture = tcb.createFakeAsync(LinkCmp);
233+
advance(fixture);
234+
expect(fixture.debugElement.nativeElement).toHaveText('link');
235+
})));
235236
}
236237
});
237238
}

‎modules/@angular/router/test/link_spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,9 +183,9 @@ export function main() {
183183
let p = parser.parse("/a(ap)/c(cp)");
184184
let c = p.firstChild(p.root);
185185

186-
let child = new RouteSegment([], {'one':'1'}, null, null, null);
186+
let child = new RouteSegment([], {'one': '1'}, null, null, null);
187187
let root = new TreeNode<RouteSegment>(new RouteSegment([c], {}, null, null, null),
188-
[new TreeNode<RouteSegment>(child, [])]);
188+
[new TreeNode<RouteSegment>(child, [])]);
189189
let tree = new RouteTree(root);
190190

191191
let t = link(child, tree, p, ["./c2"]);

0 commit comments

Comments
 (0)