@leafer/core 1.4.0 → 1.4.2

package/lib/core.cjs

@@ -1376,7 +1376,7 @@ function getNameList(name) {
 }
 const D$4 = Debug;
 
-const debug$9 = Debug.get('RunTime');
+const debug$a = Debug.get('RunTime');
 const Run = {
     currentId: 0,
     currentName: '',
@@ -1385,24 +1385,24 @@ const Run = {
     nameToIdMap: {},
     start(name, microsecond) {
         const id = IncrementId.create(IncrementId.RUNTIME);
-        R.currentId = R.idMap[id] = microsecond ? performance.now() : Date.now();
-        R.currentName = R.nameMap[id] = name;
-        R.nameToIdMap[name] = id;
+        R$1.currentId = R$1.idMap[id] = microsecond ? performance.now() : Date.now();
+        R$1.currentName = R$1.nameMap[id] = name;
+        R$1.nameToIdMap[name] = id;
         return id;
     },
     end(id, microsecond) {
-        const time = R.idMap[id], name = R.nameMap[id];
+        const time = R$1.idMap[id], name = R$1.nameMap[id];
         const duration = microsecond ? (performance.now() - time) / 1000 : Date.now() - time;
-        R.idMap[id] = R.nameMap[id] = R.nameToIdMap[name] = undefined;
-        debug$9.log(name, duration, 'ms');
+        R$1.idMap[id] = R$1.nameMap[id] = R$1.nameToIdMap[name] = undefined;
+        debug$a.log(name, duration, 'ms');
     },
     endOfName(name, microsecond) {
-        const id = R.nameToIdMap[name];
+        const id = R$1.nameToIdMap[name];
         if (id !== undefined)
-            R.end(id, microsecond);
+            R$1.end(id, microsecond);
     }
 };
-const R = Run;
+const R$1 = Run;
 
 const check = [];
 const Plugin = {
@@ -1423,18 +1423,18 @@ const Plugin = {
 };
 setTimeout(() => check.forEach(name => Plugin.has(name, true)));
 
-const debug$8 = Debug.get('UICreator');
+const debug$9 = Debug.get('UICreator');
 const UICreator = {
     list: {},
     register(UI) {
         const { __tag: tag } = UI.prototype;
         if (list$1[tag])
-            debug$8.repeat(tag);
+            debug$9.repeat(tag);
         list$1[tag] = UI;
     },
     get(tag, data, x, y, width, height) {
         if (!list$1[tag])
-            debug$8.error('not register ' + tag);
+            debug$9.error('not register ' + tag);
         const ui = new list$1[tag](data);
         if (x !== undefined) {
             ui.x = x;
@@ -1450,7 +1450,7 @@ const UICreator = {
 };
 const { list: list$1 } = UICreator;
 
-const debug$7 = Debug.get('EventCreator');
+const debug$8 = Debug.get('EventCreator');
 const EventCreator = {
     nameList: {},
     register(Event) {
@@ -1458,7 +1458,7 @@ const EventCreator = {
         Object.keys(Event).forEach(key => {
             name = Event[key];
             if (typeof name === 'string')
-                nameList[name] && debug$7.repeat(name), nameList[name] = Event;
+                nameList[name] && debug$8.repeat(name), nameList[name] = Event;
         });
     },
     changeName(oldName, newName) {
@@ -1535,10 +1535,10 @@ const DataHelper = {
         Object.keys(merge).forEach(key => {
             var _a, _b;
             value = merge[key];
-            if ((value === null || value === undefined ? undefined : value.constructor) === Object && ((_a = t[key]) === null || _a === undefined ? undefined : _a.constructor) === Object)
+            if ((value === null || value === void 0 ? void 0 : value.constructor) === Object && ((_a = t[key]) === null || _a === void 0 ? void 0 : _a.constructor) === Object)
                 return assign(t[key], merge[key], exclude && exclude[key]);
             if (exclude && (key in exclude)) {
-                if (((_b = exclude[key]) === null || _b === undefined ? undefined : _b.constructor) === Object)
+                if (((_b = exclude[key]) === null || _b === void 0 ? void 0 : _b.constructor) === Object)
                     assign(t[key] = {}, merge[key], exclude[key]);
                 return;
             }
@@ -1662,7 +1662,7 @@ class LeafData {
         const t = this;
         if (t.blendMode === 'pass-through') {
             const leaf = this.__leaf;
-            if ((t.opacity < 1 && (leaf.isBranch || t.__hasMultiPaint)) || leaf.__hasEraser || t.eraser) {
+            if ((t.opacity < 1 && (leaf.isBranch || t.__hasMultiPaint)) || leaf.__hasEraser || t.eraser || t.filter) {
                 t.__single = true;
             }
             else if (t.__single) {
@@ -1775,7 +1775,7 @@ class Canvas {
     }
     setTransform(_a, _b, _c, _d, _e, _f) { }
     resetTransform() { }
-    getTransform() { return undefined; }
+    getTransform() { return void 0; }
     save() { }
     restore() { }
     transform(a, b, c, d, e, f) {
@@ -1832,12 +1832,12 @@ class Canvas {
     ellipse(_x, _y, _radiusX, _radiusY, _rotation, _startAngle, _endAngle, _anticlockwise) { }
     rect(_x, _y, _width, _height) { }
     roundRect(_x, _y, _width, _height, _radius) { }
-    createConicGradient(_startAngle, _x, _y) { return undefined; }
-    createLinearGradient(_x0, _y0, _x1, _y1) { return undefined; }
-    createPattern(_image, _repetition) { return undefined; }
-    createRadialGradient(_x0, _y0, _r0, _x1, _y1, _r1) { return undefined; }
+    createConicGradient(_startAngle, _x, _y) { return void 0; }
+    createLinearGradient(_x0, _y0, _x1, _y1) { return void 0; }
+    createPattern(_image, _repetition) { return void 0; }
+    createRadialGradient(_x0, _y0, _r0, _x1, _y1, _r1) { return void 0; }
     fillText(_text, _x, _y, _maxWidth) { }
-    measureText(_text) { return undefined; }
+    measureText(_text) { return void 0; }
     strokeText(_text, _x, _y, _maxWidth) { }
     destroy() {
         this.context = null;
@@ -1845,79 +1845,79 @@ class Canvas {
 }
 __decorate([
     contextAttr('imageSmoothingEnabled')
-], Canvas.prototype, "smooth", undefined);
+], Canvas.prototype, "smooth", void 0);
 __decorate([
     contextAttr('imageSmoothingQuality')
-], Canvas.prototype, "smoothLevel", undefined);
+], Canvas.prototype, "smoothLevel", void 0);
 __decorate([
     contextAttr('globalAlpha')
-], Canvas.prototype, "opacity", undefined);
+], Canvas.prototype, "opacity", void 0);
 __decorate([
     contextAttr()
-], Canvas.prototype, "fillStyle", undefined);
+], Canvas.prototype, "fillStyle", void 0);
 __decorate([
     contextAttr()
-], Canvas.prototype, "strokeStyle", undefined);
+], Canvas.prototype, "strokeStyle", void 0);
 __decorate([
     contextAttr('lineWidth')
-], Canvas.prototype, "strokeWidth", undefined);
+], Canvas.prototype, "strokeWidth", void 0);
 __decorate([
     contextAttr('lineCap')
-], Canvas.prototype, "strokeCap", undefined);
+], Canvas.prototype, "strokeCap", void 0);
 __decorate([
     contextAttr('lineJoin')
-], Canvas.prototype, "strokeJoin", undefined);
+], Canvas.prototype, "strokeJoin", void 0);
 __decorate([
     contextAttr('lineDashOffset')
-], Canvas.prototype, "dashOffset", undefined);
+], Canvas.prototype, "dashOffset", void 0);
 __decorate([
     contextAttr()
-], Canvas.prototype, "miterLimit", undefined);
+], Canvas.prototype, "miterLimit", void 0);
 __decorate([
     contextAttr()
-], Canvas.prototype, "shadowBlur", undefined);
+], Canvas.prototype, "shadowBlur", void 0);
 __decorate([
     contextAttr()
-], Canvas.prototype, "shadowColor", undefined);
+], Canvas.prototype, "shadowColor", void 0);
 __decorate([
     contextAttr()
-], Canvas.prototype, "shadowOffsetX", undefined);
+], Canvas.prototype, "shadowOffsetX", void 0);
 __decorate([
     contextAttr()
-], Canvas.prototype, "shadowOffsetY", undefined);
+], Canvas.prototype, "shadowOffsetY", void 0);
 __decorate([
     contextAttr()
-], Canvas.prototype, "filter", undefined);
+], Canvas.prototype, "filter", void 0);
 __decorate([
     contextAttr()
-], Canvas.prototype, "font", undefined);
+], Canvas.prototype, "font", void 0);
 __decorate([
     contextAttr()
-], Canvas.prototype, "fontKerning", undefined);
+], Canvas.prototype, "fontKerning", void 0);
 __decorate([
     contextAttr()
-], Canvas.prototype, "fontStretch", undefined);
+], Canvas.prototype, "fontStretch", void 0);
 __decorate([
     contextAttr()
-], Canvas.prototype, "fontVariantCaps", undefined);
+], Canvas.prototype, "fontVariantCaps", void 0);
 __decorate([
     contextAttr()
-], Canvas.prototype, "textAlign", undefined);
+], Canvas.prototype, "textAlign", void 0);
 __decorate([
     contextAttr()
-], Canvas.prototype, "textBaseline", undefined);
+], Canvas.prototype, "textBaseline", void 0);
 __decorate([
     contextAttr()
-], Canvas.prototype, "textRendering", undefined);
+], Canvas.prototype, "textRendering", void 0);
 __decorate([
     contextAttr()
-], Canvas.prototype, "wordSpacing", undefined);
+], Canvas.prototype, "wordSpacing", void 0);
 __decorate([
     contextAttr()
-], Canvas.prototype, "letterSpacing", undefined);
+], Canvas.prototype, "letterSpacing", void 0);
 __decorate([
     contextAttr()
-], Canvas.prototype, "direction", undefined);
+], Canvas.prototype, "direction", void 0);
 __decorate([
     contextMethod()
 ], Canvas.prototype, "setTransform", null);
@@ -2614,7 +2614,7 @@ const EllipseHelper = {
 const { M: M$4, m, L: L$5, l, H, h, V, v, C: C$4, c, S, s, Q: Q$3, q, T, t, A, a, Z: Z$4, z, N: N$3, D: D$3, X: X$3, G: G$3, F: F$4, O: O$3, P: P$3, U: U$3 } = PathCommandMap;
 const { rect: rect$1, roundRect: roundRect$2, arcTo: arcTo$3, arc: arc$3, ellipse: ellipse$3, quadraticCurveTo: quadraticCurveTo$1 } = BezierHelper;
 const { ellipticalArc } = EllipseHelper;
-const debug$6 = Debug.get('PathConvert');
+const debug$7 = Debug.get('PathConvert');
 const setEndPoint$1 = {};
 const PathConvert = {
     current: { dot: 0 },
@@ -2855,7 +2855,7 @@ const PathConvert = {
                     i += 6;
                     break;
                 default:
-                    debug$6.error(`command: ${command} [index:${i}]`, old);
+                    debug$7.error(`command: ${command} [index:${i}]`, old);
                     return data;
             }
             lastCommand = command;
@@ -2964,12 +2964,10 @@ const PathCommandDataHelper = {
     },
     arcTo(data, x1, y1, x2, y2, radius, lastX, lastY) {
         if (lastX !== undefined) {
-            const maxRadius = tan(getRadianFrom(lastX, lastY, x1, y1, x2, y2) / 2) * (getMinDistanceFrom(lastX, lastY, x1, y1, x2, y2) / 2);
-            data.push(U$2, x1, y1, x2, y2, min(radius, abs(maxRadius)));
-        }
-        else {
-            data.push(U$2, x1, y1, x2, y2, radius);
+            const d = getMinDistanceFrom(lastX, lastY, x1, y1, x2, y2);
+            radius = min(radius, min(d / 2, d / 2 * abs(tan(getRadianFrom(lastX, lastY, x1, y1, x2, y2) / 2))));
         }
+        data.push(U$2, x1, y1, x2, y2, radius);
     },
     drawEllipse(data, x, y, radiusX, radiusY, rotation, startAngle, endAngle, anticlockwise) {
         BezierHelper.ellipse(null, x, y, radiusX, radiusY, rotation === undefined ? 0 : rotation, startAngle === undefined ? 0 : startAngle, endAngle === undefined ? 360 : endAngle, anticlockwise, null, null, startPoint);
@@ -3080,7 +3078,7 @@ class PathCreator {
 }
 
 const { M: M$2, L: L$3, C: C$2, Q: Q$1, Z: Z$2, N: N$1, D: D$1, X: X$1, G: G$1, F: F$2, O: O$1, P: P$1, U: U$1 } = PathCommandMap;
-const debug$5 = Debug.get('PathDrawer');
+const debug$6 = Debug.get('PathDrawer');
 const PathDrawer = {
     drawPathByData(drawer, data) {
         if (!data)
@@ -3143,7 +3141,7 @@ const PathDrawer = {
                     i += 6;
                     break;
                 default:
-                    debug$5.error(`command: ${command} [index:${i}]`, data);
+                    debug$6.error(`command: ${command} [index:${i}]`, data);
                     return;
             }
         }
@@ -3153,7 +3151,7 @@ const PathDrawer = {
 const { M: M$1, L: L$2, C: C$1, Q, Z: Z$1, N, D, X, G, F: F$1, O, P, U } = PathCommandMap;
 const { toTwoPointBounds, toTwoPointBoundsByQuadraticCurve, arcTo: arcTo$1, arc, ellipse } = BezierHelper;
 const { addPointBounds, copy: copy$4, addPoint, setPoint, addBounds, toBounds: toBounds$1 } = TwoPointBoundsHelper;
-const debug$4 = Debug.get('PathBounds');
+const debug$5 = Debug.get('PathBounds');
 let radius, radiusX, radiusY;
 const tempPointBounds = {};
 const setPointBounds = {};
@@ -3261,7 +3259,7 @@ const PathBounds = {
                     i += 6;
                     break;
                 default:
-                    debug$4.error(`command: ${command} [index:${i}]`, data);
+                    debug$5.error(`command: ${command} [index:${i}]`, data);
                     return;
             }
         }
@@ -3377,7 +3375,7 @@ const FileHelper = {
 const F = FileHelper;
 F.opacityTypes.forEach(type => F.upperCaseTypeMap[type] = type.toUpperCase());
 
-const debug$3 = Debug.get('TaskProcessor');
+const debug$4 = Debug.get('TaskProcessor');
 class TaskItem {
     constructor(task) {
         this.parallel = true;
@@ -3386,13 +3384,13 @@ class TaskItem {
         this.task = task;
     }
     run() {
-        return __awaiter(this, undefined, undefined, function* () {
+        return __awaiter(this, void 0, void 0, function* () {
             try {
                 if (this.task && !this.isComplete && this.parent.running)
                     yield this.task();
             }
             catch (error) {
-                debug$3.error(error);
+                debug$4.error(error);
             }
         });
     }
@@ -3625,18 +3623,58 @@ class TaskProcessor {
     }
 }
 
-const ImageManager = {
+const debug$3 = Debug.get('Resource');
+const Resource = {
+    tasker: new TaskProcessor(),
     map: {},
+    get isComplete() { return R.tasker.isComplete; },
+    set(key, value) {
+        if (R.map[key])
+            debug$3.repeat(key);
+        R.map[key] = value;
+    },
+    get(key) {
+        return R.map[key];
+    },
+    remove(key) {
+        const r = R.map[key];
+        if (r) {
+            if (r.destroy)
+                r.destroy();
+            delete R.map[key];
+        }
+    },
+    loadImage(key, format) {
+        return new Promise((resolve, reject) => {
+            const image = this.setImage(key, key, format);
+            image.load(() => resolve(image), (e) => reject(e));
+        });
+    },
+    setImage(key, value, format) {
+        let config;
+        if (typeof value === 'string')
+            config = { url: value };
+        else if (!value.url)
+            config = { url: key, view: value };
+        if (config)
+            format && (config.format = format), value = Creator.image(config);
+        R.set(key, value);
+        return value;
+    },
+    destroy() {
+        R.map = {};
+    }
+};
+const R = Resource;
+
+const ImageManager = {
+    maxRecycled: 100,
     recycledList: [],
-    tasker: new TaskProcessor(),
     patternTasker: new TaskProcessor(),
-    get isComplete() { return I.tasker.isComplete; },
     get(config) {
-        let image = I.map[config.url];
-        if (!image) {
-            image = Creator.image(config);
-            I.map[config.url] = image;
-        }
+        let image = Resource.get(config.url);
+        if (!image)
+            Resource.set(config.url, image = Creator.image(config));
         image.use++;
         return image;
     },
@@ -3647,13 +3685,8 @@ const ImageManager = {
     },
     clearRecycled() {
         const list = I.recycledList;
-        if (list.length > 100) {
-            list.forEach(image => {
-                if (!image.use && image.url) {
-                    delete I.map[image.url];
-                    image.destroy();
-                }
-            });
+        if (list.length > I.maxRecycled) {
+            list.forEach(image => (!image.use && image.url) && Resource.remove(image.url));
             list.length = 0;
         }
     },
@@ -3677,7 +3710,6 @@ const ImageManager = {
         return false;
     },
     destroy() {
-        I.map = {};
         I.recycledList = [];
     }
 };
@@ -3691,21 +3723,19 @@ class LeaferImage {
         this.use = 0;
         this.waitComplete = [];
         this.innerId = create$1(IMAGE);
-        this.config = config || { url: '' };
-        this.isSVG = ImageManager.isFormat('svg', config);
-        this.hasOpacityPixel = ImageManager.hasOpacityPixel(config);
+        this.config = config || (config = { url: '' });
+        if (config.view) {
+            const { view } = config;
+            this.setView(view.config ? view.view : view);
+        }
+        ImageManager.isFormat('svg', config) && (this.isSVG = true);
+        ImageManager.hasOpacityPixel(config) && (this.hasOpacityPixel = true);
     }
     load(onSuccess, onError) {
         if (!this.loading) {
             this.loading = true;
-            ImageManager.tasker.add(() => __awaiter(this, undefined, undefined, function* () {
-                return yield Platform.origin.loadImage(this.url).then((img) => {
-                    this.ready = true;
-                    this.width = img.naturalWidth || img.width;
-                    this.height = img.naturalHeight || img.height;
-                    this.view = img;
-                    this.onComplete(true);
-                }).catch((e) => {
+            Resource.tasker.add(() => __awaiter(this, void 0, void 0, function* () {
+                return yield Platform.origin.loadImage(this.url).then(img => this.setView(img)).catch((e) => {
                     this.error = e;
                     this.onComplete(false);
                 });
@@ -3723,6 +3753,13 @@ class LeaferImage {
         }
         l[index] = l[index + 1] = undefined;
     }
+    setView(img) {
+        this.ready = true;
+        this.width = img.naturalWidth || img.width;
+        this.height = img.naturalHeight || img.height;
+        this.view = img;
+        this.onComplete(true);
+    }
     onComplete(isSuccess) {
         let odd;
         this.waitComplete.forEach((item, index) => {
@@ -3741,6 +3778,9 @@ class LeaferImage {
         this.waitComplete.length = 0;
         this.loading = false;
     }
+    getFull(_filters) {
+        return this.view;
+    }
     getCanvas(width, height, opacity, _filters) {
         width || (width = this.width);
         height || (height = this.height);
@@ -5221,7 +5261,7 @@ const LeafRender = {
                 if (this.__.eraser === 'path')
                     return this.__renderEraser(canvas, options);
                 const tempCanvas = canvas.getSameCanvas(true, true);
-                this.__draw(tempCanvas, options);
+                this.__draw(tempCanvas, options, canvas);
                 if (this.__worldFlipped) {
                     canvas.copyWorldByReset(tempCanvas, this.__nowWorld, null, this.__.__blendMode, true);
                 }
@@ -6014,7 +6054,7 @@ class LeafLevelList {
     }
 }
 
-const version = "1.4.0";
+const version = "1.4.2";
 
 exports.AlignHelper = AlignHelper;
 exports.AroundHelper = AroundHelper;
@@ -6077,6 +6117,7 @@ exports.PropertyEvent = PropertyEvent;
 exports.RectHelper = RectHelper;
 exports.RenderEvent = RenderEvent;
 exports.ResizeEvent = ResizeEvent;
+exports.Resource = Resource;
 exports.Run = Run;
 exports.StringNumberMap = StringNumberMap;
 exports.TaskItem = TaskItem;