feat(geom): update asPolygon() / asPolyline()

- add support for more types
- dedupe impls

packages/geom/src/as-polygon.ts

@@ -1,13 +1,21 @@
 import type { Maybe } from "@thi.ng/api";
 import type { MultiFn1O } from "@thi.ng/defmulti";
 import { defmulti } from "@thi.ng/defmulti/defmulti";
+import { mapcat } from "@thi.ng/transducers/mapcat";
 import { copy, copyVectors } from "@thi.ng/vectors/copy";
-import type { IShape, IShape2, IShape3, SamplingOpts } from "./api.js";
+import type {
+	IShape,
+	IShape2,
+	IShape3,
+	PCLikeConstructor,
+	SamplingOpts,
+} from "./api.js";
 import type { AABB } from "./api/aabb.js";
 import type { Arc } from "./api/arc.js";
 import type { ComplexPolygon } from "./api/complex-polygon.js";
-import { Path } from "./api/path.js";
-import { Path3 } from "./api/path3.js";
+import type { Group } from "./api/group.js";
+import type { Path } from "./api/path.js";
+import type { Path3 } from "./api/path3.js";
 import { Polygon } from "./api/polygon.js";
 import { Polygon3 } from "./api/polygon3.js";
 import { __copyAttribsNoSamples as __attribs } from "./internal/copy.js";
@@ -64,6 +72,7 @@ export const asPolygon = <AsPolygonFn>(
 		__dispatch,
 		{
 			circle: "points",
+			complexpoly: "group",
 			ellipse: "points",
 			line: "points",
 			line3: "points3",
@@ -95,26 +104,13 @@ export const asPolygon = <AsPolygonFn>(
 				return [new Polygon(pts, __attribs($))];
 			},
 
-			complexpoly: ($: ComplexPolygon, opts) =>
-				[$.boundary, ...$.children].map(
-					(x) => new Polygon(vertices(x, opts), __attribs($))
-				),
+			group: ($: Group, opts) => [
+				...mapcat((child) => asPolygon(child, opts), $),
+			],
 
-			path: ($: Path, opts) => {
-				const tmp = new Path([], [], $.attribs);
-				return [$.segments, ...$.subPaths].map((segments) => {
-					tmp.segments = segments;
-					return new Polygon(vertices(tmp, opts), __attribs($));
-				});
-			},
+			path: ($: Path, opts) => __path(Polygon, $, opts),
 
-			path3: ($: Path3, opts) => {
-				const tmp = new Path3();
-				return [$.segments, ...$.subPaths].map((segments) => {
-					tmp.segments = segments;
-					return new Polygon3(vertices(tmp, opts), __attribs($));
-				});
-			},
+			path3: ($: Path3, opts) => __path(Polygon3, $, opts),
 
 			points: ($: IShape2, opts) => [
 				new Polygon(vertices($, opts), __attribs($)),
@@ -126,3 +122,17 @@ export const asPolygon = <AsPolygonFn>(
 		}
 	)
 );
+
+/** @internal */
+const __path = <T extends PCLikeConstructor<any>>(
+	ctor: T,
+	$: Path | Path3,
+	opts?: number | Partial<SamplingOpts>
+) => {
+	const tmp = $.empty();
+	tmp.attribs = $.attribs;
+	return [$.segments, ...$.subPaths].map((segments) => {
+		tmp.segments = segments;
+		return new ctor(vertices(tmp, opts), __attribs($));
+	});
+};

packages/geom/src/as-polyline.ts

@@ -1,13 +1,19 @@
 import type { Maybe } from "@thi.ng/api";
-import { peek } from "@thi.ng/arrays/peek";
 import type { MultiFn1O } from "@thi.ng/defmulti";
 import { defmulti } from "@thi.ng/defmulti/defmulti";
 import { mapcat } from "@thi.ng/transducers/mapcat";
 import { set } from "@thi.ng/vectors/set";
-import type { IShape, IShape2, IShape3, SamplingOpts } from "./api.js";
+import type {
+	IShape,
+	IShape2,
+	IShape3,
+	PCLikeConstructor,
+	SamplingOpts,
+} from "./api.js";
 import type { ComplexPolygon } from "./api/complex-polygon.js";
 import type { Group } from "./api/group.js";
-import { Path } from "./api/path.js";
+import type { Path } from "./api/path.js";
+import type { Path3 } from "./api/path3.js";
 import { Polyline } from "./api/polyline.js";
 import { Polyline3 } from "./api/polyline3.js";
 import { __copyAttribsNoSamples as __attribs } from "./internal/copy.js";
@@ -72,6 +78,7 @@ export const asPolyline = <AsPolylineFn>(
 		{
 			arc: "points",
 			circle: "poly",
+			complexpoly: "group",
 			cubic: "points",
 			cubic3: "points3",
 			ellipse: "poly",
@@ -88,44 +95,47 @@ export const asPolyline = <AsPolylineFn>(
 			tri3: "poly3",
 		},
 		{
-			complexpoly: ($: ComplexPolygon, opts) => [
-				...asPolyline($.boundary, opts),
-				...mapcat((child) => asPolyline(child, opts), $.children),
-			],
-
 			group: ($: Group, opts) => [
-				...mapcat((child) => asPolyline(child, opts), $.children),
+				...mapcat((child) => asPolyline(child, opts), $),
 			],
 
-			points: ($, opts) => [
-				new Polyline(vertices($, opts), __attribs($)),
-			],
+			path: ($: Path, opts) => __path(Polyline, $, opts),
 
-			points3: ($, opts) => [
-				new Polyline3(vertices($, opts), __attribs($)),
-			],
+			path3: ($: Path3, opts) => __path(Polyline3, $, opts),
 
-			path: ($: Path, opts) => {
-				const tmp = new Path([], [], $.attribs);
-				return [$.segments, ...$.subPaths].map((segments) => {
-					tmp.segments = segments;
-					const pts = vertices(tmp, opts);
-					peek(segments).type === "z" && pts.push(set([], pts[0]));
-					return new Polyline(pts, __attribs($));
-				});
-			},
+			points: ($, opts) => __points(Polyline, $, opts),
 
-			poly: ($, opts) => {
-				const pts = vertices($, opts);
-				pts.push(set([], pts[0]));
-				return [new Polyline(pts, __attribs($))];
-			},
+			points3: ($, opts) => __points(Polyline3, $, opts),
 
-			poly3: ($, opts) => {
-				const pts = vertices($, opts);
-				pts.push(set([], pts[0]));
-				return [new Polyline3(pts, __attribs($))];
-			},
+			poly: ($, opts) => __points(Polyline, $, opts, true),
+
+			poly3: ($, opts) => __points(Polyline3, $, opts, true),
 		}
 	)
 );
+
+/** @internal */
+const __points = <T extends PCLikeConstructor<any>>(
+	ctor: T,
+	$: IShape,
+	opts?: number | Partial<SamplingOpts>,
+	close = false
+) => {
+	const pts = vertices($, opts);
+	close && pts.push(set([], pts[0]));
+	return [new ctor(pts, __attribs($))];
+};
+
+/** @internal */
+const __path = <T extends PCLikeConstructor<any>>(
+	ctor: T,
+	$: Path | Path3,
+	opts?: number | Partial<SamplingOpts>
+) => {
+	const tmp = $.empty();
+	tmp.attribs = $.attribs;
+	return [$.segments, ...$.subPaths].map((segments) => {
+		tmp.segments = segments;
+		return __points(ctor, tmp, opts, tmp.closed)[0];
+	});
+};