perf(geom): internal update shape attrib copying

- rename __copyAttribsRaw => __copyAttribs
- avoid extraneous fn calls

packages/geom/src/api/aabb.ts

@@ -26,7 +26,7 @@ export class AABB implements AABBLike, IHiccupShape3<AABB> {
 		return new AABB(
 			set3([], this.pos),
 			set3([], this.size),
-			__copyAttribs(this)
+			__copyAttribs(this.attribs)
 		);
 	}
 

packages/geom/src/api/arc.ts

@@ -37,7 +37,7 @@ export class Arc implements IHiccupShape2<Arc>, IHiccupPathSegment {
 			this.end,
 			this.xl,
 			this.cw,
-			__copyAttribs(this)
+			__copyAttribs(this.attribs)
 		);
 	}
 

packages/geom/src/api/circle.ts

@@ -14,7 +14,11 @@ export class Circle implements IHiccupShape2<Circle> {
 	) {}
 
 	copy(): Circle {
-		return new Circle(set2([], this.pos), this.r, __copyAttribs(this));
+		return new Circle(
+			set2([], this.pos),
+			this.r,
+			__copyAttribs(this.attribs)
+		);
 	}
 
 	withAttribs(attribs: Attribs) {

packages/geom/src/api/complex-polygon.ts

@@ -25,7 +25,7 @@ export class ComplexPolygon implements IHiccupShape2<ComplexPolygon> {
 		return new ComplexPolygon(
 			this.boundary.copy(),
 			this.children.map((h) => h.copy()),
-			__copyAttribs(this)
+			__copyAttribs(this.attribs)
 		);
 	}
 

packages/geom/src/api/cubic.ts

@@ -22,7 +22,7 @@ export class Cubic
 	}
 
 	copy(): Cubic {
-		return <Cubic>__copyShape(Cubic, this);
+		return __copyShape(Cubic, this);
 	}
 
 	withAttribs(attribs: Attribs): Cubic {

packages/geom/src/api/cubic3.ts

@@ -22,7 +22,7 @@ export class Cubic3
 	}
 
 	copy(): Cubic3 {
-		return <Cubic3>__copyShape(Cubic3, this);
+		return __copyShape(Cubic3, this);
 	}
 
 	withAttribs(attribs: Attribs): Cubic3 {

packages/geom/src/api/ellipse.ts

@@ -22,7 +22,7 @@ export class Ellipse implements IHiccupShape2<Ellipse> {
 		return new Ellipse(
 			set2([], this.pos),
 			set2([], this.r),
-			__copyAttribs(this)
+			__copyAttribs(this.attribs)
 		);
 	}
 

packages/geom/src/api/group.ts

@@ -44,7 +44,7 @@ export class Group implements IClear, IHiccupShape2<Group> {
 	}
 
 	copyTransformed(fn: FnU<IHiccupShape2>) {
-		return new Group(__copyAttribs(this), this.children.map(fn));
+		return new Group(__copyAttribs(this.attribs), this.children.map(fn));
 	}
 
 	withAttribs(attribs: Attribs) {

packages/geom/src/api/group3.ts

@@ -44,7 +44,7 @@ export class Group3 implements IClear, IHiccupShape3<Group3> {
 	}
 
 	copyTransformed(fn: FnU<IHiccupShape3>) {
-		return new Group3(__copyAttribs(this), this.children.map(fn));
+		return new Group3(__copyAttribs(this.attribs), this.children.map(fn));
 	}
 
 	withAttribs(attribs: Attribs) {

packages/geom/src/api/path.ts

@@ -47,7 +47,7 @@ export class Path implements IClear, IHiccupShape2<Path> {
 		const p = new Path(
 			this.segments.map(__copySegment),
 			this.subPaths.map((sub) => sub.map(__copySegment)),
-			__copyAttribs(this)
+			__copyAttribs(this.attribs)
 		);
 		return p;
 	}

packages/geom/src/api/path3.ts

@@ -47,7 +47,7 @@ export class Path3 implements IClear, IHiccupShape3<Path3> {
 		const p = new Path3(
 			this.segments.map(__copySegment),
 			this.subPaths.map((sub) => sub.map(__copySegment)),
-			__copyAttribs(this)
+			__copyAttribs(this.attribs)
 		);
 		return p;
 	}

packages/geom/src/api/plane.ts

@@ -14,7 +14,11 @@ export class Plane implements IHiccupShape3<Plane> {
 	) {}
 
 	copy(): Plane {
-		return new Plane(set3([], this.normal), this.w, __copyAttribs(this));
+		return new Plane(
+			set3([], this.normal),
+			this.w,
+			__copyAttribs(this.attribs)
+		);
 	}
 
 	withAttribs(attribs: Attribs): Plane {

packages/geom/src/api/points3.ts

@@ -7,7 +7,7 @@ export class Points3 extends APC implements IHiccupShape3<Points3> {
 	readonly dim = 3;
 
 	copy(): Points3 {
-		return <Points3>__copyShape(Points3, this);
+		return __copyShape(Points3, this);
 	}
 
 	withAttribs(attribs: Attribs) {

packages/geom/src/api/ray.ts

@@ -14,7 +14,7 @@ export class Ray implements IHiccupShape2<Ray> {
 		return new Ray(
 			set2([], this.pos),
 			set2([], this.dir),
-			__copyAttribs(this)
+			__copyAttribs(this.attribs)
 		);
 	}
 

packages/geom/src/api/ray3.ts

@@ -14,7 +14,7 @@ export class Ray3 implements IHiccupShape3<Ray3> {
 		return new Ray3(
 			set3([], this.pos),
 			set3([], this.dir),
-			__copyAttribs(this)
+			__copyAttribs(this.attribs)
 		);
 	}
 

packages/geom/src/api/rect.ts

@@ -26,7 +26,7 @@ export class Rect implements AABBLike, IHiccupShape2<Rect> {
 		return new Rect(
 			set2([], this.pos),
 			set2([], this.size),
-			__copyAttribs(this)
+			__copyAttribs(this.attribs)
 		);
 	}
 

packages/geom/src/api/sphere.ts

@@ -14,7 +14,11 @@ export class Sphere implements IHiccupShape3<Sphere> {
 	) {}
 
 	copy(): Sphere {
-		return new Sphere(set3([], this.pos), this.r, __copyAttribs(this));
+		return new Sphere(
+			set3([], this.pos),
+			this.r,
+			__copyAttribs(this.attribs)
+		);
 	}
 
 	withAttribs(attribs: Attribs) {

packages/geom/src/api/text.ts

@@ -17,7 +17,11 @@ export class Text implements IHiccupShape2<Text> {
 	constructor(public pos: Vec, public body: any, public attribs?: Attribs) {}
 
 	copy(): Text {
-		return new Text(set([], this.pos), this.body, __copyAttribs(this));
+		return new Text(
+			set([], this.pos),
+			this.body,
+			__copyAttribs(this.attribs)
+		);
 	}
 
 	withAttribs(attribs: Attribs) {

packages/geom/src/as-cubic.ts

@@ -43,7 +43,7 @@ import { arc } from "./arc.js";
 import { asPolygon } from "./as-polygon.js";
 import { cubicFromArc, cubicFromLine, cubicFromQuadratic } from "./cubic.js";
 import { cubicFromLine3, cubicFromQuadratic3 } from "./cubic3.js";
-import { __copyAttribsRaw } from "./internal/copy.js";
+import { __copyAttribs } from "./internal/copy.js";
 import { __dispatch } from "./internal/dispatch.js";
 
 export interface AsCubicOpts extends CubicOpts {
@@ -273,4 +273,4 @@ const __polyCubic = <T extends Cubic | Cubic3>(
 };
 
 const __attribs = (opts?: Partial<AsCubicOpts>, attribs?: Attribs) =>
-	attribs && opts?.attribs !== false ? __copyAttribsRaw(attribs) : undefined;
+	attribs && opts?.attribs !== false ? __copyAttribs(attribs) : undefined;

packages/geom/src/as-path.ts

@@ -25,7 +25,7 @@ import { Polyline } from "./api/polyline.js";
 import { asCubic } from "./as-cubic.js";
 import { asPolygon } from "./as-polygon.js";
 import { asPolyline } from "./as-polyline.js";
-import { __copyAttribs, __copyAttribsRaw } from "./internal/copy.js";
+import { __copyAttribs } from "./internal/copy.js";
 import { __dispatch } from "./internal/dispatch.js";
 import { pathFromCubics } from "./path.js";
 import { pathFromCubics3 } from "./path3.js";
@@ -82,7 +82,7 @@ export const asPath = <AsPathFn>(
 				{ boundary, children, attribs }: ComplexPolygon,
 				opts
 			) => {
-				attribs = __copyAttribsRaw(attribs);
+				attribs = __copyAttribs(attribs);
 				if (opts?.linear) {
 					return __linearPath(
 						boundary,
@@ -122,7 +122,7 @@ export const asPath = <AsPathFn>(
 const __defaultImpl = (src: IShape, opts?: Partial<CubicOpts>) =>
 	(src.dim === 2 ? pathFromCubics : pathFromCubics3)(
 		<any>asCubic(src, { attribs: false, ...opts }),
-		__copyAttribs(src)
+		__copyAttribs(src.attribs)
 	);
 
 /**
@@ -165,20 +165,22 @@ function __lineSegments(
 	return segments;
 }
 
-/**
- * TODO update to support Path3
- *
- * @internal
- */
-const __linearPath = (shape: APC, subPaths: PathSegment[][], closed = false) =>
-	shape.dim === 2
+/** @internal */
+const __linearPath = (
+	shape: APC,
+	subPaths: PathSegment[][],
+	closed = false
+) => {
+	const attribs = __copyAttribs(shape.attribs);
+	return shape.dim === 2
 		? new Path(
 				__lineSegments(Line, shape.points, closed),
 				<PathSegment2[][]>subPaths,
-				__copyAttribs(shape)
+				attribs
 		  )
 		: new Path3(
 				__lineSegments(Line3, shape.points, closed),
 				<PathSegment3[][]>subPaths,
-				__copyAttribs(shape)
+				attribs
 		  );
+};

packages/geom/src/as-sector.ts

@@ -3,7 +3,7 @@ import { copy } from "@thi.ng/vectors/copy";
 import type { Arc } from "./api/arc.js";
 import { Line } from "./api/line.js";
 import { Path } from "./api/path.js";
-import { __copyAttribsRaw } from "./internal/copy.js";
+import { __copyAttribs } from "./internal/copy.js";
 
 /**
  * Converts given arc into a closed path describing a sector (using the arc's
@@ -23,5 +23,5 @@ export const asSector = (arc: Arc, attribs?: Attribs) =>
 			{ type: "z" },
 		],
 		[],
-		attribs || __copyAttribsRaw(arc.attribs)
+		attribs || __copyAttribs(arc.attribs)
 	);

packages/geom/src/center.ts

@@ -51,17 +51,21 @@ export const center = <CenterFn>(
 					$.end,
 					$.xl,
 					$.cw,
-					__copyAttribs($)
+					__copyAttribs($.attribs)
 				),
 
 			circle: ($: Circle, origin = ZERO2) =>
-				new Circle(set2([], origin), $.r, __copyAttribs($)),
+				new Circle(set2([], origin), $.r, __copyAttribs($.attribs)),
 
 			ellipse: ($: Ellipse, origin = ZERO2) =>
-				new Ellipse(set2([], origin), set2([], $.r), __copyAttribs($)),
+				new Ellipse(
+					set2([], origin),
+					set2([], $.r),
+					__copyAttribs($.attribs)
+				),
 
 			sphere: ($: Sphere, origin = ZERO3) =>
-				new Sphere(set3([], origin), $.r, __copyAttribs($)),
+				new Sphere(set3([], origin), $.r, __copyAttribs($.attribs)),
 		}
 	)
 );

packages/geom/src/clip-convex.ts

@@ -40,7 +40,9 @@ export type ClipConvexFn = {
 const __clipVertices = ($: IShape, boundary: IShape | ReadonlyVec[]) => {
 	boundary = ensureVertices(boundary);
 	const pts = sutherlandHodgeman(vertices($), boundary, centroid(boundary));
-	return pts.length ? [new Polygon(pts, __copyAttribs($))] : undefined;
+	return pts.length
+		? [new Polygon(pts, __copyAttribs($.attribs))]
+		: undefined;
 };
 
 /**
@@ -102,7 +104,11 @@ export const clipConvex = <ClipConvexFn>(
 					if (clipped.length) res.push(new Polygon(clipped));
 				}
 				return [
-					new ComplexPolygon(res[0], res.slice(1), __copyAttribs($)),
+					new ComplexPolygon(
+						res[0],
+						res.slice(1),
+						__copyAttribs($.attribs)
+					),
 				];
 			},
 
@@ -125,7 +131,7 @@ export const clipConvex = <ClipConvexFn>(
 					ensureVertices(boundary)
 				);
 				return segments && segments.length
-					? [new Line(segments[0], __copyAttribs($))]
+					? [new Line(segments[0], __copyAttribs($.attribs))]
 					: undefined;
 			},
 
@@ -144,11 +150,11 @@ export const clipConvex = <ClipConvexFn>(
 				const res = new ComplexPolygon(
 					clipped[0],
 					[],
-					__copyAttribs($)
+					__copyAttribs($.attribs)
 				);
 				for (let sub of $.subPaths) {
 					clipped = __clipVertices(
-						new Path(sub, [], __copyAttribs($)),
+						new Path(sub, [], __copyAttribs($.attribs)),
 						boundary
 					);
 					if (clipped) {
@@ -167,7 +173,7 @@ export const clipConvex = <ClipConvexFn>(
 					centroid(boundary)
 				);
 				return pts.length
-					? [new Polygon(pts, __copyAttribs($))]
+					? [new Polygon(pts, __copyAttribs($.attribs))]
 					: undefined;
 			},
 

packages/geom/src/convex-hull.ts

@@ -57,11 +57,11 @@ export const convexHull = <ConvexHullFn>defmulti<any, IShape>(
 		complexpoly: ($: ComplexPolygon) => convexHull($.boundary),
 
 		group: ($: IShape) =>
-			new Polygon(grahamScan2(vertices($)), __copyAttribs($)),
+			new Polygon(grahamScan2(vertices($)), __copyAttribs($.attribs)),
 
 		points: ($: PCLike) =>
-			new Polygon(grahamScan2($.points), __copyAttribs($)),
+			new Polygon(grahamScan2($.points), __copyAttribs($.attribs)),
 
-		tri: ($: IShape) => new Polygon(vertices($), __copyAttribs($)),
+		tri: ($: IShape) => new Polygon(vertices($), __copyAttribs($.attribs)),
 	}
 );

packages/geom/src/convolve.ts

@@ -92,7 +92,7 @@ export const convolve = <ConvoleFn>(
 					$.children.map((c) =>
 						__convolve(Polygon, convolveClosed, c, k, t, iter)
 					),
-					__copyAttribs($)
+					__copyAttribs($.attribs)
 				),
 
 			poly: ($: Polygon, k, t, iter) =>
@@ -118,7 +118,7 @@ const __convolve = <T extends PCLike>(
 	kernel: number[],
 	t?: number,
 	iter?: number
-) => new ctor(fn($.points, kernel, t, iter), __copyAttribs($));
+) => new ctor(fn($.points, kernel, t, iter), __copyAttribs($.attribs));
 
 export const KERNEL_BOX = $BOX;
 

packages/geom/src/cubic.ts

@@ -16,7 +16,7 @@ export function cubic(...args: any[]) {
 
 export const cubicFromArc = (arc: Arc) =>
 	_arc(arc.pos, arc.r, arc.axis, arc.start, arc.end).map(
-		(c) => new Cubic(c, __copyAttribs(arc))
+		(c) => new Cubic(c, __copyAttribs(arc.attribs))
 	);
 
 export const cubicFromLine = (a: Vec, b: Vec, attribs?: Attribs) =>