refactor(atom): re-use Path from @thi.ng/api

thi-ng · Nov 30, 2019 · 5476fc9 · 5476fc9
1 parent a142655
commit 5476fc9
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 10 deletions.
diff --git a/packages/atom/src/api.ts b/packages/atom/src/api.ts
@@ -4,9 +4,9 @@ import {
     INotify,
     IRelease,
     IWatch,
+    Path,
     Predicate
 } from "@thi.ng/api";
-import { Path } from "@thi.ng/paths";
 
 export type SwapFn<T> = (curr: T, ...args: any[]) => T;
 

diff --git a/packages/atom/src/atom.ts b/packages/atom/src/atom.ts
@@ -1,11 +1,12 @@
 import {
     IEquiv,
     IWatchMixin,
+    Path,
     Predicate,
     Watch
 } from "@thi.ng/api";
 import { illegalState } from "@thi.ng/errors";
-import { Path, setIn, updateIn } from "@thi.ng/paths";
+import { setIn, updateIn } from "@thi.ng/paths";
 import {
     IAtom,
     IView,

diff --git a/packages/atom/src/cursor.ts b/packages/atom/src/cursor.ts
@@ -3,12 +3,13 @@ import {
     Fn2,
     IID,
     IRelease,
+    Path,
     Predicate,
     Watch
 } from "@thi.ng/api";
 import { isArray, isFunction } from "@thi.ng/checks";
 import { illegalArgs, illegalArity } from "@thi.ng/errors";
-import { getter, Path, setter } from "@thi.ng/paths";
+import { getter, setter } from "@thi.ng/paths";
 import {
     CursorOpts,
     IAtom,

diff --git a/packages/atom/src/history.ts b/packages/atom/src/history.ts
@@ -2,16 +2,12 @@ import {
     Event,
     INotifyMixin,
     Listener,
+    Path,
     Predicate2,
     Watch
 } from "@thi.ng/api";
 import { equiv } from "@thi.ng/equiv";
-import {
-    getIn,
-    Path,
-    setIn,
-    updateIn
-} from "@thi.ng/paths";
+import { getIn, setIn, updateIn } from "@thi.ng/paths";
 import {
     IAtom,
     IHistory,

diff --git a/packages/atom/src/view.ts b/packages/atom/src/view.ts
@@ -1,5 +1,6 @@
+import { Path } from "@thi.ng/api";
 import { equiv as _equiv } from "@thi.ng/equiv";
-import { getter, Path, toPath } from "@thi.ng/paths";
+import { getter, toPath } from "@thi.ng/paths";
 import { IView, ReadonlyAtom, ViewTransform } from "./api";
 import { nextID } from "./idgen";