diff --git a/packages/dcons/src/dcons.ts b/packages/dcons/src/dcons.ts index c887a32ba5..5da844386d 100644 --- a/packages/dcons/src/dcons.ts +++ b/packages/dcons/src/dcons.ts @@ -11,14 +11,17 @@ import type { ISeq, ISeqable, IStack, - Predicate + Predicate, } from "@thi.ng/api"; -import { isArrayLike } from "@thi.ng/checks"; -import { compare } from "@thi.ng/compare"; +import { isArrayLike } from "@thi.ng/checks/is-arraylike"; +import { compare } from "@thi.ng/compare/compare"; import { equiv } from "@thi.ng/equiv"; -import { ensureIndex, illegalArgs } from "@thi.ng/errors"; -import { IRandom, SYSTEM } from "@thi.ng/random"; -import { IReducible, isReduced, ReductionFn } from "@thi.ng/transducers"; +import { illegalArgs } from "@thi.ng/errors/illegal-arguments"; +import { ensureIndex } from "@thi.ng/errors/out-of-bounds"; +import type { IRandom } from "@thi.ng/random"; +import { SYSTEM } from "@thi.ng/random/system"; +import type { IReducible, ReductionFn } from "@thi.ng/transducers"; +import { isReduced } from "@thi.ng/transducers/reduced"; export interface ConsCell { value: T; @@ -37,7 +40,8 @@ export class DCons IReducible, IRelease, ISeqable, - IStack> { + IStack> +{ head: ConsCell | undefined; tail: ConsCell | undefined; protected _length: number = 0; diff --git a/packages/dcons/src/sol.ts b/packages/dcons/src/sol.ts index 705d15f43a..282defbaea 100644 --- a/packages/dcons/src/sol.ts +++ b/packages/dcons/src/sol.ts @@ -1,5 +1,5 @@ import type { Fn2, Predicate } from "@thi.ng/api"; -import { outOfBounds } from "@thi.ng/errors"; +import { outOfBounds } from "@thi.ng/errors/out-of-bounds"; import { ConsCell, DCons } from "./dcons"; /**