Skip to content

Commit 92ebac4

Browse files
mansonamansona
committed
fix lint
1 parent 5887381 commit 92ebac4

19 files changed

Lines changed: 163 additions & 339 deletions

‎packages/router_js/.jshintrc‎

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎packages/router_js/ember-cli-build.js‎

Lines changed: 0 additions & 151 deletions
This file was deleted.

‎packages/router_js/lib/core.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
export type Present = {} | void;
1+
export type Present = object | void;
22
export type Option<T> = T | null;
33
export type Maybe<T> = Option<T> | undefined | void;
44
export type Recast<T, U> = (T & U) | U;

‎packages/router_js/lib/route-info.ts‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
1+
/* eslint-disable no-prototype-builtins */
12
import { Promise } from 'rsvp';
2-
import { Dict, Option } from './core';
3-
import Router, { SerializerFunc } from './router';
4-
import InternalTransition, {
3+
import type { Dict, Option } from './core';
4+
import type { SerializerFunc } from './router';
5+
import type Router from './router';
6+
import type {
7+
PublicTransition as Transition} from './transition';
8+
import type InternalTransition from './transition';
9+
import {
510
isTransition,
611
PARAMS_SYMBOL,
712
prepareResult,
8-
PublicTransition as Transition,
913
QUERY_PARAMS_SYMBOL,
1014
} from './transition';
1115
import { isParam, isPromise, merge } from './utils';

‎packages/router_js/lib/router.ts‎

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,40 @@
1-
import RouteRecognizer, { MatchCallback, Params, QueryParams } from 'route-recognizer';
1+
/* eslint-disable no-prototype-builtins */
2+
import type { MatchCallback, Params, QueryParams } from 'route-recognizer';
3+
import RouteRecognizer from 'route-recognizer';
24
import { Promise } from 'rsvp';
3-
import { Dict, Maybe, Option } from './core';
4-
import InternalRouteInfo, {
5+
import type { Dict, Maybe, Option } from './core';
6+
import type {
57
ModelFor,
68
Route,
79
RouteInfo,
8-
RouteInfoWithAttributes,
10+
RouteInfoWithAttributes} from './route-info';
11+
import type InternalRouteInfo from './route-info';
12+
import {
913
toReadOnlyRouteInfo,
1014
} from './route-info';
15+
import type {
16+
OpaqueTransition,
17+
PublicTransition as Transition} from './transition';
1118
import InternalTransition, {
1219
logAbort,
13-
OpaqueTransition,
14-
PublicTransition as Transition,
1520
QUERY_PARAMS_SYMBOL,
1621
STATE_SYMBOL,
1722
} from './transition';
1823
import { throwIfAborted, isTransitionAborted } from './transition-aborted-error';
19-
import { TransitionIntent } from './transition-intent';
24+
import type { TransitionIntent } from './transition-intent';
2025
import NamedTransitionIntent from './transition-intent/named-transition-intent';
2126
import URLTransitionIntent from './transition-intent/url-transition-intent';
22-
import TransitionState, { TransitionError } from './transition-state';
23-
import {
27+
import type { TransitionError } from './transition-state';
28+
import TransitionState from './transition-state';
29+
import type {
2430
ChangeList,
31+
ModelsAndQueryParams} from './utils';
32+
import {
2533
extractQueryParams,
2634
forEach,
2735
getChangelist,
2836
log,
2937
merge,
30-
ModelsAndQueryParams,
3138
promiseLabel,
3239
} from './utils';
3340

@@ -203,7 +210,7 @@ export default abstract class Router<R extends Route> {
203210
private generateNewState(intent: TransitionIntent<R>): Option<TransitionState<R>> {
204211
try {
205212
return intent.applyToState(this.state!, false);
206-
} catch (e) {
213+
} catch (_e) {
207214
return null;
208215
}
209216
}
@@ -212,7 +219,7 @@ export default abstract class Router<R extends Route> {
212219
intent: TransitionIntent<R>,
213220
isIntermediate: boolean
214221
): InternalTransition<R> {
215-
let wasTransitioning = !!this.activeTransition;
222+
let wasTransitioning = Boolean(this.activeTransition);
216223
let oldState = wasTransitioning ? this.activeTransition![STATE_SYMBOL] : this.state;
217224
let newTransition: InternalTransition<R>;
218225

‎packages/router_js/lib/transition-intent.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
import { Route } from './route-info';
2-
import Router from './router';
3-
import TransitionState from './transition-state';
1+
import type { Route } from './route-info';
2+
import type Router from './router';
3+
import type TransitionState from './transition-state';
44

55
export type OpaqueIntent = TransitionIntent<any>;
66

77
export abstract class TransitionIntent<R extends Route> {
8-
data: {};
8+
data: object;
99
router: Router<R>;
10-
constructor(router: Router<R>, data: {} = {}) {
10+
constructor(router: Router<R>, data: object = {}) {
1111
this.router = router;
1212
this.data = data;
1313
}

‎packages/router_js/lib/transition-intent/named-transition-intent.ts‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
1-
import { Dict } from '../core';
2-
import InternalRouteInfo, {
1+
/* eslint-disable no-prototype-builtins */
2+
import type { Dict } from '../core';
3+
import type {
34
ModelFor,
45
ResolvedRouteInfo,
5-
Route,
6+
Route} from '../route-info';
7+
import type InternalRouteInfo from '../route-info';
8+
import {
69
UnresolvedRouteInfoByObject,
710
UnresolvedRouteInfoByParam,
811
} from '../route-info';
9-
import Router, { ParsedHandler } from '../router';
12+
import type { ParsedHandler } from '../router';
13+
import type Router from '../router';
1014
import { TransitionIntent } from '../transition-intent';
1115
import TransitionState from '../transition-state';
1216
import { isParam, merge } from '../utils';
@@ -24,7 +28,7 @@ export default class NamedTransitionIntent<R extends Route> extends TransitionIn
2428
pivotHandler: Route | undefined,
2529
contexts: ModelFor<R>[] = [],
2630
queryParams: Dict<unknown> = {},
27-
data?: {}
31+
data?: object
2832
) {
2933
super(router, data);
3034
this.name = name;
@@ -235,7 +239,7 @@ export default class NamedTransitionIntent<R extends Route> extends TransitionIn
235239
let peek = objects[objects.length - 1];
236240
let paramName = names[numNames]!;
237241
if (isParam(peek)) {
238-
params[paramName] = '' + objects.pop();
242+
params[paramName] = String(objects.pop());
239243
} else {
240244
// If we're here, this means only some of the params
241245
// were string/number params, so try and use a param

‎packages/router_js/lib/transition-intent/url-transition-intent.ts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
import { Route, UnresolvedRouteInfoByParam } from '../route-info';
2-
import Router from '../router';
1+
import type { Route} from '../route-info';
2+
import { UnresolvedRouteInfoByParam } from '../route-info';
3+
import type Router from '../router';
34
import { TransitionIntent } from '../transition-intent';
45
import TransitionState from '../transition-state';
56
import UnrecognizedURLError from '../unrecognized-url-error';
@@ -8,7 +9,7 @@ import { merge } from '../utils';
89
export default class URLTransitionIntent<R extends Route> extends TransitionIntent<R> {
910
preTransitionState?: TransitionState<R>;
1011
url: string;
11-
constructor(router: Router<R>, url: string, data?: {}) {
12+
constructor(router: Router<R>, url: string, data?: object) {
1213
super(router, data);
1314
this.url = url;
1415
this.preTransitionState = undefined;

‎packages/router_js/lib/transition-state.ts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import { Promise } from 'rsvp';
2-
import { Dict } from './core';
3-
import InternalRouteInfo, { Route, ResolvedRouteInfo } from './route-info';
4-
import Transition from './transition';
2+
import type { Dict } from './core';
3+
import type { Route, ResolvedRouteInfo } from './route-info';
4+
import type InternalRouteInfo from './route-info';
5+
import type Transition from './transition';
56
import { forEach, promiseLabel } from './utils';
67
import { throwIfAborted } from './transition-aborted-error';
78

0 commit comments

Comments
 (0)