@thi.ng/geom 6.1.9 → 7.0.1

package/convex-hull.d.ts

@@ -11,6 +11,7 @@ import type { IShape } from "@thi.ng/geom-api";
  *
  * - {@link Arc}
  * - {@link Circle}
+ * - {@link ComplexPolygon}
  * - {@link Ellipse}
  * - {@link Group} (only the listed child shape types are considered)
  * - {@link Points}

package/convex-hull.js

@@ -12,6 +12,7 @@ const convexHull = defmulti(
     cubic: "group",
     ellipse: "tri",
     line: "tri",
+    path: "group",
     poly: "points",
     polyline: "points",
     quad: "points",
@@ -19,6 +20,7 @@ const convexHull = defmulti(
     rect: "tri"
   },
   {
+    complexpoly: ($) => convexHull($.boundary),
     group: ($) => new Polygon(grahamScan2(vertices($)), __copyAttribs($)),
     points: ($) => new Polygon(grahamScan2($.points), __copyAttribs($)),
     tri: ($) => new Polygon(vertices($), __copyAttribs($))

package/edges.d.ts

@@ -15,6 +15,7 @@ import type { VecPair } from "@thi.ng/vectors";
  * - {@link Arc}
  * - {@link BPatch}
  * - {@link Circle}
+ * - {@link ComplexPolygon}
  * - {@link Cubic}
  * - {@link Ellipse}
  * - {@link Group}
@@ -31,6 +32,7 @@ import type { VecPair } from "@thi.ng/vectors";
  * [`SamplingOpts`](https://docs.thi.ng/umbrella/geom-api/interfaces/SamplingOpts.html)
  * (all others do):
  *
+ * - {@link AABB}
  * - {@link Line}
  * - {@link Polygon}
  * - {@link Polyline}

package/edges.js

@@ -37,11 +37,15 @@ const edges = defmulti(
         // right
       ];
     },
-    arc: ($, opts) => __edges(asPolyline($, opts).points, false),
+    arc: ($, opts) => __edges(asPolyline($, opts)[0].points),
     bpatch: ($) => $.edges(),
-    circle: ($, opts) => __edges(asPolygon($, opts).points, true),
+    circle: ($, opts) => __edges(asPolygon($, opts)[0].points, true),
+    complexpoly: ($) => mapcat(
+      (poly) => __edges(poly.points, true),
+      [$.boundary, ...$.children]
+    ),
     group: ($, opts) => mapcat((c) => edges(c, opts), $.children),
-    path: ($, opts) => __edges(asPolygon($, opts).points, $.closed),
+    path: ($, opts) => mapcat((poly) => __edges(poly.points), asPolyline($, opts)),
     poly: ($) => __edges($.points, true),
     polyline: ($) => __edges($.points),
     rect: ($) => __edges(vertices($), true)

package/fit-into-bounds.js

@@ -18,11 +18,9 @@ const __translateScale = (tmat, smat, shape, preTrans, postTrans, scale) => tran
 );
 const fitIntoBounds2 = (shape, dest) => {
   const src = bounds(shape);
-  if (!src)
-    return;
+  if (!src) return;
   const c = centroid(src);
-  if (!c)
-    return;
+  if (!c) return;
   return __translateScale(
     translation23,
     scale23,
@@ -37,11 +35,9 @@ const fitIntoBounds2 = (shape, dest) => {
 };
 const fitIntoBounds3 = (shape, dest) => {
   const src = bounds(shape);
-  if (!src)
-    return;
+  if (!src) return;
   const c = centroid(src);
-  if (!c)
-    return;
+  if (!c) return;
   return __translateScale(
     translation44,
     scale44,
@@ -57,8 +53,7 @@ const fitIntoBounds3 = (shape, dest) => {
 };
 const fitAllIntoBounds2 = (shapes, dest) => {
   const sbraw = __collBounds(shapes, bounds);
-  if (!sbraw)
-    return;
+  if (!sbraw) return;
   const src = new Rect(...sbraw);
   const sx = safeDiv(dest.size[0], src.size[0]);
   const sy = safeDiv(dest.size[1], src.size[1]);

package/flip.d.ts

@@ -8,6 +8,7 @@ import type { IShape } from "@thi.ng/geom-api";
  * Currently implemented for:
  *
  * - {@link Arc}
+ * - {@link ComplexPolygon}
  * - {@link Cubic}
  * - {@link Group} (only eligible shapes)
  * - {@link Line}

package/flip.js

@@ -22,6 +22,11 @@ const flip = defmulti(
       $.cw = !$.cw;
       return $;
     },
+    complexpoly: ($) => {
+      flip($.boundary);
+      for (let c of $.children) flip(c);
+      return $;
+    },
     group: ($) => {
       $.children.forEach(flip);
       return $;

package/index.d.ts

@@ -3,6 +3,7 @@ export * from "./api/apc.js";
 export * from "./api/arc.js";
 export * from "./api/bpatch.js";
 export * from "./api/circle.js";
+export * from "./api/complex-polygon.js";
 export * from "./api/cubic.js";
 export * from "./api/ellipse.js";
 export * from "./api/group.js";
@@ -24,6 +25,8 @@ export * from "./aabb.js";
 export * from "./arc.js";
 export * from "./bpatch.js";
 export * from "./circle.js";
+export * from "./complex-polygon.js";
+export * from "./complex-polygon-from-path.js";
 export * from "./cubic.js";
 export * from "./ellipse.js";
 export * from "./group.js";
@@ -35,6 +38,7 @@ export * from "./plane.js";
 export * from "./points.js";
 export * from "./polygon.js";
 export * from "./polyline.js";
+export * from "./proximity.js";
 export * from "./quad.js";
 export * from "./quadratic.js";
 export * from "./ray.js";
@@ -67,6 +71,7 @@ export * from "./point-inside.js";
 export * from "./resample.js";
 export * from "./rotate.js";
 export * from "./scale.js";
+export * from "./scale-with-center.js";
 export * from "./scatter.js";
 export * from "./simplify.js";
 export * from "./split-arclength.js";

package/index.js

@@ -3,6 +3,7 @@ export * from "./api/apc.js";
 export * from "./api/arc.js";
 export * from "./api/bpatch.js";
 export * from "./api/circle.js";
+export * from "./api/complex-polygon.js";
 export * from "./api/cubic.js";
 export * from "./api/ellipse.js";
 export * from "./api/group.js";
@@ -24,6 +25,8 @@ export * from "./aabb.js";
 export * from "./arc.js";
 export * from "./bpatch.js";
 export * from "./circle.js";
+export * from "./complex-polygon.js";
+export * from "./complex-polygon-from-path.js";
 export * from "./cubic.js";
 export * from "./ellipse.js";
 export * from "./group.js";
@@ -35,6 +38,7 @@ export * from "./plane.js";
 export * from "./points.js";
 export * from "./polygon.js";
 export * from "./polyline.js";
+export * from "./proximity.js";
 export * from "./quad.js";
 export * from "./quadratic.js";
 export * from "./ray.js";
@@ -67,6 +71,7 @@ export * from "./point-inside.js";
 export * from "./resample.js";
 export * from "./rotate.js";
 export * from "./scale.js";
+export * from "./scale-with-center.js";
 export * from "./scatter.js";
 export * from "./simplify.js";
 export * from "./split-arclength.js";

package/internal/bounds.js

@@ -4,16 +4,13 @@ import { min } from "@thi.ng/vectors/min";
 import { sub } from "@thi.ng/vectors/sub";
 const __collBounds = (shapes, bounds) => {
   let n = shapes.length - 1;
-  if (n < 0)
-    return;
+  if (n < 0) return;
   let b = bounds(shapes[n]);
-  if (!b)
-    return;
+  if (!b) return;
   let { pos, size } = b;
   for (; n-- > 0; ) {
     b = bounds(shapes[n]);
-    if (!b)
-      continue;
+    if (!b) continue;
     [pos, size] = __unionBounds(pos, size, b.pos, b.size);
   }
   return [pos, size];

package/internal/copy.d.ts

@@ -1,4 +1,4 @@
-import type { Attribs, IShape, PCLike, PCLikeConstructor } from "@thi.ng/geom-api";
+import type { Attribs, IShape, PCLike, PCLikeConstructor, PathSegment } from "@thi.ng/geom-api";
 /**
  * Creates a shallow copy of shape's attribs. Any `exclude` keys will be removed
  * from result attribs.
@@ -17,4 +17,6 @@ export declare const __copyAttribs: ($: IShape, ...exclude: string[]) => Attribs
 export declare const __copyAttribsNoSamples: (x: IShape) => Attribs | undefined;
 /** @internal */
 export declare const __copyShape: <T extends PCLike>(ctor: PCLikeConstructor, inst: T) => T;
+/** @internal */
+export declare const __copySegment: (s: PathSegment) => PathSegment;
 //# sourceMappingURL=copy.d.ts.map

package/internal/copy.js

@@ -1,15 +1,21 @@
 import { withoutKeysObj } from "@thi.ng/associative/without-keys";
-import { copyVectors } from "@thi.ng/vectors/copy";
+import { copy, copyVectors } from "@thi.ng/vectors/copy";
 const __copyAttribs = ($, ...exclude) => {
-  if (!$.attribs)
-    return;
+  if (!$.attribs) return;
   const attribs = { ...$.attribs };
   return exclude.length ? withoutKeysObj(attribs, exclude) : attribs;
 };
 const __copyAttribsNoSamples = (x) => __copyAttribs(x, "__samples");
 const __copyShape = (ctor, inst) => new ctor(copyVectors(inst.points), __copyAttribs(inst));
+const __copySegment = (s) => {
+  const d = { type: s.type };
+  if (s.geo) d.geo = s.geo.copy();
+  else if (s.point) d.point = copy(s.point);
+  return d;
+};
 export {
   __copyAttribs,
   __copyAttribsNoSamples,
+  __copySegment,
   __copyShape
 };

package/internal/transform.d.ts

@@ -1,16 +1,29 @@
-import type { Fn } from "@thi.ng/api";
-import type { PCLike, PCLikeConstructor } from "@thi.ng/geom-api";
+import type { Fn, FnU } from "@thi.ng/api";
+import type { IShape, PCLike, PCLikeConstructor, PathSegment } from "@thi.ng/geom-api";
 import type { MatOpMV, ReadonlyMat } from "@thi.ng/matrices";
-import type { ReadonlyVec } from "@thi.ng/vectors";
+import type { ReadonlyVec, Vec } from "@thi.ng/vectors";
+/** @internal */
 export declare const __transformPoints: (pts: ReadonlyVec[], mat: ReadonlyMat, op?: MatOpMV) => ReadonlyVec[];
-export declare const __transformedPoints: (pts: ReadonlyVec[], mat: ReadonlyMat, op?: MatOpMV) => import("@thi.ng/vectors").Vec[];
+/** @internal */
+export declare const __transformedPoints: (pts: ReadonlyVec[], mat: ReadonlyMat, op?: MatOpMV) => Vec[];
+/** @internal */
 export declare const __transformPointsWith: (pts: ReadonlyVec[], fn: Fn<ReadonlyVec, ReadonlyMat>, op?: MatOpMV) => ReadonlyVec[];
-export declare const __transformedPointsWith: (pts: ReadonlyVec[], fn: Fn<ReadonlyVec, ReadonlyMat>, op?: MatOpMV) => import("@thi.ng/vectors").Vec[];
+/** @internal */
+export declare const __transformedPointsWith: (pts: ReadonlyVec[], fn: Fn<ReadonlyVec, ReadonlyMat>, op?: MatOpMV) => Vec[];
+/** @internal */
 export declare const __transformedShape: (ctor: PCLikeConstructor) => ($: PCLike, mat: ReadonlyMat) => PCLike;
+/** @internal */
 export declare const __transformedShapePoints: (ctor: PCLikeConstructor) => ($: PCLike, fn: Fn<ReadonlyVec, ReadonlyMat>) => PCLike;
+/** @internal */
 export declare const __transformPoints3: (pts: ReadonlyVec[], mat: ReadonlyMat) => ReadonlyVec[];
-export declare const __transformedPoints3: (pts: ReadonlyVec[], mat: ReadonlyMat) => import("@thi.ng/vectors").Vec[];
-export declare const __transformedPointsWith3: (pts: ReadonlyVec[], fn: Fn<ReadonlyVec, ReadonlyMat>) => import("@thi.ng/vectors").Vec[];
+/** @internal */
+export declare const __transformedPoints3: (pts: ReadonlyVec[], mat: ReadonlyMat) => Vec[];
+/** @internal */
+export declare const __transformedPointsWith3: (pts: ReadonlyVec[], fn: Fn<ReadonlyVec, ReadonlyMat>) => Vec[];
+/** @internal */
 export declare const __transformedShape3: (ctor: PCLikeConstructor) => ($: PCLike, mat: ReadonlyMat) => PCLike;
+/** @internal */
 export declare const __transformedShapePoints3: (ctor: PCLikeConstructor) => ($: PCLike, fn: Fn<ReadonlyVec, ReadonlyMat>) => PCLike;
+/** @internal */
+export declare const __segmentTransformer: (txGeo: FnU<IShape>, txPoint: FnU<Vec>) => (segments: PathSegment[]) => PathSegment[];
 //# sourceMappingURL=transform.d.ts.map

package/internal/transform.js

@@ -11,7 +11,17 @@ const __transformedPoints3 = (pts, mat) => __transformedPoints(pts, mat, mulV344
 const __transformedPointsWith3 = (pts, fn) => __transformedPointsWith(pts, fn, mulV344);
 const __transformedShape3 = (ctor) => ($, mat) => new ctor(__transformedPoints3($.points, mat), __copyAttribs($));
 const __transformedShapePoints3 = (ctor) => ($, fn) => new ctor(__transformedPointsWith3($.points, fn), __copyAttribs($));
+const __segmentTransformer = (txGeo, txPoint) => (segments) => segments.map(
+  (s) => s.geo ? {
+    type: s.type,
+    geo: txGeo(s.geo)
+  } : s.point ? {
+    type: s.type,
+    point: txPoint(s.point)
+  } : { ...s }
+);
 export {
+  __segmentTransformer,
   __transformPoints,
   __transformPoints3,
   __transformPointsWith,

package/intersects.js

@@ -43,8 +43,7 @@ const intersects = defmulti(
         group,
         opts
       );
-      if (res === NONE)
-        return res;
+      if (res === NONE) return res;
       res.isec = res.isec.filter((p) => distSq2(a, p) <= max);
       if (res.isec.length) {
         res.alpha = dist2(a, res.isec[0]);
@@ -65,10 +64,8 @@ const intersects = defmulti(
       let inside = false;
       for (let child of children) {
         let $res = intersects(ray, child, opts);
-        if ($res.type !== IntersectionType.INTERSECT)
-          continue;
-        if ($res.inside)
-          inside = true;
+        if ($res.type !== IntersectionType.INTERSECT) continue;
+        if ($res.inside) inside = true;
         const first = $res.isec[0];
         const alpha = $res.alpha !== void 0 ? $res.alpha : dist2(ray.pos, first);
         if (all) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thi.ng/geom",
-  "version": "6.1.9",
+  "version": "7.0.1",
   "description": "Functional, polymorphic API for 2D geometry types & SVG generation",
   "type": "module",
   "module": "./index.js",
@@ -37,39 +37,39 @@
     "tool:tangle": "../../node_modules/.bin/tangle src/**/*.ts"
   },
   "dependencies": {
-    "@thi.ng/api": "^8.11.1",
-    "@thi.ng/arrays": "^2.9.5",
-    "@thi.ng/associative": "^6.3.59",
-    "@thi.ng/checks": "^3.6.3",
-    "@thi.ng/defmulti": "^3.0.38",
-    "@thi.ng/equiv": "^2.1.57",
-    "@thi.ng/errors": "^2.5.6",
-    "@thi.ng/geom-api": "^4.0.9",
-    "@thi.ng/geom-arc": "^2.1.131",
-    "@thi.ng/geom-clip-line": "^2.3.88",
-    "@thi.ng/geom-clip-poly": "^2.1.130",
-    "@thi.ng/geom-closest-point": "^2.1.126",
-    "@thi.ng/geom-hull": "^2.1.126",
-    "@thi.ng/geom-isec": "^3.0.9",
-    "@thi.ng/geom-poly-utils": "^2.3.114",
-    "@thi.ng/geom-resample": "^2.3.52",
-    "@thi.ng/geom-splines": "^2.2.105",
-    "@thi.ng/geom-subdiv-curve": "^2.1.130",
-    "@thi.ng/geom-tessellate": "^2.1.131",
-    "@thi.ng/hiccup": "^5.2.0",
-    "@thi.ng/hiccup-svg": "^5.2.36",
-    "@thi.ng/math": "^5.10.12",
-    "@thi.ng/matrices": "^2.3.36",
-    "@thi.ng/random": "^3.7.5",
-    "@thi.ng/strings": "^3.7.32",
-    "@thi.ng/transducers": "^9.0.4",
-    "@thi.ng/vectors": "^7.10.30"
+    "@thi.ng/api": "^8.11.2",
+    "@thi.ng/arrays": "^2.9.6",
+    "@thi.ng/associative": "^6.3.60",
+    "@thi.ng/checks": "^3.6.4",
+    "@thi.ng/defmulti": "^3.0.39",
+    "@thi.ng/equiv": "^2.1.58",
+    "@thi.ng/errors": "^2.5.7",
+    "@thi.ng/geom-api": "^4.0.10",
+    "@thi.ng/geom-arc": "^2.1.132",
+    "@thi.ng/geom-clip-line": "^2.3.89",
+    "@thi.ng/geom-clip-poly": "^2.1.131",
+    "@thi.ng/geom-closest-point": "^2.1.127",
+    "@thi.ng/geom-hull": "^2.1.127",
+    "@thi.ng/geom-isec": "^3.1.0",
+    "@thi.ng/geom-poly-utils": "^2.4.0",
+    "@thi.ng/geom-resample": "^2.3.53",
+    "@thi.ng/geom-splines": "^2.2.106",
+    "@thi.ng/geom-subdiv-curve": "^2.1.131",
+    "@thi.ng/geom-tessellate": "^2.1.132",
+    "@thi.ng/hiccup": "^5.2.1",
+    "@thi.ng/hiccup-svg": "^5.2.37",
+    "@thi.ng/math": "^5.10.13",
+    "@thi.ng/matrices": "^2.3.37",
+    "@thi.ng/random": "^3.8.0",
+    "@thi.ng/strings": "^3.7.33",
+    "@thi.ng/transducers": "^9.0.5",
+    "@thi.ng/vectors": "^7.10.31"
   },
   "devDependencies": {
-    "@microsoft/api-extractor": "^7.43.0",
-    "esbuild": "^0.20.2",
-    "typedoc": "^0.25.12",
-    "typescript": "^5.4.3"
+    "@microsoft/api-extractor": "^7.43.2",
+    "esbuild": "^0.21.1",
+    "typedoc": "^0.25.13",
+    "typescript": "^5.4.5"
   },
   "keywords": [
     "2d",
@@ -127,6 +127,9 @@
     "./api/circle": {
       "default": "./api/circle.js"
     },
+    "./api/complex-polygon": {
+      "default": "./api/complex-polygon.js"
+    },
     "./api/cubic": {
       "default": "./api/cubic.js"
     },
@@ -229,6 +232,12 @@
     "./closest-point": {
       "default": "./closest-point.js"
     },
+    "./complex-polygon-from-path": {
+      "default": "./complex-polygon-from-path.js"
+    },
+    "./complex-polygon": {
+      "default": "./complex-polygon.js"
+    },
     "./convex-hull": {
       "default": "./convex-hull.js"
     },
@@ -304,6 +313,9 @@
     "./polyline": {
       "default": "./polyline.js"
     },
+    "./proximity": {
+      "default": "./proximity.js"
+    },
     "./quad": {
       "default": "./quad.js"
     },
@@ -322,6 +334,9 @@
     "./rotate": {
       "default": "./rotate.js"
     },
+    "./scale-with-center": {
+      "default": "./scale-with-center.js"
+    },
     "./scale": {
       "default": "./scale.js"
     },
@@ -398,5 +413,5 @@
     ],
     "year": 2013
   },
-  "gitHead": "aed3421c21044c005fbcb7cc37965ccf85a870d2\n"
+  "gitHead": "41bd769068da804eeace622ec7db50e4d48f1dc9\n"
 }

package/path-builder.d.ts

@@ -15,6 +15,9 @@ export interface PathBuilderOpts {
 export declare class PathBuilder {
     attribs?: Attribs | undefined;
     opts: Partial<PathBuilderOpts>;
+    /**
+     * Array of all paths which have been built already (incl. the current)
+     */
     paths: Path[];
     protected curr: Path;
     protected currP: Vec;
@@ -22,7 +25,14 @@ export declare class PathBuilder {
     protected startP: Vec;
     constructor(attribs?: Attribs | undefined, opts?: Partial<PathBuilderOpts>);
     [Symbol.iterator](): Generator<Path, void, undefined>;
+    /**
+     * Returns the current path being constructed.
+     */
     current(): Path;
+    /**
+     * Starts a new path and makes it the current one. Any future build commands
+     * will only act on this new path.
+     */
     newPath(): void;
     moveTo(p: Vec, relative?: boolean): PathBuilder;
     lineTo(p: Vec, relative?: boolean): PathBuilder;
@@ -33,12 +43,22 @@ export declare class PathBuilder {
     cubicChainTo(cp2: Vec, p: Vec, relative?: boolean): this;
     quadraticChainTo(p: Vec, relative?: boolean): this;
     arcTo(p: Vec, r: Vec, xaxis: number, xl: boolean, clockwise: boolean, relative?: boolean): PathBuilder;
-    closePath(): this;
+    close(): this;
     protected updateCurrent(p: Vec, relative: boolean): Vec;
     protected absPoint(p: Vec, relative: boolean): Vec;
     protected addHVLine(p: number, i: number, relative: boolean): void;
     protected addCubic(cp1: Vec, cp2: Vec, p: Vec, relative: boolean): void;
     protected addQuadratic(cp: Vec, p: Vec, relative: boolean): void;
 }
+/**
+ * Creates a new {@link PathBuilder} instance to construct a path step-by-step
+ * via a fluent builder API to append various segments and/or sub-paths.
+ *
+ * @remarks
+ * Also see {@link pathFromSvg} and {@link roundedRect}.
+ *
+ * @param attribs
+ * @param opts
+ */
 export declare const pathBuilder: (attribs?: Attribs, opts?: Partial<PathBuilderOpts>) => PathBuilder;
 //# sourceMappingURL=path-builder.d.ts.map

package/path-builder.js

@@ -2,6 +2,7 @@ import { peek } from "@thi.ng/arrays/peek";
 import { eqDelta } from "@thi.ng/math/eqdelta";
 import { add2 } from "@thi.ng/vectors/add";
 import { copy } from "@thi.ng/vectors/copy";
+import { eqDelta2 } from "@thi.ng/vectors/eqdelta";
 import { mulN2 } from "@thi.ng/vectors/muln";
 import { set2 } from "@thi.ng/vectors/set";
 import { zeroes } from "@thi.ng/vectors/setn";
@@ -19,6 +20,9 @@ class PathBuilder {
     this.attribs = attribs;
     this.newPath();
   }
+  /**
+   * Array of all paths which have been built already (incl. the current)
+   */
   paths;
   curr;
   currP;
@@ -27,11 +31,22 @@ class PathBuilder {
   *[Symbol.iterator]() {
     yield* this.paths;
   }
+  /**
+   * Returns the current path being constructed.
+   */
   current() {
     return this.curr;
   }
+  /**
+   * Starts a new path and makes it the current one. Any future build commands
+   * will only act on this new path.
+   */
   newPath() {
-    this.curr = new Path([], this.attribs);
+    this.curr = new Path(
+      [],
+      [],
+      this.attribs ? { ...this.attribs } : void 0
+    );
     this.paths.push(this.curr);
     this.currP = zeroes(2);
     this.bezierP = zeroes(2);
@@ -39,20 +54,20 @@ class PathBuilder {
   }
   moveTo(p, relative = false) {
     if (this.opts.autoSplit !== false && this.curr.segments.length > 0) {
-      this.curr = new Path([], this.attribs);
+      this.curr = new Path([], [], this.attribs);
       this.paths.push(this.curr);
     }
     p = this.updateCurrent(p, relative);
     set2(this.startP, p);
     set2(this.bezierP, p);
-    this.curr.add({
+    this.curr.addSegments({
       point: p,
       type: "m"
     });
     return this;
   }
   lineTo(p, relative = false) {
-    this.curr.add({
+    this.curr.addSegments({
       geo: new Line([copy(this.currP), this.updateCurrent(p, relative)]),
       type: "l"
     });
@@ -96,7 +111,7 @@ class PathBuilder {
       return this.lineTo(p, relative);
     }
     const prev = copy(this.currP);
-    this.curr.add({
+    this.curr.addSegments({
       geo: arcFrom2Points(
         prev,
         this.updateCurrent(p, relative),
@@ -110,12 +125,14 @@ class PathBuilder {
     set2(this.bezierP, this.currP);
     return this;
   }
-  closePath() {
-    this.curr.add({
-      geo: new Line([copy(this.currP), copy(this.startP)]),
-      type: "l"
-    });
-    this.curr.closed = true;
+  close() {
+    if (!eqDelta2(this.startP, this.currP)) {
+      this.curr.addSegments({
+        geo: new Line([copy(this.currP), copy(this.startP)]),
+        type: "l"
+      });
+    }
+    this.curr.close();
     return this;
   }
   updateCurrent(p, relative) {
@@ -129,7 +146,7 @@ class PathBuilder {
     const prev = copy(this.currP);
     this.currP[i] = relative ? this.currP[i] + p : p;
     set2(this.bezierP, this.currP);
-    this.curr.add({
+    this.curr.addSegments({
       geo: new Line([prev, copy(this.currP)]),
       type: "l"
     });
@@ -137,7 +154,7 @@ class PathBuilder {
   addCubic(cp1, cp2, p, relative) {
     cp2 = this.absPoint(cp2, relative);
     set2(this.bezierP, cp2);
-    this.curr.add({
+    this.curr.addSegments({
       geo: new Cubic([
         copy(this.currP),
         cp1,
@@ -149,7 +166,7 @@ class PathBuilder {
   }
   addQuadratic(cp, p, relative) {
     set2(this.bezierP, cp);
-    this.curr.add({
+    this.curr.addSegments({
       geo: new Quadratic([
         copy(this.currP),
         cp,

package/path-from-svg.d.ts

@@ -1,2 +1,14 @@
-export declare const pathFromSvg: (svg: string) => import("./index.js").Path[];
+import type { Attribs } from "@thi.ng/geom-api";
+/**
+ * Takes a SVG path string and parses it into a {@link Path} shape, optionally
+ * with given attributes.
+ *
+ * @remarks
+ * If the path contains multiple sub-paths (e.g. holes or multiple curves), they
+ * will be added as sub-paths to the returned main path.
+ *
+ * @param svg
+ * @param attribs
+ */
+export declare const pathFromSvg: (svg: string, attribs?: Attribs) => import("./index.js").Path;
 //# sourceMappingURL=path-from-svg.d.ts.map