@meta2d/core 1.0.18 → 1.0.19

package/src/core.d.ts

@@ -77,6 +77,7 @@ export declare class Meta2d {
     }): void;
     open(data?: Meta2dData, render?: boolean): void;
     initBindDatas(): void;
+    initBinds(): void;
     connectSocket(): void;
     /**
      * open 后执行初始化 Js ，每个图纸可配置一个初始化 js
@@ -334,6 +335,7 @@ export declare class Meta2d {
      * @param pen 画笔
      */
     upByArea(pen: Pen): void;
+    specificLayerMove(pen: Pen, type: string): void;
     /**
      * 该画笔上移，即把该画笔在数组中的位置向后移动一个
      * @param pens 画笔

package/src/core.js

@@ -770,7 +770,7 @@ var Meta2d = /** @class */ (function () {
         this.store.patchFlagsTop = true;
     };
     Meta2d.prototype.open = function (data, render) {
-        var e_1, _a, e_2, _b, e_3, _c;
+        var e_1, _a, e_2, _b, e_3, _c, e_4, _e;
         var _this = this;
         if (render === void 0) { render = true; }
         this.clear(false);
@@ -780,8 +780,8 @@ var Meta2d = /** @class */ (function () {
             this.store.data.pens = [];
             try {
                 // 第一遍赋初值
-                for (var _e = __values(data.pens), _f = _e.next(); !_f.done; _f = _e.next()) {
-                    var pen = _f.value;
+                for (var _f = __values(data.pens), _g = _f.next(); !_g.done; _g = _f.next()) {
+                    var pen = _g.value;
                     if (!pen.id) {
                         pen.id = s8();
                     }
@@ -792,28 +792,42 @@ var Meta2d = /** @class */ (function () {
             catch (e_1_1) { e_1 = { error: e_1_1 }; }
             finally {
                 try {
-                    if (_f && !_f.done && (_a = _e.return)) _a.call(_e);
+                    if (_g && !_g.done && (_a = _f.return)) _a.call(_f);
                 }
                 finally { if (e_1) throw e_1.error; }
             }
             try {
-                for (var _g = __values(data.pens), _h = _g.next(); !_h.done; _h = _g.next()) {
-                    var pen = _h.value;
+                for (var _h = __values(data.pens), _j = _h.next(); !_j.done; _j = _h.next()) {
+                    var pen = _j.value;
                     this.canvas.makePen(pen);
                 }
             }
             catch (e_2_1) { e_2 = { error: e_2_1 }; }
             finally {
                 try {
-                    if (_h && !_h.done && (_b = _g.return)) _b.call(_g);
+                    if (_j && !_j.done && (_b = _h.return)) _b.call(_h);
                 }
                 finally { if (e_2) throw e_2.error; }
             }
+            try {
+                for (var _k = __values(data.pens), _l = _k.next(); !_l.done; _l = _k.next()) {
+                    var pen = _l.value;
+                    this.canvas.updateLines(pen);
+                }
+            }
+            catch (e_3_1) { e_3 = { error: e_3_1 }; }
+            finally {
+                try {
+                    if (_l && !_l.done && (_c = _k.return)) _c.call(_k);
+                }
+                finally { if (e_3) throw e_3.error; }
+            }
         }
         if (!render) {
             this.canvas.opening = true;
         }
         this.initBindDatas();
+        this.initBinds();
         this.render();
         this.listenSocket();
         this.connectSocket();
@@ -822,19 +836,19 @@ var Meta2d = /** @class */ (function () {
         this.doInitJS();
         if (this.store.data.iconUrls) {
             try {
-                for (var _j = __values(this.store.data.iconUrls), _k = _j.next(); !_k.done; _k = _j.next()) {
-                    var item = _k.value;
+                for (var _m = __values(this.store.data.iconUrls), _o = _m.next(); !_o.done; _o = _m.next()) {
+                    var item = _o.value;
                     loadCss(item, function () {
                         _this.render();
                     });
                 }
             }
-            catch (e_3_1) { e_3 = { error: e_3_1 }; }
+            catch (e_4_1) { e_4 = { error: e_4_1 }; }
             finally {
                 try {
-                    if (_k && !_k.done && (_c = _j.return)) _c.call(_j);
+                    if (_o && !_o.done && (_e = _m.return)) _e.call(_m);
                 }
-                finally { if (e_3) throw e_3.error; }
+                finally { if (e_4) throw e_4.error; }
             }
         }
         this.store.emitter.emit('opened');
@@ -869,6 +883,24 @@ var Meta2d = /** @class */ (function () {
             });
         });
     };
+    Meta2d.prototype.initBinds = function () {
+        var _this = this;
+        this.store.binds = {};
+        this.store.data.pens.forEach(function (pen) {
+            var _a;
+            (_a = pen.realTimes) === null || _a === void 0 ? void 0 : _a.forEach(function (realTime) {
+                if (realTime.binds && realTime.binds.id) {
+                    if (!_this.store.binds[realTime.binds.id]) {
+                        _this.store.binds[realTime.binds.id] = [];
+                    }
+                    _this.store.binds[realTime.binds.id].push({
+                        id: pen.id,
+                        key: realTime.key,
+                    });
+                }
+            });
+        });
+    };
     Meta2d.prototype.connectSocket = function () {
         this.connectWebsocket();
         this.connectMqtt();
@@ -1000,7 +1032,7 @@ var Meta2d = /** @class */ (function () {
      * @param render 是否重绘
      */
     Meta2d.prototype.clear = function (render) {
-        var e_4, _a;
+        var e_5, _a;
         var _b;
         if (render === void 0) { render = true; }
         try {
@@ -1009,12 +1041,12 @@ var Meta2d = /** @class */ (function () {
                 (_b = pen.onDestroy) === null || _b === void 0 ? void 0 : _b.call(pen, pen);
             }
         }
-        catch (e_4_1) { e_4 = { error: e_4_1 }; }
+        catch (e_5_1) { e_5 = { error: e_5_1 }; }
         finally {
             try {
                 if (_e && !_e.done && (_a = _c.return)) _a.call(_c);
             }
-            finally { if (e_4) throw e_4.error; }
+            finally { if (e_5) throw e_5.error; }
         }
         clearStore(this.store);
         this.hideInput();
@@ -1710,7 +1742,8 @@ var Meta2d = /** @class */ (function () {
         if (pen.realTimes) {
             var _d_1 = {};
             pen.realTimes.forEach(function (realTime) {
-                if (!realTime.binds || !realTime.binds.length) {
+                if (realTime.value !== undefined &&
+                    (!realTime.binds || !realTime.binds.id)) {
                     if (realTime.type === 'number') {
                         if (realTime.value && realTime.value.indexOf(',') !== -1) {
                             var arr = realTime.value.split(',');
@@ -1789,7 +1822,7 @@ var Meta2d = /** @class */ (function () {
                             return [4 /*yield*/, fetch(item.url, {
                                     headers: item.headers,
                                     method: item.method,
-                                    body: item.body,
+                                    body: item.method === 'GET' ? undefined : item.body,
                                 })];
                         case 1:
                             res = _a.sent();
@@ -1869,7 +1902,7 @@ var Meta2d = /** @class */ (function () {
         // 把{dataId: string; value: any}转成setValue格式数据
         var penValues = new Map();
         datas.forEach(function (v) {
-            var _a;
+            var _a, _b;
             (_a = _this.store.bindDatas[v.dataId]) === null || _a === void 0 ? void 0 : _a.forEach(function (p) {
                 var _a;
                 var pen = _this.store.pens[p.id];
@@ -1897,6 +1930,34 @@ var Meta2d = /** @class */ (function () {
                     penValues.set(pen, penValue);
                 }
             });
+            (_b = _this.store.binds[v.id]) === null || _b === void 0 ? void 0 : _b.forEach(function (p) {
+                var _a;
+                var pen = _this.store.pens[p.id];
+                if (!pen) {
+                    return;
+                }
+                var penValue = penValues.get(pen);
+                // if (typeof pen.onBinds === 'function') {
+                //   // 已经计算了
+                //   if (penValue) {
+                //     return;
+                //   }
+                //   //TODO onBinds的情况
+                //   penValues.set(pen, pen.onBinds(pen, datas));
+                //   return;
+                // }
+                if (penValue) {
+                    penValue[p.key] = v.value;
+                }
+                else {
+                    penValue = (_a = {
+                            id: p.id
+                        },
+                        _a[p.key] = v.value,
+                        _a);
+                    penValues.set(pen, penValue);
+                }
+            });
         });
         var initPens;
         var pens;
@@ -2138,7 +2199,7 @@ var Meta2d = /** @class */ (function () {
      * @param padding 上右下左的内边距
      */
     Meta2d.prototype.downloadPng = function (name, padding) {
-        var e_5, _a;
+        var e_6, _a;
         var _this = this;
         var _b;
         try {
@@ -2150,12 +2211,12 @@ var Meta2d = /** @class */ (function () {
                 }
             }
         }
-        catch (e_5_1) { e_5 = { error: e_5_1 }; }
+        catch (e_6_1) { e_6 = { error: e_6_1 }; }
         finally {
             try {
                 if (_e && !_e.done && (_a = _c.return)) _a.call(_c);
             }
-            finally { if (e_5) throw e_5.error; }
+            finally { if (e_6) throw e_6.error; }
         }
         setTimeout(function () {
             var a = document.createElement('a');
@@ -2485,7 +2546,7 @@ var Meta2d = /** @class */ (function () {
         this.formatPainter();
     };
     Meta2d.prototype.alignNodes = function (align, pens, rect) {
-        var e_6, _a;
+        var e_7, _a;
         if (pens === void 0) { pens = this.store.data.pens; }
         !rect && (rect = this.getPenRect(this.getRect(pens)));
         var initPens = deepClone(pens); // 原 pens ，深拷贝一下
@@ -2495,12 +2556,12 @@ var Meta2d = /** @class */ (function () {
                 this.alignPen(align, item, rect);
             }
         }
-        catch (e_6_1) { e_6 = { error: e_6_1 }; }
+        catch (e_7_1) { e_7 = { error: e_7_1 }; }
         finally {
             try {
                 if (pens_1_1 && !pens_1_1.done && (_a = pens_1.return)) _a.call(pens_1);
             }
-            finally { if (e_6) throw e_6.error; }
+            finally { if (e_7) throw e_7.error; }
         }
         this.render();
         this.pushHistory({
@@ -2589,7 +2650,7 @@ var Meta2d = /** @class */ (function () {
      * @param distance 总的宽 or 高
      */
     Meta2d.prototype.spaceBetweenByDirection = function (direction, pens, distance) {
-        var e_7, _a;
+        var e_8, _a;
         var _this = this;
         if (pens === void 0) { pens = this.store.data.pens; }
         !distance && (distance = this.getPenRect(this.getRect(pens))[direction]);
@@ -2623,12 +2684,12 @@ var Meta2d = /** @class */ (function () {
                 this.setValue(__assign({ id: pen.id }, penRect), { render: false, doEvent: false });
             }
         }
-        catch (e_7_1) { e_7 = { error: e_7_1 }; }
+        catch (e_8_1) { e_8 = { error: e_8_1 }; }
         finally {
             try {
                 if (pens_2_1 && !pens_2_1.done && (_a = pens_2.return)) _a.call(pens_2);
             }
-            finally { if (e_7) throw e_7.error; }
+            finally { if (e_8) throw e_8.error; }
         }
         this.render();
         this.pushHistory({
@@ -2745,7 +2806,7 @@ var Meta2d = /** @class */ (function () {
      * @param pens pen 置顶的画笔
      */
     Meta2d.prototype.top = function (pens) {
-        var e_8, _a;
+        var e_9, _a;
         var _this = this;
         if (!pens)
             pens = this.store.active;
@@ -2763,16 +2824,8 @@ var Meta2d = /** @class */ (function () {
                     _pens.splice(index, 1);
                     _this.initImageCanvas([pen]);
                 }
+                _this.specificLayerMove(pen, 'top');
             });
-            //image
-            if (pen.image && pen.name !== 'gif') {
-                this_1.setValue({ id: pen.id, isBottom: false }, { render: false, doEvent: false, history: false });
-            }
-            //dom
-            if (pen.externElement || pen.name === 'gif') {
-                pen.calculative.canvas.maxZindex += 1;
-                this_1.setValue({ id: pen.id, zIndex: pen.calculative.canvas.maxZindex }, { render: false, doEvent: false, history: false });
-            }
         };
         var this_1 = this;
         try {
@@ -2781,12 +2834,12 @@ var Meta2d = /** @class */ (function () {
                 _loop_3(pen);
             }
         }
-        catch (e_8_1) { e_8 = { error: e_8_1 }; }
+        catch (e_9_1) { e_9 = { error: e_9_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_8) throw e_8.error; }
+            finally { if (e_9) throw e_9.error; }
         }
     };
     /**
@@ -2802,7 +2855,7 @@ var Meta2d = /** @class */ (function () {
      * @param pens 画笔们，注意 pen 必须在该数组内才有效
      */
     Meta2d.prototype.bottom = function (pens) {
-        var e_9, _a;
+        var e_10, _a;
         if (!pens)
             pens = this.store.active;
         if (!Array.isArray(pens))
@@ -2819,19 +2872,12 @@ var Meta2d = /** @class */ (function () {
                     _pens.splice(index + 1, 1);
                     this_2.initImageCanvas([pen_1]);
                 }
+                this_2.specificLayerMove(pen_1, 'bottom');
             };
             // 从后往前，保证 allPens 顺序不变
             for (var i = allPens.length - 1; i >= 0; i--) {
                 _loop_5(i);
             }
-            //image
-            if (pen.image && pen.name !== 'gif') {
-                this_2.setValue({ id: pen.id, isBottom: true }, { render: false, doEvent: false, history: false });
-            }
-            //dom
-            if (pen.externElement || pen.name === 'gif') {
-                this_2.setValue({ id: pen.id, zIndex: 0 }, { render: false, doEvent: false, history: false });
-            }
         };
         var this_2 = this;
         try {
@@ -2840,12 +2886,12 @@ var Meta2d = /** @class */ (function () {
                 _loop_4(pen);
             }
         }
-        catch (e_9_1) { e_9 = { error: e_9_1 }; }
+        catch (e_10_1) { e_10 = { error: e_10_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_9) throw e_9.error; }
+            finally { if (e_10) throw e_10.error; }
         }
     };
     /**
@@ -2854,7 +2900,7 @@ var Meta2d = /** @class */ (function () {
      * @param pen 画笔
      */
     Meta2d.prototype.upByArea = function (pen) {
-        var _a, e_10, _b;
+        var _a, e_11, _b;
         var _this = this;
         var index = this.store.data.pens.findIndex(function (p) { return p.id === pen.id; });
         if (index === -1) {
@@ -2904,28 +2950,61 @@ var Meta2d = /** @class */ (function () {
                 _loop_6(pen_2);
             }
         }
-        catch (e_10_1) { e_10 = { error: e_10_1 }; }
+        catch (e_11_1) { e_11 = { error: e_11_1 }; }
         finally {
             try {
                 if (allPens_1_1 && !allPens_1_1.done && (_b = allPens_1.return)) _b.call(allPens_1);
             }
-            finally { if (e_10) throw e_10.error; }
+            finally { if (e_11) throw e_11.error; }
         }
         this.initImageCanvas([pen]);
     };
+    //特殊图元层级处理
+    Meta2d.prototype.specificLayerMove = function (pen, type) {
+        //image
+        if (pen.image && pen.name !== 'gif') {
+            var isBottom = false;
+            if (type === 'bottom' || type === 'down') {
+                isBottom = true;
+            }
+            this.setValue({ id: pen.id, isBottom: isBottom }, { render: false, doEvent: false, history: false });
+        }
+        //dom
+        if (pen.externElement || pen.name === 'gif') {
+            var zIndex = 0;
+            // let zIndex = pen.calculative.zIndex === undefined ? 5 : pen.calculative.zIndex + 1;
+            if (type === 'top') {
+                pen.calculative.canvas.maxZindex += 1;
+                zIndex = pen.calculative.canvas.maxZindex;
+            }
+            else if (type === 'up') {
+                zIndex =
+                    pen.calculative.zIndex === undefined ? 5 : pen.calculative.zIndex + 1;
+            }
+            else if (type === 'down') {
+                zIndex =
+                    pen.calculative.zIndex === undefined ? 3 : pen.calculative.zIndex - 1;
+                if (zIndex < 0) {
+                    zIndex = 0;
+                }
+            }
+            this.setValue({ id: pen.id, zIndex: zIndex }, { render: false, doEvent: false, history: false });
+        }
+    };
     /**
      * 该画笔上移，即把该画笔在数组中的位置向后移动一个
      * @param pens 画笔
      */
     Meta2d.prototype.up = function (pens) {
-        var e_11, _a;
+        var e_12, _a;
+        var _this = this;
         if (!pens)
             pens = this.store.active;
         if (!Array.isArray(pens))
             pens = [pens]; // 兼容
         var _loop_7 = function (pen) {
             var _pens = this_4.store.data.pens;
-            if (pen.children) {
+            if (pen.children && pen.children.length) {
                 //组合图元
                 var preMovePens = __spreadArray(__spreadArray([], __read(getAllChildren(pen, this_4.store)), false), [pen], false);
                 //先保证组合图元的顺序正确。
@@ -2948,8 +3027,10 @@ var Meta2d = /** @class */ (function () {
                     offset_1 += 1;
                     lastIndex_1 = _pen.temIndex;
                     delete _pen.temIndex;
+                    _this.specificLayerMove(_pen, 'up');
                 });
-                _pens.splice.apply(_pens, __spreadArray([lastIndex_1 + 1, 0], __read(preMovePens), false));
+                _pens.splice.apply(_pens, __spreadArray([lastIndex_1 + 1, 0], __read(orderPens), false));
+                this_4.initImageCanvas(orderPens);
             }
             else {
                 var index = _pens.findIndex(function (p) { return p.id === pen.id; });
@@ -2958,15 +3039,7 @@ var Meta2d = /** @class */ (function () {
                     _pens.splice(index, 1);
                     this_4.initImageCanvas([pen]);
                 }
-            }
-            //image
-            if (pen.image && pen.name !== 'gif') {
-                this_4.setValue({ id: pen.id, isBottom: false }, { render: false, doEvent: false, history: false });
-            }
-            //dom
-            if (pen.externElement || pen.name === 'gif') {
-                var zIndex = pen.calculative.zIndex === undefined ? 5 : pen.calculative.zIndex + 1;
-                this_4.setValue({ id: pen.id, zIndex: zIndex }, { render: false, doEvent: false, history: false });
+                this_4.specificLayerMove(pen, 'up');
             }
         };
         var this_4 = this;
@@ -2976,12 +3049,12 @@ var Meta2d = /** @class */ (function () {
                 _loop_7(pen);
             }
         }
-        catch (e_11_1) { e_11 = { error: e_11_1 }; }
+        catch (e_12_1) { e_12 = { error: e_12_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_11) throw e_11.error; }
+            finally { if (e_12) throw e_12.error; }
         }
     };
     /**
@@ -2989,14 +3062,15 @@ var Meta2d = /** @class */ (function () {
      * @param pen 画笔
      */
     Meta2d.prototype.down = function (pens) {
-        var e_12, _a;
+        var e_13, _a;
+        var _this = this;
         if (!pens)
             pens = this.store.active;
         if (!Array.isArray(pens))
             pens = [pens]; // 兼容
         var _loop_9 = function (pen) {
             var _pens = this_5.store.data.pens;
-            if (pen.children) {
+            if (pen.children && pen.children.length) {
                 //组合图元
                 var preMovePens = __spreadArray(__spreadArray([], __read(getAllChildren(pen, this_5.store)), false), [pen], false);
                 //先保证组合图元的顺序正确。
@@ -3021,8 +3095,10 @@ var Meta2d = /** @class */ (function () {
                         firstIndex_1 = _pen.temIndex;
                     }
                     delete _pen.temIndex;
+                    _this.specificLayerMove(_pen, 'down');
                 });
-                _pens.splice.apply(_pens, __spreadArray([firstIndex_1 - 1, 0], __read(preMovePens), false));
+                _pens.splice.apply(_pens, __spreadArray([firstIndex_1 - 1, 0], __read(orderPens), false));
+                this_5.initImageCanvas(orderPens);
             }
             else {
                 var index = _pens.findIndex(function (p) { return p.id === pen.id; });
@@ -3031,18 +3107,7 @@ var Meta2d = /** @class */ (function () {
                     _pens.splice(index + 1, 1);
                     this_5.initImageCanvas([pen]);
                 }
-            }
-            //image
-            if (pen.image && pen.name !== 'gif') {
-                this_5.setValue({ id: pen.id, isBottom: true }, { render: false, doEvent: false, history: false });
-            }
-            //dom
-            if (pen.externElement || pen.name === 'gif') {
-                var zIndex = pen.calculative.zIndex === undefined ? 3 : pen.calculative.zIndex - 1;
-                if (zIndex < 0) {
-                    zIndex = 0;
-                }
-                this_5.setValue({ id: pen.id, zIndex: zIndex }, { render: false, doEvent: false, history: false });
+                this_5.specificLayerMove(pen, 'down');
             }
         };
         var this_5 = this;
@@ -3052,12 +3117,12 @@ var Meta2d = /** @class */ (function () {
                 _loop_9(pen);
             }
         }
-        catch (e_12_1) { e_12 = { error: e_12_1 }; }
+        catch (e_13_1) { e_13 = { error: e_13_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_12) throw e_12.error; }
+            finally { if (e_13) throw e_13.error; }
         }
     };
     Meta2d.prototype.setLayer = function (pen, toIndex, pens) {
@@ -3132,7 +3197,7 @@ var Meta2d = /** @class */ (function () {
             var nextNodes_1 = [];
             // 2. 遍历出线的 nextNode
             lines.forEach(function (line) {
-                var e_13, _a;
+                var e_14, _a;
                 var lineNextNode = _this.nextNode(line);
                 var _loop_11 = function (node) {
                     var have = nextNodes_1.find(function (next) { return next.id === node.id; });
@@ -3145,12 +3210,12 @@ var Meta2d = /** @class */ (function () {
                         _loop_11(node);
                     }
                 }
-                catch (e_13_1) { e_13 = { error: e_13_1 }; }
+                catch (e_14_1) { e_14 = { error: e_14_1 }; }
                 finally {
                     try {
                         if (lineNextNode_1_1 && !lineNextNode_1_1.done && (_a = lineNextNode_1.return)) _a.call(lineNextNode_1);
                     }
-                    finally { if (e_13) throw e_13.error; }
+                    finally { if (e_14) throw e_14.error; }
                 }
             });
             return nextNodes_1;
@@ -3173,7 +3238,7 @@ var Meta2d = /** @class */ (function () {
             var preNodes_1 = [];
             // 2. 遍历入线的 preNode
             lines.forEach(function (line) {
-                var e_14, _a;
+                var e_15, _a;
                 var linePreNode = _this.previousNode(line);
                 var _loop_12 = function (node) {
                     var have = preNodes_1.find(function (pre) { return pre.id === node.id; });
@@ -3186,12 +3251,12 @@ var Meta2d = /** @class */ (function () {
                         _loop_12(node);
                     }
                 }
-                catch (e_14_1) { e_14 = { error: e_14_1 }; }
+                catch (e_15_1) { e_15 = { error: e_15_1 }; }
                 finally {
                     try {
                         if (linePreNode_1_1 && !linePreNode_1_1.done && (_a = linePreNode_1.return)) _a.call(linePreNode_1);
                     }
-                    finally { if (e_14) throw e_14.error; }
+                    finally { if (e_15) throw e_15.error; }
                 }
             });
             return preNodes_1;
@@ -3467,7 +3532,7 @@ var Meta2d = /** @class */ (function () {
             : deepClone(__spreadArray([parent], __read(components), false));
     };
     Meta2d.prototype.setVisible = function (pen, visible, render) {
-        var e_15, _a;
+        var e_16, _a;
         if (render === void 0) { render = true; }
         this.onSizeUpdate();
         this.setValue({ id: pen.id, visible: visible }, { render: false, doEvent: false });
@@ -3479,12 +3544,12 @@ var Meta2d = /** @class */ (function () {
                     child && this.setVisible(child, visible, false);
                 }
             }
-            catch (e_15_1) { e_15 = { error: e_15_1 }; }
+            catch (e_16_1) { e_16 = { error: e_16_1 }; }
             finally {
                 try {
                     if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                 }
-                finally { if (e_15) throw e_15.error; }
+                finally { if (e_16) throw e_16.error; }
             }
         }
         render && this.render();