@orbcharts/core 4.0.0 → 4.0.2

package/dist/orbcharts-core.es.js

@@ -1,14 +1,14 @@
-var _e = function(t, e) {
-  return _e = Object.setPrototypeOf || { __proto__: [] } instanceof Array && function(r, n) {
+var Te = function(t, e) {
+  return Te = Object.setPrototypeOf || { __proto__: [] } instanceof Array && function(r, n) {
     r.__proto__ = n;
   } || function(r, n) {
     for (var s in n) Object.prototype.hasOwnProperty.call(n, s) && (r[s] = n[s]);
-  }, _e(t, e);
+  }, Te(t, e);
 };
-function Z(t, e) {
+function Y(t, e) {
   if (typeof e != "function" && e !== null)
     throw new TypeError("Class extends value " + String(e) + " is not a constructor or null");
-  _e(t, e);
+  Te(t, e);
   function r() {
     this.constructor = t;
   }
@@ -101,7 +101,7 @@ function ze(t, e) {
     return { value: i[0] ? i[1] : void 0, done: !0 };
   }
 }
-function ce(t) {
+function ue(t) {
   var e = typeof Symbol == "function" && Symbol.iterator, r = e && t[e], n = 0;
   if (r) return r.call(t);
   if (t && typeof t.length == "number") return {
@@ -111,7 +111,7 @@ function ce(t) {
   };
   throw new TypeError(e ? "Object is not iterable." : "Symbol.iterator is not defined.");
 }
-function le(t, e) {
+function ce(t, e) {
   var r = typeof Symbol == "function" && t[Symbol.iterator];
   if (!r) return t;
   var n = r.call(t), s, o = [], u;
@@ -128,13 +128,13 @@ function le(t, e) {
   }
   return o;
 }
-function fe(t, e, r) {
+function le(t, e, r) {
   if (r || arguments.length === 2) for (var n = 0, s = e.length, o; n < s; n++)
     (o || !(n in e)) && (o || (o = Array.prototype.slice.call(e, 0, n)), o[n] = e[n]);
   return t.concat(o || Array.prototype.slice.call(e));
 }
-function ue(t) {
-  return this instanceof ue ? (this.v = t, this) : new ue(t);
+function ie(t) {
+  return this instanceof ie ? (this.v = t, this) : new ie(t);
 }
 function wt(t, e, r) {
   if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
@@ -148,21 +148,21 @@ function wt(t, e, r) {
     };
   }
   function a(y, A) {
-    n[y] && (s[y] = function(v) {
+    n[y] && (s[y] = function(m) {
       return new Promise(function(d, b) {
-        o.push([y, v, d, b]) > 1 || c(y, v);
+        o.push([y, m, d, b]) > 1 || c(y, m);
       });
     }, A && (s[y] = A(s[y])));
   }
   function c(y, A) {
     try {
       i(n[y](A));
-    } catch (v) {
-      S(o[0][3], v);
+    } catch (m) {
+      S(o[0][3], m);
     }
   }
   function i(y) {
-    y.value instanceof ue ? Promise.resolve(y.value.v).then(f, w) : S(o[0][2], y);
+    y.value instanceof ie ? Promise.resolve(y.value.v).then(f, w) : S(o[0][2], y);
   }
   function f(y) {
     c("next", y);
@@ -177,7 +177,7 @@ function wt(t, e, r) {
 function Et(t) {
   if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
   var e = t[Symbol.asyncIterator], r;
-  return e ? e.call(t) : (t = typeof ce == "function" ? ce(t) : t[Symbol.iterator](), r = {}, n("next"), n("throw"), n("return"), r[Symbol.asyncIterator] = function() {
+  return e ? e.call(t) : (t = typeof ue == "function" ? ue(t) : t[Symbol.iterator](), r = {}, n("next"), n("throw"), n("return"), r[Symbol.asyncIterator] = function() {
     return this;
   }, r);
   function n(o) {
@@ -196,13 +196,13 @@ function Et(t) {
 function V(t) {
   return typeof t == "function";
 }
-function Oe(t) {
+function Ge(t) {
   var e = function(n) {
     Error.call(n), n.stack = new Error().stack;
   }, r = t(e);
   return r.prototype = Object.create(Error.prototype), r.prototype.constructor = r, r;
 }
-var Ae = Oe(function(t) {
+var Se = Ge(function(t) {
   return function(r) {
     t(this), this.message = r ? r.length + ` errors occurred during unsubscription:
 ` + r.map(function(n, s) {
@@ -217,7 +217,7 @@ function Ee(t, e) {
     0 <= r && t.splice(r, 1);
   }
 }
-var ve = function() {
+var me = function() {
   function t(e) {
     this.initialTeardown = e, this.closed = !1, this._parentage = null, this._finalizers = null;
   }
@@ -229,12 +229,12 @@ var ve = function() {
       if (u)
         if (this._parentage = null, Array.isArray(u))
           try {
-            for (var a = ce(u), c = a.next(); !c.done; c = a.next()) {
+            for (var a = ue(u), c = a.next(); !c.done; c = a.next()) {
               var i = c.value;
               i.remove(this);
             }
-          } catch (v) {
-            e = { error: v };
+          } catch (m) {
+            e = { error: m };
           } finally {
             try {
               c && !c.done && (r = a.return) && r.call(a);
@@ -248,23 +248,23 @@ var ve = function() {
       if (V(f))
         try {
           f();
-        } catch (v) {
-          o = v instanceof Ae ? v.errors : [v];
+        } catch (m) {
+          o = m instanceof Se ? m.errors : [m];
         }
       var w = this._finalizers;
       if (w) {
         this._finalizers = null;
         try {
-          for (var S = ce(w), y = S.next(); !y.done; y = S.next()) {
+          for (var S = ue(w), y = S.next(); !y.done; y = S.next()) {
             var A = y.value;
             try {
               je(A);
-            } catch (v) {
-              o = o ?? [], v instanceof Ae ? o = fe(fe([], le(o)), le(v.errors)) : o.push(v);
+            } catch (m) {
+              o = o ?? [], m instanceof Se ? o = le(le([], ce(o)), ce(m.errors)) : o.push(m);
             }
           }
-        } catch (v) {
-          n = { error: v };
+        } catch (m) {
+          n = { error: m };
         } finally {
           try {
             y && !y.done && (s = S.return) && s.call(S);
@@ -274,7 +274,7 @@ var ve = function() {
         }
       }
       if (o)
-        throw new Ae(o);
+        throw new Se(o);
     }
   }, t.prototype.add = function(e) {
     var r;
@@ -305,9 +305,9 @@ var ve = function() {
     var e = new t();
     return e.closed = !0, e;
   }(), t;
-}(), Ge = ve.EMPTY;
-function qe(t) {
-  return t instanceof ve || t && "closed" in t && V(t.remove) && V(t.add) && V(t.unsubscribe);
+}(), qe = me.EMPTY;
+function We(t) {
+  return t instanceof me || t && "closed" in t && V(t.remove) && V(t.add) && V(t.unsubscribe);
 }
 function je(t) {
   V(t) ? t() : t.unsubscribe();
@@ -318,31 +318,31 @@ var xt = {
   setTimeout: function(t, e) {
     for (var r = [], n = 2; n < arguments.length; n++)
       r[n - 2] = arguments[n];
-    return setTimeout.apply(void 0, fe([t, e], le(r)));
+    return setTimeout.apply(void 0, le([t, e], ce(r)));
   },
   clearTimeout: function(t) {
     return clearTimeout(t);
   },
   delegate: void 0
 };
-function We(t) {
+function Ye(t) {
   At.setTimeout(function() {
     throw t;
   });
 }
-function Te() {
+function $e() {
 }
 function we(t) {
   t();
 }
-var Ie = function(t) {
-  Z(e, t);
+var Ce = function(t) {
+  Y(e, t);
   function e(r) {
     var n = t.call(this) || this;
-    return n.isStopped = !1, r ? (n.destination = r, qe(r) && r.add(n)) : n.destination = Tt, n;
+    return n.isStopped = !1, r ? (n.destination = r, We(r) && r.add(n)) : n.destination = Tt, n;
   }
   return e.create = function(r, n, s) {
-    return new ye(r, n, s);
+    return new pe(r, n, s);
   }, e.prototype.next = function(r) {
     this.isStopped || this._next(r);
   }, e.prototype.error = function(r) {
@@ -366,7 +366,7 @@ var Ie = function(t) {
       this.unsubscribe();
     }
   }, e;
-}(ve), St = function() {
+}(me), St = function() {
   function t(e) {
     this.partialObserver = e;
   }
@@ -397,8 +397,8 @@ var Ie = function(t) {
         be(r);
       }
   }, t;
-}(), ye = function(t) {
-  Z(e, t);
+}(), pe = function(t) {
+  Y(e, t);
   function e(r, n, s) {
     var o = t.call(this) || this, u;
     return V(r) || !r ? u = {
@@ -408,26 +408,26 @@ var Ie = function(t) {
     } : u = r, o.destination = new St(u), o;
   }
   return e;
-}(Ie);
+}(Ce);
 function be(t) {
-  We(t);
+  Ye(t);
 }
 function _t(t) {
   throw t;
 }
 var Tt = {
   closed: !0,
-  next: Te,
+  next: $e,
   error: _t,
-  complete: Te
-}, Ce = function() {
+  complete: $e
+}, Ie = function() {
   return typeof Symbol == "function" && Symbol.observable || "@@observable";
 }();
-function me(t) {
+function xe(t) {
   return t;
 }
 function $t(t) {
-  return t.length === 0 ? me : t.length === 1 ? t[0] : function(r) {
+  return t.length === 0 ? xe : t.length === 1 ? t[0] : function(r) {
     return t.reduce(function(n, s) {
       return s(n);
     }, r);
@@ -441,7 +441,7 @@ var R = function() {
     var r = new t();
     return r.source = this, r.operator = e, r;
   }, t.prototype.subscribe = function(e, r, n) {
-    var s = this, o = It(e) ? e : new ye(e, r, n);
+    var s = this, o = Ct(e) ? e : new pe(e, r, n);
     return we(function() {
       var u = s, a = u.operator, c = u.source;
       o.add(a ? a.call(o, c) : c ? s._subscribe(o) : s._trySubscribe(o));
@@ -455,7 +455,7 @@ var R = function() {
   }, t.prototype.forEach = function(e, r) {
     var n = this;
     return r = Me(r), new r(function(s, o) {
-      var u = new ye({
+      var u = new pe({
         next: function(a) {
           try {
             e(a);
@@ -471,7 +471,7 @@ var R = function() {
   }, t.prototype._subscribe = function(e) {
     var r;
     return (r = this.source) === null || r === void 0 ? void 0 : r.subscribe(e);
-  }, t.prototype[Ce] = function() {
+  }, t.prototype[Ie] = function() {
     return this;
   }, t.prototype.pipe = function() {
     for (var e = [], r = 0; r < arguments.length; r++)
@@ -500,15 +500,15 @@ function Me(t) {
 function Ot(t) {
   return t && V(t.next) && V(t.error) && V(t.complete);
 }
-function It(t) {
-  return t && t instanceof Ie || Ot(t) && qe(t);
-}
 function Ct(t) {
+  return t && t instanceof Ce || Ot(t) && We(t);
+}
+function It(t) {
   return V(t == null ? void 0 : t.lift);
 }
-function z(t) {
+function Z(t) {
   return function(e) {
-    if (Ct(e))
+    if (It(e))
       return e.lift(function(r) {
         try {
           return t(r, this);
@@ -519,11 +519,11 @@ function z(t) {
     throw new TypeError("Unable to lift unknown Observable type");
   };
 }
-function U(t, e, r, n, s) {
+function W(t, e, r, n, s) {
   return new Bt(t, e, r, n, s);
 }
 var Bt = function(t) {
-  Z(e, t);
+  Y(e, t);
   function e(r, n, s, o, u, a) {
     var c = t.call(this, r) || this;
     return c.onFinalize = u, c.shouldUnsubscribe = a, c._next = n ? function(i) {
@@ -557,12 +557,12 @@ var Bt = function(t) {
       t.prototype.unsubscribe.call(this), !n && ((r = this.onFinalize) === null || r === void 0 || r.call(this));
     }
   }, e;
-}(Ie), Pt = Oe(function(t) {
+}(Ce), Pt = Ge(function(t) {
   return function() {
     t(this), this.name = "ObjectUnsubscribedError", this.message = "object unsubscribed";
   };
 }), oe = function(t) {
-  Z(e, t);
+  Y(e, t);
   function e() {
     var r = t.call(this) || this;
     return r.closed = !1, r.currentObservers = null, r.observers = [], r.isStopped = !1, r.hasError = !1, r.thrownError = null, r;
@@ -580,7 +580,7 @@ var Bt = function(t) {
       if (n._throwIfClosed(), !n.isStopped) {
         n.currentObservers || (n.currentObservers = Array.from(n.observers));
         try {
-          for (var u = ce(n.currentObservers), a = u.next(); !a.done; a = u.next()) {
+          for (var u = ue(n.currentObservers), a = u.next(); !a.done; a = u.next()) {
             var c = a.value;
             c.next(r);
           }
@@ -628,7 +628,7 @@ var Bt = function(t) {
     return this._throwIfClosed(), this._checkFinalizedStatuses(r), this._innerSubscribe(r);
   }, e.prototype._innerSubscribe = function(r) {
     var n = this, s = this, o = s.hasError, u = s.isStopped, a = s.observers;
-    return o || u ? Ge : (this.currentObservers = null, a.push(r), new ve(function() {
+    return o || u ? qe : (this.currentObservers = null, a.push(r), new me(function() {
       n.currentObservers = null, Ee(a, r);
     }));
   }, e.prototype._checkFinalizedStatuses = function(r) {
@@ -641,7 +641,7 @@ var Bt = function(t) {
     return new Le(r, n);
   }, e;
 }(R), Le = function(t) {
-  Z(e, t);
+  Y(e, t);
   function e(r, n) {
     var s = t.call(this) || this;
     return s.destination = r, s.source = n, s;
@@ -657,10 +657,10 @@ var Bt = function(t) {
     (n = (r = this.destination) === null || r === void 0 ? void 0 : r.complete) === null || n === void 0 || n.call(r);
   }, e.prototype._subscribe = function(r) {
     var n, s;
-    return (s = (n = this.source) === null || n === void 0 ? void 0 : n.subscribe(r)) !== null && s !== void 0 ? s : Ge;
+    return (s = (n = this.source) === null || n === void 0 ? void 0 : n.subscribe(r)) !== null && s !== void 0 ? s : qe;
   }, e;
 }(oe), N = function(t) {
-  Z(e, t);
+  Y(e, t);
   function e(r) {
     var n = t.call(this) || this;
     return n._value = r, n;
@@ -688,7 +688,7 @@ var Bt = function(t) {
   },
   delegate: void 0
 }, kt = function(t) {
-  Z(e, t);
+  Y(e, t);
   function e(r, n, s) {
     r === void 0 && (r = 1 / 0), n === void 0 && (n = 1 / 0), s === void 0 && (s = Be);
     var o = t.call(this) || this;
@@ -711,25 +711,25 @@ var Bt = function(t) {
     }
   }, e;
 }(oe), jt = function(t) {
-  Z(e, t);
+  Y(e, t);
   function e(r, n) {
     return t.call(this) || this;
   }
   return e.prototype.schedule = function(r, n) {
     return this;
   }, e;
-}(ve), Ve = {
+}(me), Ve = {
   setInterval: function(t, e) {
     for (var r = [], n = 2; n < arguments.length; n++)
       r[n - 2] = arguments[n];
-    return setInterval.apply(void 0, fe([t, e], le(r)));
+    return setInterval.apply(void 0, le([t, e], ce(r)));
   },
   clearInterval: function(t) {
     return clearInterval(t);
   },
   delegate: void 0
 }, Mt = function(t) {
-  Z(e, t);
+  Y(e, t);
   function e(r, n) {
     var s = t.call(this, r, n) || this;
     return s.scheduler = r, s.work = n, s.pending = !1, s;
@@ -778,7 +778,7 @@ var Bt = function(t) {
     return r === void 0 && (r = 0), new this.schedulerActionCtor(this, e).schedule(n, r);
   }, t.now = Be.now, t;
 }(), Lt = function(t) {
-  Z(e, t);
+  Y(e, t);
   function e(r, n) {
     n === void 0 && (n = Ke.now);
     var s = t.call(this, r, n) || this;
@@ -802,44 +802,44 @@ var Bt = function(t) {
       throw s;
     }
   }, e;
-}(Ke), Vt = new Lt(Mt), ae = new R(function(t) {
+}(Ke), Vt = new Lt(Mt), fe = new R(function(t) {
   return t.complete();
 });
 function Kt(t) {
   return t && V(t.schedule);
 }
-function Ye(t) {
+function Ze(t) {
   return t[t.length - 1];
 }
 function Rt(t) {
-  return V(Ye(t)) ? t.pop() : void 0;
+  return V(Ze(t)) ? t.pop() : void 0;
 }
-function Ze(t) {
-  return Kt(Ye(t)) ? t.pop() : void 0;
+function Je(t) {
+  return Kt(Ze(t)) ? t.pop() : void 0;
 }
-var Je = function(t) {
+var He = function(t) {
   return t && typeof t.length == "number" && typeof t != "function";
 };
-function He(t) {
-  return V(t == null ? void 0 : t.then);
-}
 function Qe(t) {
-  return V(t[Ce]);
+  return V(t == null ? void 0 : t.then);
 }
 function Xe(t) {
-  return Symbol.asyncIterator && V(t == null ? void 0 : t[Symbol.asyncIterator]);
+  return V(t[Ie]);
 }
 function et(t) {
+  return Symbol.asyncIterator && V(t == null ? void 0 : t[Symbol.asyncIterator]);
+}
+function tt(t) {
   return new TypeError("You provided " + (t !== null && typeof t == "object" ? "an invalid object" : "'" + t + "'") + " where a stream was expected. You can provide an Observable, Promise, ReadableStream, Array, AsyncIterable, or Iterable.");
 }
 function Ft() {
   return typeof Symbol != "function" || !Symbol.iterator ? "@@iterator" : Symbol.iterator;
 }
-var tt = Ft();
-function rt(t) {
-  return V(t == null ? void 0 : t[tt]);
-}
+var rt = Ft();
 function nt(t) {
+  return V(t == null ? void 0 : t[rt]);
+}
+function st(t) {
   return wt(this, arguments, function() {
     var r, n, s, o;
     return ze(this, function(u) {
@@ -849,13 +849,13 @@ function nt(t) {
         case 1:
           u.trys.push([1, , 9, 10]), u.label = 2;
         case 2:
-          return [4, ue(r.read())];
+          return [4, ie(r.read())];
         case 3:
-          return n = u.sent(), s = n.value, o = n.done, o ? [4, ue(void 0)] : [3, 5];
+          return n = u.sent(), s = n.value, o = n.done, o ? [4, ie(void 0)] : [3, 5];
         case 4:
           return [2, u.sent()];
         case 5:
-          return [4, ue(s)];
+          return [4, ie(s)];
         case 6:
           return [4, u.sent()];
         case 7:
@@ -870,31 +870,31 @@ function nt(t) {
     });
   });
 }
-function st(t) {
+function ot(t) {
   return V(t == null ? void 0 : t.getReader);
 }
 function te(t) {
   if (t instanceof R)
     return t;
   if (t != null) {
-    if (Qe(t))
+    if (Xe(t))
       return Dt(t);
-    if (Je(t))
-      return Nt(t);
     if (He(t))
+      return Nt(t);
+    if (Qe(t))
       return Ut(t);
-    if (Xe(t))
-      return ot(t);
-    if (rt(t))
+    if (et(t))
+      return at(t);
+    if (nt(t))
       return zt(t);
-    if (st(t))
+    if (ot(t))
       return Gt(t);
   }
-  throw et(t);
+  throw tt(t);
 }
 function Dt(t) {
   return new R(function(e) {
-    var r = t[Ce]();
+    var r = t[Ie]();
     if (V(r.subscribe))
       return r.subscribe(e);
     throw new TypeError("Provided object does not correctly implement Symbol.observable");
@@ -913,14 +913,14 @@ function Ut(t) {
       e.closed || (e.next(r), e.complete());
     }, function(r) {
       return e.error(r);
-    }).then(null, We);
+    }).then(null, Ye);
   });
 }
 function zt(t) {
   return new R(function(e) {
     var r, n;
     try {
-      for (var s = ce(t), o = s.next(); !o.done; o = s.next()) {
+      for (var s = ue(t), o = s.next(); !o.done; o = s.next()) {
         var u = o.value;
         if (e.next(u), e.closed)
           return;
@@ -937,7 +937,7 @@ function zt(t) {
     e.complete();
   });
 }
-function ot(t) {
+function at(t) {
   return new R(function(e) {
     qt(t, e).catch(function(r) {
       return e.error(r);
@@ -945,7 +945,7 @@ function ot(t) {
   });
 }
 function Gt(t) {
-  return ot(nt(t));
+  return at(st(t));
 }
 function qt(t, e) {
   var r, n, s, o;
@@ -993,9 +993,9 @@ function se(t, e, r, n, s) {
   if (t.add(o), !s)
     return o;
 }
-function at(t, e) {
-  return e === void 0 && (e = 0), z(function(r, n) {
-    r.subscribe(U(n, function(s) {
+function it(t, e) {
+  return e === void 0 && (e = 0), Z(function(r, n) {
+    r.subscribe(W(n, function(s) {
       return se(n, t, function() {
         return n.next(s);
       }, e);
@@ -1010,18 +1010,18 @@ function at(t, e) {
     }));
   });
 }
-function it(t, e) {
-  return e === void 0 && (e = 0), z(function(r, n) {
+function ut(t, e) {
+  return e === void 0 && (e = 0), Z(function(r, n) {
     n.add(t.schedule(function() {
       return r.subscribe(n);
     }, e));
   });
 }
 function Wt(t, e) {
-  return te(t).pipe(it(e), at(e));
+  return te(t).pipe(ut(e), it(e));
 }
 function Yt(t, e) {
-  return te(t).pipe(it(e), at(e));
+  return te(t).pipe(ut(e), it(e));
 }
 function Zt(t, e) {
   return new R(function(r) {
@@ -1035,7 +1035,7 @@ function Jt(t, e) {
   return new R(function(r) {
     var n;
     return se(r, e, function() {
-      n = t[tt](), se(r, e, function() {
+      n = t[rt](), se(r, e, function() {
         var s, o, u;
         try {
           s = n.next(), o = s.value, u = s.done;
@@ -1050,7 +1050,7 @@ function Jt(t, e) {
     };
   });
 }
-function ut(t, e) {
+function ct(t, e) {
   if (!t)
     throw new Error("Iterable cannot be null");
   return new R(function(r) {
@@ -1065,24 +1065,24 @@ function ut(t, e) {
   });
 }
 function Ht(t, e) {
-  return ut(nt(t), e);
+  return ct(st(t), e);
 }
 function Qt(t, e) {
   if (t != null) {
-    if (Qe(t))
+    if (Xe(t))
       return Wt(t, e);
-    if (Je(t))
-      return Zt(t, e);
     if (He(t))
+      return Zt(t, e);
+    if (Qe(t))
       return Yt(t, e);
-    if (Xe(t))
-      return ut(t, e);
-    if (rt(t))
+    if (et(t))
+      return ct(t, e);
+    if (nt(t))
       return Jt(t, e);
-    if (st(t))
+    if (ot(t))
       return Ht(t, e);
   }
-  throw et(t);
+  throw tt(t);
 }
 function Pe(t, e) {
   return e ? Qt(t, e) : te(t);
@@ -1090,28 +1090,23 @@ function Pe(t, e) {
 function Xt() {
   for (var t = [], e = 0; e < arguments.length; e++)
     t[e] = arguments[e];
-  var r = Ze(t);
+  var r = Je(t);
   return Pe(t, r);
 }
-var ct = Oe(function(t) {
-  return function() {
-    t(this), this.name = "EmptyError", this.message = "no elements in sequence";
-  };
-});
-function q(t, e) {
-  return z(function(r, n) {
+function z(t, e) {
+  return Z(function(r, n) {
     var s = 0;
-    r.subscribe(U(n, function(o) {
+    r.subscribe(W(n, function(o) {
       n.next(t.call(e, o, s++));
     }));
   });
 }
 var er = Array.isArray;
 function tr(t, e) {
-  return er(e) ? t.apply(void 0, fe([], le(e))) : t(e);
+  return er(e) ? t.apply(void 0, le([], ce(e))) : t(e);
 }
 function rr(t) {
-  return q(function(e) {
+  return z(function(e) {
     return tr(t, e);
   });
 }
@@ -1144,21 +1139,21 @@ function cr(t, e) {
 function H() {
   for (var t = [], e = 0; e < arguments.length; e++)
     t[e] = arguments[e];
-  var r = Ze(t), n = Rt(t), s = ir(t), o = s.args, u = s.keys;
+  var r = Je(t), n = Rt(t), s = ir(t), o = s.args, u = s.keys;
   if (o.length === 0)
     return Pe([], r);
   var a = new R(lr(o, r, u ? function(c) {
     return cr(u, c);
-  } : me));
+  } : xe));
   return n ? a.pipe(rr(n)) : a;
 }
 function lr(t, e, r) {
-  return r === void 0 && (r = me), function(n) {
+  return r === void 0 && (r = xe), function(n) {
     Re(e, function() {
       for (var s = t.length, o = new Array(s), u = s, a = s, c = function(f) {
         Re(e, function() {
           var w = Pe(t[f], e), S = !1;
-          w.subscribe(U(n, function(y) {
+          w.subscribe(W(n, function(y) {
             o[f] = y, S || (S = !0, a--), a || n.next(r(o.slice()));
           }, function() {
             --u || n.complete();
@@ -1182,24 +1177,24 @@ function hr(t, e, r) {
     return t() ? e : r;
   });
 }
-function pe(t, e) {
-  return z(function(r, n) {
+function de(t, e) {
+  return Z(function(r, n) {
     var s = 0;
-    r.subscribe(U(n, function(o) {
+    r.subscribe(W(n, function(o) {
       return t.call(e, o, s++) && n.next(o);
     }));
   });
 }
-function ie(t) {
-  return z(function(e, r) {
+function ae(t) {
+  return Z(function(e, r) {
     var n = null, s = !1, o;
-    n = e.subscribe(U(r, void 0, void 0, function(u) {
-      o = te(t(u, ie(t)(e))), n ? (n.unsubscribe(), n = null, o.subscribe(r)) : s = !0;
+    n = e.subscribe(W(r, void 0, void 0, function(u) {
+      o = te(t(u, ae(t)(e))), n ? (n.unsubscribe(), n = null, o.subscribe(r)) : s = !0;
     })), s && (n.unsubscribe(), n = null, o.subscribe(r));
   });
 }
-function W(t, e) {
-  return e === void 0 && (e = Vt), z(function(r, n) {
+function G(t, e) {
+  return e === void 0 && (e = Vt), Z(function(r, n) {
     var s = null, o = null, u = null, a = function() {
       if (s) {
         s.unsubscribe(), s = null;
@@ -1215,7 +1210,7 @@ function W(t, e) {
       }
       a();
     }
-    r.subscribe(U(n, function(i) {
+    r.subscribe(W(n, function(i) {
       o = i, u = e.now(), s || (s = e.schedule(c, t), n.add(s));
     }, function() {
       a(), n.complete();
@@ -1224,93 +1219,52 @@ function W(t, e) {
     }));
   });
 }
-function yr(t) {
-  return z(function(e, r) {
-    var n = !1;
-    e.subscribe(U(r, function(s) {
-      n = !0, r.next(s);
-    }, function() {
-      n || r.next(t), r.complete();
-    }));
-  });
-}
-function pr(t) {
-  return t <= 0 ? function() {
-    return ae;
-  } : z(function(e, r) {
-    var n = 0;
-    e.subscribe(U(r, function(s) {
-      ++n <= t && (r.next(s), t <= n && r.complete());
-    }));
-  });
-}
-function dr(t, e) {
-  return e === void 0 && (e = me), t = t ?? vr, z(function(r, n) {
+function yr(t, e) {
+  return e === void 0 && (e = xe), t = t ?? pr, Z(function(r, n) {
     var s, o = !0;
-    r.subscribe(U(n, function(u) {
+    r.subscribe(W(n, function(u) {
       var a = e(u);
       (o || !t(s, a)) && (o = !1, s = a, n.next(u));
     }));
   });
 }
-function vr(t, e) {
+function pr(t, e) {
   return t === e;
 }
-function mr(t) {
-  return t === void 0 && (t = gr), z(function(e, r) {
-    var n = !1;
-    e.subscribe(U(r, function(s) {
-      n = !0, r.next(s);
-    }, function() {
-      return n ? r.complete() : r.error(t());
-    }));
-  });
-}
-function gr() {
-  return new ct();
-}
-function br(t, e) {
-  var r = arguments.length >= 2;
-  return function(n) {
-    return n.pipe(me, pr(1), r ? yr(e) : mr(function() {
-      return new ct();
-    }));
-  };
-}
 function lt(t) {
   t === void 0 && (t = {});
   var e = t.connector, r = e === void 0 ? function() {
     return new oe();
   } : e, n = t.resetOnError, s = n === void 0 ? !0 : n, o = t.resetOnComplete, u = o === void 0 ? !0 : o, a = t.resetOnRefCountZero, c = a === void 0 ? !0 : a;
   return function(i) {
-    var f, w, S, y = 0, A = !1, v = !1, d = function() {
+    var f, w, S, y = 0, A = !1, m = !1, d = function() {
       w == null || w.unsubscribe(), w = void 0;
     }, b = function() {
-      d(), f = S = void 0, A = v = !1;
+      d(), f = S = void 0, A = m = !1;
     }, O = function() {
-      var I = f;
-      b(), I == null || I.unsubscribe();
+      var C = f;
+      b(), C == null || C.unsubscribe();
     };
-    return z(function(I, h) {
-      y++, !v && !A && d();
+    return Z(function(C, h) {
+      y++, !m && !A && d();
       var p = S = S ?? r();
       h.add(function() {
-        y--, y === 0 && !v && !A && (w = Se(O, c));
-      }), p.subscribe(h), !f && y > 0 && (f = new ye({
+        y--, y === 0 && !m && !A && (w = _e(O, c));
+      }), p.subscribe(h), !f && y > 0 && (f = new pe({
         next: function(E) {
           return p.next(E);
         },
         error: function(E) {
-          v = !0, d(), w = Se(b, s, E), p.error(E);
+          m = !0, d(), w = _e(b, s, E), p.error(E);
         },
         complete: function() {
-          A = !0, d(), w = Se(b, u), p.complete();
+          A = !0, d(), w = _e(b, u), p.complete();
         }
-      }), te(I).subscribe(f));
+      }), te(C).subscribe(f));
     })(i);
   };
 }
-function Se(t, e) {
+function _e(t, e) {
   for (var r = [], n = 2; n < arguments.length; n++)
     r[n - 2] = arguments[n];
   if (e === !0) {
@@ -1318,12 +1272,12 @@ function Se(t, e) {
     return;
   }
   if (e !== !1) {
-    var s = new ye({
+    var s = new pe({
       next: function() {
         s.unsubscribe(), t();
       }
     });
-    return te(e.apply(void 0, fe([], le(r)))).subscribe(s);
+    return te(e.apply(void 0, le([], ce(r)))).subscribe(s);
   }
 }
 function ne(t, e, r) {
@@ -1337,15 +1291,15 @@ function ne(t, e, r) {
     resetOnRefCountZero: s
   });
 }
-function wr(t, e) {
-  return z(function(r, n) {
+function dr(t, e) {
+  return Z(function(r, n) {
     var s = null, o = 0, u = !1, a = function() {
       return u && !s && n.complete();
     };
-    r.subscribe(U(n, function(c) {
+    r.subscribe(W(n, function(c) {
       s == null || s.unsubscribe();
       var i = 0, f = o++;
-      te(t(c, f)).subscribe(s = U(n, function(w) {
+      te(t(c, f)).subscribe(s = W(n, function(w) {
         return n.next(e ? e(c, w, f, i++) : w);
       }, function() {
         s = null, a();
@@ -1355,63 +1309,63 @@ function wr(t, e) {
     }));
   });
 }
-function Er(t) {
-  return z(function(e, r) {
-    te(t).subscribe(U(r, function() {
+function he(t) {
+  return Z(function(e, r) {
+    te(t).subscribe(W(r, function() {
       return r.complete();
-    }, Te)), !r.closed && e.subscribe(r);
+    }, $e)), !r.closed && e.subscribe(r);
   });
 }
-function xr(t) {
+function vr(t) {
   const e = t.filter((r) => r !== null && !isNaN(r));
   return e.length === 0 ? null : e.reduce((r, n) => r + n, 0);
 }
-function Ar(t) {
+function mr(t) {
   const e = t.filter((n) => n !== null && !isNaN(n));
   return e.length === 0 ? null : e.reduce((n, s) => n + s, 0) / e.length;
 }
-function Sr(t) {
+function gr(t) {
   const e = t.filter((s) => s !== null && !isNaN(s));
   if (e.length === 0) return null;
   const r = [...e].sort((s, o) => s - o), n = Math.floor(r.length / 2);
   return r.length % 2 === 0 ? (r[n - 1] + r[n]) / 2 : r[n];
 }
-function _r(t) {
+function br(t) {
   const e = t.filter((r) => r !== null && !isNaN(r));
   return e.length === 0 ? null : Math.min(...e);
 }
-function Tr(t) {
+function wr(t) {
   const e = t.filter((r) => r !== null && !isNaN(r));
   return e.length === 0 ? null : Math.max(...e);
 }
-function $r(t) {
+function Er(t) {
   return t.filter((e) => e !== null && !isNaN(e)).length;
 }
-function Or(t) {
+function xr(t) {
   const e = t.filter((r) => r !== null && !isNaN(r));
   return e.length > 0 ? e[0] : null;
 }
-function de(t, e) {
+function ve(t, e) {
   switch (e) {
     case "sum":
-      return xr(t);
+      return vr(t);
     case "mean":
-      return Ar(t);
+      return mr(t);
     case "median":
-      return Sr(t);
+      return gr(t);
     case "min":
-      return _r(t);
+      return br(t);
     case "max":
-      return Tr(t);
+      return wr(t);
     case "count":
-      return $r(t);
+      return Er(t);
     case "none":
-      return Or(t);
+      return xr(t);
     default:
       throw new Error(`Unknown aggregate type: ${e}`);
   }
 }
-function Ir(t, e) {
+function Ar(t, e) {
   let r;
   e.colorScheme === "auto" ? r = "light" : r = e.colorScheme;
   const n = e.colors[r].data, s = t % n.length;
@@ -1435,18 +1389,18 @@ function D(t, e, r) {
     default:
       n = 0;
   }
-  return Ir(n, r);
+  return Ar(n, r);
 }
 function ee(t) {
   return Object.prototype.toString.call(t) === "[object Object]";
 }
-function Cr(t) {
+function Sr(t) {
   return Object.prototype.toString.call(t) === "[object Function]";
 }
 function ft(t) {
   return !!(t && t.nodeType);
 }
-function Y(t, e) {
+function q(t, e) {
   if (ee(e) === !1 || ee(t) === !1)
     return Object.assign({}, t);
   const r = (n, s) => {
@@ -1461,7 +1415,7 @@ function Y(t, e) {
   };
   return r(t, e);
 }
-function Zr(t = 0) {
+function Ur(t = 0) {
   try {
     let e = t.toString().split(".");
     return e[0] = e[0].replace(/\B(?=(\d{3})+(?!\d))/g, ","), e.join(".");
@@ -1469,15 +1423,15 @@ function Zr(t = 0) {
     console.error(e);
   }
 }
-function Br(t) {
+function _r(t) {
   const e = document.createElementNS("http://www.w3.org/2000/svg", "svg");
   return e.setAttribute("xmlns:xlink", "http://www.w3.org/1999/xlink"), e.setAttribute("xmls", "http://www.w3.org/2000/svg"), e.setAttribute("version", "1.1"), e.style.position = "absolute", t && e.classList.add(t), e;
 }
-function Jr(t) {
+function zr(t) {
   const e = document.createElement("canvas");
   return e.style.position = "absolute", t && e.classList.add(t), e;
 }
-function Pr(t) {
+function Tr(t) {
   const e = document.createElementNS("http://www.w3.org/2000/svg", "g");
   return t && e.classList.add(t), e;
 }
@@ -1485,11 +1439,11 @@ function ht(t) {
   const e = document.createElement("canvas");
   return t && e.classList.add(t), e;
 }
-function Hr(t) {
+function Gr(t) {
   const e = document.createElement("div");
   return t && e.classList.add(t), e;
 }
-function kr(t) {
+function $r(t) {
   if (ft(t))
     for (; t.firstChild; )
       t.removeChild(t.firstChild);
@@ -1500,10 +1454,10 @@ function $(t, e, r = "") {
 function yt(t) {
   return `[OrbCharts ${t}]:`;
 }
-function G(t) {
+function U(t) {
   return `${yt("error")} ${t.message}`;
 }
-function he({ from: t, systemMessage: e }) {
+function ye({ from: t, systemMessage: e }) {
   return `unexpected error from '${t}':
 ${e}`;
 }
@@ -1517,7 +1471,7 @@ function X({ columnName: t, expectToBe: e, from: r }) {
   
 ----> find in '${r}'`;
 }
-function jr(t) {
+function Or(t) {
   return new R((e) => {
     const r = new ResizeObserver((n) => {
       const s = n[0];
@@ -1528,13 +1482,13 @@ function jr(t) {
     };
   });
 }
-function Mr(t) {
+function Cr(t) {
   return `orbcharts-${t}`;
 }
-function Lr(t, e) {
-  return `${Mr(t)}-${e}`;
+function Ir(t, e) {
+  return `${Cr(t)}-${e}`;
 }
-function Vr(t, e) {
+function Br(t, e) {
   const r = {
     string: (o) => typeof o == "string",
     number: (o) => typeof o == "number",
@@ -1544,7 +1498,7 @@ function Vr(t, e) {
     "object[]": (o) => Array.isArray(o) && o.every((u) => ee(u)),
     "string[]": (o) => Array.isArray(o) && o.every((u) => typeof u == "string"),
     "number[]": (o) => Array.isArray(o) && o.every((u) => typeof u == "number"),
-    Function: (o) => Cr(o),
+    Function: (o) => Sr(o),
     null: (o) => o === null,
     undefined: (o) => o === void 0
   }, n = {
@@ -1572,7 +1526,7 @@ function Vr(t, e) {
   });
 }
 function K(t, e) {
-  const r = Vr(t, e);
+  const r = Br(t, e);
   if (r) {
     const n = e[r], s = n.toBeTypes ? n.toBeTypes.join(" | ") : n.toBe ? n.toBe : n.toBeOption ? n.toBeOption : "";
     return {
@@ -1724,7 +1678,7 @@ const Fe = {
     }
   },
   fontSize: "0.875rem"
-}, Kr = (t, e, r) => {
+}, Pr = (t, e, r) => {
   const n = /* @__PURE__ */ new Map(), s = Array.isArray(t[0]);
   s ? t.forEach((a, c) => {
     a.forEach((i) => {
@@ -1753,83 +1707,83 @@ const Fe = {
   const u = [];
   return o.forEach((a, c) => {
     const i = n.get(a), f = /* @__PURE__ */ new Map();
-    i.forEach((v) => {
-      const d = $(v, e.series, "");
-      f.has(d) || f.set(d, []), f.get(d).push(v);
+    i.forEach((m) => {
+      const d = $(m, e.series, "");
+      f.has(d) || f.set(d, []), f.get(d).push(m);
     });
     let w = Array.from(f.keys());
     if (Array.isArray(e.series.sort))
-      w = e.series.sort.filter((v) => f.has(v)).concat(w.filter((v) => !e.series.sort.includes(v)));
+      w = e.series.sort.filter((m) => f.has(m)).concat(w.filter((m) => !e.series.sort.includes(m)));
     else if (e.series.sort === "original") {
-      const v = [];
+      const m = [];
       i.forEach((d) => {
         const b = $(d, e.series, "");
-        v.includes(b) || v.push(b);
-      }), w = v;
-    } else e.series.sort === "alphabetical" && w.sort((v, d) => v.localeCompare(d, void 0, { numeric: !0 }));
+        m.includes(b) || m.push(b);
+      }), w = m;
+    } else e.series.sort === "alphabetical" && w.sort((m, d) => m.localeCompare(d, void 0, { numeric: !0 }));
     const S = [];
     if (e.category.sort === "original")
-      i.forEach((v) => {
-        const d = $(v, e.category, "");
+      i.forEach((m) => {
+        const d = $(m, e.category, "");
         S.includes(d) || S.push(d);
       });
     else if (e.category.sort === "alphabetical") {
-      const v = /* @__PURE__ */ new Set();
+      const m = /* @__PURE__ */ new Set();
       i.forEach((d) => {
-        v.add($(d, e.category, ""));
-      }), S.push(...Array.from(v).sort((d, b) => d.localeCompare(b, void 0, { numeric: !0 })));
+        m.add($(d, e.category, ""));
+      }), S.push(...Array.from(m).sort((d, b) => d.localeCompare(b, void 0, { numeric: !0 })));
     } else if (Array.isArray(e.category.sort)) {
-      const v = [];
+      const m = [];
       i.forEach((b) => {
         const O = $(b, e.category, "");
-        v.includes(O) || v.push(O);
+        m.includes(O) || m.push(O);
       });
       const d = e.category.sort;
       S.push(
-        ...d.filter((b) => v.includes(b)),
-        ...v.filter((b) => !d.includes(b))
+        ...d.filter((b) => m.includes(b)),
+        ...m.filter((b) => !d.includes(b))
       );
     }
     const y = /* @__PURE__ */ new Map();
-    S.forEach((v, d) => {
-      y.set(v, d);
+    S.forEach((m, d) => {
+      y.set(m, d);
     });
     const A = [];
-    w.forEach((v, d) => {
-      const b = f.get(v), O = /* @__PURE__ */ new Map();
+    w.forEach((m, d) => {
+      const b = f.get(m), O = /* @__PURE__ */ new Map();
       b.forEach((p) => {
         const E = $(p, e.category, "");
         O.has(E) || O.set(E, []), O.get(E).push(p);
       });
-      const I = S.filter((p) => O.has(p)), h = [];
+      const C = S.filter((p) => O.has(p)), h = [];
       e.category.sort === "original" && e.value.aggregate === "none" ? (b.forEach((p, E) => {
-        const k = $(p, e.category, ""), C = y.get(k), l = p[e.value.from];
+        const k = $(p, e.category, ""), I = y.get(k), l = p[e.value.from];
         h.push({
-          id: p.id || `${a}-${v}-${k}-${E}`,
-          index: C,
+          id: p.id || `${a}-${m}-${k}-${E}`,
+          index: I,
           // Series 模式下 index 對應 categoryIndex
           modelType: "series",
           name: p.name || "",
           data: p.data,
           value: typeof l == "number" ? l : null,
           color: D(e.color.by, {
-            index: C,
+            index: I,
             seriesIndex: d,
-            categoryIndex: C,
+            categoryIndex: I,
             datasetIndex: c
           }, r),
-          series: v,
+          series: m,
           seriesIndex: d,
           category: k,
-          categoryIndex: C
+          categoryIndex: I
         });
-      }), e.value.sort === "asc" ? h.sort((p, E) => p.value === null && E.value === null ? 0 : p.value === null ? 1 : E.value === null ? -1 : p.value - E.value) : e.value.sort === "desc" && h.sort((p, E) => p.value === null && E.value === null ? 0 : p.value === null ? 1 : E.value === null ? -1 : E.value - p.value)) : I.forEach((p) => {
+      }), e.value.sort === "asc" ? h.sort((p, E) => p.value === null && E.value === null ? 0 : p.value === null ? 1 : E.value === null ? -1 : p.value - E.value) : e.value.sort === "desc" && h.sort((p, E) => p.value === null && E.value === null ? 0 : p.value === null ? 1 : E.value === null ? -1 : E.value - p.value)) : C.forEach((p) => {
         const E = y.get(p), k = O.get(p);
         if (e.value.aggregate === "none") {
-          let C = k.map((l, m) => {
+          let I = k.map((l, g) => {
             const T = l[e.value.from];
             return {
-              id: l.id || `${a}-${v}-${p}-${m}`,
+              id: l.id || `${a}-${m}-${p}-${g}`,
               index: E,
               // Series 模式下 index 對應 categoryIndex
               modelType: "series",
@@ -1842,26 +1796,26 @@ const Fe = {
                 categoryIndex: E,
                 datasetIndex: c
               }, r),
-              series: v,
+              series: m,
               seriesIndex: d,
               category: p,
               categoryIndex: E
             };
           });
-          e.value.sort === "asc" ? C.sort((l, m) => l.value === null && m.value === null ? 0 : l.value === null ? 1 : m.value === null ? -1 : l.value - m.value) : e.value.sort === "desc" && C.sort((l, m) => l.value === null && m.value === null ? 0 : l.value === null ? 1 : m.value === null ? -1 : m.value - l.value), h.push(...C);
+          e.value.sort === "asc" ? I.sort((l, g) => l.value === null && g.value === null ? 0 : l.value === null ? 1 : g.value === null ? -1 : l.value - g.value) : e.value.sort === "desc" && I.sort((l, g) => l.value === null && g.value === null ? 0 : l.value === null ? 1 : g.value === null ? -1 : g.value - l.value), h.push(...I);
         } else {
-          const C = k.map((B) => {
+          const I = k.map((B) => {
             if (e.value.aggregate === "count")
               return 1;
-            const g = B[e.value.from];
-            return typeof g == "number" ? g : null;
-          }), l = de(C, e.value.aggregate), m = k[0], T = {
-            id: m.id || `${a}-${v}-${p}-aggregated`,
+            const v = B[e.value.from];
+            return typeof v == "number" ? v : null;
+          }), l = ve(I, e.value.aggregate), g = k[0], T = {
+            id: g.id || `${a}-${m}-${p}-aggregated`,
             index: E,
             // Series 模式下 index 對應 categoryIndex
             modelType: "series",
-            name: m.name || p,
-            data: m.data,
+            name: g.name || p,
+            data: g.data,
             value: l,
             color: D(e.color.by, {
               index: E,
@@ -1869,7 +1823,7 @@ const Fe = {
               categoryIndex: E,
               datasetIndex: c
             }, r),
-            series: v,
+            series: m,
             seriesIndex: d,
             category: p,
             categoryIndex: E
@@ -1879,7 +1833,7 @@ const Fe = {
       }), A.push(h);
     }), u.push(A);
   }), u;
-}, Rr = (t, e, r) => {
+}, kr = (t, e, r) => {
   const n = /* @__PURE__ */ new Map(), s = Array.isArray(t[0]);
   s ? t.forEach((a, c) => {
     a.forEach((i) => {
@@ -1930,16 +1884,16 @@ const Fe = {
     const y = new Set(S);
     let A = Array.from(y);
     Array.isArray(e.category.sort) ? A = e.category.sort.filter((d) => y.has(d)).concat(A.filter((d) => !e.category.sort.includes(d))) : e.category.sort === "original" ? A = S : e.category.sort === "alphabetical" && A.sort((d, b) => d.localeCompare(b, void 0, { numeric: !0 }));
-    const v = [];
+    const m = [];
     w.forEach((d, b) => {
-      const O = f.get(d), I = /* @__PURE__ */ new Map();
+      const O = f.get(d), C = /* @__PURE__ */ new Map();
       O.forEach((p) => {
         const E = $(p, e.category, "");
-        I.has(E) || I.set(E, []), I.get(E).push(p);
+        C.has(E) || C.set(E, []), C.get(E).push(p);
       });
       const h = [];
       A.forEach((p, E) => {
-        const k = I.get(p);
+        const k = C.get(p);
         if (!k)
           h.push({
             id: `${a}-${d}-${p}-null`,
@@ -1960,10 +1914,10 @@ const Fe = {
             categoryIndex: E
           });
         else if (e.value.aggregate === "none") {
-          let C = k.map((l, m) => {
+          let I = k.map((l, g) => {
             const T = l[e.value.from];
             return {
-              id: l.id || `${a}-${d}-${p}-${m}`,
+              id: l.id || `${a}-${d}-${p}-${g}`,
               index: E,
               // Grid 模式下 index 對應 categoryIndex
               modelType: "grid",
@@ -1982,20 +1936,20 @@ const Fe = {
               categoryIndex: E
             };
           });
-          e.value.sort === "asc" ? C.sort((l, m) => l.value === null && m.value === null ? 0 : l.value === null ? 1 : m.value === null ? -1 : l.value - m.value) : e.value.sort === "desc" && C.sort((l, m) => l.value === null && m.value === null ? 0 : l.value === null ? 1 : m.value === null ? -1 : m.value - l.value), h.push(...C);
+          e.value.sort === "asc" ? I.sort((l, g) => l.value === null && g.value === null ? 0 : l.value === null ? 1 : g.value === null ? -1 : l.value - g.value) : e.value.sort === "desc" && I.sort((l, g) => l.value === null && g.value === null ? 0 : l.value === null ? 1 : g.value === null ? -1 : g.value - l.value), h.push(...I);
         } else {
-          const C = k.map((B) => {
+          const I = k.map((B) => {
             if (e.value.aggregate === "count")
               return 1;
-            const g = B[e.value.from];
-            return typeof g == "number" ? g : null;
-          }), l = de(C, e.value.aggregate), m = k[0], T = {
-            id: m.id || `${a}-${d}-${p}-aggregated`,
+            const v = B[e.value.from];
+            return typeof v == "number" ? v : null;
+          }), l = ve(I, e.value.aggregate), g = k[0], T = {
+            id: g.id || `${a}-${d}-${p}-aggregated`,
             index: E,
             // Grid 模式下 index 對應 categoryIndex
             modelType: "grid",
-            name: m.name || p,
-            data: m.data,
+            name: g.name || p,
+            data: g.data,
             value: l,
             color: D(e.color.by, {
               index: E,
@@ -2010,10 +1964,10 @@ const Fe = {
           };
           h.push(T);
         }
-      }), v.push(h);
-    }), u.push(v);
+      }), m.push(h);
+    }), u.push(m);
   }), u;
-}, Fr = (t, e, r) => {
+}, jr = (t, e, r) => {
   const n = /* @__PURE__ */ new Map(), s = Array.isArray(t[0]);
   s ? t.forEach((a, c) => {
     a.forEach((i) => {
@@ -2052,39 +2006,39 @@ const Fe = {
     else if (e.series.sort === "original") {
       const y = [];
       i.forEach((A) => {
-        const v = $(A, e.series, "");
-        y.includes(v) || y.push(v);
+        const m = $(A, e.series, "");
+        y.includes(m) || y.push(m);
       }), w = y;
     } else e.series.sort === "alphabetical" && w.sort((y, A) => y.localeCompare(A, void 0, { numeric: !0 }));
     const S = [];
     w.forEach((y, A) => {
-      const v = f.get(y), d = /* @__PURE__ */ new Map();
-      v.forEach((I) => {
-        const h = $(I, e.category, "");
-        d.has(h) || d.set(h, []), d.get(h).push(I);
+      const m = f.get(y), d = /* @__PURE__ */ new Map();
+      m.forEach((C) => {
+        const h = $(C, e.category, "");
+        d.has(h) || d.set(h, []), d.get(h).push(C);
       });
       let b = Array.from(d.keys());
       if (Array.isArray(e.category.sort))
-        b = e.category.sort.filter((I) => d.has(I)).concat(b.filter((I) => !e.category.sort.includes(I)));
+        b = e.category.sort.filter((C) => d.has(C)).concat(b.filter((C) => !e.category.sort.includes(C)));
       else if (e.category.sort === "original") {
-        const I = [];
-        v.forEach((h) => {
+        const C = [];
+        m.forEach((h) => {
           const p = $(h, e.category, "");
-          I.includes(p) || I.push(p);
-        }), b = I;
-      } else e.category.sort === "alphabetical" && b.sort((I, h) => I.localeCompare(h, void 0, { numeric: !0 }));
+          C.includes(p) || C.push(p);
+        }), b = C;
+      } else e.category.sort === "alphabetical" && b.sort((C, h) => C.localeCompare(h, void 0, { numeric: !0 }));
       const O = [];
-      b.forEach((I, h) => {
-        d.get(I).forEach((E, k) => {
-          const C = e.multivariate.map((m, T) => ({
+      b.forEach((C, h) => {
+        d.get(C).forEach((E, k) => {
+          const I = e.multivariate.map((g, T) => ({
             index: T,
-            name: m.name,
+            name: g.name,
             value: (() => {
-              const B = E[m.from];
+              const B = E[g.from];
               return typeof B == "number" ? B : null;
             })()
           })), l = {
-            id: E.id || `${a}-${y}-${I}-${k}`,
+            id: E.id || `${a}-${y}-${C}-${k}`,
             index: k,
             modelType: "multivariate",
             name: E.name || "",
@@ -2097,10 +2051,10 @@ const Fe = {
               categoryIndex: h,
               datasetIndex: c
             }, r),
-            multivariate: C,
+            multivariate: I,
             series: y,
             seriesIndex: A,
-            category: I,
+            category: C,
             categoryIndex: h
           };
           O.push(l);
@@ -2108,7 +2062,7 @@ const Fe = {
       }), S.push(O);
     }), u.push(S);
   }), u;
-}, Dr = (t, e, r) => {
+}, Mr = (t, e, r) => {
   const n = Array.isArray(t[0]), s = [], o = [];
   n ? t.forEach((i) => {
     i.forEach((f) => {
@@ -2150,36 +2104,36 @@ const Fe = {
   return a.forEach((i, f) => {
     const w = u.get(i), S = [], y = /* @__PURE__ */ new Map();
     w.forEach((l) => {
-      const m = $(l, e.series, "");
-      y.has(m) || y.set(m, []), y.get(m).push(l);
+      const g = $(l, e.series, "");
+      y.has(g) || y.set(g, []), y.get(g).push(l);
     });
     let A = Array.from(y.keys());
     if (Array.isArray(e.series.sort))
       A = e.series.sort.filter((l) => y.has(l)).concat(A.filter((l) => !e.series.sort.includes(l)));
     else if (e.series.sort === "original") {
       const l = [];
-      w.forEach((m) => {
-        const T = $(m, e.series, "");
+      w.forEach((g) => {
+        const T = $(g, e.series, "");
         l.includes(T) || l.push(T);
       }), A = l;
-    } else e.series.sort === "alphabetical" && A.sort((l, m) => l.localeCompare(m, void 0, { numeric: !0 }));
-    A.forEach((l, m) => {
+    } else e.series.sort === "alphabetical" && A.sort((l, g) => l.localeCompare(g, void 0, { numeric: !0 }));
+    A.forEach((l, g) => {
       const T = y.get(l), B = /* @__PURE__ */ new Map();
       T.forEach((x) => {
         const _ = $(x, e.category, "");
         B.has(_) || B.set(_, []), B.get(_).push(x);
       });
-      let g = Array.from(B.keys());
+      let v = Array.from(B.keys());
       if (Array.isArray(e.category.sort))
-        g = e.category.sort.filter((x) => B.has(x)).concat(g.filter((x) => !e.category.sort.includes(x)));
+        v = e.category.sort.filter((x) => B.has(x)).concat(v.filter((x) => !e.category.sort.includes(x)));
       else if (e.category.sort === "original") {
         const x = [];
         T.forEach((_) => {
           const P = $(_, e.category, "");
           x.includes(P) || x.push(P);
-        }), g = x;
-      } else e.category.sort === "alphabetical" && g.sort((x, _) => x.localeCompare(_, void 0, { numeric: !0 }));
-      g.forEach((x, _) => {
+        }), v = x;
+      } else e.category.sort === "alphabetical" && v.sort((x, _) => x.localeCompare(_, void 0, { numeric: !0 }));
+      v.forEach((x, _) => {
         const P = B.get(x);
         if (e.value.aggregate === "none") {
           let j = P.map((M, L) => {
@@ -2194,12 +2148,12 @@ const Fe = {
               value: typeof F == "number" ? F : null,
               color: D(e.color.by, {
                 index: _,
-                seriesIndex: m,
+                seriesIndex: g,
                 categoryIndex: _,
                 datasetIndex: f
               }, r),
               series: l,
-              seriesIndex: m,
+              seriesIndex: g,
               category: x,
               categoryIndex: _
             };
@@ -2211,7 +2165,7 @@ const Fe = {
               return 1;
             const re = J[e.value.from];
             return typeof re == "number" ? re : null;
-          }), M = de(j, e.value.aggregate), L = P[0], F = {
+          }), M = ve(j, e.value.aggregate), L = P[0], F = {
             id: L.id || `${i}-${l}-${x}-aggregated`,
             index: S.length,
             // 在所有 nodes 中的索引
@@ -2221,12 +2175,12 @@ const Fe = {
             value: M,
             color: D(e.color.by, {
               index: _,
-              seriesIndex: m,
+              seriesIndex: g,
               categoryIndex: _,
               datasetIndex: f
             }, r),
             series: l,
-            seriesIndex: m,
+            seriesIndex: g,
             category: x,
             categoryIndex: _
           };
@@ -2234,34 +2188,34 @@ const Fe = {
         }
       });
     });
-    const v = [], d = /* @__PURE__ */ new Map();
+    const m = [], d = /* @__PURE__ */ new Map();
     S.forEach((l) => {
-      const m = s.find((T) => T.id === l.id || T.name === l.name);
-      m != null && m.id && d.set(m.id, l.index), m != null && m.name && d.set(m.name, l.index);
+      const g = s.find((T) => T.id === l.id || T.name === l.name);
+      g != null && g.id && d.set(g.id, l.index), g != null && g.name && d.set(g.name, l.index);
     });
     const b = /* @__PURE__ */ new Map(), O = /* @__PURE__ */ new Map();
     S.forEach((l) => {
       b.has(l.series) || b.set(l.series, l.seriesIndex), O.has(l.category) || O.set(l.category, l.categoryIndex);
     });
-    let I = b.size, h = O.size;
-    const p = (l) => (b.has(l) || b.set(l, I++), b.get(l)), E = (l) => (O.has(l) || O.set(l, h++), O.get(l)), k = o.filter((l) => $(l, e.dataset, "") === i), C = /* @__PURE__ */ new Map();
+    let C = b.size, h = O.size;
+    const p = (l) => (b.has(l) || b.set(l, C++), b.get(l)), E = (l) => (O.has(l) || O.set(l, h++), O.get(l)), k = o.filter((l) => $(l, e.dataset, "") === i), I = /* @__PURE__ */ new Map();
     k.forEach((l) => {
-      const m = l.source, T = l.target, B = $(l, e.series, ""), g = $(l, e.category, ""), x = `${m}-${T}-${B}-${g}`;
-      C.has(x) || C.set(x, []), C.get(x).push(l);
-    }), Array.from(C.entries()).forEach(([l, m], T) => {
-      const B = m[0], g = B.source, x = B.target, _ = d.get(g) ?? -1, P = d.get(x) ?? -1;
+      const g = l.source, T = l.target, B = $(l, e.series, ""), v = $(l, e.category, ""), x = `${g}-${T}-${B}-${v}`;
+      I.has(x) || I.set(x, []), I.get(x).push(l);
+    }), Array.from(I.entries()).forEach(([l, g], T) => {
+      const B = g[0], v = B.source, x = B.target, _ = d.get(v) ?? -1, P = d.get(x) ?? -1;
       if (_ >= 0 && P >= 0)
         if (e.value.aggregate === "none")
-          m.forEach((j, M) => {
-            const L = j[e.value.from], F = $(j, e.series, ""), J = $(j, e.category, ""), re = p(F), ge = E(J), xe = {
+          g.forEach((j, M) => {
+            const L = j[e.value.from], F = $(j, e.series, ""), J = $(j, e.category, ""), re = p(F), ge = E(J), Ae = {
               id: j.id || `edge-${T}-${M}`,
-              index: v.length,
+              index: m.length,
               modelType: "graph",
               name: j.name || "",
               data: j.data,
               value: typeof L == "number" ? L : null,
               color: D(e.color.by, {
-                index: v.length,
+                index: m.length,
                 seriesIndex: re,
                 categoryIndex: ge,
                 datasetIndex: f
@@ -2270,28 +2224,28 @@ const Fe = {
               seriesIndex: re,
               category: J,
               categoryIndex: ge,
-              source: g,
+              source: v,
               sourceIndex: _,
               target: x,
               targetIndex: P
             };
-            v.push(xe);
+            m.push(Ae);
           });
         else {
-          const j = m.map((xe) => {
+          const j = g.map((Ae) => {
             if (e.value.aggregate === "count")
               return 1;
-            const ke = xe[e.value.from];
+            const ke = Ae[e.value.from];
             return typeof ke == "number" ? ke : null;
-          }), M = de(j, e.value.aggregate), L = $(B, e.series, ""), F = $(B, e.category, ""), J = p(L), re = E(F), ge = {
+          }), M = ve(j, e.value.aggregate), L = $(B, e.series, ""), F = $(B, e.category, ""), J = p(L), re = E(F), ge = {
             id: B.id || `edge-${T}-aggregated`,
-            index: v.length,
+            index: m.length,
             modelType: "graph",
             name: B.name || "",
             data: B.data,
             value: M,
             color: D(e.color.by, {
-              index: v.length,
+              index: m.length,
               seriesIndex: J,
               categoryIndex: re,
               datasetIndex: f
@@ -2300,16 +2254,16 @@ const Fe = {
             seriesIndex: J,
             category: F,
             categoryIndex: re,
-            source: g,
+            source: v,
             sourceIndex: _,
             target: x,
             targetIndex: P
           };
-          v.push(ge);
+          m.push(ge);
         }
-    }), c.push({ nodes: S, edges: v });
+    }), c.push({ nodes: S, edges: m });
   }), c;
-}, Nr = (t, e, r) => {
+}, Lr = (t, e, r) => {
   const n = /* @__PURE__ */ new Map(), s = Array.isArray(t[0]);
   s ? t.forEach((a, c) => {
     a.forEach((i) => {
@@ -2339,54 +2293,54 @@ const Fe = {
   return o.forEach((a, c) => {
     const i = n.get(a), f = /* @__PURE__ */ new Map();
     i.forEach((l) => {
-      const m = $(l, e.series, "");
-      f.has(m) || f.set(m, []), f.get(m).push(l);
+      const g = $(l, e.series, "");
+      f.has(g) || f.set(g, []), f.get(g).push(l);
     });
     let w = Array.from(f.keys());
     if (Array.isArray(e.series.sort))
       w = e.series.sort.filter((l) => f.has(l)).concat(w.filter((l) => !e.series.sort.includes(l)));
     else if (e.series.sort === "original") {
       const l = [];
-      i.forEach((m) => {
-        const T = $(m, e.series, "");
+      i.forEach((g) => {
+        const T = $(g, e.series, "");
         l.includes(T) || l.push(T);
       }), w = l;
-    } else e.series.sort === "alphabetical" && w.sort((l, m) => l.localeCompare(m, void 0, { numeric: !0 }));
+    } else e.series.sort === "alphabetical" && w.sort((l, g) => l.localeCompare(g, void 0, { numeric: !0 }));
     const S = /* @__PURE__ */ new Map();
     i.forEach((l) => {
-      const m = $(l, e.category, "");
-      S.has(m) || S.set(m, []), S.get(m).push(l);
+      const g = $(l, e.category, "");
+      S.has(g) || S.set(g, []), S.get(g).push(l);
     });
     let y = Array.from(S.keys());
     if (Array.isArray(e.category.sort))
       y = e.category.sort.filter((l) => S.has(l)).concat(y.filter((l) => !e.category.sort.includes(l)));
     else if (e.category.sort === "original") {
       const l = [];
-      i.forEach((m) => {
-        const T = $(m, e.category, "");
+      i.forEach((g) => {
+        const T = $(g, e.category, "");
         l.includes(T) || l.push(T);
       }), y = l;
-    } else e.category.sort === "alphabetical" && y.sort((l, m) => l.localeCompare(m, void 0, { numeric: !0 }));
+    } else e.category.sort === "alphabetical" && y.sort((l, g) => l.localeCompare(g, void 0, { numeric: !0 }));
     const A = /* @__PURE__ */ new Map();
     i.forEach((l) => {
-      const m = l.id || "unknown";
-      A.has(m) || A.set(m, []), A.get(m).push(l);
+      const g = l.id || "unknown";
+      A.has(g) || A.set(g, []), A.get(g).push(l);
     });
-    let v = 0;
+    let m = 0;
     const d = w[0] || "", b = w.indexOf(d), O = /* @__PURE__ */ new Map();
-    Array.from(A.entries()).forEach(([l, m]) => {
-      const T = m[0], B = $(T, e.series, ""), g = w.indexOf(B), x = $(T, e.category, ""), _ = y.indexOf(x);
+    Array.from(A.entries()).forEach(([l, g]) => {
+      const T = g[0], B = $(T, e.series, ""), v = w.indexOf(B), x = $(T, e.category, ""), _ = y.indexOf(x);
       if (e.value.aggregate === "none") {
         const P = T[e.value.from], j = {
           id: l,
-          index: v++,
+          index: m++,
           modelType: "tree",
           name: T.name || l,
           data: T.data,
           value: typeof P == "number" ? P : null,
           color: D(e.color.by, {
-            index: v - 1,
-            seriesIndex: g,
+            index: m - 1,
+            seriesIndex: v,
             categoryIndex: _,
             datasetIndex: c
           }, r),
@@ -2399,27 +2353,27 @@ const Fe = {
           // 稍後計算
           children: [],
           series: B,
-          seriesIndex: g,
+          seriesIndex: v,
           category: x,
           categoryIndex: _
         };
         O.set(l, j);
       } else {
-        const P = m.map((L) => {
+        const P = g.map((L) => {
           if (e.value.aggregate === "count")
             return 1;
           const F = L[e.value.from];
           return typeof F == "number" ? F : null;
-        }), j = de(P, e.value.aggregate), M = {
+        }), j = ve(P, e.value.aggregate), M = {
           id: l,
-          index: v++,
+          index: m++,
           modelType: "tree",
           name: T.name || l,
           data: T.data,
           value: j,
           color: D(e.color.by, {
-            index: v - 1,
-            seriesIndex: g,
+            index: m - 1,
+            seriesIndex: v,
             categoryIndex: _,
             datasetIndex: c
           }, r),
@@ -2432,41 +2386,41 @@ const Fe = {
           // 稍後計算
           children: [],
           series: B,
-          seriesIndex: g,
+          seriesIndex: v,
           category: x,
           categoryIndex: _
         };
         O.set(l, M);
       }
     });
-    const I = Array.from(O.values()), h = /* @__PURE__ */ new Map();
-    I.forEach((l) => {
+    const C = Array.from(O.values()), h = /* @__PURE__ */ new Map();
+    C.forEach((l) => {
       h.set(l.id, l.index);
-    }), I.forEach((l) => {
+    }), C.forEach((l) => {
       l.parent && h.has(l.parent) && (l.parentIndex = h.get(l.parent));
     });
     const p = [], E = /* @__PURE__ */ new Map();
-    I.forEach((l) => {
+    C.forEach((l) => {
       l.parent === null ? p.push(l) : (E.has(l.parent) || E.set(l.parent, []), E.get(l.parent).push(l));
     });
-    function k(l, m) {
-      l.depth = m;
+    function k(l, g) {
+      l.depth = g;
       const T = E.get(l.id) || [];
-      return e.value.sort === "asc" ? T.sort((B, g) => B.value === null && g.value === null ? 0 : B.value === null ? 1 : g.value === null ? -1 : B.value - g.value) : e.value.sort === "desc" && T.sort((B, g) => B.value === null && g.value === null ? 0 : B.value === null ? 1 : g.value === null ? -1 : g.value - B.value), T.forEach((B, g) => {
-        B.seq = g;
-      }), l.children = T.map((B) => k(B, m + 1)), l;
+      return e.value.sort === "asc" ? T.sort((B, v) => B.value === null && v.value === null ? 0 : B.value === null ? 1 : v.value === null ? -1 : B.value - v.value) : e.value.sort === "desc" && T.sort((B, v) => B.value === null && v.value === null ? 0 : B.value === null ? 1 : v.value === null ? -1 : v.value - B.value), T.forEach((B, v) => {
+        B.seq = v;
+      }), l.children = T.map((B) => k(B, g + 1)), l;
     }
-    const C = p.map((l) => k(l, 0));
-    if (C.length === 0)
+    const I = p.map((l) => k(l, 0));
+    if (I.length === 0)
       u.push({
         id: `empty-${a}`,
-        index: v++,
+        index: m++,
         modelType: "tree",
         name: "Empty Tree",
         data: {},
         value: null,
         color: D(e.color.by, {
-          index: v - 1,
+          index: m - 1,
           seriesIndex: b < 0 ? 0 : b,
           categoryIndex: 0,
           datasetIndex: c
@@ -2481,18 +2435,18 @@ const Fe = {
         category: "",
         categoryIndex: 0
       });
-    else if (C.length === 1)
-      u.push(C[0]);
+    else if (I.length === 1)
+      u.push(I[0]);
     else {
       const l = {
         id: `virtual-root-${a}`,
-        index: v++,
+        index: m++,
         modelType: "tree",
         name: `Virtual Root (${a})`,
         data: {},
         value: null,
         color: D(e.color.by, {
-          index: v - 1,
+          index: m - 1,
           seriesIndex: b < 0 ? 0 : b,
           categoryIndex: 0,
           datasetIndex: c
@@ -2501,9 +2455,9 @@ const Fe = {
         parentIndex: null,
         depth: 0,
         seq: 0,
-        children: C.map((m, T) => {
-          const B = (g, x) => (g.depth = x, x === 1 && (g.seq = T), g.children = g.children.map((_) => B(_, x + 1)), g);
-          return B(m, 1);
+        children: I.map((g, T) => {
+          const B = (v, x) => (v.depth = x, x === 1 && (v.seq = T), v.children = v.children.map((_) => B(_, x + 1)), v);
+          return B(g, 1);
         }),
         series: d,
         seriesIndex: b < 0 ? 0 : b,
@@ -2514,7 +2468,7 @@ const Fe = {
     }
   }), u;
 };
-function Ur(t, e, r) {
+function Vr(t, e, r) {
   const n = e.map((a) => r[a]).filter((a) => a && a.parentNode === t);
   if (n.length === 0) return;
   let s = !0, o = null;
@@ -2543,9 +2497,9 @@ function Ue(t, e, r, n, s) {
     r[i] = f, t.appendChild(f);
   }), e.filter((i) => r[i] && !a.includes(i)).forEach((i) => {
     r[i];
-  }), e.length > 0 && Ur(t, e, r);
+  }), e.length > 0 && Vr(t, e, r);
 }
-function zr(t) {
+function Kr(t) {
   return K({ element: t }, {
     element: {
       toBe: "Dom",
@@ -2553,7 +2507,7 @@ function zr(t) {
     }
   });
 }
-function Gr(t) {
+function Rr(t) {
   return K(t, {
     width: {
       toBe: '"auto" | number',
@@ -2758,7 +2712,7 @@ function vt(t) {
     }
   });
 }
-function $e(t) {
+function Oe(t) {
   return K({ plugins: t }, {
     plugins: {
       toBe: "PluginEntity[]",
@@ -2766,7 +2720,7 @@ function $e(t) {
     }
   });
 }
-function qr(t) {
+function Fr(t) {
   if (!t)
     return { status: "success", columnName: "", expectToBe: "" };
   const e = K(t, {
@@ -2792,7 +2746,7 @@ function qr(t) {
   if (e.status === "error")
     return e;
   if (t.size) {
-    const r = Gr(t.size);
+    const r = Rr(t.size);
     if (r.status === "error")
       return r;
   }
@@ -2812,62 +2766,62 @@ function qr(t) {
       return r;
   }
   if (t.plugins) {
-    const r = $e(t.plugins);
+    const r = Oe(t.plugins);
     if (r.status === "error")
       return r;
   }
   return e;
 }
-function Wr({ svgElement$: t, canvasElement$: e, pluginsInstance$: r }) {
+function Dr({ svgElement$: t, canvasElement$: e, pluginsInstance$: r }) {
   let n = [], s = [];
   const o = (c, i, f) => {
-    const w = r.getValue().reduce((A, v, d) => (A[v._getId()] = d, A), {}), S = f.map((A) => ({
+    const w = r.getValue().reduce((A, m, d) => (A[m._getId()] = d, A), {}), S = f.map((A) => ({
       ...A,
       pluginSeq: w[A.pluginId]
     }));
     return (c === "svg" ? n : s).filter((A) => A.pluginId !== i).map((A) => ({
       ...A,
       pluginSeq: w[A.pluginId]
-    })).concat(S).sort((A, v) => A.layerIndex - v.layerIndex || A.pluginSeq - v.pluginSeq);
+    })).concat(S).sort((A, m) => A.layerIndex - m.layerIndex || A.pluginSeq - m.pluginSeq);
   }, u = {}, a = {};
   return (c, i, f) => {
     const w = c === "svg" ? t.getValue() : e.getValue();
     if (!w)
       return {};
-    const S = c === "svg" ? u : a, y = o(c, i, f), A = y.map((d) => Lr(d.pluginId, d.layerName));
+    const S = c === "svg" ? u : a, y = o(c, i, f), A = y.map((d) => Ir(d.pluginId, d.layerName));
     return c === "svg" ? (Ue(
       w,
       A,
       S,
-      (d) => Pr(d)
+      (d) => Tr(d)
     ), n = y) : (Ue(
       w,
       A,
       S,
       (d) => ht(d)
     ), s = y), Object.entries(S).reduce((d, [b, O]) => {
-      const [I, h, p] = b.split("-");
+      const [C, h, p] = b.split("-");
       return h === i && (d[p] = O), d;
     }, {});
   };
 }
-const Yr = (t, e) => {
+const Nr = (t, e) => {
   try {
-    const { status: b, columnName: O, expectToBe: I } = qr(e);
+    const { status: b, columnName: O, expectToBe: C } = Fr(e);
     if (b === "error")
       throw new Error(Q({
         columnName: O,
-        expectToBe: I,
+        expectToBe: C,
         from: "Chart.constructor"
       }));
     if (b === "warning")
       console.warn(X({
         columnName: O,
-        expectToBe: I,
+        expectToBe: C,
         from: "Chart.constructor"
       }));
     else {
-      const { status: h, columnName: p, expectToBe: E } = zr(t);
+      const { status: h, columnName: p, expectToBe: E } = Kr(t);
       if (h === "error")
         throw new Error(Q({
           columnName: p,
@@ -2883,121 +2837,121 @@ const Yr = (t, e) => {
   } catch (b) {
     throw new Error(b);
   }
-  const r = new oe(), n = new N((e == null ? void 0 : e.data) || []), s = e && e.encoding ? Y(De, e.encoding) : De, o = new N(s), u = e && e.theme ? Y(Ne, e.theme) : Ne, a = new N(u), c = new N((e == null ? void 0 : e.plugins) || []), i = e && e.size ? Y(Fe, e.size) : Fe, f = new N(i), w = new N(null), S = new N(null), y = (() => {
+  const r = new oe(), n = new N((e == null ? void 0 : e.data) || []), s = e && e.encoding ? q(De, e.encoding) : De, o = new N(s), u = e && e.theme ? q(Ne, e.theme) : Ne, a = new N(u), c = new N((e == null ? void 0 : e.plugins) || []), i = e && e.size ? q(Fe, e.size) : Fe, f = new N(i), w = new N(null), S = new N(null), y = (() => {
     const b = f.pipe(
-      wr((g) => hr(
-        () => g.width === "auto" || g.height === "auto",
+      dr((v) => hr(
+        () => v.width === "auto" || v.height === "auto",
         // 有 'auto' 的話就監聽element的尺寸
-        jr(t).pipe(
-          q((x) => ({
-            width: g.width === "auto" ? x.width : g.width,
-            height: g.height === "auto" ? x.height <= 0 ? x.width : x.height : g.height
+        Or(t).pipe(
+          z((x) => ({
+            width: v.width === "auto" ? x.width : v.width,
+            height: v.height === "auto" ? x.height <= 0 ? x.width : x.height : v.height
           })),
-          W(g.resizeDebounce),
-          dr((x, _) => JSON.stringify(x) === JSON.stringify(_))
+          G(v.resizeDebounce),
+          yr((x, _) => JSON.stringify(x) === JSON.stringify(_))
         ),
         Xt({
-          width: g.width,
-          height: g.height
+          width: v.width,
+          height: v.height
         })
       )),
-      Er(r),
+      he(r),
       ne(1)
     ), O = o.asObservable().pipe(
       ne(1)
-    ), I = H([
+    ), C = H([
       n,
       o,
       a
     ]).pipe(
-      W(0),
-      q(([g, x, _]) => {
+      G(0),
+      z(([v, x, _]) => {
         try {
-          return Kr(g, x, _);
+          return Pr(v, x, _);
         } catch (P) {
-          throw new Error(he({
+          throw new Error(ye({
             from: "Chart.seriesData$",
             systemMessage: P
           }));
         }
       }),
-      ie((g) => (console.error(G(g)), ae)),
+      ae((v) => (console.error(U(v)), fe)),
       ne(1)
     ), h = H([
       n,
       o,
       a
     ]).pipe(
-      W(0),
-      q(([g, x, _]) => {
+      G(0),
+      z(([v, x, _]) => {
         try {
-          return Rr(g, x, _);
+          return kr(v, x, _);
         } catch (P) {
-          throw new Error(he({
+          throw new Error(ye({
             from: "Chart.gridData$",
             systemMessage: P
           }));
         }
       }),
-      ie((g) => (console.error(G(g)), ae)),
+      ae((v) => (console.error(U(v)), fe)),
       ne(1)
     ), p = H([
       n,
       o,
       a
     ]).pipe(
-      W(0),
-      q(([g, x, _]) => {
+      G(0),
+      z(([v, x, _]) => {
         try {
-          return Fr(g, x, _);
+          return jr(v, x, _);
         } catch (P) {
-          throw new Error(he({
+          throw new Error(ye({
             from: "Chart.multivariateData$",
             systemMessage: P
           }));
         }
       }),
-      ie((g) => (console.error(G(g)), ae)),
+      ae((v) => (console.error(U(v)), fe)),
       ne(1)
     ), E = H([
       n,
       o,
       a
     ]).pipe(
-      W(0),
-      q(([g, x, _]) => {
+      G(0),
+      z(([v, x, _]) => {
         try {
-          return Dr(g, x, _);
+          return Mr(v, x, _);
         } catch (P) {
-          throw new Error(he({
+          throw new Error(ye({
             from: "Chart.graphData$",
             systemMessage: P
           }));
         }
       }),
-      ie((g) => (console.error(G(g)), ae)),
+      ae((v) => (console.error(U(v)), fe)),
       ne(1)
     ), k = H([
       n,
       o,
       a
     ]).pipe(
-      W(0),
-      q(([g, x, _]) => {
+      G(0),
+      z(([v, x, _]) => {
         try {
-          return Nr(g, x, _);
+          return Lr(v, x, _);
         } catch (P) {
-          throw new Error(he({
+          throw new Error(ye({
             from: "Chart.treeData$",
             systemMessage: P
           }));
         }
       }),
-      ie((g) => (console.error(G(g)), ae)),
+      ae((v) => (console.error(U(v)), fe)),
       ne(1)
-    ), C = new N([]);
-    c.subscribe((g) => {
-      const x = {}, _ = g.map((j) => {
+    ), I = new N([]);
+    c.pipe(he(r)).subscribe((v) => {
+      const x = {}, _ = v.map((j) => {
         var L;
         let M = j._getId();
         if (x[M]) {
@@ -3006,18 +2960,18 @@ const Yr = (t, e) => {
         }
         return x[M] = j._getId(), M;
       });
-      g.forEach((j, M) => j._setId(_[M]));
-      const P = g.map((j) => ({
+      v.forEach((j, M) => j._setId(_[M]));
+      const P = v.map((j) => ({
         id: j._getId(),
         name: j._name,
         elementType: j._elementType,
         shownLayers: j.getShownLayerNames()
       }));
-      C.next(P);
+      I.next(P);
     });
     const l = a.asObservable().pipe(
       ne(1)
-    ), m = new oe(), T = m.asObservable().pipe(
+    ), g = new oe(), T = g.asObservable().pipe(
       lt()
     );
     return {
@@ -3026,16 +2980,16 @@ const Yr = (t, e) => {
       canvas: null,
       size$: b,
       encoding$: O,
-      seriesData$: I,
+      seriesData$: C,
       gridData$: h,
       multivariateData$: p,
       graphData$: E,
       treeData$: k,
-      plugins$: C,
+      plugins$: I,
       theme$: l,
       event$: T,
-      eventTrigger$: m,
-      _updateLayerElements: Wr({
+      eventTrigger$: g,
+      _updateLayerElements: Dr({
         svgElement$: w,
         canvasElement$: S,
         pluginsInstance$: c
@@ -3043,41 +2997,43 @@ const Yr = (t, e) => {
     };
   })();
   let A = null;
-  const v = () => (A || (A = document.createElement("div"), A.classList.add("orbcharts-container"), A.style.position = "relative", t.appendChild(A)), A);
+  const m = () => (A || (A = document.createElement("div"), A.classList.add("orbcharts-container"), A.style.position = "relative", t.appendChild(A)), A);
   let d = [];
-  return c.subscribe((b) => {
+  return c.pipe(he(r)).subscribe((b) => {
     d.filter((p) => !b.includes(p)).forEach((p) => {
       y._updateLayerElements(p._elementType, p._getId(), []), p.destroy();
     }), d = b;
-    let I = !1, h = !1;
+    let C = !1, h = !1;
     b.forEach((p) => {
-      p._elementType === "svg" ? I = !0 : p._elementType === "canvas" && (h = !0);
-    }), I && !y.svg ? (y.svg = Br("orbcharts-root-svg"), v().appendChild(y.svg), w.next(y.svg)) : !I && y.svg && (y.svg.remove(), y.svg = null, w.next(null)), h && !y.canvas ? (y.canvas = ht("orbcharts-root-canvas"), v().appendChild(y.canvas), S.next(y.canvas)) : !h && y.canvas && (y.canvas.remove(), y.canvas = null, S.next(null)), b.forEach((p) => {
+      p._elementType === "svg" ? C = !0 : p._elementType === "canvas" && (h = !0);
+    }), C && !y.svg ? (y.svg = _r("orbcharts-root-svg"), m().appendChild(y.svg), w.next(y.svg)) : !C && y.svg && (y.svg.remove(), y.svg = null, w.next(null)), h && !y.canvas ? (y.canvas = ht("orbcharts-root-canvas"), m().appendChild(y.canvas), S.next(y.canvas)) : !h && y.canvas && (y.canvas.remove(), y.canvas = null, S.next(null)), b.forEach((p) => {
       p._injectContext(y);
     });
   }), H({
     size: y.size$,
     svg: w
   }).pipe(
-    W(0),
-    pe(({ svg: b }) => !!b)
+    G(0),
+    de(({ svg: b }) => !!b),
+    he(r)
   ).subscribe(({ size: b, svg: O }) => {
     O && (O.setAttribute("width", b.width.toString()), O.setAttribute("height", b.height.toString()));
   }), H({
     size: y.size$,
     canvas: S
   }).pipe(
-    W(0),
-    pe(({ canvas: b }) => !!b)
+    G(0),
+    de(({ canvas: b }) => !!b),
+    he(r)
   ).subscribe(({ size: b, canvas: O }) => {
     O && (O.width = b.width, O.height = b.height);
   }), /* @__PURE__ */ (() => {
-    function b(g) {
-      f.next(g);
+    function b(v) {
+      f.next(v);
     }
-    function O(g) {
+    function O(v) {
       try {
-        const { status: x, columnName: _, expectToBe: P } = vt(g);
+        const { status: x, columnName: _, expectToBe: P } = vt(v);
         if (x === "error")
           throw new Error(Q({
             columnName: _,
@@ -3090,13 +3046,13 @@ const Yr = (t, e) => {
           from: "Chart.setData"
         }));
       } catch (x) {
-        console.error(G(x));
+        console.error(U(x));
       }
-      n.next(g);
+      n.next(v);
     }
-    function I(g) {
+    function C(v) {
       try {
-        const { status: _, columnName: P, expectToBe: j } = dt(g);
+        const { status: _, columnName: P, expectToBe: j } = dt(v);
         if (_ === "error")
           throw new Error(Q({
             columnName: P,
@@ -3109,20 +3065,20 @@ const Yr = (t, e) => {
           from: "Chart.updateEncoding"
         }));
       } catch (_) {
-        console.error(G(_));
+        console.error(U(_));
       }
-      const x = Y(o.getValue(), g);
+      const x = q(o.getValue(), v);
       o.next(x);
     }
-    function h(g) {
-      o.next(g);
+    function h(v) {
+      o.next(v);
     }
     function p() {
       return o.getValue();
     }
-    function E(g) {
+    function E(v) {
       try {
-        const { status: x, columnName: _, expectToBe: P } = $e(g);
+        const { status: x, columnName: _, expectToBe: P } = Oe(v);
         if (x === "error")
           throw new Error(Q({
             columnName: _,
@@ -3135,13 +3091,13 @@ const Yr = (t, e) => {
           from: "Chart.setPlugins"
         }));
       } catch (x) {
-        console.error(G(x));
+        console.error(U(x));
       }
-      c.next(g);
+      c.next(v);
     }
-    function k(g) {
+    function k(v) {
       try {
-        const { status: x, columnName: _, expectToBe: P } = $e([g]);
+        const { status: x, columnName: _, expectToBe: P } = Oe([v]);
         if (x === "error")
           throw new Error(Q({
             columnName: _,
@@ -3154,16 +3110,16 @@ const Yr = (t, e) => {
           from: "Chart.addPlugin"
         }));
       } catch (x) {
-        console.error(G(x));
+        console.error(U(x));
       }
-      c.next([...c.getValue(), g]);
+      c.next([...c.getValue(), v]);
     }
-    function C(g) {
-      c.next(c.getValue().filter((x) => x._getId() !== g));
+    function I(v) {
+      c.next(c.getValue().filter((x) => x._getId() !== v));
     }
-    function l(g) {
+    function l(v) {
       try {
-        const { status: _, columnName: P, expectToBe: j } = pt(g);
+        const { status: _, columnName: P, expectToBe: j } = pt(v);
         if (_ === "error")
           throw new Error(Q({
             columnName: P,
@@ -3176,49 +3132,49 @@ const Yr = (t, e) => {
           from: "Chart.updateTheme"
         }));
       } catch (_) {
-        console.error(G(_));
+        console.error(U(_));
       }
-      const x = Y(a.getValue(), g);
+      const x = q(a.getValue(), v);
       a.next(x);
     }
-    function m(g) {
-      a.next(g);
+    function g(v) {
+      a.next(v);
     }
     function T() {
       return a.getValue();
     }
     function B() {
-      r.next(void 0), kr(t), A = null;
+      r.next(void 0), c.getValue().forEach((v) => v.destroy()), $r(t), A = null;
     }
     return {
       resize: b,
       setData: O,
       // setEncoding,
-      updateEncoding: I,
+      updateEncoding: C,
       forceReplaceEncoding: h,
       getEncoding: p,
       setPlugins: E,
       addPlugin: k,
-      removePlugin: C,
+      removePlugin: I,
       // setTheme,
       updateTheme: l,
-      forceReplaceTheme: m,
+      forceReplaceTheme: g,
       getTheme: T,
       destroy: B,
       context: y
     };
   })();
 };
-class Qr {
+class qr {
   constructor(e, r) {
-    return Yr(e, r);
+    return Nr(e, r);
   }
 }
 const mt = (t, e, r) => {
   let n = e.name, s = () => {
   };
   const o = new N(null), u = o.pipe(
-    pe((h) => h !== null)
+    de((h) => h !== null)
   ), a = e.layers.map((h) => new h()), c = {
     // 將陣列轉成字典
     ...a.reduce((h, p) => (h[p._name] = p, h), {})
@@ -3231,15 +3187,15 @@ const mt = (t, e, r) => {
   }, w = a.reduce((h, p) => (p._initShow && h.push(p._name), h), []), S = f(r), y = new N(
     new Set(S.length > 0 ? S : w)
   ), A = y.pipe(
-    q((h) => Array.from(h).map((E) => {
+    z((h) => Array.from(h).map((E) => {
       var k;
       return [
         E,
-        ((k = a.find((C) => C._name === E)) == null ? void 0 : k._layerIndex) ?? -1
+        ((k = a.find((I) => I._name === E)) == null ? void 0 : k._layerIndex) ?? -1
       ];
     }).filter(([, E]) => E !== -1).sort((E, k) => E[1] - k[1]).map(([E]) => E))
   );
-  let v = Y(
+  let m = q(
     e.defaultParams ?? {},
     r ?? {}
   );
@@ -3248,74 +3204,80 @@ const mt = (t, e, r) => {
   ), b = new oe(), O = new R((h) => {
     d.subscribe((p) => {
       try {
-        const { status: E, columnName: k, expectToBe: C } = e.validator(p);
+        const { status: E, columnName: k, expectToBe: I } = e.validator(p);
         if (E === "error")
           throw new Error(Q({
             columnName: k,
-            expectToBe: C,
+            expectToBe: I,
             from: `${e.name}.params$`
           }));
         E === "warning" && console.warn(X({
           columnName: k,
-          expectToBe: C,
+          expectToBe: I,
           from: `${e.name}.params$`
         }));
       } catch (E) {
-        console.error(G(E));
+        console.error(U(E));
       }
-      h.next(v);
+      h.next(m);
     }), b.subscribe((p) => {
       h.next(p);
     });
-  }), I = u.pipe(
-    q((h) => ({
+  }), C = u.pipe(
+    z((h) => ({
       context: h,
       // 初始化時 context 有可能被 in place 擴展
       pluginParams$: O
-    })),
-    br()
-    // 只做初始化
+    }))
+    // 不能用 first()：同一個 plugin 物件可能被重新 _injectContext() 綁定到
+    // 「另一個」全新的 chart instance（例如呼叫端銷毀舊 chart 後、沿用同一組
+    // plugin 物件建立新 chart——React StrictMode 的掛載→清除→再掛載就是這種
+    // 情境）。first() 只接受第一次注入的 context、之後永久 complete，會讓後續
+    // 重新注入的 context 被靜靜地忽略，導致新 chart 的這個 plugin 永遠不會
+    // 觸發 _updateLayerElements/_enable，畫面呈現「plugin 已建立、layer 群組
+    // 存在，但沒有畫出任何圖形」（保留 pluginSetupProps$ 為 hot、可重複觸發）。
   );
   return H({
-    pluginSetupProps: I,
+    pluginSetupProps: C,
     ShownLayerNameSet: y,
     shownLayerNamesSeq: A
   }).pipe(
-    W(0)
+    G(0)
   ).subscribe(({ pluginSetupProps: h, ShownLayerNameSet: p, shownLayerNamesSeq: E }) => {
+    s();
     const k = h.context._updateLayerElements(
       t,
       n,
-      E.map((C) => ({
+      E.map((I) => ({
         pluginId: n,
         pluginName: e.name,
-        layerName: C,
-        layerIndex: c[C]._layerIndex
+        layerName: I,
+        layerIndex: c[I]._layerIndex
       }))
     );
-    e.setup && (s = e.setup(h)), a.forEach((C) => {
-      var l, m;
-      if (p.has(C._name)) {
+    e.setup && (s = e.setup(h)), a.forEach((I) => {
+      var l, g;
+      if (p.has(I._name)) {
         const T = t === "svg" ? {
           // svgG: (pluginSetupProps as PluginSetupProps<'svg', ExtendContext, PluginParams>).svgG.querySelector(`.${createLayerClassName(config.name, layer.name)}`),
-          svgG: k[C._name],
+          svgG: k[I._name],
           // canvas: context.root.querySelector(`.${createLayerClassName(config.name, layer.name)}`),
           // context: Object.assign({}, context) as ChartContext<ExtendContext>,
           context: h.context,
           pluginParams$: O,
-          initLayerParams: ((l = d.getValue()) == null ? void 0 : l[C._name]) || {}
+          initLayerParams: ((l = d.getValue()) == null ? void 0 : l[I._name]) || {}
         } : {
           // svgG: context.root.querySelector(`.${createLayerClassName(config.name, layer.name)}`),
           // canvas: (pluginSetupProps as PluginSetupProps<'canvas', ExtendContext, PluginParams>).canvas.querySelector(`.${createLayerClassName(config.name, layer.name)}`),
-          canvas: k[C._name],
+          canvas: k[I._name],
           // context: Object.assign({}, context) as ChartContext<ExtendContext>,
           context: h.context,
           pluginParams$: O,
-          initLayerParams: ((m = d.getValue()) == null ? void 0 : m[C._name]) || {}
+          initLayerParams: ((g = d.getValue()) == null ? void 0 : g[I._name]) || {}
         };
-        C._enable(T);
+        I._enable(T);
       } else
-        C._disable();
+        I._disable();
     });
   }), {
     // name: `${config.name}-${Math.random().toString(36).substr(2, 9)}`,
@@ -3362,19 +3324,19 @@ const mt = (t, e, r) => {
     //   params = { ...params, ...partial }
     // },
     updateParams: (h) => {
-      v = Y(v, h), d.next(h), Object.keys(h).forEach((p) => {
+      m = q(m, h), d.next(h), Object.keys(h).forEach((p) => {
         const E = c[p];
         E && E._updateParams(h[p]);
       });
     },
     forceReplaceParams: (h) => {
-      v = h, b.next(h), Object.keys(h).forEach((p) => {
+      m = h, b.next(h), Object.keys(h).forEach((p) => {
         const E = c[p];
         E && E._forceReplaceParams(h[p]);
       });
     },
     getParams: () => {
-      const h = Object.assign({}, v);
+      const h = Object.assign({}, m);
       return a.forEach((p) => {
         h[p._name] = p._getParams();
       }), h;
@@ -3404,7 +3366,7 @@ const mt = (t, e, r) => {
     //   }
     // }),
     destroy: () => {
-      s(), o.complete(), y.complete(), a.forEach((h) => {
+      s(), a.forEach((h) => {
         h._destroy();
       });
     }
@@ -3413,7 +3375,7 @@ const mt = (t, e, r) => {
     //   subscriber.next(params)
     // })
   };
-}, Xr = (t) => class {
+}, Wr = (t) => class {
   constructor(r) {
     return mt("svg", t, r);
   }
@@ -3422,13 +3384,13 @@ const mt = (t, e, r) => {
   let n = () => {
   };
   const s = new N(null), o = s.pipe(
-    pe((u) => u !== null)
+    de((u) => u !== null)
   );
   return H({
     layerParams: r,
     enabledProps: o
   }).pipe(
-    W(0)
+    G(0)
   ).subscribe(({ layerParams: u, enabledProps: a }) => {
     n(), n = t === "svg" ? e.setup({
       svgG: a.svgG,
@@ -3437,7 +3399,7 @@ const mt = (t, e, r) => {
       context: a.context,
       pluginParams$: a.pluginParams$,
       layerParams$: r.pipe(
-        q((c) => Y(c, a.initLayerParams ?? {}))
+        z((c) => q(c, a.initLayerParams ?? {}))
       )
     }) : e.setup({
       // svgG: enabledProps.svgG,
@@ -3446,10 +3408,10 @@ const mt = (t, e, r) => {
       context: a.context,
       pluginParams$: a.pluginParams$,
       layerParams$: r.pipe(
-        q((c) => Y(c, a.initLayerParams ?? {}))
+        z((c) => q(c, a.initLayerParams ?? {}))
       )
     });
-  }), s.pipe(pe((u) => u === null)).subscribe(() => {
+  }), s.pipe(de((u) => u === null)).subscribe(() => {
     n();
   }), {
     _name: e.name,
@@ -3480,9 +3442,9 @@ const mt = (t, e, r) => {
           from: `${e.name}.params$`
         }));
       } catch (c) {
-        console.error(G(c));
+        console.error(U(c));
       }
-      const a = Y(r.getValue(), u);
+      const a = q(r.getValue(), u);
       r.next(a);
     },
     _forceReplaceParams: (u) => {
@@ -3495,57 +3457,57 @@ const mt = (t, e, r) => {
     //   enableProps$.next(true)
     // },
     _destroy: () => {
-      s.next(null), s.complete(), r.complete();
+      s.next(null);
     }
   };
-}, tn = (t) => class {
+}, Zr = (t) => class {
   constructor() {
     return gt("svg", t);
   }
-}, nn = (t) => class {
+}, Hr = (t) => class {
   constructor(r) {
     return mt("canvas", t, r);
   }
-}, on = (t) => class {
+}, Xr = (t) => class {
   constructor() {
     return gt("canvas", t);
   }
 };
 export {
-  Qr as OrbCharts,
-  de as aggregate,
-  $r as count,
+  qr as OrbCharts,
+  ve as aggregate,
+  Er as count,
   ht as createCanvas,
-  Jr as createCanvasElement,
-  Hr as createDiv,
-  Lr as createLayerClassName,
+  zr as createCanvasElement,
+  Gr as createDiv,
+  Ir as createLayerClassName,
   yt as createMessagePrefix,
-  G as createOrbChartsErrorMessage,
-  Mr as createPluginClassName,
-  Br as createSVG,
-  Pr as createSVGGroup,
-  he as createUnexpectedErrorMessage,
+  U as createOrbChartsErrorMessage,
+  Cr as createPluginClassName,
+  _r as createSVG,
+  Tr as createSVGGroup,
+  ye as createUnexpectedErrorMessage,
   Q as createValidatorErrorMessage,
   X as createValidatorWarningMessage,
-  Y as deepOverwrite,
-  on as defineCanvasLayer,
-  nn as defineCanvasPlugin,
-  tn as defineSVGLayer,
-  Xr as defineSVGPlugin,
-  Zr as formatCommaNumber,
+  q as deepOverwrite,
+  Xr as defineCanvasLayer,
+  Hr as defineCanvasPlugin,
+  Zr as defineSVGLayer,
+  Wr as defineSVGPlugin,
+  Ur as formatCommaNumber,
   D as getColorByFrom,
-  Ir as getColorByIndex,
+  Ar as getColorByIndex,
   ft as isDom,
-  Cr as isFunction,
+  Sr as isFunction,
   ee as isPlainObject,
-  Tr as max,
-  Ar as mean,
-  Sr as median,
-  _r as min,
-  Or as none,
-  kr as removeElementChildren,
-  jr as resizeObservable,
+  wr as max,
+  mr as mean,
+  gr as median,
+  br as min,
+  xr as none,
+  $r as removeElementChildren,
+  Or as resizeObservable,
   $ as resolveGroupKey,
-  xr as sum,
+  vr as sum,
   K as validateObject
 };