@visactor/vrender 0.17.17-alpha.1 → 0.17.18-alpha.0

package/dist/index.js

@@ -11360,15 +11360,7 @@
         var data = ResourceLoader.cache.get(url);
         data ? "fail" === data.loadState ? application.global.getRequestAnimationFrame()(function () {
           mark.imageLoadFail(url);
-        }) : "init" === data.loadState || "loading" === data.loadState ? null === (_a = data.waitingMark) || void 0 === _a || _a.push(mark) : mark && mark.imageLoadSuccess(url, data.data) : (data = {
-          type: "image",
-          loadState: "init"
-        }, ResourceLoader.cache.set(url, data), data.dataPromise = application.global.loadImage(url), data.dataPromise ? (data.waitingMark = [mark], data.dataPromise.then(function (res) {
-          var _a;
-          data.loadState = (null == res ? void 0 : res.data) ? "success" : "fail", data.data = null == res ? void 0 : res.data, null === (_a = data.waitingMark) || void 0 === _a || _a.map(function (mark, index) {
-            (null == res ? void 0 : res.data) ? (data.loadState = "success", data.data = res.data, mark.imageLoadSuccess(url, res.data)) : (data.loadState = "fail", mark.imageLoadFail(url));
-          });
-        })) : (data.loadState = "fail", mark.imageLoadFail(url)));
+        }) : "init" === data.loadState || "loading" === data.loadState ? null === (_a = data.waitingMark) || void 0 === _a || _a.push(mark) : mark && mark.imageLoadSuccess(url, data.data) : ResourceLoader.loadImage(url, mark);
       }
     }, {
       key: "GetSvg",
@@ -11402,10 +11394,68 @@
           return data.data;
         }));
       }
+    }, {
+      key: "loading",
+      value: function loading() {
+        setTimeout(function () {
+          if (!ResourceLoader.isLoading && ResourceLoader.toLoadAueue.length) {
+            ResourceLoader.isLoading = !0;
+            var tasks = ResourceLoader.toLoadAueue.splice(0, 10),
+              promises = [];
+            tasks.forEach(function (task) {
+              var url = task.url,
+                marks = task.marks,
+                data = {
+                  type: "image",
+                  loadState: "init"
+                };
+              if (ResourceLoader.cache.set(url, data), data.dataPromise = application.global.loadImage(url), data.dataPromise) {
+                data.waitingMark = marks;
+                var end = data.dataPromise.then(function (res) {
+                  var _a;
+                  data.loadState = (null == res ? void 0 : res.data) ? "success" : "fail", data.data = null == res ? void 0 : res.data, null === (_a = data.waitingMark) || void 0 === _a || _a.map(function (mark, index) {
+                    (null == res ? void 0 : res.data) ? (data.loadState = "success", data.data = res.data, mark.imageLoadSuccess(url, res.data)) : (data.loadState = "fail", mark.imageLoadFail(url));
+                  });
+                });
+                promises.push(end);
+              } else data.loadState = "fail", marks.forEach(function (mark) {
+                return mark.imageLoadFail(url);
+              });
+            }), Promise.all(promises).then(function () {
+              ResourceLoader.isLoading = !1, ResourceLoader.loading();
+            })["catch"](function (error) {
+              console.error(error), ResourceLoader.isLoading = !1, ResourceLoader.loading();
+            });
+          }
+        }, 0);
+      }
+    }, {
+      key: "loadImage",
+      value: function loadImage(url, mark) {
+        var index = getIndex(url, ResourceLoader.toLoadAueue);
+        if (-1 !== index) return ResourceLoader.toLoadAueue[index].marks.push(mark), void ResourceLoader.loading();
+        ResourceLoader.toLoadAueue.push({
+          url: url,
+          marks: [mark]
+        }), ResourceLoader.loading();
+      }
+    }, {
+      key: "improveImageLoading",
+      value: function improveImageLoading(url) {
+        var index = getIndex(url, ResourceLoader.toLoadAueue);
+        if (-1 !== index) {
+          var elememt = ResourceLoader.toLoadAueue.splice(index, 1);
+          ResourceLoader.toLoadAueue.unshift(elememt[0]);
+        }
+      }
     }]);
     return ResourceLoader;
   }();
-  ResourceLoader.cache = new Map();
+  function getIndex(url, arr) {
+    for (var i = 0; i < arr.length; i++) if (arr[i].url === url) return i;
+    return -1;
+  }
+  ResourceLoader.cache = new Map(), ResourceLoader.isLoading = !1, ResourceLoader.toLoadAueue = [];
 
   var tempMatrix = new Matrix(),
     tempBounds$1 = new AABBBounds();
@@ -11661,7 +11711,7 @@
         var context = {
           type: exports.AttributeUpdateType.INIT
         };
-        params = this.onBeforeAttributeUpdate && this.onBeforeAttributeUpdate(params, this.attribute, null, context) || params, this.attribute = params, params.background && this.loadImage(params.background, !0), this._updateTag = exports.UpdateTag.INIT, this.onAttributeUpdate(context);
+        params = this.onBeforeAttributeUpdate && this.onBeforeAttributeUpdate(params, this.attribute, null, context) || params, this.attribute = params, params.background && this.loadImage(params.background, !0), this._updateTag = exports.UpdateTag.INIT, this.valid = this.isValid(), this.onAttributeUpdate(context);
       }
     }, {
       key: "translate",
@@ -12191,7 +12241,7 @@
           data: "init",
           state: null
         };
-        this.resources.set(url, cache), "string" == typeof image ? (cache.state = "loading", image.startsWith("<svg") ? (ResourceLoader.GetSvg(image, this), this.backgroundImg = this.backgroundImg || background) : (isValidUrl$1(image) || image.includes("/") || isBase64$1(image)) && (ResourceLoader.GetImage(image, this), this.backgroundImg = this.backgroundImg || background)) : (cache.state = "success", cache.data = image, this.backgroundImg = this.backgroundImg || background);
+        this.resources.set(url, cache), "string" == typeof image ? (cache.state = "loading", image.startsWith("<svg") ? (ResourceLoader.GetSvg(image, this), this.backgroundImg = this.backgroundImg || background) : (isValidUrl$1(image) || image.includes("/") || isBase64$1(image)) && (ResourceLoader.GetImage(image, this), this.backgroundImg = this.backgroundImg || background)) : isObject$1(image) ? (cache.state = "success", cache.data = image, this.backgroundImg = this.backgroundImg || background) : cache.state = "fail";
       }
     }, {
       key: "imageLoadSuccess",
@@ -16115,6 +16165,16 @@
           _this3.failCallback && _this3.failCallback();
         });
       }
+    }, {
+      key: "setAttributes",
+      value: function setAttributes(params, forceUpdateTag, context) {
+        return params.image && this.loadImage(params.image), _get(_getPrototypeOf(Image.prototype), "setAttributes", this).call(this, params, forceUpdateTag, context);
+      }
+    }, {
+      key: "setAttribute",
+      value: function setAttribute(key, value, forceUpdateTag, context) {
+        return "image" === key && this.loadImage(value), _get(_getPrototypeOf(Image.prototype), "setAttribute", this).call(this, key, value, forceUpdateTag, context);
+      }
     }, {
       key: "doUpdateAABBBounds",
       value: function doUpdateAABBBounds() {
@@ -18191,7 +18251,7 @@
 
   var text, richText;
   function getTextBounds(params) {
-    return text || (text = graphicCreator.CreateGraphic("text", {})), text.setAttributes(params), text.AABBBounds;
+    return text || (text = graphicCreator.CreateGraphic("text", {})), text.initAttributes(params), text.AABBBounds;
   }
   function getRichTextBounds(params) {
     return richText || (richText = graphicCreator.CreateGraphic("richtext", {})), richText.setAttributes(params), richText.AABBBounds;
@@ -18364,6 +18424,254 @@
     return BaseRender;
   }();
 
+  var parse = function () {
+    var tokens = {
+      linearGradient: /^(linear\-gradient)/i,
+      radialGradient: /^(radial\-gradient)/i,
+      conicGradient: /^(conic\-gradient)/i,
+      sideOrCorner: /^to (left (top|bottom)|right (top|bottom)|top (left|right)|bottom (left|right)|left|right|top|bottom)/i,
+      extentKeywords: /^(closest\-side|closest\-corner|farthest\-side|farthest\-corner|contain|cover)/,
+      positionKeywords: /^(left|center|right|top|bottom)/i,
+      pixelValue: /^(-?(([0-9]*\.[0-9]+)|([0-9]+\.?)))px/,
+      percentageValue: /^(-?(([0-9]*\.[0-9]+)|([0-9]+\.?)))\%/,
+      emValue: /^(-?(([0-9]*\.[0-9]+)|([0-9]+\.?)))em/,
+      angleValue: /^(-?(([0-9]*\.[0-9]+)|([0-9]+\.?)))deg/,
+      fromAngleValue: /^from\s*(-?(([0-9]*\.[0-9]+)|([0-9]+\.?)))deg/,
+      startCall: /^\(/,
+      endCall: /^\)/,
+      comma: /^,/,
+      hexColor: /(^\#[0-9a-fA-F]+)/,
+      literalColor: /^([a-zA-Z]+)/,
+      rgbColor: /^(rgb\(\d{1,3},\s*\d{1,3},\s*\d{1,3}\))/i,
+      rgbaColor: /^(rgba\(\d{1,3},\s*\d{1,3},\s*\d{1,3},\s*((\d\.\d+)|\d{1,3})\))/i,
+      number: /^(([0-9]*\.[0-9]+)|([0-9]+\.?))/
+    };
+    var input = "";
+    function error(msg) {
+      var err = new Error(input + ": " + msg);
+      throw err.source = input, err;
+    }
+    function getAST() {
+      var ast = matchListing(matchDefinition);
+      return input.length > 0 && error("Invalid input not EOF"), ast;
+    }
+    function matchDefinition() {
+      return matchGradient("linear", tokens.linearGradient, matchLinearOrientation) || matchGradient("radial", tokens.radialGradient, matchListRadialOrientations) || matchGradient("conic", tokens.conicGradient, matchConicalOrientation);
+    }
+    function matchGradient(gradientType, pattern, orientationMatcher) {
+      return function (pattern, callback) {
+        var captures = scan(pattern);
+        if (captures) {
+          scan(tokens.startCall) || error("Missing (");
+          var result = callback(captures);
+          return scan(tokens.endCall) || error("Missing )"), result;
+        }
+      }(pattern, function (captures) {
+        var orientation = orientationMatcher();
+        return orientation && (scan(tokens.comma) || error("Missing comma before color stops")), {
+          type: gradientType,
+          orientation: orientation,
+          colorStops: matchListing(matchColorStop)
+        };
+      });
+    }
+    function matchLinearOrientation() {
+      return match("directional", tokens.sideOrCorner, 1) || match("angular", tokens.angleValue, 1);
+    }
+    function matchConicalOrientation() {
+      return match("angular", tokens.fromAngleValue, 1);
+    }
+    function matchListRadialOrientations() {
+      var radialOrientations,
+        lookaheadCache,
+        radialOrientation = matchRadialOrientation();
+      return radialOrientation && (radialOrientations = [], radialOrientations.push(radialOrientation), lookaheadCache = input, scan(tokens.comma) && (radialOrientation = matchRadialOrientation(), radialOrientation ? radialOrientations.push(radialOrientation) : input = lookaheadCache)), radialOrientations;
+    }
+    function matchRadialOrientation() {
+      var radialType = function () {
+        var circle = match("shape", /^(circle)/i, 0);
+        circle && (circle.style = matchLength() || matchExtentKeyword());
+        return circle;
+      }() || function () {
+        var ellipse = match("shape", /^(ellipse)/i, 0);
+        ellipse && (ellipse.style = matchDistance() || matchExtentKeyword());
+        return ellipse;
+      }();
+      if (radialType) radialType.at = matchAtPosition();else {
+        var extent = matchExtentKeyword();
+        if (extent) {
+          radialType = extent;
+          var positionAt = matchAtPosition();
+          positionAt && (radialType.at = positionAt);
+        } else {
+          var defaultPosition = matchPositioning();
+          defaultPosition && (radialType = {
+            type: "default-radial",
+            at: defaultPosition
+          });
+        }
+      }
+      return radialType;
+    }
+    function matchExtentKeyword() {
+      return match("extent-keyword", tokens.extentKeywords, 1);
+    }
+    function matchAtPosition() {
+      if (match("position", /^at/, 0)) {
+        var positioning = matchPositioning();
+        return positioning || error("Missing positioning value"), positioning;
+      }
+    }
+    function matchPositioning() {
+      var location = {
+        x: matchDistance(),
+        y: matchDistance()
+      };
+      if (location.x || location.y) return {
+        type: "position",
+        value: location
+      };
+    }
+    function matchListing(matcher) {
+      var captures = matcher();
+      var result = [];
+      if (captures) for (result.push(captures); scan(tokens.comma);) captures = matcher(), captures ? result.push(captures) : error("One extra comma");
+      return result;
+    }
+    function matchColorStop() {
+      var color = match("hex", tokens.hexColor, 1) || match("rgba", tokens.rgbaColor, 1) || match("rgb", tokens.rgbColor, 1) || match("literal", tokens.literalColor, 0);
+      return color || error("Expected color definition"), color.length = matchDistance(), color;
+    }
+    function matchDistance() {
+      return match("%", tokens.percentageValue, 1) || match("position-keyword", tokens.positionKeywords, 1) || matchLength();
+    }
+    function matchLength() {
+      return match("px", tokens.pixelValue, 1) || match("em", tokens.emValue, 1);
+    }
+    function match(type, pattern, captureIndex) {
+      var captures = scan(pattern);
+      if (captures) return {
+        type: type,
+        value: captures[captureIndex]
+      };
+    }
+    function scan(regexp) {
+      var blankCaptures = /^[\n\r\t\s]+/.exec(input);
+      blankCaptures && consume(blankCaptures[0].length);
+      var captures = regexp.exec(input);
+      return captures && consume(captures[0].length), captures;
+    }
+    function consume(size) {
+      input = input.substr(size);
+    }
+    return function (code) {
+      return input = code.toString(), getAST();
+    };
+  }();
+  var GradientParser = /*#__PURE__*/function () {
+    function GradientParser() {
+      _classCallCheck(this, GradientParser);
+    }
+    _createClass(GradientParser, null, [{
+      key: "IsGradient",
+      value: function IsGradient(c) {
+        return !("string" == typeof c && c.length < 10);
+      }
+    }, {
+      key: "IsGradientStr",
+      value: function IsGradientStr(c) {
+        return "string" == typeof c && c.length > 10;
+      }
+    }, {
+      key: "Parse",
+      value: function Parse(c) {
+        if (GradientParser.IsGradientStr(c)) try {
+          var datum = parse(c)[0];
+          if (datum) {
+            if ("linear" === datum.type) return GradientParser.ParseLinear(datum);
+            if ("radial" === datum.type) return GradientParser.ParseRadial(datum);
+            if ("conic" === datum.type) return GradientParser.ParseConic(datum);
+          }
+        } catch (err) {
+          return c;
+        }
+        return c;
+      }
+    }, {
+      key: "ParseConic",
+      value: function ParseConic(datum) {
+        var orientation = datum.orientation,
+          _datum$colorStops = datum.colorStops,
+          colorStops = _datum$colorStops === void 0 ? [] : _datum$colorStops,
+          halfPi = pi / 2,
+          sa = parseFloat(orientation.value) / 180 * pi - halfPi;
+        return {
+          gradient: "conical",
+          x: .5,
+          y: .5,
+          startAngle: sa,
+          endAngle: sa + pi2,
+          stops: colorStops.map(function (item) {
+            return {
+              color: item.value,
+              offset: parseFloat(item.length.value) / 100
+            };
+          })
+        };
+      }
+    }, {
+      key: "ParseRadial",
+      value: function ParseRadial(datum) {
+        var _datum$colorStops2 = datum.colorStops,
+          colorStops = _datum$colorStops2 === void 0 ? [] : _datum$colorStops2;
+        return {
+          gradient: "radial",
+          x0: .5,
+          y0: .5,
+          x1: .5,
+          y1: .5,
+          r0: 0,
+          r1: 1,
+          stops: colorStops.map(function (item) {
+            return {
+              color: item.value,
+              offset: parseFloat(item.length.value) / 100
+            };
+          })
+        };
+      }
+    }, {
+      key: "ParseLinear",
+      value: function ParseLinear(datum) {
+        var orientation = datum.orientation,
+          _datum$colorStops3 = datum.colorStops,
+          colorStops = _datum$colorStops3 === void 0 ? [] : _datum$colorStops3,
+          halfPi = pi / 2;
+        var angle = "angular" === orientation.type ? parseFloat(orientation.value) / 180 * pi : 0;
+        for (; angle < 0;) angle += pi2;
+        for (; angle > pi2;) angle -= pi2;
+        var x0 = 0,
+          y0 = 0,
+          x1 = 0,
+          y1 = 0;
+        return angle < halfPi ? (x0 = 0, y0 = 1, x1 = Math.sin(angle), y1 = Math.cos(angle)) : angle < pi ? (x0 = 0, y0 = 0, x1 = Math.cos(angle - halfPi), y1 = Math.sin(angle - halfPi)) : angle < pi + halfPi ? (x0 = 1, y0 = 0, x1 = x0 - Math.sin(angle - pi), y1 = Math.cos(angle - pi)) : (x0 = 1, x1 = x0 - Math.cos(angle - halfPi - pi), y1 -= Math.sin(angle - halfPi - pi)), {
+          gradient: "linear",
+          x0: x0,
+          y0: y0,
+          x1: x1,
+          y1: y1,
+          stops: colorStops.map(function (item) {
+            return {
+              color: item.value,
+              offset: parseFloat(item.length.value) / 100
+            };
+          })
+        };
+      }
+    }]);
+    return GradientParser;
+  }();
+
   function getScaledStroke(context, width, dpr) {
     var strokeWidth = width;
     var _context$currentMatri = context.currentMatrix,
@@ -18379,7 +18687,7 @@
     if (!c || !0 === c) return "black";
     var result, color;
     if (isArray$1(c)) for (var i = 0; i < c.length && (color = c[i], !color); i++);else color = c;
-    return "string" == typeof color ? color : ("linear" === color.gradient ? result = createLinearGradient(context, color, params, offsetX, offsetY) : "conical" === color.gradient ? result = createConicGradient(context, color, params, offsetX, offsetY) : "radial" === color.gradient && (result = createRadialGradient(context, color, params, offsetX, offsetY)), result || "orange");
+    return color = GradientParser.Parse(color), "string" == typeof color ? color : ("linear" === color.gradient ? result = createLinearGradient(context, color, params, offsetX, offsetY) : "conical" === color.gradient ? result = createConicGradient(context, color, params, offsetX, offsetY) : "radial" === color.gradient && (result = createRadialGradient(context, color, params, offsetX, offsetY)), result || "orange");
   }
   function createLinearGradient(context, color, params) {
     var offsetX = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0;
@@ -20932,7 +21240,9 @@
       value: function draw(image, renderService, drawContext) {
         var url = image.attribute.image;
         if (!url || !image.resources) return;
-        if ("success" !== image.resources.get(url).state) return;
+        var res = image.resources.get(url);
+        if ("loading" === res.state && isString$1(url)) return void ResourceLoader.improveImageLoading(url);
+        if ("success" !== res.state) return;
         var context = renderService.drawParams.context;
         if (!context) return;
         var imageAttribute = getTheme(image).image;
@@ -22740,11 +23050,10 @@
     container.load(renderModule);
   }
 
-  var loaded$r = !1;
   function preLoadAllModule() {
-    loaded$r || (loaded$r = !0, container.load(coreModule), container.load(graphicModule), container.load(renderModule$1), container.load(pickModule), container.load(pluginModule), load$1(container), load(container));
+    preLoadAllModule.__loaded || (preLoadAllModule.__loaded = !0, container.load(coreModule), container.load(graphicModule), container.load(renderModule$1), container.load(pickModule), container.load(pluginModule), load$1(container), load(container));
   }
-  preLoadAllModule();
+  preLoadAllModule.__loaded = !1, preLoadAllModule();
   var vglobal = container.get(VGlobal);
   application.global = vglobal;
   var graphicUtil = container.get(GraphicUtil);
@@ -22955,7 +23264,7 @@
         graphic.bindDom.forEach(function (_ref) {
           var wrapGroup = _ref.wrapGroup;
           application.global.removeDom(wrapGroup);
-        }), nativeDom = "string" == typeof dom ? new DOMParser().parseFromString(dom, "text/html").firstChild : dom;
+        }), "string" == typeof dom ? (nativeDom = new DOMParser().parseFromString(dom, "text/html").firstChild, nativeDom.lastChild && (nativeDom = nativeDom.lastChild.firstChild)) : nativeDom = dom;
         var _container = container || (!0 === stage.params.enableHtmlAttribute ? null : stage.params.enableHtmlAttribute);
         nativeContainer = _container ? "string" == typeof _container ? application.global.getElementById(_container) : _container : graphic.stage.window.getContainer();
         var wrapGroup = application.global.createDom({
@@ -26684,7 +26993,7 @@
       ops: I(t, e, s, n, a)
     };
   }
-  function m(t, e, s) {
+  function m$2(t, e, s) {
     var n = (t || []).length;
     if (n > 2) {
       var _a5 = [];
@@ -26701,7 +27010,7 @@
   }
   function w(t, e, s, n, a) {
     return function (t, e) {
-      return m(t, !0, e);
+      return m$2(t, !0, e);
     }([[t, e], [t + s, e], [t + s, e + n], [t, e + n]], a);
   }
   function x(t, e) {
@@ -27137,7 +27446,7 @@
       key: "linearPath",
       value: function linearPath(t, e) {
         var s = this._o(e);
-        return this._d("linearPath", [m(t, !1, s)], s);
+        return this._d("linearPath", [m$2(t, !1, s)], s);
       }
     }, {
       key: "arc",
@@ -27204,7 +27513,7 @@
       value: function polygon(t, e) {
         var s = this._o(e),
           n = [],
-          a = m(t, !0, s);
+          a = m$2(t, !0, s);
         return s.fill && ("solid" === s.fillStyle ? n.push(S([t], s)) : n.push(L([t], s))), s.stroke !== H && n.push(a), this._d("polygon", n, s);
       }
     }, {
@@ -27270,7 +27579,7 @@
             return l;
           }(t, 1, h ? 4 - 4 * s.simplification : (1 + s.roughness) / 2);
         return a && ("solid" === s.fillStyle ? n.push(S(r, s)) : n.push(L(r, s))), o && (h ? r.forEach(function (t) {
-          n.push(m(t, !1, s));
+          n.push(m$2(t, !1, s));
         }) : n.push(function (t, e) {
           var s = g(d(f(t))),
             n = [];
@@ -29918,10 +30227,11 @@
   }();
   DefaultCanvasGroupPicker = __decorate$O([injectable()], DefaultCanvasGroupPicker);
 
-  var loaded$q = !1;
-  var canvasModule = new ContainerModule(function (bind, unbind, isBound, rebind) {
-    loaded$q || (loaded$q = !0, bind(CanvasGroupPicker).to(DefaultCanvasGroupPicker).inSingletonScope(), bind(CanvasPickerContribution).toService(CanvasGroupPicker), bindContributionProvider(bind, CanvasPickerContribution));
+  var m$1 = new ContainerModule(function (bind, unbind, isBound, rebind) {
+    m$1.__vloaded || (m$1.__vloaded = !0, bind(CanvasGroupPicker).to(DefaultCanvasGroupPicker).inSingletonScope(), bind(CanvasPickerContribution).toService(CanvasGroupPicker), bindContributionProvider(bind, CanvasPickerContribution));
   });
+  m$1.__vloaded = !1;
+  var canvasModule = m$1;
 
   var canvasPickerModule = new ContainerModule(function (bind, unbind, isBound, rebind) {
     isBound(DefaultCanvasPickerService) || bind(DefaultCanvasPickerService).toSelf().inSingletonScope(), isBound(PickerService) ? rebind(PickerService).toService(DefaultCanvasPickerService) : bind(PickerService).toService(DefaultCanvasPickerService);
@@ -30268,7 +30578,7 @@
       key: "getNativeAABBBounds",
       value: function getNativeAABBBounds(_dom) {
         var dom = _dom;
-        if ("string" == typeof _dom && (dom = new DOMParser().parseFromString(_dom, "text/html").firstChild), dom.getBoundingClientRect) {
+        if ("string" == typeof _dom && (dom = new DOMParser().parseFromString(_dom, "text/html").firstChild, dom.lastChild && (dom = dom.lastChild.firstChild)), dom.getBoundingClientRect) {
           var b = dom.getBoundingClientRect();
           return new DynamicB(b);
         }
@@ -30430,15 +30740,15 @@
   }(exports.BaseEnvContribution);
   BrowserEnvContribution = __decorate$M([injectable(), __metadata$D("design:paramtypes", [])], BrowserEnvContribution);
 
-  var isBrowserBound = !1;
   var browserEnvModule = new ContainerModule(function (bind) {
-    isBrowserBound || (isBrowserBound = !0, bind(BrowserEnvContribution).toSelf().inSingletonScope(), bind(EnvContribution).toService(BrowserEnvContribution));
+    browserEnvModule.isBrowserBound || (browserEnvModule.isBrowserBound = !0, bind(BrowserEnvContribution).toSelf().inSingletonScope(), bind(EnvContribution).toService(BrowserEnvContribution));
   });
-  var loaded$p = !1;
+  browserEnvModule.isBrowserBound = !1;
   function loadBrowserEnv(container) {
     var loadPicker = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : !0;
-    loaded$p || (loaded$p = !0, container.load(browserEnvModule), container.load(browserCanvasModule), container.load(browserWindowModule), loadPicker && loadCanvasPicker(container));
+    loadBrowserEnv.__loaded || (loadBrowserEnv.__loaded = !0, container.load(browserEnvModule), container.load(browserCanvasModule), container.load(browserWindowModule), loadPicker && loadCanvasPicker(container));
   }
+  loadBrowserEnv.__loaded = !1;
   function initBrowserEnv() {
     loadBrowserEnv(container);
   }
@@ -30803,10 +31113,11 @@
   }(exports.DefaultPickService);
   DefaultMathPickerService = __decorate$I([injectable(), __param$r(0, inject(ContributionProvider)), __param$r(0, named(MathPickerContribution)), __param$r(1, inject(ContributionProvider)), __param$r(1, named(PickItemInterceptor)), __metadata$A("design:paramtypes", [Object, Object])], DefaultMathPickerService);
 
-  var loaded$o = !1;
-  var mathModule = new ContainerModule(function (bind) {
-    loaded$o || (loaded$o = !0, bindContributionProvider(bind, MathPickerContribution));
+  var m = new ContainerModule(function (bind) {
+    m.__vloaded || (m.__vloaded = !0, bindContributionProvider(bind, MathPickerContribution));
   });
+  m.__vloaded = !1;
+  var mathModule = m;
 
   var mathPickerModule = new ContainerModule(function (bind, unbind, isBound, rebind) {
     isBound(DefaultMathPickerService) || bind(DefaultMathPickerService).toSelf().inSingletonScope(), isBound(PickerService) ? rebind(PickerService).toService(DefaultMathPickerService) : bind(PickerService).toService(DefaultMathPickerService);
@@ -30970,15 +31281,15 @@
   }(exports.BaseEnvContribution);
   FeishuEnvContribution = __decorate$H([injectable(), __metadata$z("design:paramtypes", [])], FeishuEnvContribution);
 
-  var isFeishuBound = !1;
   var feishuEnvModule = new ContainerModule(function (bind) {
-    isFeishuBound || (isFeishuBound = !0, bind(FeishuEnvContribution).toSelf().inSingletonScope(), bind(EnvContribution).toService(FeishuEnvContribution));
+    feishuEnvModule.isFeishuBound || (feishuEnvModule.isFeishuBound = !0, bind(FeishuEnvContribution).toSelf().inSingletonScope(), bind(EnvContribution).toService(FeishuEnvContribution));
   });
-  var loaded$n = !1;
+  feishuEnvModule.isFeishuBound = !1;
   function loadFeishuEnv(container) {
     var loadPicker = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : !0;
-    loaded$n || (loaded$n = !0, container.load(feishuEnvModule), container.load(feishuCanvasModule), container.load(feishuWindowModule), loadPicker && loadMathPicker(container));
+    loadFeishuEnv.__loaded || (loadFeishuEnv.__loaded = !0, container.load(feishuEnvModule), container.load(feishuCanvasModule), container.load(feishuWindowModule), loadPicker && loadMathPicker(container));
   }
+  loadFeishuEnv.__loaded = !1;
   function initFeishuEnv() {
     loadFeishuEnv(container);
   }
@@ -31497,15 +31808,15 @@
   }(exports.BaseEnvContribution);
   LynxEnvContribution = __decorate$D([injectable(), __metadata$w("design:paramtypes", [])], LynxEnvContribution);
 
-  var isLynxBound = !1;
   var lynxEnvModule = new ContainerModule(function (bind) {
-    isLynxBound || (isLynxBound = !0, bind(LynxEnvContribution).toSelf().inSingletonScope(), bind(EnvContribution).toService(LynxEnvContribution));
+    lynxEnvModule.isLynxBound || (lynxEnvModule.isLynxBound = !0, bind(LynxEnvContribution).toSelf().inSingletonScope(), bind(EnvContribution).toService(LynxEnvContribution));
   });
-  var loaded$m = !1;
+  lynxEnvModule.isLynxBound = !1;
   function loadLynxEnv(container) {
     var loadPicker = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : !0;
-    loaded$m || (loaded$m = !0, container.load(lynxEnvModule), container.load(lynxCanvasModule), container.load(lynxWindowModule), loadPicker && loadMathPicker(container));
+    loadLynxEnv.__loaded || (loadLynxEnv.__loaded = !0, container.load(lynxEnvModule), container.load(lynxCanvasModule), container.load(lynxWindowModule), loadPicker && loadMathPicker(container));
   }
+  loadLynxEnv.__loaded = !1;
   function initLynxEnv() {
     loadLynxEnv(container);
   }
@@ -31878,14 +32189,14 @@
   }(exports.BaseEnvContribution);
   NodeEnvContribution = __decorate$z([injectable()], NodeEnvContribution);
 
-  var isNodeBound = !1;
   var nodeEnvModule = new ContainerModule(function (bind) {
-    isNodeBound || (isNodeBound = !0, bind(NodeEnvContribution).toSelf().inSingletonScope(), bind(EnvContribution).toService(NodeEnvContribution));
+    nodeEnvModule.isNodeBound || (nodeEnvModule.isNodeBound = !0, bind(NodeEnvContribution).toSelf().inSingletonScope(), bind(EnvContribution).toService(NodeEnvContribution));
   });
-  var loaded$l = !1;
+  nodeEnvModule.isNodeBound = !1;
   function loadNodeEnv(container) {
-    loaded$l || (loaded$l = !0, container.load(nodeEnvModule), container.load(nodeCanvasModule), container.load(nodeWindowModule));
+    loadNodeEnv.__loaded || (loadNodeEnv.__loaded = !0, container.load(nodeEnvModule), container.load(nodeCanvasModule), container.load(nodeWindowModule));
   }
+  loadNodeEnv.__loaded = !1;
   function initNodeEnv() {
     loadNodeEnv(container);
   }
@@ -32426,15 +32737,15 @@
   }(exports.BaseEnvContribution);
   TaroEnvContribution = __decorate$v([injectable(), __metadata$q("design:paramtypes", [])], TaroEnvContribution);
 
-  var isTaroBound = !1;
   var taroEnvModule = new ContainerModule(function (bind) {
-    isTaroBound || (isTaroBound = !0, bind(TaroEnvContribution).toSelf().inSingletonScope(), bind(EnvContribution).toService(TaroEnvContribution));
+    taroEnvModule.isTaroBound || (taroEnvModule.isTaroBound = !0, bind(TaroEnvContribution).toSelf().inSingletonScope(), bind(EnvContribution).toService(TaroEnvContribution));
   });
-  var loaded$k = !1;
+  taroEnvModule.isTaroBound = !1;
   function loadTaroEnv(container) {
     var loadPicker = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : !0;
-    loaded$k || (loaded$k = !0, container.load(taroEnvModule), container.load(taroCanvasModule), container.load(taroWindowModule), loadPicker && loadMathPicker(container));
+    loadTaroEnv.__loaded || (loadTaroEnv.__loaded = !0, container.load(taroEnvModule), container.load(taroCanvasModule), container.load(taroWindowModule), loadPicker && loadMathPicker(container));
   }
+  loadTaroEnv.__loaded = !1;
   function initTaroEnv() {
     loadTaroEnv(container);
   }
@@ -32901,15 +33212,15 @@
   }(exports.BaseEnvContribution);
   WxEnvContribution = __decorate$r([injectable(), __metadata$n("design:paramtypes", [])], WxEnvContribution);
 
-  var isWxBound = !1;
   var wxEnvModule = new ContainerModule(function (bind) {
-    isWxBound || (isWxBound = !0, bind(WxEnvContribution).toSelf().inSingletonScope(), bind(EnvContribution).toService(WxEnvContribution));
+    wxEnvModule._isWxBound || (wxEnvModule._isWxBound = !0, bind(WxEnvContribution).toSelf().inSingletonScope(), bind(EnvContribution).toService(WxEnvContribution));
   });
-  var loaded$j = !1;
+  wxEnvModule._isWxBound = !1;
   function loadWxEnv(container) {
     var loadPicker = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : !0;
-    loaded$j || (loaded$j = !0, container.load(wxEnvModule), container.load(wxCanvasModule), container.load(wxWindowModule), loadPicker && loadMathPicker(container));
+    loadWxEnv.__loaded || (loadWxEnv.__loaded = !0, container.load(wxEnvModule), container.load(wxCanvasModule), container.load(wxWindowModule), loadPicker && loadMathPicker(container));
   }
+  loadWxEnv.__loaded = !1;
   function initWxEnv() {
     loadWxEnv(container);
   }
@@ -32917,12 +33228,12 @@
   function loadAllEnv(container) {
     loadAllModule(container);
   }
-  var loaded$i = !1;
   function loadAllModule(container) {
-    loaded$i || (loaded$i = !0, loadBrowserEnv(container, !1), loadFeishuEnv(container, !1), loadLynxEnv(container, !1), loadNodeEnv(container), loadTaroEnv(container, !1), loadWxEnv(container, !1), loadCanvasPicker(container), vglobal.hooks.onSetEnv.tap("loadMathPicker", function (lastEnv, env) {
+    loadAllModule.__loaded || (loadAllModule.__loaded = !0, loadBrowserEnv(container, !1), loadFeishuEnv(container, !1), loadLynxEnv(container, !1), loadNodeEnv(container), loadTaroEnv(container, !1), loadWxEnv(container, !1), loadCanvasPicker(container), vglobal.hooks.onSetEnv.tap("loadMathPicker", function (lastEnv, env) {
       "browser" !== env && loadMathPicker(container);
     }));
   }
+  loadAllModule.__loaded = !1;
   function initAllEnv() {
     loadAllEnv(container);
   }
@@ -34424,99 +34735,117 @@
 
   var browser = isBrowserEnv();
 
-  var loaded$h = !1;
-  function registerArc() {
-    loaded$h || (loaded$h = !0, registerArcGraphic(), container.load(arcModule), container.load(browser ? arcCanvasPickModule : arcMathPickModule));
+  function _registerArc() {
+    _registerArc.__loaded || (_registerArc.__loaded = !0, registerArcGraphic(), container.load(arcModule), container.load(browser ? arcCanvasPickModule : arcMathPickModule));
   }
+  _registerArc.__loaded = !1;
+  var registerArc = _registerArc;
 
-  var loaded$g = !1;
-  function registerArc3d() {
-    loaded$g || (loaded$g = !0, registerArc3dGraphic(), container.load(arc3dModule), container.load(arc3dCanvasPickModule));
+  function _registerArc3d() {
+    _registerArc3d.__loaded || (_registerArc3d.__loaded = !0, registerArc3dGraphic(), container.load(arc3dModule), container.load(arc3dCanvasPickModule));
   }
+  _registerArc3d.__loaded = !1;
+  var registerArc3d = _registerArc3d;
 
-  var loaded$f = !1;
-  function registerArea() {
-    loaded$f || (loaded$f = !0, registerAreaGraphic(), container.load(areaModule), container.load(browser ? areaCanvasPickModule : areaMathPickModule));
+  function _registerArea() {
+    _registerArea.__loaded || (_registerArea.__loaded = !0, registerAreaGraphic(), container.load(areaModule), container.load(browser ? areaCanvasPickModule : areaMathPickModule));
   }
+  _registerArea.__loaded = !1;
+  var registerArea = _registerArea;
 
-  var loaded$e = !1;
-  function registerCircle() {
-    loaded$e || (loaded$e = !0, registerCircleGraphic(), container.load(circleModule), container.load(browser ? circleCanvasPickModule : circleMathPickModule));
+  function _registerCircle() {
+    _registerCircle.__loaded || (_registerCircle.__loaded = !0, registerCircleGraphic(), container.load(circleModule), container.load(browser ? circleCanvasPickModule : circleMathPickModule));
   }
+  _registerCircle.__loaded = !1;
+  var registerCircle = _registerCircle;
 
-  var loaded$d = !1;
-  function registerGlyph() {
-    loaded$d || (loaded$d = !0, registerGlyphGraphic(), container.load(glyphModule), container.load(browser ? glyphCanvasPickModule : glyphMathPickModule));
+  function _registerGlyph() {
+    _registerGlyph.__loaded || (_registerGlyph.__loaded = !0, registerGlyphGraphic(), container.load(glyphModule), container.load(browser ? glyphCanvasPickModule : glyphMathPickModule));
   }
+  _registerGlyph.__loaded = !1;
+  var registerGlyph = _registerGlyph;
 
-  var loaded$c = !1;
-  function registerGroup() {
-    loaded$c || (loaded$c = !0, registerGroupGraphic());
+  function _registerGroup() {
+    _registerGroup.__loaded || (_registerGroup.__loaded = !0, registerGroupGraphic());
   }
+  _registerGroup.__loaded = !1;
+  var registerGroup = _registerGroup;
 
-  var loaded$b = !1;
-  function registerImage() {
-    loaded$b || (loaded$b = !0, registerImageGraphic(), container.load(imageModule), container.load(browser ? imageCanvasPickModule : imageMathPickModule));
+  function _registerImage() {
+    _registerImage.__loaded || (_registerImage.__loaded = !0, registerImageGraphic(), container.load(imageModule), container.load(browser ? imageCanvasPickModule : imageMathPickModule));
   }
+  _registerImage.__loaded = !1;
+  var registerImage = _registerImage;
 
-  var loaded$a = !1;
-  function registerLine() {
-    loaded$a || (loaded$a = !0, registerLineGraphic(), container.load(lineModule), container.load(browser ? lineCanvasPickModule : lineMathPickModule));
+  function _registerLine() {
+    _registerLine.__loaded || (_registerLine.__loaded = !0, registerLineGraphic(), container.load(lineModule), container.load(browser ? lineCanvasPickModule : lineMathPickModule));
   }
+  _registerLine.__loaded = !1;
+  var registerLine = _registerLine;
 
-  var loaded$9 = !1;
-  function registerPath() {
-    loaded$9 || (loaded$9 = !0, registerPathGraphic(), container.load(pathModule), container.load(browser ? pathCanvasPickModule : pathMathPickModule));
+  function _registerPath() {
+    _registerPath.__loaded || (_registerPath.__loaded = !0, registerPathGraphic(), container.load(pathModule), container.load(browser ? pathCanvasPickModule : pathMathPickModule));
   }
+  _registerPath.__loaded = !1;
+  var registerPath = _registerPath;
 
-  var loaded$8 = !1;
-  function registerPolygon() {
-    loaded$8 || (loaded$8 = !0, registerPolygonGraphic(), container.load(polygonModule), container.load(browser ? polygonCanvasPickModule : polygonMathPickModule));
+  function _registerPolygon() {
+    _registerPolygon.__loaded || (_registerPolygon.__loaded = !0, registerPolygonGraphic(), container.load(polygonModule), container.load(browser ? polygonCanvasPickModule : polygonMathPickModule));
   }
+  _registerPolygon.__loaded = !1;
+  var registerPolygon = _registerPolygon;
 
-  var loaded$7 = !1;
-  function registerPyramid3d() {
-    loaded$7 || (loaded$7 = !0, registerPyramid3dGraphic(), container.load(pyramid3dModule), container.load(pyramid3dCanvasPickModule));
+  function _registerPyramid3d() {
+    _registerPyramid3d.__loaded || (_registerPyramid3d.__loaded = !0, registerPyramid3dGraphic(), container.load(pyramid3dModule), container.load(pyramid3dCanvasPickModule));
   }
+  _registerPyramid3d.__loaded = !1;
+  var registerPyramid3d = _registerPyramid3d;
 
-  var loaded$6 = !1;
-  function registerRect() {
-    loaded$6 || (loaded$6 = !0, registerRectGraphic(), container.load(rectModule), container.load(browser ? rectCanvasPickModule : rectMathPickModule));
+  function _registerRect() {
+    _registerRect.__loaded || (_registerRect.__loaded = !0, registerRectGraphic(), container.load(rectModule), container.load(browser ? rectCanvasPickModule : rectMathPickModule));
   }
+  _registerRect.__loaded = !1;
+  var registerRect = _registerRect;
 
-  var loaded$5 = !1;
-  function registerRect3d() {
-    loaded$5 || (loaded$5 = !0, registerRect3dGraphic(), container.load(rect3dModule), container.load(rect3dCanvasPickModule));
+  function _registerRect3d() {
+    _registerRect3d.__loaded || (_registerRect3d.__loaded = !0, registerRect3dGraphic(), container.load(rect3dModule), container.load(rect3dCanvasPickModule));
   }
+  _registerRect3d.__loaded = !1;
+  var registerRect3d = _registerRect3d;
 
-  var loaded$4 = !1;
-  function registerRichtext() {
-    loaded$4 || (loaded$4 = !0, registerRichtextGraphic(), container.load(richtextModule), container.load(browser ? richtextCanvasPickModule : richTextMathPickModule));
+  function _registerRichtext() {
+    _registerRichtext.__loaded || (_registerRichtext.__loaded = !0, registerRichtextGraphic(), container.load(richtextModule), container.load(browser ? richtextCanvasPickModule : richTextMathPickModule));
   }
+  _registerRichtext.__loaded = !1;
+  var registerRichtext = _registerRichtext;
 
-  var loaded$3 = !1;
-  function registerShadowRoot() {
-    loaded$3 || (loaded$3 = !0, registerShadowRootGraphic());
+  function _registerShadowRoot() {
+    _registerShadowRoot.__loaded || (_registerShadowRoot.__loaded = !0, registerShadowRootGraphic());
   }
+  _registerShadowRoot.__loaded = !1;
+  var registerShadowRoot = _registerShadowRoot;
 
-  var loaded$2 = !1;
-  function registerSymbol() {
-    loaded$2 || (loaded$2 = !0, registerSymbolGraphic(), container.load(symbolModule), container.load(browser ? symbolCanvasPickModule : symbolMathPickModule));
+  function _registerSymbol() {
+    _registerSymbol.__loaded || (_registerSymbol.__loaded = !0, registerSymbolGraphic(), container.load(symbolModule), container.load(browser ? symbolCanvasPickModule : symbolMathPickModule));
   }
+  _registerSymbol.__loaded = !1;
+  var registerSymbol = _registerSymbol;
 
-  var loaded$1 = !1;
-  function registerText() {
-    loaded$1 || (loaded$1 = !0, registerTextGraphic(), container.load(textModule), container.load(browser ? textCanvasPickModule : textMathPickModule));
+  function _registerText() {
+    _registerText.__loaded || (_registerText.__loaded = !0, registerTextGraphic(), container.load(textModule), container.load(browser ? textCanvasPickModule : textMathPickModule));
   }
+  _registerText.__loaded = !1;
+  var registerText = _registerText;
 
-  var loaded = !1;
-  function registerWrapText() {
-    loaded || (loaded = !0, registerWrapTextGraphic());
+  function _registerWrapText() {
+    _registerWrapText.__loaded || (_registerWrapText.__loaded = !0, registerWrapTextGraphic());
   }
+  _registerWrapText.__loaded = !1;
+  var registerWrapText = _registerWrapText;
 
   var roughModule = _roughModule;
 
-  const version = "0.17.17-alpha.1";
+  const version = "0.17.18-alpha.0";
   preLoadAllModule();
   if (isBrowserEnv()) {
       loadBrowserEnv(container);
@@ -34780,6 +35109,7 @@
   exports.WindowHandlerContribution = WindowHandlerContribution;
   exports.WrapText = WrapText;
   exports.XMLParser = XMLParser;
+  exports._registerArc = _registerArc;
   exports.addArcToBezierPath = addArcToBezierPath$1;
   exports.addAttributeToPrototype = addAttributeToPrototype;
   exports.alignBezierCurves = alignBezierCurves;