dom-render 1.0.90 → 1.0.92

package/operators/DrForm.js

@@ -25,76 +25,114 @@ 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.DrForm = void 0;
-var OperatorRender_1 = require("./OperatorRender");
 var ScriptUtils_1 = require("../utils/script/ScriptUtils");
 var RawSet_1 = require("../rawsets/RawSet");
 var Validator_1 = require("../validators/Validator");
 var EventManager_1 = require("../events/EventManager");
 var ValidatorArray_1 = require("../validators/ValidatorArray");
+var OperatorExecuterAttrRequire_1 = require("./OperatorExecuterAttrRequire");
+var OperatorExecuter_1 = require("./OperatorExecuter");
 var DrForm = /** @class */ (function (_super) {
     __extends(DrForm, _super);
-    function DrForm() {
-        return _super !== null && _super.apply(this, arguments) || this;
+    function DrForm(rawSet, render, returnContainer, elementSource, source, afterCallBack) {
+        return _super.call(this, rawSet, render, returnContainer, elementSource, source, afterCallBack, false) || this;
     }
-    DrForm.prototype.execRender = function () {
+    DrForm.prototype.executeAttrRequire = function (attr) {
         var _a;
-        var _this = this;
-        var _b;
-        if (this.elementSource.attrs.drForm) {
-            RawSet_1.RawSet.drFormOtherMoveAttr(this.elementSource.element, 'name', 'temp-name', this.source.config);
-            var data = ScriptUtils_1.ScriptUtils.evalReturn("".concat(this.elementSource.attrs.drForm), this.source.obj);
-            var childs = Array.from(this.elementSource.element.querySelectorAll('[name]'));
-            var fromName = ScriptUtils_1.ScriptUtils.evalReturn((_b = this.elementSource.element.getAttribute("".concat(RawSet_1.RawSet.DR_FORM_NAME, ":name"))) !== null && _b !== void 0 ? _b : '', this.source.obj);
-            var thisName = fromName !== null && fromName !== void 0 ? fromName : this.elementSource.element.getAttribute('name');
-            // console.log('dr-form:name', thisName, element.getAttribute('dr-form:name'), obj, element);
-            // // 자기자신이 Input 대상일때
-            if (childs.length <= 0 && thisName) {
-                childs.push(this.elementSource.element);
-            }
-            else {
-                if (data instanceof Validator_1.Validator) {
-                    data.setTarget(this.elementSource.element);
+        return __awaiter(this, void 0, void 0, function () {
+            var data, childs, fromName, thisName;
+            var _b;
+            var _this = this;
+            return __generator(this, function (_c) {
+                RawSet_1.RawSet.drFormOtherMoveAttr(this.elementSource.element, 'name', 'temp-name', this.source.config);
+                data = ScriptUtils_1.ScriptUtils.evalReturn("".concat(attr), this.source.obj);
+                childs = Array.from(this.elementSource.element.querySelectorAll('[name]'));
+                fromName = ScriptUtils_1.ScriptUtils.evalReturn((_a = this.elementSource.element.getAttribute("".concat(RawSet_1.RawSet.DR_FORM_NAME, ":name"))) !== null && _a !== void 0 ? _a : '', this.source.obj);
+                thisName = fromName !== null && fromName !== void 0 ? fromName : this.elementSource.element.getAttribute('name');
+                // // 자기자신이 Input 대상일때
+                if (childs.length <= 0 && thisName) {
+                    childs.push(this.elementSource.element);
                 }
-            }
-            childs.forEach(function (it) {
-                var _a, _b, _c, _d, _e;
-                var eventName = (_a = it.getAttribute("".concat(RawSet_1.RawSet.DR_FORM_NAME, ":event"))) !== null && _a !== void 0 ? _a : 'change';
-                var validatorName = it.getAttribute("".concat(RawSet_1.RawSet.DR_FORM_NAME, ":validator"));
-                var attrEventName = EventManager_1.EventManager.attrPrefix + 'event-' + eventName;
-                var varpath = (_c = ScriptUtils_1.ScriptUtils.evalReturn((_b = _this.elementSource.element.getAttribute("".concat(RawSet_1.RawSet.DR_FORM_NAME, ":name"))) !== null && _b !== void 0 ? _b : '', _this.source.obj)) !== null && _c !== void 0 ? _c : it.getAttribute('name');
-                if (varpath != null) {
-                    if (validatorName) {
-                        ScriptUtils_1.ScriptUtils.eval("\n                                    ".concat(_this.render.bindScript, "\n                                    const validator = typeof ").concat(validatorName, " ==='function' ?  new  ").concat(validatorName, "() : ").concat(validatorName, ";\n                                    ").concat(_this.elementSource.attrs.drForm, "['").concat(varpath, "'] = validator;\n                                "), Object.assign(_this.source.obj, {
-                            __render: Object.freeze(__assign({ drStripOption: _this.elementSource.attrs.drStripOption }, _this.render))
-                        }));
-                    }
-                    varpath = "".concat(_this.elementSource.attrs.drForm, "['").concat(varpath, "']");
-                    var data_1 = ScriptUtils_1.ScriptUtils.evalReturn("".concat(varpath), _this.source.obj);
-                    if (data_1 instanceof ValidatorArray_1.ValidatorArray) {
-                        it.setAttribute(attrEventName, "".concat(varpath, ".setArrayValue($target, $target.value, $event); ").concat((_d = it.getAttribute(attrEventName)) !== null && _d !== void 0 ? _d : '', ";"));
-                        data_1.addValidator(it.value, it);
-                    }
-                    else if (data_1 instanceof Validator_1.Validator) {
-                        // varpath += (varpath ? '.value' : 'value');
-                        // varpath = drAttr.drForm + '.' + varpath;
-                        // it.setAttribute(attrEventName, `${varpath} = $target.value; ${target}=$target; ${event}=$event;`);
-                        it.setAttribute(attrEventName, "".concat(varpath, ".set($target.value, $target, $event); ").concat((_e = it.getAttribute(attrEventName)) !== null && _e !== void 0 ? _e : '', ";"));
-                        data_1.setTarget(it);
-                        data_1.value = it.value;
-                    }
-                    else {
-                        it.setAttribute(attrEventName, "".concat(varpath, " = $target.value;"));
+                else {
+                    if (data instanceof Validator_1.Validator) {
+                        data.setTarget(this.elementSource.element);
                     }
                 }
+                childs.forEach(function (it) {
+                    var _a, _b, _c, _d, _e;
+                    var eventName = (_a = it.getAttribute("".concat(RawSet_1.RawSet.DR_FORM_NAME, ":event"))) !== null && _a !== void 0 ? _a : 'change';
+                    var validatorName = it.getAttribute("".concat(RawSet_1.RawSet.DR_FORM_NAME, ":validator"));
+                    var attrEventName = EventManager_1.EventManager.attrPrefix + 'event-' + eventName;
+                    var varpath = (_c = ScriptUtils_1.ScriptUtils.evalReturn((_b = _this.elementSource.element.getAttribute("".concat(RawSet_1.RawSet.DR_FORM_NAME, ":name"))) !== null && _b !== void 0 ? _b : '', _this.source.obj)) !== null && _c !== void 0 ? _c : it.getAttribute('name');
+                    if (varpath != null) {
+                        if (validatorName) {
+                            ScriptUtils_1.ScriptUtils.eval("\n                                ".concat(_this.render.bindScript, "\n                                const validator = typeof ").concat(validatorName, " ==='function' ?  new  ").concat(validatorName, "() : ").concat(validatorName, ";\n                                ").concat(attr, "['").concat(varpath, "'] = validator;\n                            "), Object.assign(_this.source.obj, {
+                                __render: Object.freeze(__assign({ drStripOption: _this.elementSource.attrs.drStripOption }, _this.render))
+                            }));
+                        }
+                        varpath = "".concat(attr, "['").concat(varpath, "']");
+                        var data_1 = ScriptUtils_1.ScriptUtils.evalReturn("".concat(varpath), _this.source.obj);
+                        if (data_1 instanceof ValidatorArray_1.ValidatorArray) {
+                            it.setAttribute(attrEventName, "".concat(varpath, ".setArrayValue($target, $target.value, $event); ").concat((_d = it.getAttribute(attrEventName)) !== null && _d !== void 0 ? _d : '', ";"));
+                            data_1.addValidator(it.value, it);
+                        }
+                        else if (data_1 instanceof Validator_1.Validator) {
+                            // varpath += (varpath ? '.value' : 'value');
+                            // varpath = drAttr.drForm + '.' + varpath;
+                            // it.setAttribute(attrEventName, `${varpath} = $target.value; ${target}=$target; ${event}=$event;`);
+                            it.setAttribute(attrEventName, "".concat(varpath, ".set($target.value, $target, $event); ").concat((_e = it.getAttribute(attrEventName)) !== null && _e !== void 0 ? _e : '', ";"));
+                            data_1.setTarget(it);
+                            data_1.value = it.value;
+                        }
+                        else {
+                            it.setAttribute(attrEventName, "".concat(varpath, " = $target.value;"));
+                        }
+                    }
+                });
+                RawSet_1.RawSet.drFormOtherMoveAttr(this.elementSource.element, 'temp-name', 'name', this.source.config);
+                (_b = this.returnContainer.raws).push.apply(_b, RawSet_1.RawSet.checkPointCreates(this.elementSource.element, this.source.obj, this.source.config));
+                return [2 /*return*/, OperatorExecuter_1.ExecuteState.EXECUTE];
             });
-            RawSet_1.RawSet.drFormOtherMoveAttr(this.elementSource.element, 'temp-name', 'name', this.source.config);
-            (_a = this.returnContainer.raws).push.apply(_a, RawSet_1.RawSet.checkPointCreates(this.elementSource.element, this.source.obj, this.source.config));
-            return OperatorRender_1.ExecuteState.EXECUTE;
-        }
-        return OperatorRender_1.ExecuteState.NO_EXECUTE;
+        });
     };
     return DrForm;
-}(OperatorRender_1.OperatorRender));
+}(OperatorExecuterAttrRequire_1.OperatorExecuterAttrRequire));
 exports.DrForm = DrForm;

package/operators/DrIf.d.ts

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

package/operators/DrIf.js

@@ -25,48 +25,84 @@ 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.DrIf = 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 OperatorExecuter_1 = require("./OperatorExecuter");
 var DrIf = /** @class */ (function (_super) {
     __extends(DrIf, _super);
-    function DrIf() {
-        return _super !== null && _super.apply(this, arguments) || this;
+    function DrIf(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;
     }
-    DrIf.prototype.execRender = function () {
-        var _a;
-        var _b, _c, _d, _e;
-        if (this.elementSource.attrs.drIf) {
-            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');
-            // Object.entries(this.__render.drAttr).filter(([k,v]) => k !== 'drIf' && v).forEach(([k, v]) => n.setAttribute(this.__render.drAttrsOriginName[k], v)); <-- 이부분은 다른 attr에도 적용을 할지말지 생각해야됨  엘리먼트 존재유무에 따라서 적용을 할지말지 결정해야됨
-            var keepgoing = ScriptUtils_1.ScriptUtils.eval("\n                    ".concat(this.render.bindScript, "\n                    ").concat((_c = this.elementSource.attrs.drBeforeOption) !== null && _c !== void 0 ? _c : '', "\n                    if ($rawset.data === (").concat(this.elementSource.attrs.drIf, ")) {\n                        return false;\n                    }\n                    $rawset.data = ").concat(this.elementSource.attrs.drIf, "\n                    if($rawset.data) {\n                        const n = $element.cloneNode(true);\n                        Object.entries(this.__render.drAttr).filter(([k,v]) => k !== 'drIf' && v).forEach(([k, v]) => n.setAttribute(this.__render.drAttrsOriginName[k], v));\n                        var destIt = ").concat(this.elementSource.attrs.drItOption, ";\n                        if (destIt !== undefined) {\n                            n.getAttributeNames().forEach(it => n.setAttribute(it, n.getAttribute(it).replace(/\\#it\\#/g, destIt)))\n                            n.innerHTML = n.innerHTML.replace(/\\#it\\#/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                    }\n                    ").concat((_d = this.elementSource.attrs.drAfterOption) !== null && _d !== void 0 ? _d : '', ";\n                    return true;\n                    "), Object.assign(this.source.obj, {
-                __render: Object.freeze(__assign({ fag: newTemp, drAttr: this.elementSource.attrs, drAttrsOriginName: RawSet_1.RawSet.drAttrsOriginName, drStripOption: this.elementSource.attrs.drStripOption }, this.render))
-            }));
-            // console.log('keepgoing', keepgoing);
-            if (keepgoing === false) {
-                return OperatorRender_1.ExecuteState.STOP;
-            }
-            RawSet_1.RawSet.drVarDecoding(newTemp, vars);
-            RawSet_1.RawSet.drItOtherDecoding(newTemp, itRandom);
-            // const bypass = (newTemp.innerHTML ?? '').trim().length <= 0;
-            var tempalte = this.source.config.window.document.createElement('template');
-            tempalte.innerHTML = newTemp.innerHTML;
-            // console.log(tempalte.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);
-            // if (bypass) {
-            //     continue;
-            // }
-            return OperatorRender_1.ExecuteState.EXECUTE;
-        }
-        return OperatorRender_1.ExecuteState.NO_EXECUTE;
+    DrIf.prototype.executeAttrRequire = function (attr) {
+        var _a, _b, _c, _d;
+        return __awaiter(this, void 0, void 0, function () {
+            var itRandom, vars, newTemp, keepgoing, 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');
+                keepgoing = ScriptUtils_1.ScriptUtils.eval("\n                ".concat(this.render.bindScript, "\n                ").concat((_b = this.elementSource.attrs.drBeforeOption) !== null && _b !== void 0 ? _b : '', "\n                if ($rawset.data === (").concat(attr, ")) {\n                    return false;\n                }\n                $rawset.data = ").concat(attr, ";\n                if($rawset.data) {\n                    const n = $element.cloneNode(true);\n                    Object.entries(this.__render.drAttr).filter(([k,v]) => k !== 'drIf' && v).forEach(([k, v]) => n.setAttribute(this.__render.drAttrsOriginName[k], v));\n                    var destIt = ").concat(this.elementSource.attrs.drItOption, ";\n                    if (destIt !== undefined) {\n                        n.getAttributeNames().forEach(it => n.setAttribute(it, n.getAttribute(it).replace(/\\#it\\#/g, destIt)))\n                        n.innerHTML = n.innerHTML.replace(/\\#it\\#/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                }\n                ").concat((_c = this.elementSource.attrs.drAfterOption) !== null && _c !== void 0 ? _c : '', ";\n                return true;\n                "), Object.assign(this.source.obj, {
+                    __render: Object.freeze(__assign({ fag: newTemp, drAttr: this.elementSource.attrs, drAttrsOriginName: RawSet_1.RawSet.drAttrsOriginName, drStripOption: this.elementSource.attrs.drStripOption }, this.render))
+                }));
+                // TODO: 뭐지?? 지워야되는거 아닌가?
+                if (keepgoing === false) {
+                    return [2 /*return*/, OperatorExecuter_1.ExecuteState.STOP];
+                }
+                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 DrIf;
-}(OperatorRender_1.OperatorRender));
+}(OperatorExecuterAttrRequire_1.OperatorExecuterAttrRequire));
 exports.DrIf = DrIf;

package/operators/DrInnerHTML.d.ts

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

package/operators/DrInnerHTML.js

@@ -25,36 +25,75 @@ 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.DrInnerHTML = 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 OperatorExecuter_1 = require("./OperatorExecuter");
 var DrInnerHTML = /** @class */ (function (_super) {
     __extends(DrInnerHTML, _super);
-    function DrInnerHTML() {
-        return _super !== null && _super.apply(this, arguments) || this;
+    function DrInnerHTML(rawSet, render, returnContainer, elementSource, source, afterCallBack) {
+        return _super.call(this, rawSet, render, returnContainer, elementSource, source, afterCallBack, false) || this;
     }
-    DrInnerHTML.prototype.execRender = function () {
-        var _a;
-        var _b, _c, _d;
-        if (this.elementSource.attrs.drInnerHTML) {
-            var newTemp = this.source.config.window.document.createElement('temp');
-            ScriptUtils_1.ScriptUtils.eval("\n                        ".concat(this.render.bindScript, "\n                        const n = $element.cloneNode(true);\n                        ").concat((_b = this.elementSource.attrs.drBeforeOption) !== null && _b !== void 0 ? _b : '', "\n                        n.innerHTML = ").concat(this.elementSource.attrs.drInnerHTML, ";\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                        ").concat((_c = this.elementSource.attrs.drAfterOption) !== null && _c !== void 0 ? _c : '', "\n                    "), Object.assign(this.source.obj, {
-                __render: Object.freeze(__assign({ drStripOption: this.elementSource.attrs.drStripOption, fag: newTemp }, this.render
-                // eslint-disable-next-line no-use-before-define
-                ))
-            }));
-            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);
-            (_d = this.elementSource.element.parentNode) === null || _d === void 0 ? void 0 : _d.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;
+    DrInnerHTML.prototype.executeAttrRequire = function (attr) {
+        var _a, _b, _c;
+        return __awaiter(this, void 0, void 0, function () {
+            var newTemp, tempalte, rr;
+            var _d;
+            return __generator(this, function (_e) {
+                newTemp = this.source.config.window.document.createElement('temp');
+                ScriptUtils_1.ScriptUtils.eval("\n                        ".concat(this.render.bindScript, "\n                        const n = $element.cloneNode(true);\n                        ").concat((_a = this.elementSource.attrs.drBeforeOption) !== null && _a !== void 0 ? _a : '', "\n                        n.innerHTML = ").concat(attr, ";\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                        ").concat((_b = this.elementSource.attrs.drAfterOption) !== null && _b !== void 0 ? _b : '', "\n                    "), Object.assign(this.source.obj, {
+                    __render: Object.freeze(__assign({ drStripOption: this.elementSource.attrs.drStripOption, fag: newTemp }, this.render
+                    // eslint-disable-next-line no-use-before-define
+                    ))
+                }));
+                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);
+                (_c = this.elementSource.element.parentNode) === null || _c === void 0 ? void 0 : _c.replaceChild(this.returnContainer.fag, this.elementSource.element);
+                (_d = this.returnContainer.raws).push.apply(_d, rr);
+                return [2 /*return*/, OperatorExecuter_1.ExecuteState.EXECUTE];
+            });
+        });
     };
     return DrInnerHTML;
-}(OperatorRender_1.OperatorRender));
+}(OperatorExecuterAttrRequire_1.OperatorExecuterAttrRequire));
 exports.DrInnerHTML = DrInnerHTML;

package/operators/DrInnerText.d.ts

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

package/operators/DrInnerText.js

@@ -25,34 +25,73 @@ 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.DrInnerText = 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 OperatorExecuter_1 = require("./OperatorExecuter");
 var DrInnerText = /** @class */ (function (_super) {
     __extends(DrInnerText, _super);
-    function DrInnerText() {
-        return _super !== null && _super.apply(this, arguments) || this;
+    function DrInnerText(rawSet, render, returnContainer, elementSource, source, afterCallBack) {
+        return _super.call(this, rawSet, render, returnContainer, elementSource, source, afterCallBack, false) || this;
     }
-    DrInnerText.prototype.execRender = function () {
-        var _a;
-        var _b, _c, _d;
-        if (this.elementSource.attrs.drInnerText) {
-            var newTemp = this.source.config.window.document.createElement('temp');
-            ScriptUtils_1.ScriptUtils.eval(" \n                        ".concat(this.render.bindScript, "\n                        const n = $element.cloneNode(true);  \n                        ").concat((_b = this.elementSource.attrs.drBeforeOption) !== null && _b !== void 0 ? _b : '', "\n                        n.innerText = ").concat(this.elementSource.attrs.drInnerText, ";\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                        ").concat((_c = this.elementSource.attrs.drAfterOption) !== null && _c !== void 0 ? _c : '', "\n                    "), Object.assign(this.source.obj, {
-                __render: Object.freeze(__assign({ drStripOption: this.elementSource.attrs.drStripOption, fag: newTemp }, this.render))
-            }));
-            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);
-            (_d = this.elementSource.element.parentNode) === null || _d === void 0 ? void 0 : _d.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;
+    DrInnerText.prototype.executeAttrRequire = function (attr) {
+        var _a, _b, _c;
+        return __awaiter(this, void 0, void 0, function () {
+            var newTemp, tempalte, rr;
+            var _d;
+            return __generator(this, function (_e) {
+                newTemp = this.source.config.window.document.createElement('temp');
+                ScriptUtils_1.ScriptUtils.eval(" \n                        ".concat(this.render.bindScript, "\n                        const n = $element.cloneNode(true);  \n                        ").concat((_a = this.elementSource.attrs.drBeforeOption) !== null && _a !== void 0 ? _a : '', "\n                        n.innerText = ").concat(attr, ";\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                        ").concat((_b = this.elementSource.attrs.drAfterOption) !== null && _b !== void 0 ? _b : '', "\n                    "), Object.assign(this.source.obj, {
+                    __render: Object.freeze(__assign({ drStripOption: this.elementSource.attrs.drStripOption, fag: newTemp }, this.render))
+                }));
+                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);
+                (_c = this.elementSource.element.parentNode) === null || _c === void 0 ? void 0 : _c.replaceChild(this.returnContainer.fag, this.elementSource.element);
+                (_d = this.returnContainer.raws).push.apply(_d, rr);
+                return [2 /*return*/, OperatorExecuter_1.ExecuteState.EXECUTE];
+            });
+        });
     };
     return DrInnerText;
-}(OperatorRender_1.OperatorRender));
+}(OperatorExecuterAttrRequire_1.OperatorExecuterAttrRequire));
 exports.DrInnerText = DrInnerText;

package/operators/DrPre.d.ts

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