dom-render 1.0.90 → 1.0.91

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): ExecuteState;
 }

package/operators/DrInnerHTML.js

@@ -27,34 +27,32 @@ var __assign = (this && this.__assign) || function () {
 };
 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 () {
+    DrInnerHTML.prototype.executeAttrRequire = function (attr) {
         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;
+        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(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((_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 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): ExecuteState;
 }

package/operators/DrInnerText.js

@@ -27,32 +27,30 @@ var __assign = (this && this.__assign) || function () {
 };
 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 () {
+    DrInnerText.prototype.executeAttrRequire = function (attr) {
         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;
+        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(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((_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 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): ExecuteState;
 }

package/operators/DrPre.js

@@ -16,15 +16,18 @@ var __extends = (this && this.__extends) || (function () {
 })();
 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 (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): ExecuteState;
 }

package/operators/DrRepeat.js

@@ -27,37 +27,38 @@ var __assign = (this && this.__assign) || function () {
 };
 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 () {
+    DrRepeat.prototype.executeAttrRequire = function (attr) {
         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;
+        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(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((_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 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(): ExecuteState;
 }

package/operators/DrTargetAttr.js

@@ -16,18 +16,20 @@ var __extends = (this && this.__extends) || (function () {
 })();
 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 () {
+    DrTargetAttr.prototype.execute = 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;
@@ -46,10 +48,10 @@ var DrTargetAttr = /** @class */ (function (_super) {
                     (_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);
                 }
             }
-            return OperatorRender_1.ExecuteState.EXECUTE;
+            return OperatorExecuter_1.ExecuteState.EXECUTE;
         }
-        return OperatorRender_1.ExecuteState.NO_EXECUTE;
+        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(): ExecuteState;
 }

package/operators/DrTargetElement.js

@@ -16,15 +16,18 @@ var __extends = (this && this.__extends) || (function () {
 })();
 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;
+    function DrTargetElement(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;
     }
-    DrTargetElement.prototype.execRender = function () {
+    DrTargetElement.prototype.execute = function () {
         var _a;
         var _this = this;
         var _b, _c, _d, _e;
@@ -32,34 +35,10 @@ var DrTargetElement = /** @class */ (function (_super) {
         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 () {
@@ -80,13 +59,12 @@ var DrTargetElement = /** @class */ (function (_super) {
                     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 OperatorExecuter_1.ExecuteState.EXECUTE;
         }
-        return OperatorRender_1.ExecuteState.NO_EXECUTE;
+        return OperatorExecuter_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): ExecuteState;
 }

package/operators/DrThis.js

@@ -16,47 +16,41 @@ var __extends = (this && this.__extends) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DrThis = void 0;
-var OperatorRender_1 = require("./OperatorRender");
-var ScriptUtils_1 = require("../utils/script/ScriptUtils");
+var OperatorExecuterAttrRequire_1 = require("./OperatorExecuterAttrRequire");
 var RawSet_1 = require("../rawsets/RawSet");
 var ComponentSet_1 = require("../components/ComponentSet");
+var OperatorExecuter_1 = require("./OperatorExecuter");
 var DrThis = /** @class */ (function (_super) {
     __extends(DrThis, _super);
     function DrThis() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
-    DrThis.prototype.execRender = function () {
+    DrThis.prototype.executeAttrRequire = function (attr) {
         var _a;
         var _b, _c, _d, _e, _f;
-        if (this.elementSource.attrs.drThis) {
-            var r = ScriptUtils_1.ScriptUtils.evalReturn(this.elementSource.attrs.drThis, this.source.obj);
-            // const isStrip = ScriptUtils.eval(`if (${this.elementSource.attrs.drStripOption ?? 'false'}) { return true; } else { return false; }`, this.source.obj);
-            // console.log('isStrip', isStrip)
-            if (r) {
-                if (r instanceof ComponentSet_1.ComponentSet) {
-                    if (this.rawSet.data) {
-                        var destroyOptions = (_c = (_b = this.elementSource.attrs.drDestroyOption) === null || _b === void 0 ? void 0 : _b.split(',')) !== null && _c !== void 0 ? _c : [];
-                        RawSet_1.RawSet.destroy(this.rawSet.data.obj, [], this.source.config, destroyOptions);
-                    }
-                    this.rawSet.data = r;
-                    var componentBody = RawSet_1.RawSet.drThisCreate(this.rawSet, this.elementSource.element, "".concat(this.elementSource.attrs.drThis, ".obj"), (_d = this.elementSource.attrs.drVarOption) !== null && _d !== void 0 ? _d : '', this.elementSource.attrs.drStripOption, this.source.obj, this.source.config, r);
-                    this.returnContainer.fag.append(componentBody);
-                    this.afterCallBack.onThisComponentSetCallBacks.push(r);
+        if (attr && this.elementSource.attrs.drThis) {
+            if (attr instanceof ComponentSet_1.ComponentSet) {
+                if (this.rawSet.data) {
+                    var destroyOptions = (_c = (_b = this.elementSource.attrs.drDestroyOption) === null || _b === void 0 ? void 0 : _b.split(',')) !== null && _c !== void 0 ? _c : [];
+                    RawSet_1.RawSet.destroy(this.rawSet.data.obj, [], this.source.config, destroyOptions);
                 }
-                else {
-                    this.returnContainer.fag.append(RawSet_1.RawSet.drThisCreate(this.rawSet, this.elementSource.element, this.elementSource.attrs.drThis, (_e = this.elementSource.attrs.drVarOption) !== null && _e !== void 0 ? _e : '', this.elementSource.attrs.drStripOption, this.source.obj, this.source.config));
-                }
-                var rr = RawSet_1.RawSet.checkPointCreates(this.returnContainer.fag, this.source.obj, this.source.config);
-                (_f = this.elementSource.element.parentNode) === null || _f === void 0 ? void 0 : _f.replaceChild(this.returnContainer.fag, this.elementSource.element);
-                (_a = this.returnContainer.raws).push.apply(_a, rr);
+                this.rawSet.data = attr;
+                var componentBody = RawSet_1.RawSet.drThisCreate(this.rawSet, this.elementSource.element, "".concat(this.elementSource.attrs.drThis).concat(attr.config.objPath ? ('.' + attr.config.objPath) : ''), (_d = this.elementSource.attrs.drVarOption) !== null && _d !== void 0 ? _d : '', this.elementSource.attrs.drStripOption, this.source.obj, this.source.config, attr);
+                this.returnContainer.fag.append(componentBody);
+                this.afterCallBack.onThisComponentSetCallBacks.push(attr);
             }
             else {
-                this.elementSource.element.remove();
+                this.returnContainer.fag.append(RawSet_1.RawSet.drThisCreate(this.rawSet, this.elementSource.element, this.elementSource.attrs.drThis, (_e = this.elementSource.attrs.drVarOption) !== null && _e !== void 0 ? _e : '', this.elementSource.attrs.drStripOption, this.source.obj, this.source.config));
             }
-            return OperatorRender_1.ExecuteState.EXECUTE;
+            var rr = RawSet_1.RawSet.checkPointCreates(this.returnContainer.fag, this.source.obj, this.source.config);
+            (_f = this.elementSource.element.parentNode) === null || _f === void 0 ? void 0 : _f.replaceChild(this.returnContainer.fag, this.elementSource.element);
+            (_a = this.returnContainer.raws).push.apply(_a, rr);
+        }
+        else {
+            this.elementSource.element.remove();
         }
-        return OperatorRender_1.ExecuteState.NO_EXECUTE;
+        return OperatorExecuter_1.ExecuteState.EXECUTE;
     };
     return DrThis;
-}(OperatorRender_1.OperatorRender));
+}(OperatorExecuterAttrRequire_1.OperatorExecuterAttrRequire));
 exports.DrThis = DrThis;

package/operators/OperatorExecuter.d.ts

@@ -0,0 +1,48 @@
+import { AttrInitCallBack } from '../rawsets/AttrInitCallBack';
+import { ElementInitCallBack } from '../rawsets/ElementInitCallBack';
+import { ComponentSet } from '../components/ComponentSet';
+import { RawSet } from '../rawsets/RawSet';
+import { Render } from '../rawsets/Render';
+import { Attrs } from '../rawsets/Attrs';
+import { Config } from '../configs/Config';
+export declare type OperatorAround = {
+    beforeAttr?: (value: string | null | undefined, opratorExecutor: OperatorExecuter) => string | null | undefined;
+    before?: (data: any, opratorExecutor: OperatorExecuter) => any;
+    after?: (data: any, opratorExecutor: OperatorExecuter) => void;
+};
+export declare enum ExecuteState {
+    EXECUTE = 0,
+    NO_EXECUTE = 1,
+    STOP = 2
+}
+export declare type AfterCallBack = {
+    onAttrInitCallBacks: AttrInitCallBack[];
+    onElementInitCallBacks: ElementInitCallBack[];
+    onThisComponentSetCallBacks: ComponentSet[];
+};
+export declare type ReturnContainer = {
+    raws: RawSet[];
+    fag: DocumentFragment;
+};
+export declare type ElementSource = {
+    element: Element;
+    attrs: Attrs;
+    attr?: string | null;
+};
+export declare type Source = {
+    config: Config;
+    operatorAround?: OperatorAround;
+    obj: any;
+};
+export declare abstract class OperatorExecuter<T = any> {
+    rawSet: RawSet;
+    render: Render;
+    returnContainer: ReturnContainer;
+    elementSource: ElementSource;
+    source: Source;
+    afterCallBack: AfterCallBack;
+    startingExecute: boolean;
+    constructor(rawSet: RawSet, render: Render, returnContainer: ReturnContainer, elementSource: ElementSource, source: Source, afterCallBack: AfterCallBack, startingExecute?: boolean);
+    start(): ExecuteState;
+    abstract execute(value: T): ExecuteState;
+}

package/operators/OperatorExecuter.js

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OperatorExecuter = exports.ExecuteState = void 0;
+var ScriptUtils_1 = require("../utils/script/ScriptUtils");
+var ExecuteState;
+(function (ExecuteState) {
+    ExecuteState[ExecuteState["EXECUTE"] = 0] = "EXECUTE";
+    ExecuteState[ExecuteState["NO_EXECUTE"] = 1] = "NO_EXECUTE";
+    ExecuteState[ExecuteState["STOP"] = 2] = "STOP";
+})(ExecuteState = exports.ExecuteState || (exports.ExecuteState = {}));
+var OperatorExecuter = /** @class */ (function () {
+    function OperatorExecuter(rawSet, render, returnContainer, elementSource, source, afterCallBack, startingExecute) {
+        if (startingExecute === void 0) { startingExecute = true; }
+        this.rawSet = rawSet;
+        this.render = render;
+        this.returnContainer = returnContainer;
+        this.elementSource = elementSource;
+        this.source = source;
+        this.afterCallBack = afterCallBack;
+        this.startingExecute = startingExecute;
+    }
+    ;
+    OperatorExecuter.prototype.start = function () {
+        var _a, _b, _c, _d, _e, _f;
+        var attrValue = this.elementSource.attr;
+        if ((_a = this.source.operatorAround) === null || _a === void 0 ? void 0 : _a.beforeAttr) {
+            attrValue = (_b = this.source.operatorAround.beforeAttr(attrValue, this)) !== null && _b !== void 0 ? _b : '';
+        }
+        var r = attrValue;
+        if (r && this.startingExecute) {
+            r = ScriptUtils_1.ScriptUtils.eval(" ".concat(this.render.bindScript, "; return ").concat(attrValue), Object.assign(this.source.obj, { __render: this.render }));
+        }
+        if ((_c = this.source.operatorAround) === null || _c === void 0 ? void 0 : _c.before) {
+            r = (_d = this.source.operatorAround) === null || _d === void 0 ? void 0 : _d.before(r, this);
+        }
+        var state = this.execute(r);
+        (_f = (_e = this.source.operatorAround) === null || _e === void 0 ? void 0 : _e.after) === null || _f === void 0 ? void 0 : _f.call(_e, r, this);
+        return state;
+    };
+    ;
+    return OperatorExecuter;
+}());
+exports.OperatorExecuter = OperatorExecuter;

package/operators/OperatorExecuterAttrRequire.d.ts

@@ -0,0 +1,8 @@
+import { RawSet } from '../rawsets/RawSet';
+import { Render } from '../rawsets/Render';
+import { AfterCallBack, ElementSource, ExecuteState, OperatorExecuter, ReturnContainer, Source } from './OperatorExecuter';
+export declare abstract class OperatorExecuterAttrRequire<T> extends OperatorExecuter<T> {
+    constructor(rawSet: RawSet, render: Render, returnContainer: ReturnContainer, elementSource: ElementSource, source: Source, afterCallBack: AfterCallBack, startingExecute?: boolean);
+    execute(data: T): ExecuteState;
+    protected abstract executeAttrRequire(attr: T): ExecuteState;
+}