@idraw/renderer 0.4.0-beta.3 → 0.4.0-beta.5

package/dist/esm/loader.js

@@ -7,6 +7,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var _Loader_instances, _Loader_loadFuncMap, _Loader_currentLoadItemMap, _Loader_storageLoadItemMap, _Loader_registerLoadFunc, _Loader_getLoadElementSource, _Loader_createLoadItem, _Loader_emitLoad, _Loader_emitError, _Loader_loadResource, _Loader_isExistingErrorStorage;
 import { loadImage, loadHTML, loadSVG, EventEmitter, createAssetId, isAssetId, createUUID } from '@idraw/util';
 const supportElementTypes = ['image', 'svg', 'html'];
 const getAssetIdFromElement = (element) => {
@@ -32,10 +44,11 @@ const getAssetIdFromElement = (element) => {
 export class Loader extends EventEmitter {
     constructor() {
         super();
-        this._loadFuncMap = {};
-        this._currentLoadItemMap = {};
-        this._storageLoadItemMap = {};
-        this._registerLoadFunc('image', (elem, assets) => __awaiter(this, void 0, void 0, function* () {
+        _Loader_instances.add(this);
+        _Loader_loadFuncMap.set(this, {});
+        _Loader_currentLoadItemMap.set(this, {});
+        _Loader_storageLoadItemMap.set(this, {});
+        __classPrivateFieldGet(this, _Loader_instances, "m", _Loader_registerLoadFunc).call(this, 'image', (elem, assets) => __awaiter(this, void 0, void 0, function* () {
             var _a;
             const src = ((_a = assets[elem.detail.src]) === null || _a === void 0 ? void 0 : _a.value) || elem.detail.src;
             const content = yield loadImage(src);
@@ -45,12 +58,12 @@ export class Loader extends EventEmitter {
                 content
             };
         }));
-        this._registerLoadFunc('html', (elem, assets) => __awaiter(this, void 0, void 0, function* () {
+        __classPrivateFieldGet(this, _Loader_instances, "m", _Loader_registerLoadFunc).call(this, 'html', (elem, assets) => __awaiter(this, void 0, void 0, function* () {
             var _b;
             const html = ((_b = assets[elem.detail.html]) === null || _b === void 0 ? void 0 : _b.value) || elem.detail.html;
             const content = yield loadHTML(html, {
-                width: elem.detail.width || elem.w,
-                height: elem.detail.height || elem.h
+                width: elem.detail.originW || elem.w,
+                height: elem.detail.originH || elem.h
             });
             return {
                 uuid: elem.uuid,
@@ -58,7 +71,7 @@ export class Loader extends EventEmitter {
                 content
             };
         }));
-        this._registerLoadFunc('svg', (elem, assets) => __awaiter(this, void 0, void 0, function* () {
+        __classPrivateFieldGet(this, _Loader_instances, "m", _Loader_registerLoadFunc).call(this, 'svg', (elem, assets) => __awaiter(this, void 0, void 0, function* () {
             var _c;
             const svg = ((_c = assets[elem.detail.svg]) === null || _c === void 0 ? void 0 : _c.value) || elem.detail.svg;
             const content = yield loadSVG(svg);
@@ -69,105 +82,105 @@ export class Loader extends EventEmitter {
             };
         }));
     }
-    _registerLoadFunc(type, func) {
-        this._loadFuncMap[type] = func;
-    }
-    _getLoadElementSource(element) {
-        var _a, _b, _c;
-        let source = null;
-        if (element.type === 'image') {
-            source = ((_a = element === null || element === void 0 ? void 0 : element.detail) === null || _a === void 0 ? void 0 : _a.src) || null;
-        }
-        else if (element.type === 'svg') {
-            source = ((_b = element === null || element === void 0 ? void 0 : element.detail) === null || _b === void 0 ? void 0 : _b.svg) || null;
-        }
-        else if (element.type === 'html') {
-            source = ((_c = element === null || element === void 0 ? void 0 : element.detail) === null || _c === void 0 ? void 0 : _c.html) || null;
-        }
-        return source;
-    }
-    _createLoadItem(element) {
-        return {
-            element,
-            status: 'null',
-            content: null,
-            error: null,
-            startTime: -1,
-            endTime: -1,
-            source: this._getLoadElementSource(element)
-        };
-    }
-    _emitLoad(item) {
-        const assetId = getAssetIdFromElement(item.element);
-        const storageItem = this._storageLoadItemMap[assetId];
-        if (storageItem) {
-            if (storageItem.startTime < item.startTime) {
-                this._storageLoadItemMap[assetId] = item;
-                this.trigger('load', Object.assign(Object.assign({}, item), { countTime: item.endTime - item.startTime }));
-            }
-        }
-        else {
-            this._storageLoadItemMap[assetId] = item;
-            this.trigger('load', Object.assign(Object.assign({}, item), { countTime: item.endTime - item.startTime }));
-        }
-    }
-    _emitError(item) {
-        const assetId = getAssetIdFromElement(item.element);
-        const storageItem = this._storageLoadItemMap[assetId];
-        if (storageItem) {
-            if (storageItem.startTime < item.startTime) {
-                this._storageLoadItemMap[assetId] = item;
-                this.trigger('error', Object.assign(Object.assign({}, item), { countTime: item.endTime - item.startTime }));
-            }
-        }
-        else {
-            this._storageLoadItemMap[assetId] = item;
-            this.trigger('error', Object.assign(Object.assign({}, item), { countTime: item.endTime - item.startTime }));
-        }
-    }
-    _loadResource(element, assets) {
-        const item = this._createLoadItem(element);
-        const assetId = getAssetIdFromElement(element);
-        this._currentLoadItemMap[assetId] = item;
-        const loadFunc = this._loadFuncMap[element.type];
-        if (typeof loadFunc === 'function') {
-            item.startTime = Date.now();
-            loadFunc(element, assets)
-                .then((result) => {
-                item.content = result.content;
-                item.endTime = Date.now();
-                item.status = 'load';
-                this._emitLoad(item);
-            })
-                .catch((err) => {
-                console.warn(`Load element source "${item.source}" fail`, err, element);
-                item.endTime = Date.now();
-                item.status = 'error';
-                item.error = err;
-                this._emitError(item);
-            });
-        }
-    }
-    _isExistingErrorStorage(element) {
-        var _a;
-        const assetId = getAssetIdFromElement(element);
-        const existItem = (_a = this._currentLoadItemMap) === null || _a === void 0 ? void 0 : _a[assetId];
-        if (existItem && existItem.status === 'error' && existItem.source && existItem.source === this._getLoadElementSource(element)) {
-            return true;
-        }
-        return false;
-    }
     load(element, assets) {
-        if (this._isExistingErrorStorage(element)) {
+        if (__classPrivateFieldGet(this, _Loader_instances, "m", _Loader_isExistingErrorStorage).call(this, element)) {
             return;
         }
         if (supportElementTypes.includes(element.type)) {
-            this._loadResource(element, assets);
+            __classPrivateFieldGet(this, _Loader_instances, "m", _Loader_loadResource).call(this, element, assets);
         }
     }
     getContent(element) {
         var _a, _b;
         const assetId = getAssetIdFromElement(element);
-        return ((_b = (_a = this._storageLoadItemMap) === null || _a === void 0 ? void 0 : _a[assetId]) === null || _b === void 0 ? void 0 : _b.content) || null;
+        return ((_b = (_a = __classPrivateFieldGet(this, _Loader_storageLoadItemMap, "f")) === null || _a === void 0 ? void 0 : _a[assetId]) === null || _b === void 0 ? void 0 : _b.content) || null;
+    }
+    getLoadItemMap() {
+        return __classPrivateFieldGet(this, _Loader_storageLoadItemMap, "f");
+    }
+    setLoadItemMap(itemMap) {
+        __classPrivateFieldSet(this, _Loader_storageLoadItemMap, itemMap, "f");
     }
 }
+_Loader_loadFuncMap = new WeakMap(), _Loader_currentLoadItemMap = new WeakMap(), _Loader_storageLoadItemMap = new WeakMap(), _Loader_instances = new WeakSet(), _Loader_registerLoadFunc = function _Loader_registerLoadFunc(type, func) {
+    __classPrivateFieldGet(this, _Loader_loadFuncMap, "f")[type] = func;
+}, _Loader_getLoadElementSource = function _Loader_getLoadElementSource(element) {
+    var _a, _b, _c;
+    let source = null;
+    if (element.type === 'image') {
+        source = ((_a = element === null || element === void 0 ? void 0 : element.detail) === null || _a === void 0 ? void 0 : _a.src) || null;
+    }
+    else if (element.type === 'svg') {
+        source = ((_b = element === null || element === void 0 ? void 0 : element.detail) === null || _b === void 0 ? void 0 : _b.svg) || null;
+    }
+    else if (element.type === 'html') {
+        source = ((_c = element === null || element === void 0 ? void 0 : element.detail) === null || _c === void 0 ? void 0 : _c.html) || null;
+    }
+    return source;
+}, _Loader_createLoadItem = function _Loader_createLoadItem(element) {
+    return {
+        element,
+        status: 'null',
+        content: null,
+        error: null,
+        startTime: -1,
+        endTime: -1,
+        source: __classPrivateFieldGet(this, _Loader_instances, "m", _Loader_getLoadElementSource).call(this, element)
+    };
+}, _Loader_emitLoad = function _Loader_emitLoad(item) {
+    const assetId = getAssetIdFromElement(item.element);
+    const storageItem = __classPrivateFieldGet(this, _Loader_storageLoadItemMap, "f")[assetId];
+    if (storageItem) {
+        if (storageItem.startTime < item.startTime) {
+            __classPrivateFieldGet(this, _Loader_storageLoadItemMap, "f")[assetId] = item;
+            this.trigger('load', Object.assign(Object.assign({}, item), { countTime: item.endTime - item.startTime }));
+        }
+    }
+    else {
+        __classPrivateFieldGet(this, _Loader_storageLoadItemMap, "f")[assetId] = item;
+        this.trigger('load', Object.assign(Object.assign({}, item), { countTime: item.endTime - item.startTime }));
+    }
+}, _Loader_emitError = function _Loader_emitError(item) {
+    const assetId = getAssetIdFromElement(item.element);
+    const storageItem = __classPrivateFieldGet(this, _Loader_storageLoadItemMap, "f")[assetId];
+    if (storageItem) {
+        if (storageItem.startTime < item.startTime) {
+            __classPrivateFieldGet(this, _Loader_storageLoadItemMap, "f")[assetId] = item;
+            this.trigger('error', Object.assign(Object.assign({}, item), { countTime: item.endTime - item.startTime }));
+        }
+    }
+    else {
+        __classPrivateFieldGet(this, _Loader_storageLoadItemMap, "f")[assetId] = item;
+        this.trigger('error', Object.assign(Object.assign({}, item), { countTime: item.endTime - item.startTime }));
+    }
+}, _Loader_loadResource = function _Loader_loadResource(element, assets) {
+    const item = __classPrivateFieldGet(this, _Loader_instances, "m", _Loader_createLoadItem).call(this, element);
+    const assetId = getAssetIdFromElement(element);
+    __classPrivateFieldGet(this, _Loader_currentLoadItemMap, "f")[assetId] = item;
+    const loadFunc = __classPrivateFieldGet(this, _Loader_loadFuncMap, "f")[element.type];
+    if (typeof loadFunc === 'function') {
+        item.startTime = Date.now();
+        loadFunc(element, assets)
+            .then((result) => {
+            item.content = result.content;
+            item.endTime = Date.now();
+            item.status = 'load';
+            __classPrivateFieldGet(this, _Loader_instances, "m", _Loader_emitLoad).call(this, item);
+        })
+            .catch((err) => {
+            console.warn(`Load element source "${item.source}" fail`, err, element);
+            item.endTime = Date.now();
+            item.status = 'error';
+            item.error = err;
+            __classPrivateFieldGet(this, _Loader_instances, "m", _Loader_emitError).call(this, item);
+        });
+    }
+}, _Loader_isExistingErrorStorage = function _Loader_isExistingErrorStorage(element) {
+    var _a;
+    const assetId = getAssetIdFromElement(element);
+    const existItem = (_a = __classPrivateFieldGet(this, _Loader_currentLoadItemMap, "f")) === null || _a === void 0 ? void 0 : _a[assetId];
+    if (existItem && existItem.status === 'error' && existItem.source && existItem.source === __classPrivateFieldGet(this, _Loader_instances, "m", _Loader_getLoadElementSource).call(this, element)) {
+        return true;
+    }
+    return false;
+};