diff --git a/packages/arrays/src/binary-search.ts b/packages/arrays/src/binary-search.ts index bda59bb75d..df6b3e925f 100644 --- a/packages/arrays/src/binary-search.ts +++ b/packages/arrays/src/binary-search.ts @@ -1,5 +1,6 @@ import type { Comparator, Fn, FnN, FnN2 } from "@thi.ng/api"; -import { compare, compareNumAsc } from "@thi.ng/compare"; +import { compare } from "@thi.ng/compare/compare"; +import { compareNumAsc } from "@thi.ng/compare/numeric"; /** * Returns the supposed index of `x` in pre-sorted array-like collection diff --git a/packages/arrays/src/ensure-array.ts b/packages/arrays/src/ensure-array.ts index bac82d8045..820164fc01 100644 --- a/packages/arrays/src/ensure-array.ts +++ b/packages/arrays/src/ensure-array.ts @@ -1,4 +1,5 @@ -import { isArray, isArrayLike } from "@thi.ng/checks"; +import { isArray } from "@thi.ng/checks/is-array"; +import { isArrayLike } from "@thi.ng/checks/is-arraylike"; import { ensureIterable } from "./ensure-iterable"; /** diff --git a/packages/arrays/src/ensure-iterable.ts b/packages/arrays/src/ensure-iterable.ts index a3f6000852..c85a440307 100644 --- a/packages/arrays/src/ensure-iterable.ts +++ b/packages/arrays/src/ensure-iterable.ts @@ -1,4 +1,4 @@ -import { illegalArgs } from "@thi.ng/errors"; +import { illegalArgs } from "@thi.ng/errors/illegal-arguments"; /** * Attempts to obtain an iterator from `x` and throws error if `x` is diff --git a/packages/arrays/src/is-sorted.ts b/packages/arrays/src/is-sorted.ts index 745ea0aba4..cd2e1411be 100644 --- a/packages/arrays/src/is-sorted.ts +++ b/packages/arrays/src/is-sorted.ts @@ -1,5 +1,5 @@ import type { Comparator } from "@thi.ng/api"; -import { compare } from "@thi.ng/compare"; +import { compare } from "@thi.ng/compare/compare"; /** * Returns true if the given array and its elements in the selected diff --git a/packages/arrays/src/quicksort.ts b/packages/arrays/src/quicksort.ts index c363a44d57..0032a62f6c 100644 --- a/packages/arrays/src/quicksort.ts +++ b/packages/arrays/src/quicksort.ts @@ -1,5 +1,5 @@ import type { Comparator, Fn3, TypedArray } from "@thi.ng/api"; -import { compare } from "@thi.ng/compare"; +import { compare } from "@thi.ng/compare/compare"; import { swap } from "./swap"; /** diff --git a/packages/arrays/src/shuffle.ts b/packages/arrays/src/shuffle.ts index e1c88acc2f..bc43624890 100644 --- a/packages/arrays/src/shuffle.ts +++ b/packages/arrays/src/shuffle.ts @@ -1,5 +1,7 @@ -import { assert, TypedArray } from "@thi.ng/api"; -import { IRandom, SYSTEM } from "@thi.ng/random"; +import type { TypedArray } from "@thi.ng/api"; +import { assert } from "@thi.ng/api/assert"; +import type { IRandom } from "@thi.ng/random"; +import { SYSTEM } from "@thi.ng/random/system"; import type { AnyArray } from "./api"; /** diff --git a/packages/arrays/src/sort-cached.ts b/packages/arrays/src/sort-cached.ts index 426132113f..82c44c4602 100644 --- a/packages/arrays/src/sort-cached.ts +++ b/packages/arrays/src/sort-cached.ts @@ -1,6 +1,7 @@ -import { assert, Comparator, Fn } from "@thi.ng/api"; -import { isFunction } from "@thi.ng/checks"; -import { compare } from "@thi.ng/compare"; +import type { Comparator, Fn } from "@thi.ng/api"; +import { assert } from "@thi.ng/api/assert"; +import { isFunction } from "@thi.ng/checks/is-function"; +import { compare } from "@thi.ng/compare/compare"; import { quickSort } from "./quicksort"; import { multiSwap } from "./swap";