Add & fix consistent type imports/exports lint rules

.eslintrc.js

@@ -59,6 +59,8 @@ module.exports = {
           },
         ],
         '@typescript-eslint/no-non-null-assertion': 'off',
+        '@typescript-eslint/consistent-type-imports': 'error',
+        '@typescript-eslint/consistent-type-exports': 'error',
       },
     },
 

lib/router/index.ts

@@ -1,17 +1,12 @@
 export { default } from './router';
+export type { PublicTransition as Transition } from './transition';
 export {
   default as InternalTransition,
-  PublicTransition as Transition,
   logAbort,
   STATE_SYMBOL,
   PARAMS_SYMBOL,
   QUERY_PARAMS_SYMBOL,
 } from './transition';
 export { default as TransitionState, TransitionError } from './transition-state';
-export {
-  default as InternalRouteInfo,
-  ModelFor,
-  Route,
-  RouteInfo,
-  RouteInfoWithAttributes,
-} from './route-info';
+export type { ModelFor, Route, RouteInfo, RouteInfoWithAttributes } from './route-info';
+export { default as InternalRouteInfo } from './route-info';

lib/router/route-info.ts

@@ -1,13 +1,10 @@
 import { Promise } from 'rsvp';
-import { Dict, Option } from './core';
-import Router, { SerializerFunc } from './router';
-import InternalTransition, {
-  isTransition,
-  PARAMS_SYMBOL,
-  prepareResult,
-  PublicTransition as Transition,
-  QUERY_PARAMS_SYMBOL,
-} from './transition';
+import type { Dict, Option } from './core';
+import type { SerializerFunc } from './router';
+import type Router from './router';
+import type { PublicTransition as Transition } from './transition';
+import type InternalTransition from './transition';
+import { isTransition, PARAMS_SYMBOL, prepareResult, QUERY_PARAMS_SYMBOL } from './transition';
 import { isParam, isPromise, merge } from './utils';
 import { throwIfAborted } from './transition-aborted-error';
 

lib/router/router.ts

@@ -1,35 +1,20 @@
-import RouteRecognizer, { MatchCallback, Params, QueryParams } from 'route-recognizer';
+import type { MatchCallback, Params, QueryParams } from 'route-recognizer';
+import RouteRecognizer from 'route-recognizer';
 import { Promise } from 'rsvp';
-import { Dict, Maybe, Option } from './core';
-import InternalRouteInfo, {
-  ModelFor,
-  Route,
-  RouteInfo,
-  RouteInfoWithAttributes,
-  toReadOnlyRouteInfo,
-} from './route-info';
-import InternalTransition, {
-  logAbort,
-  OpaqueTransition,
-  PublicTransition as Transition,
-  QUERY_PARAMS_SYMBOL,
-  STATE_SYMBOL,
-} from './transition';
+import type { Dict, Maybe, Option } from './core';
+import type { ModelFor, Route, RouteInfo, RouteInfoWithAttributes } from './route-info';
+import type InternalRouteInfo from './route-info';
+import { toReadOnlyRouteInfo } from './route-info';
+import type { OpaqueTransition, PublicTransition as Transition } from './transition';
+import InternalTransition, { logAbort, QUERY_PARAMS_SYMBOL, STATE_SYMBOL } from './transition';
 import { throwIfAborted, isTransitionAborted } from './transition-aborted-error';
-import { TransitionIntent } from './transition-intent';
+import type { TransitionIntent } from './transition-intent';
 import NamedTransitionIntent from './transition-intent/named-transition-intent';
 import URLTransitionIntent from './transition-intent/url-transition-intent';
-import TransitionState, { TransitionError } from './transition-state';
-import {
-  ChangeList,
-  extractQueryParams,
-  forEach,
-  getChangelist,
-  log,
-  merge,
-  ModelsAndQueryParams,
-  promiseLabel,
-} from './utils';
+import type { TransitionError } from './transition-state';
+import TransitionState from './transition-state';
+import type { ChangeList, ModelsAndQueryParams } from './utils';
+import { extractQueryParams, forEach, getChangelist, log, merge, promiseLabel } from './utils';
 
 export interface SerializerFunc<T> {
   (model: T, params: string[]): Dict<unknown>;

lib/router/transition-intent.ts

@@ -1,6 +1,6 @@
-import { Route } from './route-info';
-import Router from './router';
-import TransitionState from './transition-state';
+import type { Route } from './route-info';
+import type Router from './router';
+import type TransitionState from './transition-state';
 
 export type OpaqueIntent = TransitionIntent<any>;
 

lib/router/transition-intent/named-transition-intent.ts

@@ -1,12 +1,9 @@
-import { Dict } from '../core';
-import InternalRouteInfo, {
-  ModelFor,
-  ResolvedRouteInfo,
-  Route,
-  UnresolvedRouteInfoByObject,
-  UnresolvedRouteInfoByParam,
-} from '../route-info';
-import Router, { ParsedHandler } from '../router';
+import type { Dict } from '../core';
+import type { ModelFor, ResolvedRouteInfo, Route } from '../route-info';
+import type InternalRouteInfo from '../route-info';
+import { UnresolvedRouteInfoByObject, UnresolvedRouteInfoByParam } from '../route-info';
+import type { ParsedHandler } from '../router';
+import type Router from '../router';
 import { TransitionIntent } from '../transition-intent';
 import TransitionState from '../transition-state';
 import { isParam, merge } from '../utils';

lib/router/transition-intent/url-transition-intent.ts

@@ -1,5 +1,6 @@
-import { Route, UnresolvedRouteInfoByParam } from '../route-info';
-import Router from '../router';
+import type { Route } from '../route-info';
+import { UnresolvedRouteInfoByParam } from '../route-info';
+import type Router from '../router';
 import { TransitionIntent } from '../transition-intent';
 import TransitionState from '../transition-state';
 import UnrecognizedURLError from '../unrecognized-url-error';

lib/router/transition-state.ts

@@ -1,7 +1,8 @@
 import { Promise } from 'rsvp';
-import { Dict } from './core';
-import InternalRouteInfo, { Route, ResolvedRouteInfo } from './route-info';
-import Transition from './transition';
+import type { Dict } from './core';
+import type { Route, ResolvedRouteInfo } from './route-info';
+import type InternalRouteInfo from './route-info';
+import type Transition from './transition';
 import { forEach, promiseLabel } from './utils';
 import { throwIfAborted } from './transition-aborted-error';
 

lib/router/transition.ts

@@ -1,15 +1,13 @@
 import { Promise } from 'rsvp';
-import { Dict, Maybe, Option } from './core';
-import InternalRouteInfo, {
-  ModelFor,
-  Route,
-  RouteInfo,
-  RouteInfoWithAttributes,
-} from './route-info';
-import Router from './router';
-import { TransitionAbortedError, buildTransitionAborted } from './transition-aborted-error';
-import { OpaqueIntent } from './transition-intent';
-import TransitionState, { TransitionError } from './transition-state';
+import type { Dict, Maybe, Option } from './core';
+import type { ModelFor, Route, RouteInfo, RouteInfoWithAttributes } from './route-info';
+import type InternalRouteInfo from './route-info';
+import type Router from './router';
+import type { TransitionAbortedError } from './transition-aborted-error';
+import { buildTransitionAborted } from './transition-aborted-error';
+import type { OpaqueIntent } from './transition-intent';
+import type { TransitionError } from './transition-state';
+import type TransitionState from './transition-state';
 import { log, promiseLabel } from './utils';
 import { DEBUG } from '@glimmer/env';
 

lib/router/utils.ts

@@ -1,7 +1,7 @@
-import { QueryParams } from 'route-recognizer';
-import { Promise } from 'rsvp';
-import { Dict } from './core';
-import Router from './router';
+import type { QueryParams } from 'route-recognizer';
+import type { Promise } from 'rsvp';
+import type { Dict } from './core';
+import type Router from './router';
 
 export const slice = Array.prototype.slice;
 const hasOwnProperty = Object.prototype.hasOwnProperty;

tests/async_get_handler_test.ts

@@ -1,5 +1,5 @@
-import { Route } from 'router';
-import { Dict } from 'router/core';
+import type { Route } from 'router';
+import type { Dict } from 'router/core';
 import { Promise } from 'rsvp';
 import { createHandler, TestRouter } from './test_helpers';
 

tests/query_params_test.ts

@@ -1,7 +1,8 @@
-import { MatchCallback } from 'route-recognizer';
-import Router, { Route, Transition } from 'router';
-import { Dict, Maybe } from 'router/core';
-import RouteInfo from 'router/route-info';
+import type { MatchCallback } from 'route-recognizer';
+import type { Route, Transition } from 'router';
+import type Router from 'router';
+import type { Dict, Maybe } from 'router/core';
+import type RouteInfo from 'router/route-info';
 import { Promise } from 'rsvp';
 import {
   createHandler,

tests/route_info_test.ts

@@ -1,9 +1,8 @@
-import { Transition } from 'router';
-import { Dict } from 'router/core';
+import type { Transition } from 'router';
+import type { Dict } from 'router/core';
+import type { IModel, Route } from 'router/route-info';
 import {
-  IModel,
   ResolvedRouteInfo,
-  Route,
   toReadOnlyRouteInfo,
   UnresolvedRouteInfoByObject,
   UnresolvedRouteInfoByParam,

tests/router_test.ts

@@ -1,14 +1,16 @@
-import { MatchCallback } from 'route-recognizer';
-import Router, { Route, Transition } from 'router';
-import { Dict, Maybe } from 'router/core';
-import RouteInfo, {
+import type { MatchCallback } from 'route-recognizer';
+import type { Route, Transition } from 'router';
+import type Router from 'router';
+import type { Dict, Maybe } from 'router/core';
+import type {
   IModel,
   RouteInfo as PublicRouteInfo,
   RouteInfoWithAttributes,
 } from 'router/route-info';
-import { SerializerFunc } from 'router/router';
+import type RouteInfo from 'router/route-info';
+import type { SerializerFunc } from 'router/router';
 import { logAbort, PARAMS_SYMBOL, QUERY_PARAMS_SYMBOL, STATE_SYMBOL } from 'router/transition';
-import { TransitionError } from 'router/transition-state';
+import type { TransitionError } from 'router/transition-state';
 import { Promise, reject } from 'rsvp';
 import {
   assertAbort,

tests/test_helpers.ts

@@ -1,10 +1,13 @@
 import Backburner from 'backburner';
-import Router, { Route, Transition } from 'router';
-import { Dict } from 'router/core';
-import RouteInfo, { IModel, UnresolvedRouteInfoByParam } from 'router/route-info';
-import { logAbort, PublicTransition } from 'router/transition';
-import { TransitionError } from 'router/transition-state';
-import { UnrecognizedURLError } from 'router/unrecognized-url-error';
+import type { Route, Transition } from 'router';
+import Router from 'router';
+import type { Dict } from 'router/core';
+import type { IModel } from 'router/route-info';
+import RouteInfo, { UnresolvedRouteInfoByParam } from 'router/route-info';
+import type { PublicTransition } from 'router/transition';
+import { logAbort } from 'router/transition';
+import type { TransitionError } from 'router/transition-state';
+import type { UnrecognizedURLError } from 'router/unrecognized-url-error';
 import { configure, resolve } from 'rsvp';
 import { isTransitionAborted } from 'router/transition-aborted-error';
 

tests/transition_intent_test.ts

@@ -3,9 +3,11 @@ import URLTransitionIntent from 'router/transition-intent/url-transition-intent'
 import TransitionState from 'router/transition-state';
 import { createHandler, module, test, TestRouter } from './test_helpers';
 
-import Router, { Route } from 'router';
-import { Dict } from 'router/core';
-import InternalRouteInfo, {
+import type { Route } from 'router';
+import type Router from 'router';
+import type { Dict } from 'router/core';
+import type InternalRouteInfo from 'router/route-info';
+import {
   ResolvedRouteInfo,
   UnresolvedRouteInfoByObject,
   UnresolvedRouteInfoByParam,

tests/transition_state_test.ts

@@ -1,7 +1,9 @@
-import { Transition } from 'router';
-import { Dict } from 'router/core';
-import { Route, UnresolvedRouteInfoByObject, UnresolvedRouteInfoByParam } from 'router/route-info';
-import TransitionState, { TransitionError } from 'router/transition-state';
+import type { Transition } from 'router';
+import type { Dict } from 'router/core';
+import type { Route } from 'router/route-info';
+import { UnresolvedRouteInfoByObject, UnresolvedRouteInfoByParam } from 'router/route-info';
+import type { TransitionError } from 'router/transition-state';
+import TransitionState from 'router/transition-state';
 import { Promise, resolve } from 'rsvp';
 import {
   createHandler,