pantograph2d 0.2.0 → 0.3.0

package/dist/{exportJSON-b3e1c256.js → exportJSON-c42ca4ac.js}

@@ -36,64 +36,67 @@ class q {
     );
   }
 }
-function xt(n) {
-  const t = [];
-  for (let e = 0; e < n; e++)
-    for (let r = 0; r <= e; r++)
-      t.push([e, r]);
-  return t;
-}
-function* tt(n) {
-  for (const [t, e] of xt(n.length))
-    t !== e && (yield [n[t], n[e]]);
+const lt = (n, t = 1e-9) => {
+  let e = n;
+  return Math.abs(n) < t && (e = 0), e.toFixed(-Math.log10(t));
+};
+function J(n, t = 1e-9) {
+  return Array.from(
+    new Map(
+      n.map(([e, r]) => [
+        `[${lt(e, t)},${lt(r, t)}]`,
+        [e, r]
+      ])
+    ).values()
+  );
 }
-const Vt = Math.PI / 180, L = (n) => `[${n[0]}, ${n[1]}]`, h = ([n, t], [e, r], s = 1e-9) => Math.abs(n - e) <= s && Math.abs(t - r) <= s, M = ([n, t], [e, r]) => [n + e, t + r], S = ([n, t], [e, r]) => [n - e, t - r], X = ([n, t]) => n * n + t * t, v = ([n, t], e) => [n * e, t * e], j = ([n, t], [e, r] = [0, 0]) => (n - e) ** 2 + (t - r) ** 2, k = (n, t = [0, 0]) => Math.sqrt(j(n, t));
+const Ot = Math.PI / 180, B = (n) => `[${n[0]}, ${n[1]}]`, h = ([n, t], [e, r], s = 1e-9) => Math.abs(n - e) <= s && Math.abs(t - r) <= s, M = ([n, t], [e, r]) => [n + e, t + r], y = ([n, t], [e, r]) => [n - e, t - r], X = ([n, t]) => n * n + t * t, k = ([n, t], e) => [n * e, t * e], j = ([n, t], [e, r] = [0, 0]) => (n - e) ** 2 + (t - r) ** 2, v = (n, t = [0, 0]) => Math.sqrt(j(n, t));
 function $([n, t], [e, r]) {
   return n * r - t * e;
 }
-function nt([n, t], [e, r]) {
+function et([n, t], [e, r]) {
   return n * e + t * r;
 }
-function O([n, t]) {
-  const e = k([n, t]);
+function E([n, t]) {
+  const e = v([n, t]);
   return [n / e, t / e];
 }
 function U(n, t) {
   const e = Math.cos(t) * n, r = Math.sin(t) * n;
   return [e, r];
 }
-function Et([n, t]) {
+function Ft([n, t]) {
   return Math.atan2(t, n);
 }
-function Ot(n) {
-  const t = k(n), e = Et(n);
+function Lt(n) {
+  const t = v(n), e = Ft(n);
   return [t, e];
 }
-function Mt(n, t, e = 1e-9) {
+function xt(n, t, e = 1e-9) {
   const r = $(n, t), s = X(n), i = X(t);
   return r * r < s * i * e * e;
 }
-function B(n) {
+function C(n) {
   return [-n[1], n[0]];
 }
-function ut(n) {
+function Z(n) {
   return [n[1], -n[0]];
 }
 const _ = (n, t) => {
-  const [e, r, s, i, o, a, u, l, c] = n, [f, g, p, d, w, x, C, y, T] = t;
+  const [e, r, s, i, o, a, u, c, l] = n, [f, P, p, d, w, x, I, S, T] = t;
   return [
-    e * f + r * d + s * C,
-    e * g + r * w + s * y,
+    e * f + r * d + s * I,
+    e * P + r * w + s * S,
     e * p + r * x + s * T,
-    i * f + o * d + a * C,
-    i * g + o * w + a * y,
+    i * f + o * d + a * I,
+    i * P + o * w + a * S,
     i * p + o * x + a * T,
-    u * f + l * d + c * C,
-    u * g + l * w + c * y,
-    u * p + l * x + c * T
+    u * f + c * d + l * I,
+    u * P + c * w + l * S,
+    u * p + c * x + l * T
   ];
 };
-class I {
+class V {
   constructor() {
     this._matrix = [1, 0, 0, 0, 1, 0, 0, 0, 1];
   }
@@ -121,169 +124,57 @@ class I {
     return e && this.translate(e[0], e[1]), this._matrix = _(this._matrix, [t, 0, 0, 0, t, 0, 0, 0, 1]), e && this.translate(-e[0], -e[1]), this;
   }
   transform(t) {
-    const [e, r] = t, [s, i, o, a, u, l] = this._matrix;
-    return [s * e + i * r + o, a * e + u * r + l];
+    const [e, r] = t, [s, i, o, a, u, c] = this._matrix;
+    return [s * e + i * r + o, a * e + u * r + c];
   }
   keepsOrientation() {
     const [t, , , , e] = this._matrix;
     return t * e > 0;
   }
 }
-class z {
+class K {
   translateX(t) {
-    const e = new I().translate(t, 0);
+    const e = new V().translate(t, 0);
     return this.transform(e);
   }
   translateY(t) {
-    const e = new I().translate(0, t);
+    const e = new V().translate(0, t);
     return this.transform(e);
   }
   translate(t, e) {
-    const r = new I().translate(t, e);
+    const r = new V().translate(t, e);
     return this.transform(r);
   }
   translateTo([t, e]) {
-    const r = new I().translate(t, e);
+    const r = new V().translate(t, e);
     return this.transform(r);
   }
   rotate(t, e) {
-    const r = new I().rotate(
-      t * Vt,
+    const r = new V().rotate(
+      t * Ot,
       e
     );
     return this.transform(r);
   }
   scale(t, e) {
-    const r = new I().scale(t, e);
+    const r = new V().scale(t, e);
     return this.transform(r);
   }
   mirrorCenter(t) {
-    const e = new I().mirrorCenter(t);
+    const e = new V().mirrorCenter(t);
     return this.transform(e);
   }
   mirror(t = "x", e) {
-    const r = new I();
+    const r = new V();
     return t === "x" ? r.mirrorX() : t === "y" ? r.mirrorY() : r.mirrorLine(t, e), this.transform(r);
   }
 }
-class b extends z {
-  constructor(t, e = [], { ignoreChecks: r = !1 } = {}) {
-    super(), r || Ft(t, e), this.contour = t, this.holes = e;
-  }
-  get boundingBox() {
-    return this.contour.boundingBox;
-  }
-  get isFull() {
-    return this.holes.length === 0;
-  }
-  get allLoops() {
-    return [this.contour, ...this.holes];
-  }
-  clone() {
-    return new b(
-      this.contour.clone(),
-      this.holes.map((t) => t.clone())
-    );
-  }
-  transform(t) {
-    return new b(
-      this.contour.transform(t),
-      this.holes.map((e) => e.transform(t))
-    );
-  }
-  contains(t) {
-    return this.contour.contains(t) && !this.holes.some((e) => e.contains(t));
-  }
-  intersects(t) {
-    return this.allLoops.some(
-      (e) => t.allLoops.some((r) => e.intersects(r))
-    );
-  }
-}
-function Ft(n, t = []) {
-  if (!n)
-    throw new Error("Figure must have a contour");
-  for (const [e, r] of tt([n, ...t]))
-    if (e.intersects(r))
-      throw new Error("Loops in a figure must not intersect");
-  if (t.some((e) => !n.contains(e.firstPoint)))
-    throw new Error("Holes must be inside the contour");
-  for (const [e, r] of tt(t))
-    if (e.contains(r.firstPoint))
-      throw console.error(wt(e), wt(r)), new Error("Holes must not be inside other holes");
-}
-const Lt = (n) => {
-  const t = n.map((s, i) => n.slice(i + 1).map((o, a) => [a + i + 1, o]).filter(([, o]) => s.boundingBox.overlaps(o.boundingBox)).map(([o]) => o)), e = [], r = Array(t.length);
-  return t.forEach((s, i) => {
-    let o = r[i];
-    o || (o = [], e.push(o)), o.push(n[i]), s.length && s.forEach((a) => {
-      r[a] = o;
-    });
-  }), e;
-}, St = (n) => n.map((t, e) => {
-  const s = t.segments[0].midPoint, i = n.filter((o, a) => e === a ? !1 : o.contains(s));
-  return {
-    loop: t,
-    isIn: i
-  };
-}), Bt = (n, t) => n.flatMap(({ loop: e }) => st(
-  t.filter(
-    ({ loop: r, isIn: s }) => r === e || s.indexOf(e) !== -1
-  )
-)), Tt = (n, t) => {
-  const e = t.filter(({ isIn: s }) => s.length <= 1), r = st(
-    St(n.map(({ loop: s }) => s))
-  );
-  return [e, ...r];
-}, st = (n) => {
-  if (!n.length)
-    return [];
-  const t = n.filter(({ isIn: r }) => !r.length), e = n.filter(({ isIn: r }) => r.length > 1);
-  return t.length === 1 && e.length === 0 ? [n] : t.length > 1 ? Bt(t, n) : Tt(e, n);
-};
-function D(n) {
-  return Lt(n).map(St).flatMap(st).map((e) => {
-    if (e.length === 1)
-      return new b(e[0].loop);
-    e.sort((i, o) => i.isIn.length - o.isIn.length);
-    const [r, ...s] = e.map(({ loop: i }) => i);
-    return new b(r, s);
-  });
-}
-function _t(n, t) {
-  const e = [];
-  for (const r of n)
-    for (const s of t)
-      e.push([r, s]);
-  return e;
-}
-function $t(n) {
-  return Array.from(Array(n).keys());
-}
-function F(n) {
-  const t = Math.min(...n.map((e) => e.length));
-  return $t(t).map((e) => n.map((r) => r[e]));
-}
-const lt = (n, t = 1e-9) => {
-  let e = n;
-  return Math.abs(n) < t && (e = 0), e.toFixed(-Math.log10(t));
-};
-function J(n, t = 1e-9) {
-  return Array.from(
-    new Map(
-      n.map(([e, r]) => [
-        `[${lt(e, t)},${lt(r, t)}]`,
-        [e, r]
-      ])
-    ).values()
-  );
-}
-class yt extends z {
+class Mt extends K {
   constructor(t, e) {
     super(), this.firstPoint = t, this.lastPoint = e, this.precision = 1e-9, this.firstPoint = t, this.lastPoint = e;
   }
   get repr() {
-    return `${this.segmentType} ${L(this.firstPoint)} - ${L(
+    return `${this.segmentType} ${B(this.firstPoint)} - ${B(
       this.lastPoint
     )}`;
   }
@@ -291,7 +182,7 @@ class yt extends z {
     return this.repr;
   }
 }
-class P extends yt {
+class m extends Mt {
   constructor() {
     super(...arguments), this.segmentType = "LINE", this._V = null, this._boundingBox = null;
   }
@@ -300,28 +191,28 @@ class P extends yt {
     return t >= -e && 1 - t >= -e;
   }
   paramPoint(t) {
-    return M(this.firstPoint, v(this.V, t));
+    return M(this.firstPoint, k(this.V, t));
   }
   get length() {
-    return k(this.firstPoint, this.lastPoint);
+    return v(this.firstPoint, this.lastPoint);
   }
   get squareLength() {
     return j(this.firstPoint, this.lastPoint);
   }
   get V() {
-    return this._V === null && (this._V = S(this.lastPoint, this.firstPoint)), this._V;
+    return this._V === null && (this._V = y(this.lastPoint, this.firstPoint)), this._V;
   }
   get midPoint() {
-    return M(this.firstPoint, v(this.V, 0.5));
+    return M(this.firstPoint, k(this.V, 0.5));
   }
   isSame(t) {
-    return t instanceof P ? h(this.firstPoint, t.firstPoint) && h(this.lastPoint, t.lastPoint) || h(this.lastPoint, t.firstPoint) && h(this.firstPoint, t.lastPoint) : !1;
+    return t instanceof m ? h(this.firstPoint, t.firstPoint) && h(this.lastPoint, t.lastPoint) || h(this.lastPoint, t.firstPoint) && h(this.firstPoint, t.lastPoint) : !1;
   }
   clone() {
-    return new P(this.firstPoint, this.lastPoint);
+    return new m(this.firstPoint, this.lastPoint);
   }
   reverse() {
-    return new P(this.lastPoint, this.firstPoint);
+    return new m(this.lastPoint, this.firstPoint);
   }
   get boundingBox() {
     return this._boundingBox === null && (this._boundingBox = new q(
@@ -332,33 +223,36 @@ class P extends yt {
     )), this._boundingBox;
   }
   distanceFrom(t) {
-    const e = S(t, this.firstPoint), r = nt(e, this.V) / this.squareLength;
+    const e = y(t, this.firstPoint), r = et(e, this.V) / this.squareLength;
     if (r < 0)
-      return k(t, this.firstPoint);
+      return v(t, this.firstPoint);
     if (r > 1)
-      return k(t, this.lastPoint);
+      return v(t, this.lastPoint);
     const s = this.paramPoint(r);
-    return k(t, s);
+    return v(t, s);
   }
   isOnSegment(t) {
     if (h(t, this.firstPoint, this.precision))
       return !0;
-    const e = S(t, this.firstPoint);
-    if (!Mt(this.V, e))
+    const e = y(t, this.firstPoint);
+    if (!xt(this.V, e))
       return !1;
-    const r = nt(e, this.V) / this.squareLength;
+    const r = et(e, this.V) / this.squareLength;
     return this.isValidParameter(r);
   }
   tangentAt(t) {
     if (!this.isOnSegment(t))
       throw new Error("Point is not on segment");
-    return O(this.V);
+    return E(this.V);
+  }
+  get normalVector() {
+    return C(E(this.V));
   }
   get tangentAtFirstPoint() {
-    return O(this.V);
+    return E(this.V);
   }
   get tangentAtLastPoint() {
-    return O(this.V);
+    return E(this.V);
   }
   splitAt(t) {
     let e;
@@ -367,41 +261,48 @@ class P extends yt {
     Array.isArray(t[0]) ? e = t : e = [t], e.forEach((u) => {
       if (!this.isOnSegment(u))
         throw new Error(
-          `Point ${L(u)} is not on segment ${this.repr}`
+          `Point ${B(u)} is not on segment ${this.repr}`
         );
     });
     const r = [this.firstPoint, ...e, this.lastPoint], s = J(r), i = this.lastPoint[0] - this.firstPoint[0];
     let o = Math.sign(i), a = 0;
     return Math.abs(i) < this.precision && (o = Math.sign(this.lastPoint[1] - this.firstPoint[1]), a = 1), s.sort(
-      (u, l) => o * (u[a] - l[a])
-    ), s.flatMap((u, l) => l === s.length - 1 ? [] : new P(u, s[l + 1]));
+      (u, c) => o * (u[a] - c[a])
+    ), s.flatMap((u, c) => c === s.length - 1 ? [] : new m(u, s[c + 1]));
   }
   transform(t) {
-    return new P(
+    return new m(
       t.transform(this.firstPoint),
       t.transform(this.lastPoint)
     );
   }
 }
-function Q(n) {
+function Bt(n) {
+  return Array.from(Array(n).keys());
+}
+function L(n) {
+  const t = Math.min(...n.map((e) => e.length));
+  return Bt(t).map((e) => n.map((r) => r[e]));
+}
+function tt(n) {
   return n < 0 ? n + 2 * Math.PI : n >= 2 * Math.PI ? n % (2 * Math.PI) : n;
 }
-function ct(n, t, e) {
+function ht(n, t, e) {
   let r = t - n;
   return e && (r = -r), r < 0 && (r += 2 * Math.PI), r;
 }
-const K = (n, t, e) => {
+const Q = (n, t, e) => {
   const r = $(n.V, t.V), s = X(n.V), i = X(t.V), o = e ? e * e : n.precision * t.precision;
   if (r * r < s * i * o)
     return "parallel";
-  const a = S(t.firstPoint, n.firstPoint), u = $(a, t.V) / r, l = $(a, n.V) / r;
+  const a = y(t.firstPoint, n.firstPoint), u = $(a, t.V) / r, c = $(a, n.V) / r;
   return {
     intersectionParam1: u,
-    intersectionParam2: l
+    intersectionParam2: c
   };
 };
-function qt(n, t, e = !1, r) {
-  const s = K(n, t, r);
+function yt(n, t, e = !1, r) {
+  const s = Q(n, t, r);
   if (s === "parallel") {
     if (!e)
       return null;
@@ -414,13 +315,13 @@ function qt(n, t, e = !1, r) {
         n.isOnSegment(t.firstPoint) ? t.firstPoint : null,
         n.isOnSegment(t.lastPoint) ? t.lastPoint : null
       ].filter((u) => u !== null)
-    ).sort((u, l) => u[0] - l[0]);
+    ).sort((u, c) => u[0] - c[0]);
     if (a.length === 0)
       return null;
     if (a.length === 1)
       return null;
     if (a.length === 2)
-      return new P(a[0], a[1]);
+      return new m(a[0], a[1]);
     throw console.error(a), new Error(
       "Unexpected number of points while intersecting parallel lines"
     );
@@ -429,15 +330,15 @@ function qt(n, t, e = !1, r) {
   return !n.isValidParameter(i) || !t.isValidParameter(o) ? null : n.paramPoint(i);
 }
 const W = (n, t) => {
-  const e = S(n, t);
-  return Ot(e);
+  const e = y(n, t);
+  return Lt(e);
 };
-class m extends yt {
+class g extends Mt {
   constructor(t, e, r, s = !1, { ignoreChecks: i = !1 } = {}) {
     if (super(t, e), this.segmentType = "ARC", this._angularLength = null, this._radius = null, this._firstAngle = null, this._lastAngle = null, this._boundingBox = null, this.center = r, this.clockwise = s, !i) {
       if (h(t, e))
         throw new Error("Invalid arc, cannot be a full circle");
-      if (Math.abs(this.radius - k(this.lastPoint, this.center)) > this.precision)
+      if (Math.abs(this.radius - v(this.lastPoint, this.center)) > this.precision)
         throw new Error(
           "Invalid arc, radius does not match between start and end"
         );
@@ -447,10 +348,10 @@ class m extends yt {
     return 1 - t >= -this.precision && t >= -this.precision;
   }
   angleToParam(t) {
-    return ct(this.firstAngle, Q(t), this.clockwise) / this.angularLength;
+    return ht(this.firstAngle, tt(t), this.clockwise) / this.angularLength;
   }
   get angularLength() {
-    return this._angularLength || (this._angularLength = ct(
+    return this._angularLength || (this._angularLength = ht(
       this.firstAngle,
       this.lastAngle,
       this.clockwise
@@ -469,29 +370,29 @@ class m extends yt {
     const [e, r] = W(t, this.center);
     if (Math.abs(e - this.radius) > this.precision)
       throw new Error(
-        `Point ${L(t)} is not on segment ${this.repr}`
+        `Point ${B(t)} is not on segment ${this.repr}`
       );
     const s = this.angleToParam(r);
     if (!this.isValidParameter(s))
       throw new Error(
-        `Point ${L(t)} is not on segment ${this.repr}`
+        `Point ${B(t)} is not on segment ${this.repr}`
       );
     return s;
   }
   get radius() {
-    return this._radius === null && (this._radius = k(this.firstPoint, this.center)), this._radius;
+    return this._radius === null && (this._radius = v(this.firstPoint, this.center)), this._radius;
   }
   get firstAngle() {
     if (this._firstAngle === null) {
-      const [t, e] = S(this.firstPoint, this.center);
-      this._firstAngle = Q(Math.atan2(e, t));
+      const [t, e] = y(this.firstPoint, this.center);
+      this._firstAngle = tt(Math.atan2(e, t));
     }
     return this._firstAngle;
   }
   get lastAngle() {
     if (this._lastAngle === null) {
-      const [t, e] = S(this.lastPoint, this.center);
-      this._lastAngle = Q(Math.atan2(e, t));
+      const [t, e] = y(this.lastPoint, this.center);
+      this._lastAngle = tt(Math.atan2(e, t));
     }
     return this._lastAngle;
   }
@@ -505,10 +406,10 @@ class m extends yt {
     return this.paramPoint(0.5);
   }
   isSame(t) {
-    return !(t instanceof m) || !h(this.center, t.center) ? !1 : h(this.firstPoint, t.firstPoint) && h(this.lastPoint, t.lastPoint) && this.clockwise === t.clockwise || h(this.lastPoint, t.firstPoint) && h(this.firstPoint, t.lastPoint) && this.clockwise === !t.clockwise;
+    return !(t instanceof g) || !h(this.center, t.center) ? !1 : h(this.firstPoint, t.firstPoint) && h(this.lastPoint, t.lastPoint) && this.clockwise === t.clockwise || h(this.lastPoint, t.firstPoint) && h(this.firstPoint, t.lastPoint) && this.clockwise === !t.clockwise;
   }
   clone() {
-    return new m(
+    return new g(
       this.firstPoint,
       this.lastPoint,
       this.center,
@@ -516,7 +417,7 @@ class m extends yt {
     );
   }
   reverse() {
-    return new m(
+    return new g(
       this.lastPoint,
       this.firstPoint,
       this.center,
@@ -558,19 +459,16 @@ class m extends yt {
     const s = this.angleToParam(r);
     if (!this.isValidParameter(s))
       throw new Error("Point is not on the arc");
-    const i = U(
-      1,
-      r + (this.clockwise ? Math.PI / 2 : -Math.PI / 2)
-    );
-    return O(i);
+    const i = U(1, r);
+    return (this.clockwise ? Z : C)(E(i));
   }
   get tangentAtFirstPoint() {
     const t = U(1, this.firstAngle);
-    return (this.clockwise ? ut : B)(O(t));
+    return (this.clockwise ? Z : C)(E(t));
   }
   get tangentAtLastPoint() {
     const t = U(1, this.lastAngle);
-    return (this.clockwise ? ut : B)(O(t));
+    return (this.clockwise ? Z : C)(E(t));
   }
   splitAt(t) {
     let e;
@@ -578,19 +476,19 @@ class m extends yt {
       return [this];
     Array.isArray(t[0]) ? e = t : e = [t];
     const s = [0, 1, ...e.map((a) => this.pointToParam(a))], i = new Map(
-      F([s, [this.firstPoint, this.lastPoint, ...e]])
+      L([s, [this.firstPoint, this.lastPoint, ...e]])
     );
     s.sort((a, u) => a - u);
     let o = null;
     return s.flatMap((a, u) => {
       if (u === s.length - 1)
         return [];
-      const l = s[u + 1];
-      if (l - a < this.precision)
+      const c = s[u + 1];
+      if (c - a < this.precision)
         return o === null && (o = a), [];
-      const c = o === null ? a : o, f = new m(
-        i.get(c) || this.paramPoint(c),
+      const l = o === null ? a : o, f = new g(
         i.get(l) || this.paramPoint(l),
+        i.get(c) || this.paramPoint(c),
         this.center,
         this.clockwise
       );
@@ -598,7 +496,7 @@ class m extends yt {
     });
   }
   transform(t) {
-    return new m(
+    return new g(
       t.transform(this.firstPoint),
       t.transform(this.lastPoint),
       t.transform(this.center),
@@ -607,30 +505,30 @@ class m extends yt {
   }
 }
 function rn(n, t, e) {
-  const r = new P(t, n), s = new P(t, e), i = B(r.tangentAtFirstPoint), o = B(s.tangentAtLastPoint), a = K(
+  const r = new m(t, n), s = new m(t, e), i = C(r.tangentAtFirstPoint), o = C(s.tangentAtLastPoint), a = Q(
     { firstPoint: r.midPoint, V: i, precision: 1e-9 },
     { firstPoint: s.midPoint, V: o, precision: 1e-9 }
   );
   if (a === "parallel")
     throw new Error("Cannot create an arc from three colinear points");
   const u = $(
-    S(n, t),
-    S(e, t)
+    y(n, t),
+    y(e, t)
   ) > 0;
-  return new m(
+  return new g(
     n,
     e,
-    M(r.midPoint, v(i, a.intersectionParam1)),
+    M(r.midPoint, k(i, a.intersectionParam1)),
     u,
     { ignoreChecks: !0 }
   );
 }
 function sn(n, t, e) {
-  const r = new P(t, n), s = B(r.tangentAtFirstPoint), i = K(
+  const r = new m(t, n), s = C(r.tangentAtFirstPoint), i = Q(
     { firstPoint: r.midPoint, V: s, precision: 1e-9 },
     {
       firstPoint: n,
-      V: B(e),
+      V: C(e),
       precision: 1e-9
     }
   );
@@ -638,21 +536,21 @@ function sn(n, t, e) {
     throw new Error("Cannot create an arc from three colinear points");
   const o = M(
     r.midPoint,
-    v(s, i.intersectionParam1)
+    k(s, i.intersectionParam1)
   ), a = $(
-    S(o, n),
+    y(o, n),
     M(n, e)
   ) > 0;
-  return new m(n, t, o, a, {
+  return new g(n, t, o, a, {
     ignoreChecks: !0
   });
 }
-function Dt(n, t) {
-  const e = S(t, n.firstPoint), r = nt(e, n.V) / n.squareLength;
+function Tt(n, t) {
+  const e = y(t, n.firstPoint), r = et(e, n.V) / n.squareLength;
   return n.paramPoint(r);
 }
-function ht(n, t, e) {
-  const r = e || n.precision, s = Dt(n, t.center), i = k(s, t.center);
+function z(n, t, e) {
+  const r = e || n.precision, s = Tt(n, t.center), i = v(s, t.center);
   if (i > t.radius + r)
     return [];
   if (Math.abs(i - t.radius) < r) {
@@ -661,17 +559,17 @@ function ht(n, t, e) {
   }
   const o = [], a = Math.sqrt(
     t.radius * t.radius - i * i
-  ), u = n.tangentAtFirstPoint, l = M(s, v(u, a));
-  n.isOnSegment(l) && t.isOnSegment(l) && o.push(l);
-  const c = M(s, v(u, -a));
-  return n.isOnSegment(c) && t.isOnSegment(c) && o.push(c), o;
+  ), u = n.tangentAtFirstPoint, c = M(s, k(u, a));
+  n.isOnSegment(c) && t.isOnSegment(c) && o.push(c);
+  const l = M(s, k(u, -a));
+  return n.isOnSegment(l) && t.isOnSegment(l) && o.push(l), o;
 }
-const jt = (n) => {
+const _t = (n) => {
   const { firstPoint: t, lastPoint: e, center: r, clockwise: s } = n;
-  return new m(e, t, r, s, {
+  return new g(e, t, r, s, {
     ignoreChecks: !0
   });
-}, Nt = (n, t) => {
+}, $t = (n, t) => {
   if (n.isSame(t))
     return [n];
   const e = J(
@@ -689,11 +587,11 @@ const jt = (n) => {
   if (e.length === 1)
     return [];
   if (e.length === 2)
-    return n.isSame(jt(t)) ? [] : [new m(e[0], e[1], n.center, n.clockwise)];
+    return n.isSame(_t(t)) ? [] : [new g(e[0], e[1], n.center, n.clockwise)];
   if (e.length === 3) {
     const r = h(e[0], t.lastPoint) || h(e[0], t.firstPoint) ? 1 : 0;
     return [
-      new m(
+      new g(
         e[0 + r],
         e[1 + r],
         n.center,
@@ -702,68 +600,86 @@ const jt = (n) => {
     ];
   } else if (e.length === 4)
     return [
-      new m(e[0], e[1], n.center, n.clockwise),
-      new m(e[2], e[3], n.center, n.clockwise)
+      new g(e[0], e[1], n.center, n.clockwise),
+      new g(e[2], e[3], n.center, n.clockwise)
     ];
   throw new Error("Bug in the arc arc overlap algorithm");
 };
-function Rt(n, t, e = !1, r) {
-  const s = r || n.precision, i = k(n.center, t.center), o = n.radius + t.radius;
+function St(n, t, e = !1, r) {
+  const s = r || n.precision, i = v(n.center, t.center), o = n.radius + t.radius;
   if (i > o + s)
     return [];
   const a = Math.abs(n.radius - t.radius);
   if (i < a - s)
     return [];
   if (i < s)
-    return a > s ? [] : e ? Nt(n, t) : [];
-  const u = O(S(t.center, n.center)), l = i > o - s;
+    return a > s ? [] : e ? $t(n, t) : [];
+  const u = E(y(t.center, n.center)), c = i > o - s;
   if (
     // circles are outside each other
-    l || // circles are inside each other
+    c || // circles are inside each other
     Math.abs(i - a) < s
   ) {
-    const C = l || n.radius > t.radius ? 1 : -1, y = M(
+    const I = c || n.radius > t.radius ? 1 : -1, S = M(
       n.center,
-      v(u, C * n.radius)
+      k(u, I * n.radius)
     );
-    return n.isOnSegment(y) && t.isOnSegment(y) ? [y] : [];
+    return n.isOnSegment(S) && t.isOnSegment(S) ? [S] : [];
   }
-  const c = n.radius * n.radius / (2 * i) - t.radius * t.radius / (2 * i) + i / 2, f = M(
+  const l = n.radius * n.radius / (2 * i) - t.radius * t.radius / (2 * i) + i / 2, f = M(
     n.center,
-    v(u, c)
-  ), g = Math.sqrt(
-    n.radius * n.radius - c * c
-  ), p = B(u), d = M(f, v(p, g)), w = M(f, v(p, -g)), x = [];
+    k(u, l)
+  ), P = Math.sqrt(
+    n.radius * n.radius - l * l
+  ), p = C(u), d = M(f, k(p, P)), w = M(f, k(p, -P)), x = [];
   return n.isOnSegment(d) && t.isOnSegment(d) && x.push(d), n.isOnSegment(w) && t.isOnSegment(w) && x.push(w), x;
 }
-function it(n, t, e) {
-  if (n instanceof P && t instanceof P) {
-    const r = qt(
+function on(n, t, e) {
+  if (n instanceof m && t instanceof m) {
+    const r = yt(
+      n,
+      t,
+      !1,
+      e
+    );
+    return r === null ? [] : [r];
+  }
+  if (n instanceof m && t instanceof g)
+    return z(n, t, e);
+  if (n instanceof g && t instanceof m)
+    return z(t, n, e);
+  if (n instanceof g && t instanceof g)
+    return St(n, t, !1, e);
+  throw new Error("Not implemented");
+}
+function ot(n, t, e) {
+  if (n instanceof m && t instanceof m) {
+    const r = yt(
       n,
       t,
       !0,
       e
     );
-    return r === null ? { intersections: [], overlaps: [], count: 0 } : r instanceof P ? { intersections: [], overlaps: [r], count: 1 } : { intersections: [r], overlaps: [], count: 1 };
+    return r === null ? { intersections: [], overlaps: [], count: 0 } : r instanceof m ? { intersections: [], overlaps: [r], count: 1 } : { intersections: [r], overlaps: [], count: 1 };
   }
   if (!n.boundingBox.overlaps(t.boundingBox))
     return { intersections: [], overlaps: [], count: 0 };
-  if (n instanceof P && t instanceof m) {
-    const r = ht(n, t, e);
+  if (n instanceof m && t instanceof g) {
+    const r = z(n, t, e);
     return { intersections: r, overlaps: [], count: r.length };
   }
-  if (n instanceof m && t instanceof P) {
-    const r = ht(t, n, e);
+  if (n instanceof g && t instanceof m) {
+    const r = z(t, n, e);
     return { intersections: r, overlaps: [], count: r.length };
   }
-  if (n instanceof m && t instanceof m) {
-    const r = Rt(
+  if (n instanceof g && t instanceof g) {
+    const r = St(
       n,
       t,
       !0,
       e
     );
-    return r.length ? r[0] instanceof m ? {
+    return r.length ? r[0] instanceof g ? {
       intersections: [],
       overlaps: r,
       count: r.length
@@ -775,9 +691,111 @@ function it(n, t, e) {
   }
   throw new Error("Not implemented");
 }
-class bt extends z {
+function bt(n) {
+  const t = [];
+  for (let e = 0; e < n; e++)
+    for (let r = 0; r <= e; r++)
+      t.push([e, r]);
+  return t;
+}
+function* rt(n) {
+  for (const [t, e] of bt(n.length))
+    t !== e && (yield [n[t], n[e]]);
+}
+class b extends K {
+  constructor(t, e = [], { ignoreChecks: r = !1 } = {}) {
+    super(), r || qt(t, e), this.contour = t, this.holes = e;
+  }
+  get boundingBox() {
+    return this.contour.boundingBox;
+  }
+  get isFull() {
+    return this.holes.length === 0;
+  }
+  get allLoops() {
+    return [this.contour, ...this.holes];
+  }
+  clone() {
+    return new b(
+      this.contour.clone(),
+      this.holes.map((t) => t.clone())
+    );
+  }
+  transform(t) {
+    return new b(
+      this.contour.transform(t),
+      this.holes.map((e) => e.transform(t))
+    );
+  }
+  contains(t) {
+    return this.contour.contains(t) && !this.holes.some((e) => e.contains(t));
+  }
+  intersects(t) {
+    return this.allLoops.some(
+      (e) => t.allLoops.some((r) => e.intersects(r))
+    );
+  }
+}
+function qt(n, t = []) {
+  if (!n)
+    throw new Error("Figure must have a contour");
+  for (const [e, r] of rt([n, ...t]))
+    if (e.intersects(r))
+      throw new Error("Loops in a figure must not intersect");
+  if (t.some((e) => !n.contains(e.firstPoint)))
+    throw new Error("Holes must be inside the contour");
+  for (const [e, r] of rt(t))
+    if (e.contains(r.firstPoint))
+      throw console.error(wt(e), wt(r)), new Error("Holes must not be inside other holes");
+}
+const Dt = (n) => {
+  const t = n.map((s, i) => n.slice(i + 1).map((o, a) => [a + i + 1, o]).filter(([, o]) => s.boundingBox.overlaps(o.boundingBox)).map(([o]) => o)), e = [], r = Array(t.length);
+  return t.forEach((s, i) => {
+    let o = r[i];
+    o || (o = [], e.push(o)), o.push(n[i]), s.length && s.forEach((a) => {
+      r[a] = o;
+    });
+  }), e;
+}, At = (n) => n.map((t, e) => {
+  const s = t.segments[0].midPoint, i = n.filter((o, a) => e === a ? !1 : o.contains(s));
+  return {
+    loop: t,
+    isIn: i
+  };
+}), jt = (n, t) => n.flatMap(({ loop: e }) => at(
+  t.filter(
+    ({ loop: r, isIn: s }) => r === e || s.indexOf(e) !== -1
+  )
+)), Nt = (n, t) => {
+  const e = t.filter(({ isIn: s }) => s.length <= 1), r = at(
+    At(n.map(({ loop: s }) => s))
+  );
+  return [e, ...r];
+}, at = (n) => {
+  if (!n.length)
+    return [];
+  const t = n.filter(({ isIn: r }) => !r.length), e = n.filter(({ isIn: r }) => r.length > 1);
+  return t.length === 1 && e.length === 0 ? [n] : t.length > 1 ? jt(t, n) : Nt(e, n);
+};
+function D(n) {
+  return Dt(n).map(At).flatMap(at).map((e) => {
+    if (e.length === 1)
+      return new b(e[0].loop);
+    e.sort((i, o) => i.isIn.length - o.isIn.length);
+    const [r, ...s] = e.map(({ loop: i }) => i);
+    return new b(r, s);
+  });
+}
+function Rt(n, t) {
+  const e = [];
+  for (const r of n)
+    for (const s of t)
+      e.push([r, s]);
+  return e;
+}
+class kt extends K {
   constructor(t, { ignoreChecks: e = !1 } = {}) {
-    super(), this._boundingBox = null, e || At(t), this.segments = t;
+    super(), this._boundingBox = null, e || vt(t), this.segments = t;
   }
   get repr() {
     return this.segments.map((t) => t.repr).join(`
@@ -799,7 +817,7 @@ class bt extends z {
   intersects(t) {
     return this.boundingBox.overlaps(t.boundingBox) ? this.segments.some(
       (e) => t.segments.some(
-        (r) => it(e, r).count > 0
+        (r) => ot(e, r).count > 0
       )
     ) : !1;
   }
@@ -817,11 +835,11 @@ class bt extends z {
   }
 }
 function Gt(n, t = "Stroke") {
-  xt(n.length).forEach(
+  bt(n.length).forEach(
     ([e, r]) => {
       if (e === r)
         return;
-      const s = n[e], i = n[r], o = it(s, i);
+      const s = n[e], i = n[r], o = ot(s, i);
       if (o.count !== 0) {
         if (o.count === 1 && !o.overlaps.length) {
           const a = e - r, u = o.intersections[0];
@@ -835,10 +853,10 @@ function Gt(n, t = "Stroke") {
     }
   );
 }
-function At(n, t = "Stroke") {
+function vt(n, t = "Stroke") {
   if (n.length === 0)
     throw new Error(`${t} must have at least one segment`);
-  F([n.slice(0, -1), n.slice(1)]).forEach(
+  L([n.slice(0, -1), n.slice(1)]).forEach(
     ([e, r]) => {
       if (!h(e.lastPoint, r.firstPoint))
         throw new Error(
@@ -848,13 +866,13 @@ function At(n, t = "Stroke") {
   ), Gt(n, t);
 }
 function ft(n, t) {
-  return !!(n instanceof P && t instanceof P && Mt(n.V, t.V) || n instanceof m && t instanceof m && h(n.center, t.center) && n.radius - t.radius < n.precision);
+  return !!(n instanceof m && t instanceof m && xt(n.V, t.V) || n instanceof g && t instanceof g && h(n.center, t.center) && n.radius - t.radius < n.precision);
 }
 function gt(n, t) {
-  if (n instanceof P && t instanceof P)
-    return new P(n.firstPoint, t.lastPoint);
   if (n instanceof m && t instanceof m)
-    return new m(
+    return new m(n.firstPoint, t.lastPoint);
+  if (n instanceof g && t instanceof g)
+    return new g(
       n.firstPoint,
       t.lastPoint,
       n.center,
@@ -862,7 +880,7 @@ function gt(n, t) {
     );
   throw new Error("Not implemented");
 }
-function vt(n) {
+function Ct(n) {
   let t = !1;
   const e = [];
   for (const r of n.segments) {
@@ -883,7 +901,7 @@ function vt(n) {
   }
   return t ? e : null;
 }
-class A extends bt {
+class A extends kt {
   constructor() {
     super(...arguments), this.strokeType = "STRAND";
   }
@@ -903,7 +921,7 @@ class A extends bt {
     return new A([...this.segments, ...t.segments]);
   }
   simplify() {
-    const t = vt(this);
+    const t = Ct(this);
     return t ? new A(t, { ignoreChecks: !0 }) : this;
   }
   transform(t) {
@@ -914,7 +932,7 @@ class A extends bt {
   }
 }
 const Ut = (n, t) => {
-  const e = K(t, {
+  const e = Q(t, {
     V: [1, 0],
     firstPoint: n,
     precision: t.precision
@@ -942,35 +960,45 @@ const Ut = (n, t) => {
   const u = Math.sqrt(
     t.radius * t.radius - r * r
   );
-  let l = 0;
-  const c = (f) => {
-    t.isOnSegment(f) && (h(f, t.firstPoint) ? l += t.tangentAtFirstPoint[1] > 0 ? 1 : 0 : h(f, t.lastPoint) ? l += t.tangentAtLastPoint[1] > 0 ? 0 : 1 : l += 1);
+  let c = 0;
+  const l = (f) => {
+    t.isOnSegment(f) && (h(f, t.firstPoint) ? c += t.tangentAtFirstPoint[1] > 0 ? 1 : 0 : h(f, t.lastPoint) ? c += t.tangentAtLastPoint[1] > 0 ? 0 : 1 : c += 1);
   };
-  return c([t.center[0] + u, n[1]]), a && c([t.center[0] - u, n[1]]), l;
+  return l([t.center[0] + u, n[1]]), a && l([t.center[0] - u, n[1]]), c;
 };
 function Xt(n, t) {
-  if (t instanceof P)
-    return Ut(n, t);
   if (t instanceof m)
+    return Ut(n, t);
+  if (t instanceof g)
     return Wt(n, t);
   throw new Error("Not implemented");
 }
-class E extends bt {
+class F extends kt {
   constructor(t, { ignoreChecks: e = !1 } = {}) {
-    super(t, { ignoreChecks: !0 }), this.strokeType = "LOOP", e || Ht(t);
+    super(t, { ignoreChecks: !0 }), this.strokeType = "LOOP", this._clockwise = null, e || zt(t);
+  }
+  get clockwise() {
+    if (this._clockwise === null) {
+      const t = this.segments.flatMap((r) => r instanceof m ? [r.firstPoint] : [r.firstPoint, r.paramPoint(0.5)]), e = t.map((r, s) => {
+        const i = t[(s + 1) % t.length];
+        return (i[0] - r[0]) * (i[1] + r[1]);
+      }).reduce((r, s) => r + s, 0);
+      this._clockwise = e > 0;
+    }
+    return this._clockwise;
   }
   clone() {
-    return new E(
+    return new F(
       this.segments.map((t) => t.clone()),
       { ignoreChecks: !0 }
     );
   }
   reverse() {
     const t = this.segments.map((e) => e.reverse());
-    return t.reverse(), new E(t, { ignoreChecks: !0 });
+    return t.reverse(), new F(t, { ignoreChecks: !0 });
   }
   transform(t) {
-    return new E(
+    return new F(
       this.segments.map((e) => e.transform(t)),
       { ignoreChecks: !0 }
     );
@@ -979,12 +1007,12 @@ class E extends bt {
     return this.onStroke(t) || !this.boundingBox.contains(t) ? !1 : this.segments.reduce((r, s) => r + Xt(t, s), 0) % 2 === 1;
   }
   simplify() {
-    const t = vt(this);
-    return t ? new E(t, { ignoreChecks: !0 }) : this;
+    const t = Ct(this);
+    return t ? new F(t, { ignoreChecks: !0 }) : this;
   }
 }
-function Ht(n) {
-  if (At(n, "Loop"), !h(n[0].firstPoint, n[n.length - 1].lastPoint))
+function zt(n) {
+  if (vt(n, "Loop"), !h(n[0].firstPoint, n[n.length - 1].lastPoint))
     throw new Error("Loop segment must be closed");
 }
 const mt = (n, t) => {
@@ -1013,7 +1041,7 @@ function* pt(n, t, e) {
     r(o) ? (i.push(o), yield new A(i, { ignoreChecks: !0 }), i = []) : s(o) ? (i.length && (yield new A(i, { ignoreChecks: !0 }), i = []), yield new A([o], { ignoreChecks: !0 })) : i.push(o);
   i.length && (yield new A(i, { ignoreChecks: !0 }));
 }
-function Yt(n, t, e) {
+function Ht(n, t, e) {
   return n.filter((r) => {
     const s = t.filter((a) => h(a.firstPoint, r) || h(a.lastPoint, r));
     if (s.length % 2)
@@ -1022,47 +1050,47 @@ function Yt(n, t, e) {
     return !(i.every((a) => a) || !i.some((a) => a));
   });
 }
-function zt(n, t, e) {
+function Yt(n, t, e) {
   let r = [];
   const s = [], i = new Array(n.segments.length).fill(0).map(() => []), o = new Array(t.segments.length).fill(0).map(() => []);
-  if (n.segments.forEach((g, p) => {
+  if (n.segments.forEach((P, p) => {
     t.segments.forEach((d, w) => {
-      const { intersections: x, overlaps: C } = it(
-        g,
+      const { intersections: x, overlaps: I } = ot(
+        P,
         d,
         e
       );
-      r.push(...x), i[p].push(...x), o[w].push(...x), s.push(...C);
-      const y = C.flatMap((T) => [
+      r.push(...x), i[p].push(...x), o[w].push(...x), s.push(...I);
+      const S = I.flatMap((T) => [
         T.firstPoint,
         T.lastPoint
       ]);
-      r.push(...y), i[p].push(...y), o[w].push(...y);
+      r.push(...S), i[p].push(...S), o[w].push(...S);
     });
   }), r = J(r, e), !r.length || r.length === 1)
     return null;
-  const a = ([g, p]) => p.length ? g.splitAt(p) : [g];
-  let u = F([n.segments, i]).flatMap(a), l = F([t.segments, o]).flatMap(a);
-  if (r = Yt(
+  const a = ([P, p]) => p.length ? P.splitAt(p) : [P];
+  let u = L([n.segments, i]).flatMap(a), c = L([t.segments, o]).flatMap(a);
+  if (r = Ht(
     r,
     u,
     t
   ), !r.length && !s.length)
     return null;
   if (s.length) {
-    const g = s[0];
+    const P = s[0];
     u = Pt(
       u,
-      g
-    ), l = Pt(
-      l,
-      g
+      P
+    ), c = Pt(
+      c,
+      P
     );
   } else {
-    const g = r[0];
-    u = mt(u, g), l = mt(l, g);
+    const P = r[0];
+    u = mt(u, P), c = mt(c, P);
   }
-  const c = Array.from(
+  const l = Array.from(
     pt(
       u,
       r,
@@ -1071,26 +1099,26 @@ function zt(n, t, e) {
   );
   let f = Array.from(
     pt(
-      l,
+      c,
       r,
       s
     )
   );
   return (!h(
     f[0].lastPoint,
-    c[0].lastPoint
-  ) || s.length > 0 && f[0].segmentsCount !== 1) && (f = f.reverse().map((g) => g.reverse())), F([c, f]).map(([g, p]) => g.segmentsCount === 1 && s.some((d) => g.segments[0].isSame(d)) ? [g, "same"] : [g, p]);
+    l[0].lastPoint
+  ) || s.length > 0 && f[0].segmentsCount !== 1) && (f = f.reverse().map((P) => P.reverse())), L([l, f]).map(([P, p]) => P.segmentsCount === 1 && s.some((d) => P.segments[0].isSame(d)) ? [P, "same"] : [P, p]);
 }
-function Z(n) {
+function nt(n) {
   let t = n[0];
   for (const e of n.slice(1))
     t = t.extend(e);
   if (!h(t.firstPoint, t.lastPoint))
     throw console.error(
-      L(t.firstPoint),
-      L(t.lastPoint)
+      B(t.firstPoint),
+      B(t.lastPoint)
     ), new Error("Bug in the intersection algo on non closing strand");
-  return new E(t.segments);
+  return new F(t.segments);
 }
 function Jt(n) {
   if (!n.length)
@@ -1098,19 +1126,19 @@ function Jt(n) {
   const t = n.map((o) => o.firstPoint);
   let e = n.map((o) => o.lastPoint);
   e = e.slice(-1).concat(e.slice(0, -1));
-  const r = F([t, e]).flatMap(
+  const r = L([t, e]).flatMap(
     ([o, a], u) => h(o, a) ? [] : u
   );
   if (!r.length)
-    return [Z(n)];
-  const s = F([
+    return [nt(n)];
+  const s = L([
     r.slice(0, -1),
     r.slice(1)
-  ]).map(([o, a]) => Z(n.slice(o, a)));
+  ]).map(([o, a]) => nt(n.slice(o, a)));
   let i = n.slice(
     r[r.length - 1]
   );
-  return r[0] !== 0 && (i = i.concat(n.slice(0, r[0]))), s.push(Z(i)), s;
+  return r[0] !== 0 && (i = i.concat(n.slice(0, r[0]))), s.push(nt(i)), s;
 }
 const dt = (n, t) => {
   if (n.length === 0)
@@ -1118,51 +1146,51 @@ const dt = (n, t) => {
   const e = n.at(-1);
   return h(e.lastPoint, t.firstPoint) ? n.slice(0, -1).concat([e.extend(t)]) : h(e.lastPoint, t.lastPoint) ? n.slice(0, -1).concat([e.extend(t.reverse())]) : n.concat([t]);
 }, Kt = (n, t) => n.length === 0 ? [t] : h(n[0].firstPoint, t.lastPoint) ? [t.extend(n[0])].concat(n.slice(1)) : [t].concat(n);
-function ot(n, t, {
+function ut(n, t, {
   firstInside: e,
   secondInside: r
 }) {
-  const s = zt(n, t);
+  const s = Yt(n, t);
   if (!s) {
-    const u = n.segments[0].midPoint, l = t.contains(u), c = t.segments[0].midPoint, f = n.contains(c);
+    const u = n.segments[0].midPoint, c = t.contains(u), l = t.segments[0].midPoint, f = n.contains(l);
     return {
       identical: !1,
-      firstCurveInSecond: l,
+      firstCurveInSecond: c,
       secondCurveInFirst: f
     };
   }
   if (s.every(([, u]) => u === "same"))
     return { identical: !0 };
   let i = null, o = null;
-  const a = s.flatMap(([u, l]) => {
-    let c = [], f = 0;
-    if (l === "same")
+  const a = s.flatMap(([u, c]) => {
+    let l = [], f = 0;
+    if (c === "same")
       return o === 1 ? (o = 1, u) : o === 2 || o === 0 ? (o = null, []) : o === null ? (i ? i = i.extend(u) : i = u, []) : (console.error("weird situation"), []);
-    const g = u.segments[0].midPoint, p = t.contains(g);
-    (e === "keep" && p || e === "remove" && !p) && (f += 1, c = dt(c, u));
-    const d = l.segments[0].midPoint, w = n.contains(d);
+    const P = u.segments[0].midPoint, p = t.contains(P);
+    (e === "keep" && p || e === "remove" && !p) && (f += 1, l = dt(l, u));
+    const d = c.segments[0].midPoint, w = n.contains(d);
     if (r === "keep" && w || r === "remove" && !w) {
-      const x = l;
-      f += 1, f === 2 && c.length ? (c = dt(c, x), i = null) : c = [x];
+      const x = c;
+      f += 1, f === 2 && l.length ? (l = dt(l, x), i = null) : l = [x];
     }
-    return o === null && f === 1 && i && (c = Kt(c, i)), f === 1 && (o = f, i = null), c.length ? c : (i = null, []);
+    return o === null && f === 1 && i && (l = Kt(l, i)), f === 1 && (o = f, i = null), l.length ? l : (i = null, []);
   });
   return Jt(a);
 }
 const Qt = (n, t) => {
-  const e = ot(n, t, {
+  const e = ut(n, t, {
     firstInside: "remove",
     secondInside: "remove"
   });
   return Array.isArray(e) ? e : e.identical ? [n] : e.firstCurveInSecond ? [t] : e.secondCurveInFirst ? [n] : [n, t];
 }, H = (n, t) => {
-  const e = ot(n, t, {
+  const e = ut(n, t, {
     firstInside: "remove",
     secondInside: "keep"
   });
   return Array.isArray(e) ? e : e.identical ? [] : e.firstCurveInSecond ? [] : e.secondCurveInFirst ? [n, t] : [n];
-}, at = (n, t) => {
-  const e = ot(n, t, {
+}, ct = (n, t) => {
+  const e = ut(n, t, {
     firstInside: "keep",
     secondInside: "keep"
   });
@@ -1173,22 +1201,22 @@ function Zt(n) {
   return n.forEach((r, s) => {
     let i;
     t.has(s) ? i = t.get(s) : (i = { current: [r], fusedWith: /* @__PURE__ */ new Set([s]) }, e.push(i)), n.slice(s + 1).forEach((o, a) => {
-      const u = i.current, l = s + a + 1;
-      if (i.fusedWith.has(l))
+      const u = i.current, c = s + a + 1;
+      if (i.fusedWith.has(c))
         return;
-      let c = [o], f = !1;
-      if (t.has(l) && (c = t.get(l).current, f = !0), !u.some(
-        (d) => c.some((w) => d.intersects(w))
+      let l = [o], f = !1;
+      if (t.has(c) && (l = t.get(c).current, f = !0), !u.some(
+        (d) => l.some((w) => d.intersects(w))
       ))
         return;
       let p;
-      u.length > 1 || c.length > 1 ? p = N(u, c) : p = kt(u[0], c[0]), i.fusedWith.add(l), i.current = p, f || t.set(l, i);
+      u.length > 1 || l.length > 1 ? p = N(u, l) : p = It(u[0], l[0]), i.fusedWith.add(c), i.current = p, f || t.set(c, i);
     });
   }), e.flatMap(({ current: r }) => r);
 }
-function kt(n, t) {
-  const e = Qt(n.contour, t.contour), r = t.holes.flatMap((o) => H(o, n.contour)), s = n.holes.flatMap((o) => H(o, t.contour)), i = _t(n.holes, t.holes).flatMap(
-    ([o, a]) => at(o, a)
+function It(n, t) {
+  const e = Qt(n.contour, t.contour), r = t.holes.flatMap((o) => H(o, n.contour)), s = n.holes.flatMap((o) => H(o, t.contour)), i = Rt(n.holes, t.holes).flatMap(
+    ([o, a]) => ct(o, a)
   );
   return D([
     ...e,
@@ -1202,7 +1230,7 @@ function Y(n, t) {
     return D(H(n.contour, t.contour));
   if (n.isFull) {
     const r = H(n.contour, t.contour), s = t.holes.flatMap(
-      (i) => at(i, n.contour)
+      (i) => ct(i, n.contour)
     );
     return D([...r, ...s]);
   } else if (t.isFull && !n.contour.intersects(t.contour))
@@ -1223,7 +1251,7 @@ function Y(n, t) {
   }), e;
 }
 function tn(n, t) {
-  const e = at(n.contour, t.contour);
+  const e = ct(n.contour, t.contour);
   if (!e.length)
     return [];
   let r = D(e);
@@ -1248,7 +1276,7 @@ function N(n, t) {
       e = N([r], e);
     }), e;
   }
-  return n.length === 1 && t.length === 1 ? kt(n[0], t[0]) : [];
+  return n.length === 1 && t.length === 1 ? It(n[0], t[0]) : [];
 }
 function R(n, t) {
   if (!n.length)
@@ -1264,10 +1292,10 @@ function R(n, t) {
     e = R(e, [r]);
   }), e;
 }
-function et(n, t) {
-  return !n.length || !t.length ? [] : n.length === 1 && t.length === 1 ? tn(n[0], t[0]) : n.length > 1 ? n.flatMap((e) => et([e], t)) : t.flatMap((e) => et(n, [e]));
+function st(n, t) {
+  return !n.length || !t.length ? [] : n.length === 1 && t.length === 1 ? tn(n[0], t[0]) : n.length > 1 ? n.flatMap((e) => st([e], t)) : t.flatMap((e) => st(n, [e]));
 }
-class V extends z {
+class O extends K {
   constructor(t = [], { ignoreChecks: e = !1 } = {}) {
     super(), this._boundingBox = null, e || nn(t), this.figures = t;
   }
@@ -1286,10 +1314,10 @@ class V extends z {
     return this._boundingBox;
   }
   clone() {
-    return new V(this.figures.map((t) => t.clone()));
+    return new O(this.figures.map((t) => t.clone()));
   }
   transform(t) {
-    return new V(this.figures.map((e) => e.transform(t)));
+    return new O(this.figures.map((e) => e.transform(t)));
   }
   contains(t) {
     return this.figures.some((e) => e.contains(t));
@@ -1300,28 +1328,28 @@ class V extends z {
     );
   }
   fuse(t) {
-    return new V(N(this.figures, t.figures));
+    return new O(N(this.figures, t.figures));
   }
   cut(t) {
-    return new V(R(this.figures, t.figures));
+    return new O(R(this.figures, t.figures));
   }
   intersect(t) {
-    return new V(et(this.figures, t.figures));
+    return new O(st(this.figures, t.figures));
   }
 }
 function nn(n) {
-  for (const [t, e] of tt(n))
+  for (const [t, e] of rt(n))
     if (t.intersects(e))
       throw new Error("Diagram figures must not intersect");
 }
-function Ct(n) {
-  if (n instanceof P)
+function Vt(n) {
+  if (n instanceof m)
     return {
       type: n.segmentType,
       firstPoint: n.firstPoint,
       lastPoint: n.lastPoint
     };
-  if (n instanceof m)
+  if (n instanceof g)
     return {
       type: n.segmentType,
       firstPoint: n.firstPoint,
@@ -1331,58 +1359,69 @@ function Ct(n) {
     };
   throw new Error("Unknown segment type");
 }
-function rt(n) {
+function it(n) {
   return {
     type: "LOOP",
-    segments: n.segments.map(Ct)
+    segments: n.segments.map(Vt)
   };
 }
-function It(n) {
+function Et(n) {
   return {
     type: "FIGURE",
-    contour: rt(n.contour),
-    holes: n.holes.map(rt)
+    contour: it(n.contour),
+    holes: n.holes.map(it)
   };
 }
 function en(n) {
   return {
     type: "DIAGRAM",
-    figures: n.figures.map(It)
+    figures: n.figures.map(Et)
   };
 }
 function wt(n) {
-  if (n instanceof V)
+  if (n instanceof O)
     return en(n);
   if (n instanceof b)
-    return It(n);
-  if (n instanceof E)
-    return rt(n);
-  if (n instanceof m || n instanceof P)
-    return Ct(n);
+    return Et(n);
+  if (n instanceof F)
+    return it(n);
+  if (n instanceof g || n instanceof m)
+    return Vt(n);
   throw new Error("Unknown shape type");
 }
 export {
-  m as A,
+  g as A,
   q as B,
-  V as D,
+  O as D,
   b as F,
-  P as L,
+  m as L,
   A as S,
-  I as T,
+  V as T,
   M as a,
-  v as b,
-  sn as c,
-  k as d,
-  S as e,
-  E as f,
-  U as g,
-  Vt as h,
-  N as i,
-  R as j,
-  et as k,
-  wt as l,
-  B as p,
-  h as s,
-  rn as t
+  Z as b,
+  $ as c,
+  h as d,
+  rn as e,
+  on as f,
+  v as g,
+  y as h,
+  F as i,
+  U as j,
+  Ot as k,
+  N as l,
+  R as m,
+  st as n,
+  Q as o,
+  C as p,
+  z as q,
+  Tt as r,
+  k as s,
+  sn as t,
+  E as u,
+  St as v,
+  Ft as w,
+  ot as x,
+  j as y,
+  wt as z
 };
-//# sourceMappingURL=exportJSON-b3e1c256.js.map
+//# sourceMappingURL=exportJSON-c42ca4ac.js.map