dom-render 1.0.90 → 1.0.92

package/operators/DrPre.js

@@ -14,17 +14,60 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DrPre = void 0;
-var OperatorRender_1 = require("./OperatorRender");
+var OperatorExecuter_1 = require("./OperatorExecuter");
 var DrPre = /** @class */ (function (_super) {
     __extends(DrPre, _super);
-    function DrPre() {
-        return _super !== null && _super.apply(this, arguments) || this;
+    function DrPre(rawSet, render, returnContainer, elementSource, source, afterCallBack) {
+        var _this = this;
+        source.operatorAround = undefined;
+        _this = _super.call(this, rawSet, render, returnContainer, elementSource, source, afterCallBack) || this;
+        return _this;
     }
-    DrPre.prototype.execRender = function () {
-        return (this.elementSource.attrs.drPre != null) ? OperatorRender_1.ExecuteState.EXECUTE : OperatorRender_1.ExecuteState.NO_EXECUTE;
+    DrPre.prototype.execute = function (value) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                return [2 /*return*/, (value != null) ? OperatorExecuter_1.ExecuteState.EXECUTE : OperatorExecuter_1.ExecuteState.NO_EXECUTE];
+            });
+        });
     };
     return DrPre;
-}(OperatorRender_1.OperatorRender));
+}(OperatorExecuter_1.OperatorExecuter));
 exports.DrPre = DrPre;

package/operators/DrRepeat.d.ts

@@ -1,4 +1,8 @@
-import { ExecuteState, OperatorRender } from './OperatorRender';
-export declare class DrRepeat extends OperatorRender {
-    execRender(): ExecuteState;
+import { OperatorExecuterAttrRequire } from './OperatorExecuterAttrRequire';
+import { RawSet } from '../rawsets/RawSet';
+import { Render } from '../rawsets/Render';
+import { AfterCallBack, ElementSource, ExecuteState, ReturnContainer, Source } from './OperatorExecuter';
+export declare class DrRepeat extends OperatorExecuterAttrRequire<string> {
+    constructor(rawSet: RawSet, render: Render, returnContainer: ReturnContainer, elementSource: ElementSource, source: Source, afterCallBack: AfterCallBack);
+    executeAttrRequire(attr: string): Promise<ExecuteState>;
 }

package/operators/DrRepeat.js

@@ -25,39 +25,81 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DrRepeat = void 0;
-var OperatorRender_1 = require("./OperatorRender");
+var OperatorExecuterAttrRequire_1 = require("./OperatorExecuterAttrRequire");
 var ScriptUtils_1 = require("../utils/script/ScriptUtils");
 var RawSet_1 = require("../rawsets/RawSet");
 var EventManager_1 = require("../events/EventManager");
+var OperatorExecuter_1 = require("./OperatorExecuter");
 var DrRepeat = /** @class */ (function (_super) {
     __extends(DrRepeat, _super);
-    function DrRepeat() {
-        return _super !== null && _super.apply(this, arguments) || this;
+    function DrRepeat(rawSet, render, returnContainer, elementSource, source, afterCallBack) {
+        var _this = this;
+        source.operatorAround = undefined;
+        _this = _super.call(this, rawSet, render, returnContainer, elementSource, source, afterCallBack, false) || this;
+        return _this;
     }
-    DrRepeat.prototype.execRender = function () {
-        var _a;
-        var _b, _c, _d, _e;
-        if (this.elementSource.attrs.drRepeat) {
-            var itRandom = RawSet_1.RawSet.drItOtherEncoding(this.elementSource.element);
-            var vars = RawSet_1.RawSet.drVarEncoding(this.elementSource.element, (_b = this.elementSource.attrs.drVarOption) !== null && _b !== void 0 ? _b : '');
-            var newTemp = this.source.config.window.document.createElement('temp');
-            ScriptUtils_1.ScriptUtils.eval("\n                    ".concat(this.render.bindScript, "\n                    ").concat((_c = this.elementSource.attrs.drBeforeOption) !== null && _c !== void 0 ? _c : '', "\n                    var i = 0; \n                    const repeat = ").concat(this.elementSource.attrs.drRepeat, ";\n                    const repeatStr = `").concat(this.elementSource.attrs.drRepeat, "`;\n                    let range = repeat;\n                    if (typeof repeat === 'number') {\n                        range = ").concat(EventManager_1.EventManager.RANGE_VARNAME, "(repeat);\n                    } \n                    for(const it of range) {\n                        var destIt = it;\n                        if (range.isRange) {\n                            destIt = it;\n                        }  else {\n                            destIt = repeatStr + '[' + i +']'\n                        }\n                        const n = this.__render.element.cloneNode(true);\n                        n.getAttributeNames().forEach(it => n.setAttribute(it, n.getAttribute(it).replace(/\\#it\\#/g, destIt).replace(/\\#nearRangeIt\\#/g, destIt).replace(/\\#nearRangeIndex\\#/g, destIt)))\n                        n.innerHTML = n.innerHTML.replace(/\\#it\\#/g, destIt).replace(/\\#index\\#/g, destIt);\n                        \n                        if (this.__render.drStripOption === 'true') {\n                            Array.from(n.childNodes).forEach(it => this.__render.fag.append(it));\n                        } else {\n                            this.__render.fag.append(n);\n                        }\n                        i++;\n                    }\n                    ").concat((_d = this.elementSource.attrs.drAfterOption) !== null && _d !== void 0 ? _d : '', "\n                    "), Object.assign(this.source.obj, {
-                __render: Object.freeze(__assign({ fag: newTemp, drStripOption: this.elementSource.attrs.drStripOption }, this.render))
-            }));
-            RawSet_1.RawSet.drVarDecoding(newTemp, vars);
-            RawSet_1.RawSet.drItOtherDecoding(newTemp, itRandom);
-            var tempalte = this.source.config.window.document.createElement('template');
-            tempalte.innerHTML = newTemp.innerHTML;
-            this.returnContainer.fag.append(tempalte.content);
-            var rr = RawSet_1.RawSet.checkPointCreates(this.returnContainer.fag, this.source.obj, this.source.config);
-            (_e = this.elementSource.element.parentNode) === null || _e === void 0 ? void 0 : _e.replaceChild(this.returnContainer.fag, this.elementSource.element);
-            (_a = this.returnContainer.raws).push.apply(_a, rr);
-            return OperatorRender_1.ExecuteState.EXECUTE;
-        }
-        return OperatorRender_1.ExecuteState.NO_EXECUTE;
+    DrRepeat.prototype.executeAttrRequire = function (attr) {
+        var _a, _b, _c, _d;
+        return __awaiter(this, void 0, void 0, function () {
+            var itRandom, vars, newTemp, tempalte, rr;
+            var _e;
+            return __generator(this, function (_f) {
+                itRandom = RawSet_1.RawSet.drItOtherEncoding(this.elementSource.element);
+                vars = RawSet_1.RawSet.drVarEncoding(this.elementSource.element, (_a = this.elementSource.attrs.drVarOption) !== null && _a !== void 0 ? _a : '');
+                newTemp = this.source.config.window.document.createElement('temp');
+                ScriptUtils_1.ScriptUtils.eval("\n                    ".concat(this.render.bindScript, "\n                    ").concat((_b = this.elementSource.attrs.drBeforeOption) !== null && _b !== void 0 ? _b : '', "\n                    var i = 0; \n                    const repeat = ").concat(attr, ";\n                    const repeatStr = `").concat(attr, "`;\n                    let range = repeat;\n                    if (typeof repeat === 'number') {\n                        range = ").concat(EventManager_1.EventManager.RANGE_VARNAME, "(repeat);\n                    } \n                    for(const it of range) {\n                        var destIt = it;\n                        if (range.isRange) {\n                            destIt = it;\n                        }  else {\n                            destIt = repeatStr + '[' + i +']'\n                        }\n                        const n = this.__render.element.cloneNode(true);\n                        n.getAttributeNames().forEach(it => n.setAttribute(it, n.getAttribute(it).replace(/\\#it\\#/g, destIt).replace(/\\#nearRangeIt\\#/g, destIt).replace(/\\#nearRangeIndex\\#/g, destIt)))\n                        n.innerHTML = n.innerHTML.replace(/\\#it\\#/g, destIt).replace(/\\#index\\#/g, destIt);\n                        \n                        if (this.__render.drStripOption === 'true') {\n                            Array.from(n.childNodes).forEach(it => this.__render.fag.append(it));\n                        } else {\n                            this.__render.fag.append(n);\n                        }\n                        i++;\n                    }\n                    ").concat((_c = this.elementSource.attrs.drAfterOption) !== null && _c !== void 0 ? _c : '', "\n                    "), Object.assign(this.source.obj, {
+                    __render: Object.freeze(__assign({ fag: newTemp, drStripOption: this.elementSource.attrs.drStripOption }, this.render))
+                }));
+                RawSet_1.RawSet.drVarDecoding(newTemp, vars);
+                RawSet_1.RawSet.drItOtherDecoding(newTemp, itRandom);
+                tempalte = this.source.config.window.document.createElement('template');
+                tempalte.innerHTML = newTemp.innerHTML;
+                this.returnContainer.fag.append(tempalte.content);
+                rr = RawSet_1.RawSet.checkPointCreates(this.returnContainer.fag, this.source.obj, this.source.config);
+                (_d = this.elementSource.element.parentNode) === null || _d === void 0 ? void 0 : _d.replaceChild(this.returnContainer.fag, this.elementSource.element);
+                (_e = this.returnContainer.raws).push.apply(_e, rr);
+                return [2 /*return*/, OperatorExecuter_1.ExecuteState.EXECUTE];
+            });
+        });
     };
     return DrRepeat;
-}(OperatorRender_1.OperatorRender));
+}(OperatorExecuterAttrRequire_1.OperatorExecuterAttrRequire));
 exports.DrRepeat = DrRepeat;

package/operators/DrTargetAttr.d.ts

@@ -1,4 +1,7 @@
-import { ExecuteState, OperatorRender } from './OperatorRender';
-export declare class DrTargetAttr extends OperatorRender {
-    execRender(): ExecuteState;
+import { RawSet } from '../rawsets/RawSet';
+import { AfterCallBack, ElementSource, ExecuteState, OperatorExecuter, ReturnContainer, Source } from './OperatorExecuter';
+import { Render } from '../rawsets/Render';
+export declare class DrTargetAttr extends OperatorExecuter<void> {
+    constructor(rawSet: RawSet, render: Render, returnContainer: ReturnContainer, elementSource: ElementSource, source: Source, afterCallBack: AfterCallBack);
+    execute(): Promise<ExecuteState>;
 }

package/operators/DrTargetAttr.js

@@ -14,42 +14,85 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DrTargetAttr = void 0;
-var OperatorRender_1 = require("./OperatorRender");
 var RawSet_1 = require("../rawsets/RawSet");
+var OperatorExecuter_1 = require("./OperatorExecuter");
 var DrTargetAttr = /** @class */ (function (_super) {
     __extends(DrTargetAttr, _super);
-    function DrTargetAttr() {
-        return _super !== null && _super.apply(this, arguments) || this;
+    function DrTargetAttr(rawSet, render, returnContainer, elementSource, source, afterCallBack) {
+        var _this = this;
+        source.operatorAround = undefined;
+        _this = _super.call(this, rawSet, render, returnContainer, elementSource, source, afterCallBack, false) || this;
+        return _this;
     }
-    DrTargetAttr.prototype.execRender = function () {
-        var _a;
-        var _b, _c, _d, _e;
-        var attributeNames = this.elementSource.element.getAttributeNames();
-        // const targetAttr = config?.targetAttrs?.find(it => (!drAttr.drForOf && !drAttr.drFor && !drAttr.drRepeat) && attributeNames.includes(it.name));
-        var targetAttr = (_c = (_b = this.source.config) === null || _b === void 0 ? void 0 : _b.targetAttrs) === null || _c === void 0 ? void 0 : _c.find(function (it) { return attributeNames.includes(it.name); });
-        if (targetAttr) {
-            var attrName = targetAttr.name;
-            var attrValue = this.rawSet.getAttributeAndDelete(this.elementSource.element, attrName);
-            if (attrValue && attrName && (!this.elementSource.attrs.drForOf && !this.elementSource.attrs.drFor && !this.elementSource.attrs.drRepeat)) {
-                var documentFragment = targetAttr.callBack(this.elementSource.element, attrValue, this.source.obj, this.rawSet);
-                if (documentFragment) {
-                    var rr = RawSet_1.RawSet.checkPointCreates(documentFragment, this.source.obj, this.source.config);
-                    (_d = this.elementSource.element.parentNode) === null || _d === void 0 ? void 0 : _d.replaceChild(documentFragment, this.elementSource.element);
-                    (_a = this.returnContainer.raws).push.apply(_a, rr);
-                    this.afterCallBack.onAttrInitCallBacks.push({
-                        attrName: attrName,
-                        attrValue: attrValue,
-                        obj: this.source.obj
-                    });
-                    (_e = targetAttr === null || targetAttr === void 0 ? void 0 : targetAttr.complete) === null || _e === void 0 ? void 0 : _e.call(targetAttr, this.elementSource.element, attrValue, this.source.obj, this.rawSet);
+    DrTargetAttr.prototype.execute = function () {
+        var _a, _b, _c, _d;
+        return __awaiter(this, void 0, void 0, function () {
+            var attributeNames, targetAttr, attrName, attrValue, documentFragment, rr;
+            var _e;
+            return __generator(this, function (_f) {
+                attributeNames = this.elementSource.element.getAttributeNames();
+                targetAttr = (_b = (_a = this.source.config) === null || _a === void 0 ? void 0 : _a.targetAttrs) === null || _b === void 0 ? void 0 : _b.find(function (it) { return attributeNames.includes(it.name); });
+                if (targetAttr) {
+                    attrName = targetAttr.name;
+                    attrValue = this.rawSet.getAttributeAndDelete(this.elementSource.element, attrName);
+                    if (attrValue && attrName && (!this.elementSource.attrs.drForOf && !this.elementSource.attrs.drFor && !this.elementSource.attrs.drRepeat)) {
+                        documentFragment = targetAttr.callBack(this.elementSource.element, attrValue, this.source.obj, this.rawSet);
+                        if (documentFragment) {
+                            rr = RawSet_1.RawSet.checkPointCreates(documentFragment, this.source.obj, this.source.config);
+                            (_c = this.elementSource.element.parentNode) === null || _c === void 0 ? void 0 : _c.replaceChild(documentFragment, this.elementSource.element);
+                            (_e = this.returnContainer.raws).push.apply(_e, rr);
+                            this.afterCallBack.onAttrInitCallBacks.push({
+                                attrName: attrName,
+                                attrValue: attrValue,
+                                obj: this.source.obj
+                            });
+                            (_d = targetAttr === null || targetAttr === void 0 ? void 0 : targetAttr.complete) === null || _d === void 0 ? void 0 : _d.call(targetAttr, this.elementSource.element, attrValue, this.source.obj, this.rawSet);
+                        }
+                    }
+                    return [2 /*return*/, OperatorExecuter_1.ExecuteState.EXECUTE];
                 }
-            }
-            return OperatorRender_1.ExecuteState.EXECUTE;
-        }
-        return OperatorRender_1.ExecuteState.NO_EXECUTE;
+                return [2 /*return*/, OperatorExecuter_1.ExecuteState.NO_EXECUTE];
+            });
+        });
     };
     return DrTargetAttr;
-}(OperatorRender_1.OperatorRender));
+}(OperatorExecuter_1.OperatorExecuter));
 exports.DrTargetAttr = DrTargetAttr;

package/operators/DrTargetElement.d.ts

@@ -1,4 +1,7 @@
-import { ExecuteState, OperatorRender } from './OperatorRender';
-export declare class DrTargetElement extends OperatorRender {
-    execRender(): ExecuteState;
+import { RawSet } from '../rawsets/RawSet';
+import { AfterCallBack, ElementSource, ExecuteState, OperatorExecuter, ReturnContainer, Source } from './OperatorExecuter';
+import { Render } from '../rawsets/Render';
+export declare class DrTargetElement extends OperatorExecuter<void> {
+    constructor(rawSet: RawSet, render: Render, returnContainer: ReturnContainer, elementSource: ElementSource, source: Source, afterCallBack: AfterCallBack);
+    execute(): Promise<ExecuteState>;
 }

package/operators/DrTargetElement.js

@@ -14,79 +14,101 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DrTargetElement = void 0;
-var OperatorRender_1 = require("./OperatorRender");
 var ScriptUtils_1 = require("../utils/script/ScriptUtils");
 var RawSet_1 = require("../rawsets/RawSet");
+var OperatorExecuter_1 = require("./OperatorExecuter");
 var DrTargetElement = /** @class */ (function (_super) {
     __extends(DrTargetElement, _super);
-    function DrTargetElement() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    DrTargetElement.prototype.execRender = function () {
-        var _a;
+    function DrTargetElement(rawSet, render, returnContainer, elementSource, source, afterCallBack) {
         var _this = this;
-        var _b, _c, _d, _e;
-        var targetElement = (_c = (_b = this.source.config) === null || _b === void 0 ? void 0 : _b.targetElements) === null || _c === void 0 ? void 0 : _c.find(function (it) { return it.name.toLowerCase() === _this.elementSource.element.tagName.toLowerCase(); });
-        if (targetElement) {
-            var documentFragment = targetElement.callBack(this.elementSource.element, this.source.obj, this.rawSet, this.elementSource.attrs, this.source.config);
-            if (documentFragment) {
-                // const targetAttrMap = this.elementSource.element.getAttribute(EventManager.normalAttrMapAttrName);
-                var detectAction_1 = this.elementSource.element.getAttribute(RawSet_1.RawSet.DR_DETECT_NAME);
-                var render_1 = documentFragment.render;
-                // console.log('-------drTargetElement->', render, targetAttrMap);
-                this.rawSet.fragment = documentFragment;
-                this.rawSet.data = render_1.component;
-                // const targetAttrs = this.elementSource.element.getAttributeNames()
-                //     .filter(it => RawSet.isExporesion(this.elementSource.element.getAttribute(it)))
-                //     .map(it => ({name: it, expresion: RawSet.exporesionGrouops(this.elementSource.element.getAttribute(it))[0][1]}))
-                //     .filter(it => it.name.length > 0 && it.expresion.length > 0)
-                //     .map(it => {
-                //         return `n.setAttribute('${it.name}', ${it.expresion})`;
-                //     });
-                // if (targetAttrMap) {
-                //     ScriptUtils.eval(`
-                //                 ${this.render.bindScript}
-                //                 //const n = $element.cloneNode(true);
-                //                 const n = $element;
-                //                 ${targetAttrMap.join(';')};
-                //                 // this.__render.fag.append(n);
-                //             `, Object.assign(this.source.obj, {
-                //         __render: Object.freeze({
-                //             fag: newTemp,
-                //             targetAttrs: targetAttrMap,
-                //             ...this.render
-                //         } as Render)
-                //     }));
-                // }
-                if (detectAction_1 && render_1) {
-                    this.rawSet.detect = {
-                        action: function () {
-                            var script = "var $component = this.__render.component; var $element = this.__render.element; var $innerHTML = this.__render.innerHTML; var $attribute = this.__render.attribute;  ".concat(detectAction_1, " ");
-                            ScriptUtils_1.ScriptUtils.eval(script, Object.assign(_this.source.obj, {
-                                __render: render_1
-                            }));
+        source.operatorAround = undefined;
+        _this = _super.call(this, rawSet, render, returnContainer, elementSource, source, afterCallBack, false) || this;
+        return _this;
+    }
+    DrTargetElement.prototype.execute = function () {
+        var _a, _b, _c, _d;
+        return __awaiter(this, void 0, void 0, function () {
+            var targetElement, documentFragment, detectAction_1, render_1, rr;
+            var _e;
+            var _this = this;
+            return __generator(this, function (_f) {
+                switch (_f.label) {
+                    case 0:
+                        targetElement = (_b = (_a = this.source.config) === null || _a === void 0 ? void 0 : _a.targetElements) === null || _b === void 0 ? void 0 : _b.find(function (it) { return it.name.toLowerCase() === _this.elementSource.element.tagName.toLowerCase(); });
+                        if (!targetElement) return [3 /*break*/, 2];
+                        return [4 /*yield*/, targetElement.callBack(this.elementSource.element, this.source.obj, this.rawSet, this.elementSource.attrs, this.source.config)];
+                    case 1:
+                        documentFragment = _f.sent();
+                        if (documentFragment) {
+                            detectAction_1 = this.elementSource.element.getAttribute(RawSet_1.RawSet.DR_DETECT_NAME);
+                            render_1 = documentFragment.render;
+                            this.rawSet.fragment = documentFragment;
+                            this.rawSet.data = render_1.component;
+                            if (detectAction_1 && render_1) {
+                                this.rawSet.detect = {
+                                    action: function () {
+                                        var script = "var $component = this.__render.component; var $element = this.__render.element; var $innerHTML = this.__render.innerHTML; var $attribute = this.__render.attribute;  ".concat(detectAction_1, " ");
+                                        ScriptUtils_1.ScriptUtils.eval(script, Object.assign(_this.source.obj, {
+                                            __render: render_1
+                                        }));
+                                    }
+                                };
+                            }
+                            rr = RawSet_1.RawSet.checkPointCreates(documentFragment, this.source.obj, this.source.config);
+                            (_c = this.elementSource.element.parentNode) === null || _c === void 0 ? void 0 : _c.replaceChild(documentFragment, this.elementSource.element);
+                            (_e = this.returnContainer.raws).push.apply(_e, rr);
+                            this.afterCallBack.onElementInitCallBacks.push({
+                                name: targetElement.name.toLowerCase(),
+                                obj: this.source.obj,
+                                targetElement: targetElement,
+                                creatorMetaData: targetElement.__creatorMetaData
+                            });
+                            (_d = targetElement === null || targetElement === void 0 ? void 0 : targetElement.complete) === null || _d === void 0 ? void 0 : _d.call(targetElement, this.elementSource.element, this.source.obj, this.rawSet);
                         }
-                    };
+                        return [2 /*return*/, OperatorExecuter_1.ExecuteState.EXECUTE];
+                    case 2: return [2 /*return*/, OperatorExecuter_1.ExecuteState.NO_EXECUTE];
                 }
-                // fag.append(documentFragment)
-                var rr = RawSet_1.RawSet.checkPointCreates(documentFragment, this.source.obj, this.source.config);
-                (_d = this.elementSource.element.parentNode) === null || _d === void 0 ? void 0 : _d.replaceChild(documentFragment, this.elementSource.element);
-                (_a = this.returnContainer.raws).push.apply(_a, rr);
-                this.afterCallBack.onElementInitCallBacks.push({
-                    name: targetElement.name.toLowerCase(),
-                    obj: this.source.obj,
-                    targetElement: targetElement,
-                    creatorMetaData: targetElement.__creatorMetaData
-                });
-                // console.log(document.body.innerHTML);
-                (_e = targetElement === null || targetElement === void 0 ? void 0 : targetElement.complete) === null || _e === void 0 ? void 0 : _e.call(targetElement, this.elementSource.element, this.source.obj, this.rawSet);
-            }
-            return OperatorRender_1.ExecuteState.EXECUTE;
-        }
-        return OperatorRender_1.ExecuteState.NO_EXECUTE;
+            });
+        });
     };
     return DrTargetElement;
-}(OperatorRender_1.OperatorRender));
+}(OperatorExecuter_1.OperatorExecuter));
 exports.DrTargetElement = DrTargetElement;

package/operators/DrThis.d.ts

@@ -1,4 +1,5 @@
-import { ExecuteState, OperatorRender } from './OperatorRender';
-export declare class DrThis extends OperatorRender {
-    execRender(): ExecuteState;
+import { OperatorExecuterAttrRequire } from './OperatorExecuterAttrRequire';
+import { ExecuteState } from './OperatorExecuter';
+export declare class DrThis extends OperatorExecuterAttrRequire<string> {
+    executeAttrRequire(attr: any): Promise<ExecuteState>;
 }