refactor(geom): update imports (transducers)

thi-ng · Sep 20, 2021 · 25b674f · 25b674f
1 parent e940647
commit 25b674f
Show file tree

Hide file tree

Showing 23 changed files with 64 additions and 64 deletions.
diff --git a/packages/geom-accel/src/aspatial-grid.ts b/packages/geom-accel/src/aspatial-grid.ts
@@ -2,7 +2,7 @@ import type { Fn, Nullable, Pair } from "@thi.ng/api";
 import type { IRegionQuery, ISpatialMap } from "@thi.ng/geom-api";
 import type { Heap } from "@thi.ng/heaps";
 import { EPS } from "@thi.ng/math/api";
-import { map } from "@thi.ng/transducers/xform/map";
+import { map } from "@thi.ng/transducers/map";
 import type { ReadonlyVec, VecOpRoVV } from "@thi.ng/vectors";
 import { div } from "@thi.ng/vectors/div";
 import { equals } from "@thi.ng/vectors/equals";

diff --git a/packages/geom-accel/src/kd-tree-map.ts b/packages/geom-accel/src/kd-tree-map.ts
@@ -3,7 +3,7 @@ import { ensureArray } from "@thi.ng/arrays/ensure-array";
 import type { IRegionQuery, ISpatialMap } from "@thi.ng/geom-api";
 import { Heap } from "@thi.ng/heaps/heap";
 import { EPS } from "@thi.ng/math/api";
-import { map } from "@thi.ng/transducers/xform/map";
+import { map } from "@thi.ng/transducers/map";
 import type { ReadonlyVec, Vec } from "@thi.ng/vectors";
 import { distSq } from "@thi.ng/vectors/distsq";
 import { addResults, CMP, into } from "./utils";

diff --git a/packages/geom-accel/src/nd-quadtree-map.ts b/packages/geom-accel/src/nd-quadtree-map.ts
@@ -6,11 +6,11 @@ import { pointInCenteredBox } from "@thi.ng/geom-isec/point";
 import { testCenteredBoxSphere } from "@thi.ng/geom-isec/rect-circle";
 import { Heap } from "@thi.ng/heaps/heap";
 import { EPS } from "@thi.ng/math/api";
-import { iterate } from "@thi.ng/transducers/iter/iterate";
-import { permutations } from "@thi.ng/transducers/iter/permutations";
-import { repeat } from "@thi.ng/transducers/iter/repeat";
-import { map } from "@thi.ng/transducers/xform/map";
-import { take } from "@thi.ng/transducers/xform/take";
+import { iterate } from "@thi.ng/transducers/iterate";
+import { map } from "@thi.ng/transducers/map";
+import { permutations } from "@thi.ng/transducers/permutations";
+import { repeat } from "@thi.ng/transducers/repeat";
+import { take } from "@thi.ng/transducers/take";
 import type { MultiVecOpRoVV, ReadonlyVec } from "@thi.ng/vectors";
 import { addmN } from "@thi.ng/vectors/addmn";
 import { distSq } from "@thi.ng/vectors/distsq";

diff --git a/packages/geom-fuzz/src/dots.ts b/packages/geom-fuzz/src/dots.ts
@@ -3,7 +3,7 @@ import { points } from "@thi.ng/geom/ctors/points";
 import { bounds } from "@thi.ng/geom/ops/bounds";
 import { pointInside } from "@thi.ng/geom/ops/point-inside";
 import { unmapPoint } from "@thi.ng/geom/ops/unmap-point";
-import { range2d } from "@thi.ng/transducers/iter/range2d";
+import { range2d } from "@thi.ng/transducers/range2d";
 import type { Vec } from "@thi.ng/vectors";
 import { div2 } from "@thi.ng/vectors/div";
 import { jitter } from "@thi.ng/vectors/jitter";

diff --git a/packages/geom-fuzz/src/hatch.ts b/packages/geom-fuzz/src/hatch.ts
@@ -8,7 +8,7 @@ import { unmapPoint } from "@thi.ng/geom/ops/unmap-point";
 import { columnEnds2d } from "@thi.ng/grid-iterators/column-ends";
 import { diagonalEnds2d } from "@thi.ng/grid-iterators/diagonal-ends";
 import { rowEnds2d } from "@thi.ng/grid-iterators/row-ends";
-import { partition } from "@thi.ng/transducers/xform/partition";
+import { partition } from "@thi.ng/transducers/partition";
 import { div2 } from "@thi.ng/vectors/div";
 import { DEFAULT_LINE, FillFn, HatchOpts } from "./api";
 import { defLine } from "./line";

diff --git a/packages/geom-isoline/src/index.ts b/packages/geom-isoline/src/index.ts
@@ -1,5 +1,5 @@
 import type { Fn5 } from "@thi.ng/api";
-import { range2d } from "@thi.ng/transducers/iter/range2d";
+import { range2d } from "@thi.ng/transducers/range2d";
 import type { ReadonlyVec, Vec } from "@thi.ng/vectors";
 
 // flattened [to, clear] tuples

diff --git a/packages/geom-subdiv-curve/src/api.ts b/packages/geom-subdiv-curve/src/api.ts
@@ -1,6 +1,6 @@
 import type { FnU } from "@thi.ng/api";
 import type { SubdivKernel } from "@thi.ng/geom-api";
-import { wrapSides } from "@thi.ng/transducers/iter/wrap-sides";
+import { wrapSides } from "@thi.ng/transducers/wrap-sides";
 import type { ReadonlyVec } from "@thi.ng/vectors";
 import { addmN } from "@thi.ng/vectors/addmn";
 import { mixN } from "@thi.ng/vectors/mixn";

diff --git a/packages/geom-subdiv-curve/src/subdivide.ts b/packages/geom-subdiv-curve/src/subdivide.ts
@@ -1,9 +1,9 @@
 import type { SubdivKernel } from "@thi.ng/geom-api";
-import { comp } from "@thi.ng/transducers/func/comp";
-import { push } from "@thi.ng/transducers/rfn/push";
+import { comp } from "@thi.ng/transducers/comp";
+import { mapcatIndexed } from "@thi.ng/transducers/mapcat-indexed";
+import { partition } from "@thi.ng/transducers/partition";
+import { push } from "@thi.ng/transducers/push";
 import { transduce } from "@thi.ng/transducers/transduce";
-import { mapcatIndexed } from "@thi.ng/transducers/xform/mapcat-indexed";
-import { partition } from "@thi.ng/transducers/xform/partition";
 import type { ReadonlyVec, Vec } from "@thi.ng/vectors";
 
 /**

diff --git a/packages/geom-tessellate/src/earcut.ts b/packages/geom-tessellate/src/earcut.ts
@@ -1,7 +1,7 @@
 import type { Tessellator } from "@thi.ng/geom-api";
 import { pointInTriangle2 } from "@thi.ng/geom-isec/point";
 import { polyArea2 } from "@thi.ng/geom-poly-utils/area";
-import { range } from "@thi.ng/transducers/iter/range";
+import { range } from "@thi.ng/transducers/range";
 import type { ReadonlyVec, Vec } from "@thi.ng/vectors";
 import { signedArea2 } from "@thi.ng/vectors/signed-area";
 

diff --git a/packages/geom-tessellate/src/edge-split.ts b/packages/geom-tessellate/src/edge-split.ts
@@ -1,11 +1,11 @@
 import type { Tessellator } from "@thi.ng/geom-api";
 import { centroid } from "@thi.ng/geom-poly-utils/centroid";
-import { comp } from "@thi.ng/transducers/func/comp";
-import { wrapSides } from "@thi.ng/transducers/iter/wrap-sides";
-import { push } from "@thi.ng/transducers/rfn/push";
+import { comp } from "@thi.ng/transducers/comp";
+import { mapcat } from "@thi.ng/transducers/mapcat";
+import { partition } from "@thi.ng/transducers/partition";
+import { push } from "@thi.ng/transducers/push";
 import { transduce } from "@thi.ng/transducers/transduce";
-import { mapcat } from "@thi.ng/transducers/xform/mapcat";
-import { partition } from "@thi.ng/transducers/xform/partition";
+import { wrapSides } from "@thi.ng/transducers/wrap-sides";
 import type { ReadonlyVec, Vec } from "@thi.ng/vectors";
 import { mixN } from "@thi.ng/vectors/mixn";
 

diff --git a/packages/geom-tessellate/src/inset.ts b/packages/geom-tessellate/src/inset.ts
@@ -1,12 +1,12 @@
 import type { Tessellator } from "@thi.ng/geom-api";
 import { centroid } from "@thi.ng/geom-poly-utils/centroid";
-import { comp } from "@thi.ng/transducers/func/comp";
-import { wrapSides } from "@thi.ng/transducers/iter/wrap-sides";
-import { zip } from "@thi.ng/transducers/iter/zip";
-import { push } from "@thi.ng/transducers/rfn/push";
+import { comp } from "@thi.ng/transducers/comp";
+import { map } from "@thi.ng/transducers/map";
+import { partition } from "@thi.ng/transducers/partition";
+import { push } from "@thi.ng/transducers/push";
 import { transduce } from "@thi.ng/transducers/transduce";
-import { map } from "@thi.ng/transducers/xform/map";
-import { partition } from "@thi.ng/transducers/xform/partition";
+import { wrapSides } from "@thi.ng/transducers/wrap-sides";
+import { zip } from "@thi.ng/transducers/zip";
 import type { ReadonlyVec, Vec } from "@thi.ng/vectors";
 import { mixN } from "@thi.ng/vectors/mixn";
 

diff --git a/packages/geom-tessellate/src/quad-fan.ts b/packages/geom-tessellate/src/quad-fan.ts
@@ -1,11 +1,11 @@
 import type { Tessellator } from "@thi.ng/geom-api";
 import { centroid } from "@thi.ng/geom-poly-utils/centroid";
-import { comp } from "@thi.ng/transducers/func/comp";
-import { wrapSides } from "@thi.ng/transducers/iter/wrap-sides";
-import { push } from "@thi.ng/transducers/rfn/push";
+import { comp } from "@thi.ng/transducers/comp";
+import { map } from "@thi.ng/transducers/map";
+import { partition } from "@thi.ng/transducers/partition";
+import { push } from "@thi.ng/transducers/push";
 import { transduce } from "@thi.ng/transducers/transduce";
-import { map } from "@thi.ng/transducers/xform/map";
-import { partition } from "@thi.ng/transducers/xform/partition";
+import { wrapSides } from "@thi.ng/transducers/wrap-sides";
 import type { ReadonlyVec, Vec } from "@thi.ng/vectors";
 import { mixN } from "@thi.ng/vectors/mixn";
 

diff --git a/packages/geom-tessellate/src/rim-tris.ts b/packages/geom-tessellate/src/rim-tris.ts
@@ -1,11 +1,11 @@
 import type { Tessellator } from "@thi.ng/geom-api";
-import { comp } from "@thi.ng/transducers/func/comp";
-import { wrapSides } from "@thi.ng/transducers/iter/wrap-sides";
-import { zip } from "@thi.ng/transducers/iter/zip";
-import { push } from "@thi.ng/transducers/rfn/push";
+import { comp } from "@thi.ng/transducers/comp";
+import { map } from "@thi.ng/transducers/map";
+import { partition } from "@thi.ng/transducers/partition";
+import { push } from "@thi.ng/transducers/push";
 import { transduce } from "@thi.ng/transducers/transduce";
-import { map } from "@thi.ng/transducers/xform/map";
-import { partition } from "@thi.ng/transducers/xform/partition";
+import { wrapSides } from "@thi.ng/transducers/wrap-sides";
+import { zip } from "@thi.ng/transducers/zip";
 import type { ReadonlyVec, Vec } from "@thi.ng/vectors";
 import { mixN } from "@thi.ng/vectors/mixn";
 

diff --git a/packages/geom-tessellate/src/tessellate.ts b/packages/geom-tessellate/src/tessellate.ts
@@ -1,12 +1,12 @@
 import { isFunction } from "@thi.ng/checks/is-function";
 import type { Tessellator } from "@thi.ng/geom-api";
-import { repeat } from "@thi.ng/transducers/iter/repeat";
+import { last } from "@thi.ng/transducers/last";
+import { mapcat } from "@thi.ng/transducers/mapcat";
+import { push } from "@thi.ng/transducers/push";
 import { reducer } from "@thi.ng/transducers/reduce";
-import { last } from "@thi.ng/transducers/rfn/last";
-import { push } from "@thi.ng/transducers/rfn/push";
+import { repeat } from "@thi.ng/transducers/repeat";
+import { scan } from "@thi.ng/transducers/scan";
 import { transduce } from "@thi.ng/transducers/transduce";
-import { mapcat } from "@thi.ng/transducers/xform/mapcat";
-import { scan } from "@thi.ng/transducers/xform/scan";
 import type { ReadonlyVec, Vec } from "@thi.ng/vectors";
 
 export function tessellate(

diff --git a/packages/geom-tessellate/src/tri-fan.ts b/packages/geom-tessellate/src/tri-fan.ts
@@ -1,11 +1,11 @@
 import type { Tessellator } from "@thi.ng/geom-api";
 import { centroid } from "@thi.ng/geom-poly-utils/centroid";
-import { comp } from "@thi.ng/transducers/func/comp";
-import { wrapSides } from "@thi.ng/transducers/iter/wrap-sides";
-import { push } from "@thi.ng/transducers/rfn/push";
+import { comp } from "@thi.ng/transducers/comp";
+import { map } from "@thi.ng/transducers/map";
+import { partition } from "@thi.ng/transducers/partition";
+import { push } from "@thi.ng/transducers/push";
 import { transduce } from "@thi.ng/transducers/transduce";
-import { map } from "@thi.ng/transducers/xform/map";
-import { partition } from "@thi.ng/transducers/xform/partition";
+import { wrapSides } from "@thi.ng/transducers/wrap-sides";
 import type { ReadonlyVec, Vec } from "@thi.ng/vectors";
 
 export const triFan: Tessellator = (points: ReadonlyVec[]) => {

diff --git a/packages/geom/src/ctors/path.ts b/packages/geom/src/ctors/path.ts
@@ -1,7 +1,7 @@
 import { isNumber } from "@thi.ng/checks/is-number";
 import type { Attribs, PathSegment } from "@thi.ng/geom-api";
-import { map } from "@thi.ng/transducers/xform/map";
-import { mapcat } from "@thi.ng/transducers/xform/mapcat";
+import { map } from "@thi.ng/transducers/map";
+import { mapcat } from "@thi.ng/transducers/mapcat";
 import type { Vec } from "@thi.ng/vectors";
 import { maddN2 } from "@thi.ng/vectors/maddn";
 import type { Cubic } from "../api/cubic";

diff --git a/packages/geom/src/ctors/polygon.ts b/packages/geom/src/ctors/polygon.ts
@@ -1,11 +1,11 @@
 import type { Attribs } from "@thi.ng/geom-api";
 import { TAU } from "@thi.ng/math/api";
-import { cycle } from "@thi.ng/transducers/iter/cycle";
-import { normRange } from "@thi.ng/transducers/iter/norm-range";
-import { zip } from "@thi.ng/transducers/iter/zip";
-import { push } from "@thi.ng/transducers/rfn/push";
+import { cycle } from "@thi.ng/transducers/cycle";
+import { map } from "@thi.ng/transducers/map";
+import { normRange } from "@thi.ng/transducers/norm-range";
+import { push } from "@thi.ng/transducers/push";
 import { transduce } from "@thi.ng/transducers/transduce";
-import { map } from "@thi.ng/transducers/xform/map";
+import { zip } from "@thi.ng/transducers/zip";
 import type { Vec } from "@thi.ng/vectors";
 import { cartesian2 } from "@thi.ng/vectors/cartesian";
 import { Polygon } from "../api/polygon";

diff --git a/packages/geom/src/internal/edges.ts b/packages/geom/src/internal/edges.ts
@@ -1,5 +1,5 @@
-import { wrapSides } from "@thi.ng/transducers/iter/wrap-sides";
-import { partition } from "@thi.ng/transducers/xform/partition";
+import { partition } from "@thi.ng/transducers/partition";
+import { wrapSides } from "@thi.ng/transducers/wrap-sides";
 import type { ReadonlyVec, VecPair } from "@thi.ng/vectors";
 
 export const edgeIterator = (vertices: Iterable<ReadonlyVec>, closed = false) =>

diff --git a/packages/geom/src/internal/points-as-shape.ts b/packages/geom/src/internal/points-as-shape.ts
@@ -1,5 +1,5 @@
 import type { Attribs, PCLikeConstructor } from "@thi.ng/geom-api";
-import { map } from "@thi.ng/transducers/xform/map";
+import { map } from "@thi.ng/transducers/map";
 import type { Vec } from "@thi.ng/vectors";
 import { copyVectors } from "@thi.ng/vectors/copy";
 

diff --git a/packages/geom/src/ops/as-cubic.ts b/packages/geom/src/ops/as-cubic.ts
@@ -11,7 +11,7 @@ import {
     openCubicFromControlPoints,
 } from "@thi.ng/geom-splines/cubic-from-controlpoints";
 import { TAU } from "@thi.ng/math/api";
-import { mapcat } from "@thi.ng/transducers/xform/mapcat";
+import { mapcat } from "@thi.ng/transducers/mapcat";
 import type { ReadonlyVec, Vec } from "@thi.ng/vectors";
 import type { Circle } from "../api/circle";
 import { Cubic } from "../api/cubic";

diff --git a/packages/geom/src/ops/bounds.ts b/packages/geom/src/ops/bounds.ts
@@ -6,10 +6,10 @@ import { bounds as arcBounds } from "@thi.ng/geom-arc/bounds";
 import { bounds as _bounds } from "@thi.ng/geom-poly-utils/bounds";
 import { cubicBounds } from "@thi.ng/geom-splines/cubic-bounds";
 import { quadraticBounds } from "@thi.ng/geom-splines/quadratic-bounds";
-import { comp } from "@thi.ng/transducers/func/comp";
+import { comp } from "@thi.ng/transducers/comp";
+import { filter } from "@thi.ng/transducers/filter";
 import { iterator1 } from "@thi.ng/transducers/iterator";
-import { filter } from "@thi.ng/transducers/xform/filter";
-import { map } from "@thi.ng/transducers/xform/map";
+import { map } from "@thi.ng/transducers/map";
 import { MAX2, MAX3, MIN2, MIN3 } from "@thi.ng/vectors/api";
 import { max } from "@thi.ng/vectors/max";
 import { min } from "@thi.ng/vectors/min";

diff --git a/packages/geom/src/ops/transform-vertices.ts b/packages/geom/src/ops/transform-vertices.ts
@@ -4,7 +4,7 @@ import { defmulti } from "@thi.ng/defmulti/defmulti";
 import type { IHiccupShape, IShape, PathSegment } from "@thi.ng/geom-api";
 import type { ReadonlyMat } from "@thi.ng/matrices";
 import { mulV } from "@thi.ng/matrices/mulv";
-import { map } from "@thi.ng/transducers/xform/map";
+import { map } from "@thi.ng/transducers/map";
 import type { ReadonlyVec } from "@thi.ng/vectors";
 import { Cubic } from "../api/cubic";
 import type { Group } from "../api/group";

diff --git a/packages/geom/src/ops/transform.ts b/packages/geom/src/ops/transform.ts
@@ -4,7 +4,7 @@ import { defmulti } from "@thi.ng/defmulti/defmulti";
 import type { IHiccupShape, IShape, PathSegment } from "@thi.ng/geom-api";
 import type { ReadonlyMat } from "@thi.ng/matrices";
 import { mulV } from "@thi.ng/matrices/mulv";
-import { map } from "@thi.ng/transducers/xform/map";
+import { map } from "@thi.ng/transducers/map";
 import { Cubic } from "../api/cubic";
 import type { Group } from "../api/group";
 import { Line } from "../api/line";