refactor(router): update imports, internal restruct

thi-ng · Feb 24, 2020 · bb2d60e · bb2d60e
1 parent 8548a80
commit bb2d60e
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/packages/router/src/api.ts b/packages/router/src/api.ts
@@ -1,10 +1,4 @@
-import { Fn, IID, IObjectOf } from "@thi.ng/api";
-
-/**
- * ID of event being triggered by `router.match()`
- */
-export const EVENT_ROUTE_CHANGED = "route-changed";
-export const EVENT_ROUTE_FAILED = "route-failed";
+import type { Fn, IID, IObjectOf } from "@thi.ng/api";
 
 /**
  * A validation function to for authenticated routes. If this function

diff --git a/packages/router/src/basic.ts b/packages/router/src/basic.ts
@@ -1,16 +1,15 @@
-import {
-    assert,
+import { assert, INotifyMixin } from "@thi.ng/api";
+import { isString } from "@thi.ng/checks";
+import { equiv } from "@thi.ng/equiv";
+import { illegalArgs, illegalArity } from "@thi.ng/errors";
+import { EVENT_ROUTE_CHANGED } from "./constants";
+import type {
     Event,
     INotify,
-    INotifyMixin,
     IObjectOf,
     Listener
 } from "@thi.ng/api";
-import { isString } from "@thi.ng/checks";
-import { equiv } from "@thi.ng/equiv";
-import { illegalArgs, illegalArity } from "@thi.ng/errors";
-import {
-    EVENT_ROUTE_CHANGED,
+import type {
     Route,
     RouteMatch,
     RouteParamValidator,

diff --git a/packages/router/src/constants.ts b/packages/router/src/constants.ts
@@ -0,0 +1,6 @@
+/**
+ * ID of success event being triggered by `router.match()`
+ */
+export const EVENT_ROUTE_CHANGED = "route-changed";
+
+export const EVENT_ROUTE_FAILED = "route-failed";
diff --git a/packages/router/src/history.ts b/packages/router/src/history.ts
@@ -1,9 +1,9 @@
-import { Fn } from "@thi.ng/api";
 import { isString } from "@thi.ng/checks";
 import { equiv } from "@thi.ng/equiv";
 import { illegalArity } from "@thi.ng/errors";
-import { HTMLRouterConfig, RouteMatch, RouterConfig } from "./api";
 import { BasicRouter } from "./basic";
+import type { Fn } from "@thi.ng/api";
+import type { HTMLRouterConfig, RouteMatch, RouterConfig } from "./api";
 
 export class HTMLRouter extends BasicRouter {
     protected currentPath!: string;

diff --git a/packages/router/src/index.ts b/packages/router/src/index.ts
@@ -1,3 +1,4 @@
-export * from "./api";
+export type * from "./api";
+export * from "./constants";
 export * from "./basic";
 export * from "./history";