refactor(geom-axidraw): remove geom-api dep, update imports

thi-ng · Jun 9, 2024 · da2b13b · da2b13b
1 parent 3182726
commit da2b13b
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 11 deletions.
diff --git a/packages/geom-axidraw/README.md b/packages/geom-axidraw/README.md
@@ -329,7 +329,6 @@ Package sizes (brotli'd, pre-treeshake): ESM: 1.55 KB
 - [@thi.ng/defmulti](https://github.com/thi-ng/umbrella/tree/develop/packages/defmulti)
 - [@thi.ng/geom](https://github.com/thi-ng/umbrella/tree/develop/packages/geom)
 - [@thi.ng/geom-accel](https://github.com/thi-ng/umbrella/tree/develop/packages/geom-accel)
-- [@thi.ng/geom-api](https://github.com/thi-ng/umbrella/tree/develop/packages/geom-api)
 - [@thi.ng/geom-clip-line](https://github.com/thi-ng/umbrella/tree/develop/packages/geom-clip-line)
 - [@thi.ng/geom-isec](https://github.com/thi-ng/umbrella/tree/develop/packages/geom-isec)
 - [@thi.ng/transducers](https://github.com/thi-ng/umbrella/tree/develop/packages/transducers)

diff --git a/packages/geom-axidraw/package.json b/packages/geom-axidraw/package.json
@@ -43,7 +43,6 @@
 		"@thi.ng/defmulti": "^3.0.39",
 		"@thi.ng/geom": "^7.0.1",
 		"@thi.ng/geom-accel": "^3.6.4",
-		"@thi.ng/geom-api": "^4.0.10",
 		"@thi.ng/geom-clip-line": "^2.3.89",
 		"@thi.ng/geom-isec": "^3.1.0",
 		"@thi.ng/transducers": "^9.0.5",

diff --git a/packages/geom-axidraw/src/api.ts b/packages/geom-axidraw/src/api.ts
@@ -1,6 +1,6 @@
 import type { Fn } from "@thi.ng/api";
 import type { DrawCommand } from "@thi.ng/axidraw";
-import type { IShape2, SamplingOpts } from "@thi.ng/geom-api";
+import type { IShape2, SamplingOpts } from "@thi.ng/geom";
 import type { ReadonlyVec } from "@thi.ng/vectors";
 
 /**
@@ -76,7 +76,7 @@ export interface AsAxiDrawOpts {
 	 *
 	 * @remarks
 	 * References:
-	 * - https://docs.thi.ng/umbrella/geom-api/interfaces/SamplingOpts.html
+	 * - https://docs.thi.ng/umbrella/geom-resample/interfaces/SamplingOpts.html
 	 * - https://docs.thi.ng/umbrella/geom/functions/vertices.html
 	 */
 	samples: number | Partial<SamplingOpts>;

diff --git a/packages/geom-axidraw/src/as-axidraw.ts b/packages/geom-axidraw/src/as-axidraw.ts
@@ -4,8 +4,16 @@ import { DOWN, MOVE, UP } from "@thi.ng/axidraw/commands";
 import { polyline } from "@thi.ng/axidraw/polyline";
 import type { MultiFn1O } from "@thi.ng/defmulti";
 import { defmulti } from "@thi.ng/defmulti/defmulti";
-import type { Circle, ComplexPolygon, Group, Polyline } from "@thi.ng/geom";
-import type { Attribs, IHiccupShape2, IShape2, PCLike } from "@thi.ng/geom-api";
+import type {
+	Attribs,
+	Circle,
+	ComplexPolygon,
+	Group,
+	IHiccupShape2,
+	IShape2,
+	PCLike,
+	Polyline,
+} from "@thi.ng/geom";
 import { clipPolylinePoly } from "@thi.ng/geom-clip-line/clip-poly";
 import { pointInPolygon2 } from "@thi.ng/geom-isec/point";
 import { applyTransforms } from "@thi.ng/geom/apply-transforms";

diff --git a/packages/geom-axidraw/src/as-geometry.ts b/packages/geom-axidraw/src/as-geometry.ts
@@ -1,5 +1,5 @@
 import type { DrawCommand } from "@thi.ng/axidraw";
-import type { Attribs } from "@thi.ng/geom-api";
+import type { Attribs } from "@thi.ng/geom";
 import { group } from "@thi.ng/geom/group";
 import { points } from "@thi.ng/geom/points";
 import { polyline } from "@thi.ng/geom/polyline";

diff --git a/packages/geom-axidraw/src/sort.ts b/packages/geom-axidraw/src/sort.ts
@@ -1,12 +1,12 @@
 import { sortByCachedKey } from "@thi.ng/arrays/sort-cached";
 import { compareNumAsc } from "@thi.ng/compare/numeric";
-import { KdTreeSet } from "@thi.ng/geom-accel/kd-tree-set";
+import type { IShape2 } from "@thi.ng/geom";
 import type {
 	IRegionQuery,
-	IShape2,
 	ISpatialMap,
 	ISpatialSet,
-} from "@thi.ng/geom-api";
+} from "@thi.ng/geom-accel";
+import { KdTreeSet } from "@thi.ng/geom-accel/kd-tree-set";
 import { centroid } from "@thi.ng/geom/centroid";
 import { ZERO2, type ReadonlyVec } from "@thi.ng/vectors/api";
 import { distSq2 } from "@thi.ng/vectors/distsq";
@@ -77,7 +77,7 @@ export const shapesByProximity =
 /**
  * Similar to {@link pointsByNearestNeighbor}, however for shapes and requiring
  * an
- * [`ISpatialMap`](https://docs.thi.ng/umbrella/geom-api/interfaces/ISpatialMap.html)
+ * [`ISpatialMap`](https://docs.thi.ng/umbrella/geom-accel/interfaces/ISpatialMap.html)
  * implementation and is using shape centroid (auto-computed) to perform
  * indexing and nearest neighbor queries.
  *