refactor: update imports

thi-ng · Sep 10, 2021 · 138571a · 138571a
1 parent 3c655f5
commit 138571a
Show file tree

Hide file tree

Showing 503 changed files with 2,510 additions and 2,310 deletions.
diff --git a/packages/gp/src/ast.ts b/packages/gp/src/ast.ts
@@ -1,7 +1,11 @@
-import { assert } from "@thi.ng/api";
-import { SYSTEM } from "@thi.ng/random";
-import { iterate, iterator, repeatedly, takeWhile } from "@thi.ng/transducers";
-import { Location, zipper } from "@thi.ng/zipper";
+import { assert } from "@thi.ng/api/assert";
+import { SYSTEM } from "@thi.ng/random/system";
+import { iterate } from "@thi.ng/transducers/iter/iterate";
+import { repeatedly } from "@thi.ng/transducers/iter/repeatedly";
+import { iterator } from "@thi.ng/transducers/iterator";
+import { takeWhile } from "@thi.ng/transducers/xform/take-while";
+import type { Location } from "@thi.ng/zipper";
+import { zipper } from "@thi.ng/zipper/zipper";
 import type { ASTNode, ASTOpts, OpGene } from "./api";
 import { opNode, probabilities, terminalNode } from "./utils";
 

diff --git a/packages/gp/src/mep.ts b/packages/gp/src/mep.ts
@@ -1,6 +1,6 @@
-import { inRange } from "@thi.ng/math";
-import { SYSTEM } from "@thi.ng/random";
-import { repeatedly } from "@thi.ng/transducers";
+import { inRange } from "@thi.ng/math/interval";
+import { SYSTEM } from "@thi.ng/random/system";
+import { repeatedly } from "@thi.ng/transducers/iter/repeatedly";
 import type { ASTNode, MEPChromosome, MEPGene, MEPOpts } from "./api";
 import { opNode, probabilities, terminalNode } from "./utils";
 

diff --git a/packages/gp/src/utils.ts b/packages/gp/src/utils.ts
@@ -1,5 +1,7 @@
-import { assert } from "@thi.ng/api";
-import { add, choices, range } from "@thi.ng/transducers";
+import { assert } from "@thi.ng/api/assert";
+import { choices } from "@thi.ng/transducers/iter/choices";
+import { range } from "@thi.ng/transducers/iter/range";
+import { add } from "@thi.ng/transducers/rfn/add";
 import type { GPOpts, OpGene, TerminalGene } from "./api";
 
 export const terminalNode = <T>(value: T): TerminalGene<T> => ({

diff --git a/packages/grid-iterators/src/columns.ts b/packages/grid-iterators/src/columns.ts
@@ -1,4 +1,5 @@
-import { map, range2d } from "@thi.ng/transducers";
+import { range2d } from "@thi.ng/transducers/iter/range2d";
+import { map } from "@thi.ng/transducers/xform/map";
 import { swapxy } from "./utils";
 
 /**

diff --git a/packages/grid-iterators/src/interleave.ts b/packages/grid-iterators/src/interleave.ts
@@ -1,4 +1,5 @@
-import { map, range2d } from "@thi.ng/transducers";
+import { range2d } from "@thi.ng/transducers/iter/range2d";
+import { map } from "@thi.ng/transducers/xform/map";
 import { swapxy } from "./utils";
 
 /**

diff --git a/packages/grid-iterators/src/random.ts b/packages/grid-iterators/src/random.ts
@@ -1,6 +1,7 @@
-import { shuffle } from "@thi.ng/arrays";
-import { IRandom, SYSTEM } from "@thi.ng/random";
-import { range } from "@thi.ng/transducers";
+import { shuffle } from "@thi.ng/arrays/shuffle";
+import type { IRandom } from "@thi.ng/random";
+import { SYSTEM } from "@thi.ng/random/system";
+import { range } from "@thi.ng/transducers/iter/range";
 import { asInt } from "./utils";
 
 /**

diff --git a/packages/grid-iterators/src/rows.ts b/packages/grid-iterators/src/rows.ts
@@ -1,4 +1,4 @@
-import { range2d } from "@thi.ng/transducers";
+import { range2d } from "@thi.ng/transducers/iter/range2d";
 
 /**
  * Yields sequence of 2D grid coordinates in row-major order. Same as

diff --git a/packages/grid-iterators/src/zcurve.ts b/packages/grid-iterators/src/zcurve.ts
@@ -1,5 +1,5 @@
-import { ceilPow2 } from "@thi.ng/binary";
-import { demux2 } from "@thi.ng/morton";
+import { ceilPow2 } from "@thi.ng/binary/pow";
+import { demux2 } from "@thi.ng/morton/mux";
 import { asInt } from "./utils";
 
 /**

diff --git a/packages/hdiff/src/diff.ts b/packages/hdiff/src/diff.ts
@@ -1,6 +1,6 @@
-import { diffArray } from "@thi.ng/diff";
-import { escape } from "@thi.ng/hiccup";
-import { padLeft } from "@thi.ng/strings";
+import { diffArray } from "@thi.ng/diff/array";
+import { escape } from "@thi.ng/hiccup/escape";
+import { padLeft } from "@thi.ng/strings/pad-left";
 
 const FMT_LN = padLeft(4, " ");
 

diff --git a/packages/hdiff/src/html.ts b/packages/hdiff/src/html.ts
@@ -1,4 +1,4 @@
-import { serialize } from "@thi.ng/hiccup";
+import { serialize } from "@thi.ng/hiccup/serialize";
 import { DEFAULT_THEME, Theme } from "./api";
 import { compileTheme } from "./theme";
 

diff --git a/packages/hdiff/src/theme.ts b/packages/hdiff/src/theme.ts
@@ -1,4 +1,4 @@
-import { css } from "@thi.ng/hiccup-css";
+import { css } from "@thi.ng/hiccup-css/css";
 import type { BgFg, BgFgBorder, Theme } from "./api";
 
 const block = { display: "block" };

diff --git a/packages/hdom-canvas/src/index.ts b/packages/hdom-canvas/src/index.ts
@@ -1,8 +1,11 @@
-import { assert, NO_OP } from "@thi.ng/api";
-import { isArray, isNotStringAndIterable } from "@thi.ng/checks";
-import { diffArray } from "@thi.ng/diff";
-import { equiv, HDOMImplementation, HDOMOpts, releaseTree } from "@thi.ng/hdom";
-import { draw } from "@thi.ng/hiccup-canvas";
+import { assert } from "@thi.ng/api/assert";
+import { NO_OP } from "@thi.ng/api/constants";
+import { isArray } from "@thi.ng/checks/is-array";
+import { isNotStringAndIterable } from "@thi.ng/checks/is-not-string-iterable";
+import { diffArray } from "@thi.ng/diff/array";
+import type { HDOMImplementation, HDOMOpts } from "@thi.ng/hdom";
+import { equiv, releaseTree } from "@thi.ng/hdom/diff";
+import { draw } from "@thi.ng/hiccup-canvas/draw";
 
 const FN = "function";
 const STR = "string";

diff --git a/packages/hdom-components/src/button-group.ts b/packages/hdom-components/src/button-group.ts
@@ -75,15 +75,14 @@ export type ButtonGroup = (
  *
  * @param opts -
  */
-export const buttonGroup = (opts: ButtonGroupOpts): ButtonGroup => (
-    _,
-    args: ButtonGroupArgs,
-    ...buttons: ButtonGroupItem[]
-) => [
-    "div",
-    mergeAttribs(opts.attribs, args.attribs),
-    ...groupBody(opts, args.disabled, buttons),
-];
+export const buttonGroup =
+    (opts: ButtonGroupOpts): ButtonGroup =>
+    (_, args: ButtonGroupArgs, ...buttons: ButtonGroupItem[]) =>
+        [
+            "div",
+            mergeAttribs(opts.attribs, args.attribs),
+            ...groupBody(opts, args.disabled, buttons),
+        ];
 
 const groupBody = (
     opts: ButtonGroupOpts,

diff --git a/packages/hdom-components/src/fps-counter.ts b/packages/hdom-components/src/fps-counter.ts
@@ -1,5 +1,5 @@
-import { step } from "@thi.ng/transducers";
-import { sma } from "@thi.ng/transducers-stats";
+import { step } from "@thi.ng/transducers/step";
+import { sma } from "@thi.ng/transducers-stats/sma";
 import { sparkline, SparklineOpts } from "./sparkline";
 
 export interface FpsCounterOpts {

diff --git a/packages/hdom-components/src/link.ts b/packages/hdom-components/src/link.ts
@@ -1,4 +1,4 @@
-import { isString } from "@thi.ng/checks";
+import { isString } from "@thi.ng/checks/is-string";
 
 export const link = (attribs: any, body: any) => [
     "a",

diff --git a/packages/hdom-components/src/pager.ts b/packages/hdom-components/src/pager.ts
@@ -1,4 +1,5 @@
-import { map, range } from "@thi.ng/transducers";
+import { range } from "@thi.ng/transducers/iter/range";
+import { map } from "@thi.ng/transducers/xform/map";
 
 /**
  * Configuration options for pager components.

diff --git a/packages/hdom-components/src/sparkline.ts b/packages/hdom-components/src/sparkline.ts
@@ -1,5 +1,6 @@
-import { fitClamped } from "@thi.ng/math";
-import { mapIndexed, str } from "@thi.ng/transducers";
+import { fitClamped } from "@thi.ng/math/fit";
+import { str } from "@thi.ng/transducers/rfn/str";
+import { mapIndexed } from "@thi.ng/transducers/xform/map-indexed";
 
 export interface SparklineOpts {
     /**

diff --git a/packages/hdom-mock/src/index.ts b/packages/hdom-mock/src/index.ts
@@ -1,13 +1,9 @@
-import { isFunction } from "@thi.ng/checks";
-import {
-    createTree,
-    diffTree,
-    HDOMImplementation,
-    HDOMOpts,
-    hydrateTree,
-    normalizeTree,
-} from "@thi.ng/hdom";
 import type { IObjectOf } from "@thi.ng/api";
+import { isFunction } from "@thi.ng/checks/is-function";
+import type { HDOMImplementation, HDOMOpts } from "@thi.ng/hdom";
+import { diffTree } from "@thi.ng/hdom/diff";
+import { createTree, hydrateTree } from "@thi.ng/hdom/dom";
+import { normalizeTree } from "@thi.ng/hdom/normalize";
 
 export const TEXT = Symbol();
 

diff --git a/packages/hdom/src/diff.ts b/packages/hdom/src/diff.ts
@@ -1,5 +1,7 @@
-import { IObjectOf, SEMAPHORE } from "@thi.ng/api";
-import { diffArray, diffObject } from "@thi.ng/diff";
+import type { IObjectOf } from "@thi.ng/api";
+import { SEMAPHORE } from "@thi.ng/api/constants";
+import { diffArray } from "@thi.ng/diff/array";
+import { diffObject } from "@thi.ng/diff/object";
 import {
     equiv as _equiv,
     equivArrayLike,

diff --git a/packages/hdom/src/dom.ts b/packages/hdom/src/dom.ts
@@ -1,10 +1,10 @@
-import {
-    isArray as isa,
-    isNotStringAndIterable as isi,
-    isString as iss,
-} from "@thi.ng/checks";
-import { css, formatPrefixes, SVG_TAGS } from "@thi.ng/hiccup";
-import { XML_SVG } from "@thi.ng/prefixes";
+import { isArray as isa } from "@thi.ng/checks/is-array";
+import { isNotStringAndIterable as isi } from "@thi.ng/checks/is-not-string-iterable";
+import { isString as iss } from "@thi.ng/checks/is-string";
+import { SVG_TAGS } from "@thi.ng/hiccup/api";
+import { css } from "@thi.ng/hiccup/css";
+import { formatPrefixes } from "@thi.ng/hiccup/prefix";
+import { XML_SVG } from "@thi.ng/prefixes/xml";
 import type { HDOMImplementation, HDOMOpts } from "./api";
 
 const isArray = isa;

diff --git a/packages/hdom/src/logger.ts b/packages/hdom/src/logger.ts
@@ -1,4 +1,5 @@
-import { ILogger, NULL_LOGGER } from "@thi.ng/api";
+import type { ILogger } from "@thi.ng/api";
+import { NULL_LOGGER } from "@thi.ng/api/logger";
 
 export let LOGGER = NULL_LOGGER;
 

diff --git a/packages/hdom/src/normalize.ts b/packages/hdom/src/normalize.ts
@@ -1,10 +1,9 @@
-import {
-    isArray as isa,
-    isNotStringAndIterable as isi,
-    isPlainObject as iso,
-} from "@thi.ng/checks";
-import { illegalArgs } from "@thi.ng/errors";
-import { mergeEmmetAttribs, NO_SPANS, RE_TAG } from "@thi.ng/hiccup";
+import { isArray as isa } from "@thi.ng/checks/is-array";
+import { isNotStringAndIterable as isi } from "@thi.ng/checks/is-not-string-iterable";
+import { isPlainObject as iso } from "@thi.ng/checks/is-plain-object";
+import { illegalArgs } from "@thi.ng/errors/illegal-arguments";
+import { NO_SPANS, RE_TAG } from "@thi.ng/hiccup/api";
+import { mergeEmmetAttribs } from "@thi.ng/hiccup/attribs";
 import type { HDOMOpts } from "./api";
 
 const isArray = isa;

diff --git a/packages/hdom/src/render-once.ts b/packages/hdom/src/render-once.ts
@@ -1,4 +1,4 @@
-import { derefContext } from "@thi.ng/hiccup";
+import { derefContext } from "@thi.ng/hiccup/deref";
 import type { HDOMImplementation, HDOMOpts } from "./api";
 import { DEFAULT_IMPL } from "./default";
 import { resolveRoot } from "./utils";

diff --git a/packages/hdom/src/start.ts b/packages/hdom/src/start.ts
@@ -1,4 +1,4 @@
-import { derefContext } from "@thi.ng/hiccup";
+import { derefContext } from "@thi.ng/hiccup/deref";
 import type { HDOMImplementation, HDOMOpts } from "./api";
 import { DEFAULT_IMPL } from "./default";
 import { resolveRoot } from "./utils";

diff --git a/packages/hdom/src/utils.ts b/packages/hdom/src/utils.ts
@@ -1,4 +1,4 @@
-import { isString } from "@thi.ng/checks";
+import { isString } from "@thi.ng/checks/is-string";
 import type { HDOMImplementation } from "./api";
 
 export const resolveRoot = (root: any, impl: HDOMImplementation<any>) =>

diff --git a/packages/heaps/src/heap.ts b/packages/heaps/src/heap.ts
@@ -9,7 +9,7 @@ import type {
     Predicate,
     Predicate2,
 } from "@thi.ng/api";
-import { compare } from "@thi.ng/compare";
+import { compare } from "@thi.ng/compare/compare";
 import { equiv } from "@thi.ng/equiv";
 import type { HeapOpts } from "./api";
 

diff --git a/packages/heaps/src/pairing.ts b/packages/heaps/src/pairing.ts
@@ -9,7 +9,7 @@ import type {
     Predicate,
     Predicate2,
 } from "@thi.ng/api";
-import { compare } from "@thi.ng/compare";
+import { compare } from "@thi.ng/compare/compare";
 import { equiv } from "@thi.ng/equiv";
 import type { HeapOpts } from "./api";
 

diff --git a/packages/heaps/src/priority-queue.ts b/packages/heaps/src/priority-queue.ts
@@ -8,7 +8,7 @@ import type {
     Predicate,
     Predicate2,
 } from "@thi.ng/api";
-import { compareNumDesc } from "@thi.ng/compare";
+import { compareNumDesc } from "@thi.ng/compare/numeric";
 import { equiv } from "@thi.ng/equiv";
 import type { PriorityQueueOpts } from "./api";
 import { Heap } from "./heap";

diff --git a/packages/hiccup-canvas/src/arc.ts b/packages/hiccup-canvas/src/arc.ts
@@ -1,5 +1,5 @@
 import type { IObjectOf } from "@thi.ng/api";
-import { TAU } from "@thi.ng/math";
+import { TAU } from "@thi.ng/math/api";
 import type { ReadonlyVec } from "@thi.ng/vectors";
 import { endShape } from "./end-shape";
 

diff --git a/packages/hiccup-canvas/src/color.ts b/packages/hiccup-canvas/src/color.ts
@@ -1,5 +1,5 @@
-import { isString } from "@thi.ng/checks";
-import { css } from "@thi.ng/color";
+import { isString } from "@thi.ng/checks/is-string";
+import { css } from "@thi.ng/color/css/css";
 import type { DrawState } from "./api";
 
 export const resolveColor = css;

diff --git a/packages/hiccup-canvas/src/draw.ts b/packages/hiccup-canvas/src/draw.ts
@@ -1,4 +1,5 @@
-import { implementsFunction, isArray } from "@thi.ng/checks";
+import { implementsFunction } from "@thi.ng/checks/implements-function";
+import { isArray } from "@thi.ng/checks/is-array";
 import type { DrawState } from "./api";
 import { circularArc, ellipticArc } from "./arc";
 import { defLinearGradient, defRadialGradient } from "./color";

diff --git a/packages/hiccup-canvas/src/image.ts b/packages/hiccup-canvas/src/image.ts
@@ -1,5 +1,5 @@
 import type { IObjectOf } from "@thi.ng/api";
-import { implementsFunction } from "@thi.ng/checks";
+import { implementsFunction } from "@thi.ng/checks/implements-function";
 import type { IToImageData } from "@thi.ng/pixel";
 import type { ReadonlyVec } from "@thi.ng/vectors";
 

diff --git a/packages/hiccup-canvas/src/packed-points.ts b/packages/hiccup-canvas/src/packed-points.ts
@@ -1,5 +1,5 @@
 import type { IObjectOf } from "@thi.ng/api";
-import { TAU } from "@thi.ng/math";
+import { TAU } from "@thi.ng/math/api";
 
 export const packedPoints = (
     ctx: CanvasRenderingContext2D,

diff --git a/packages/hiccup-canvas/src/points.ts b/packages/hiccup-canvas/src/points.ts
@@ -1,5 +1,5 @@
 import type { IObjectOf } from "@thi.ng/api";
-import { TAU } from "@thi.ng/math";
+import { TAU } from "@thi.ng/math/api";
 import type { ReadonlyVec } from "@thi.ng/vectors";
 
 export const points = (

diff --git a/packages/hiccup-canvas/src/state.ts b/packages/hiccup-canvas/src/state.ts
@@ -1,5 +1,5 @@
 import type { IObjectOf } from "@thi.ng/api";
-import { isArrayLike } from "@thi.ng/checks";
+import { isArrayLike } from "@thi.ng/checks/is-arraylike";
 import type { DrawState } from "./api";
 import { resolveGradientOrColor } from "./color";
 

diff --git a/packages/hiccup-css/src/conditional.ts b/packages/hiccup-css/src/conditional.ts
@@ -1,20 +1,18 @@
-import { isString } from "@thi.ng/checks";
+import { isString } from "@thi.ng/checks/is-string";
 import { expand, indent } from "./impl";
 import type { Conditional, CSSOpts, RuleFn } from "./api";
 
-export const conditional = (
-    type: string,
-    cond: Conditional,
-    rules: any[]
-): RuleFn => (acc: string[], opts: CSSOpts) => {
-    const space = indent(opts);
-    acc.push(`${space}${type} ${formatCond(cond)}${opts.format.declStart}`);
-    opts.depth++;
-    expand(acc, [], rules, opts);
-    opts.depth--;
-    acc.push(space + opts.format.declEnd);
-    return acc;
-};
+export const conditional =
+    (type: string, cond: Conditional, rules: any[]): RuleFn =>
+    (acc: string[], opts: CSSOpts) => {
+        const space = indent(opts);
+        acc.push(`${space}${type} ${formatCond(cond)}${opts.format.declStart}`);
+        opts.depth++;
+        expand(acc, [], rules, opts);
+        opts.depth--;
+        acc.push(space + opts.format.declEnd);
+        return acc;
+    };
 
 const formatCond = (cond: any) => {
     if (isString(cond)) {

diff --git a/packages/hiccup-css/src/css.ts b/packages/hiccup-css/src/css.ts
@@ -1,10 +1,8 @@
-import {
-    isArray,
-    isFunction,
-    isNotStringAndIterable,
-    isPlainObject,
-} from "@thi.ng/checks";
-import { illegalArgs } from "@thi.ng/errors";
+import { isArray } from "@thi.ng/checks/is-array";
+import { isFunction } from "@thi.ng/checks/is-function";
+import { isNotStringAndIterable } from "@thi.ng/checks/is-not-string-iterable";
+import { isPlainObject } from "@thi.ng/checks/is-plain-object";
+import { illegalArgs } from "@thi.ng/errors/illegal-arguments";
 import { COMPACT, CSSOpts, DEFAULT_VENDORS } from "./api";
 import { expand, formatDecls } from "./impl";