dom-render 1.0.92 → 1.0.93

package/events/EventManager.d.ts

@@ -44,5 +44,6 @@ export declare class EventManager {
     } | undefined, obj: any): {
         [p: string]: any;
     } | undefined;
+    getBindScript(config?: Config): string;
 }
 export declare const eventManager: EventManager;

package/events/EventManager.js

@@ -1,4 +1,15 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.eventManager = exports.EventManager = void 0;
 var ScriptUtils_1 = require("../utils/script/ScriptUtils");
@@ -46,7 +57,8 @@ var EventManager = /** @class */ (function () {
                                     element: it,
                                     event: event,
                                     range: Range_1.Range.range,
-                                    scripts: EventManager.setBindProperty(config === null || config === void 0 ? void 0 : config.scripts, obj)
+                                    scripts: EventManager.setBindProperty(config === null || config === void 0 ? void 0 : config.scripts, obj),
+                                    // ...EventManager.eventVariables
                                 })
                             }));
                         }
@@ -133,7 +145,7 @@ var EventManager = /** @class */ (function () {
                 if (typeof getValue === 'function' && getValue) {
                     var setValue = it.value;
                     if (mapScript_1) {
-                        setValue = ScriptUtils_1.ScriptUtils.eval("".concat(_this.bindScript, " return ").concat(mapScript_1), Object.assign(bindObj_1, { __render: Object.freeze({ element: it, target: bindObj_1, range: Range_1.Range.range, value: setValue, scripts: EventManager.setBindProperty(config === null || config === void 0 ? void 0 : config.scripts, obj) }) }));
+                        setValue = ScriptUtils_1.ScriptUtils.eval("".concat(_this.getBindScript(config), " return ").concat(mapScript_1), Object.assign(bindObj_1, { __render: Object.freeze(__assign({ element: it, target: bindObj_1, range: Range_1.Range.range, value: setValue, scripts: EventManager.setBindProperty(config === null || config === void 0 ? void 0 : config.scripts, obj) }, config === null || config === void 0 ? void 0 : config.eventVariables)) }));
                     }
                     getValue(setValue);
                     // 여기서 value가 먼저냐 value-link가 먼저냐 선을 정해야되는거네...
@@ -141,36 +153,15 @@ var EventManager = /** @class */ (function () {
                 else if (getValue) {
                     var setValue = getValue;
                     if (mapScript_1) {
-                        setValue = ScriptUtils_1.ScriptUtils.eval("".concat(_this.bindScript, " return ").concat(mapScript_1), Object.assign(bindObj_1, { __render: Object.freeze({ element: it, target: bindObj_1, range: Range_1.Range.range, value: setValue, scripts: EventManager.setBindProperty(config === null || config === void 0 ? void 0 : config.scripts, obj) }) }));
+                        setValue = ScriptUtils_1.ScriptUtils.eval("".concat(_this.getBindScript(config), " return ").concat(mapScript_1), Object.assign(bindObj_1, { __render: Object.freeze(__assign({ element: it, target: bindObj_1, range: Range_1.Range.range, value: setValue, scripts: EventManager.setBindProperty(config === null || config === void 0 ? void 0 : config.scripts, obj) }, config === null || config === void 0 ? void 0 : config.eventVariables)) }));
                     }
                     it.value = setValue;
-                    // this.setValue(obj, varName, setValue)
                 }
-                // } else if (getValue) { // 이구분이 있어야되나?? 없어도될것같은데..
-                //     let setValue = getValue;
-                //     if (inMapScript) {
-                //         setValue = ScriptUtils.eval(`${this.bindScript} return ${inMapScript}`, Object.assign(bindObj, {__render: Object.freeze({element: it, target: bindObj, range: Range.range, value: setValue,  scripts: EventManager.setBindProperty(config?.scripts, obj)})}));
-                //     }
-                //     this.setValue(obj, varName, setValue)
-                // } else {
-                //     let setValue = it.value;
-                //     if (mapScript) {
-                //         setValue = ScriptUtils.eval(`${this.bindScript} return ${mapScript}`, Object.assign(bindObj, {__render: Object.freeze({element: it, target: bindObj, range: Range.range, value: setValue,  scripts: EventManager.setBindProperty(config?.scripts, obj)})}));
-                //     }
-                //     this.setValue(obj, varName, setValue)
-                // }
                 it.addEventListener('input', function (event) {
                     var value = it.value;
                     if (mapScript_1) {
-                        value = ScriptUtils_1.ScriptUtils.eval("".concat(_this.bindScript, " return ").concat(mapScript_1), Object.assign(bindObj_1, {
-                            __render: Object.freeze({
-                                event: event,
-                                element: it,
-                                attribute: DomUtils_1.DomUtils.getAttributeToObject(it),
-                                target: event.target,
-                                range: Range_1.Range.range,
-                                scripts: EventManager.setBindProperty(config === null || config === void 0 ? void 0 : config.scripts, obj)
-                            })
+                        value = ScriptUtils_1.ScriptUtils.eval("".concat(_this.getBindScript(config), " return ").concat(mapScript_1), Object.assign(bindObj_1, {
+                            __render: Object.freeze(__assign({ event: event, element: it, attribute: DomUtils_1.DomUtils.getAttributeToObject(it), target: event.target, range: Range_1.Range.range, scripts: EventManager.setBindProperty(config === null || config === void 0 ? void 0 : config.scripts, obj) }, config === null || config === void 0 ? void 0 : config.eventVariables))
                         }));
                     }
                     if (typeof _this.getValue(obj, varName, bindObj_1) === 'function') {
@@ -189,11 +180,8 @@ var EventManager = /** @class */ (function () {
                 script = 'return ' + script;
             }
             if (script) {
-                ScriptUtils_1.ScriptUtils.eval("".concat(_this.bindScript, "; ").concat(script, " "), Object.assign(obj, {
-                    __render: Object.freeze({
-                        element: it,
-                        attribute: DomUtils_1.DomUtils.getAttributeToObject(it)
-                    })
+                ScriptUtils_1.ScriptUtils.eval("".concat(_this.getBindScript(config), "; ").concat(script, " "), Object.assign(obj, {
+                    __render: Object.freeze(__assign({ element: it, attribute: DomUtils_1.DomUtils.getAttributeToObject(it) }, config === null || config === void 0 ? void 0 : config.eventVariables))
                 }));
                 // console.log('onInit--->', obj, varName, it)
                 // if (typeof this.getValue(obj, varName) === 'function') {
@@ -228,14 +216,14 @@ var EventManager = /** @class */ (function () {
                 if (typeof getValue === 'function' && getValue) {
                     var setValue = it.value;
                     if (mapScript) {
-                        setValue = ScriptUtils_1.ScriptUtils.eval("".concat(_this.bindScript, " return ").concat(mapScript), Object.assign(bindObj, { __render: Object.freeze({ element: it, target: bindObj, range: Range_1.Range.range, value: setValue, scripts: EventManager.setBindProperty(config === null || config === void 0 ? void 0 : config.scripts, obj) }) }));
+                        setValue = ScriptUtils_1.ScriptUtils.eval("".concat(_this.getBindScript(config), " return ").concat(mapScript), Object.assign(bindObj, { __render: Object.freeze(__assign({ element: it, target: bindObj, range: Range_1.Range.range, value: setValue, scripts: EventManager.setBindProperty(config === null || config === void 0 ? void 0 : config.scripts, obj) }, config === null || config === void 0 ? void 0 : config.eventVariables)) }));
                     }
                     getValue(setValue);
                 }
                 else { //  if (getValue !== undefined && getValue !== null)
                     var setValue = getValue;
                     if (mapScript) {
-                        setValue = ScriptUtils_1.ScriptUtils.eval("".concat(_this.bindScript, " return ").concat(mapScript), Object.assign(bindObj, { __render: Object.freeze({ element: it, target: bindObj, range: Range_1.Range.range, value: setValue, scripts: EventManager.setBindProperty(config === null || config === void 0 ? void 0 : config.scripts, obj) }) }));
+                        setValue = ScriptUtils_1.ScriptUtils.eval("".concat(_this.getBindScript(config), " return ").concat(mapScript), Object.assign(bindObj, { __render: Object.freeze(__assign({ element: it, target: bindObj, range: Range_1.Range.range, value: setValue, scripts: EventManager.setBindProperty(config === null || config === void 0 ? void 0 : config.scripts, obj) }, config === null || config === void 0 ? void 0 : config.eventVariables)) }));
                     }
                     it.value = setValue;
                 }
@@ -386,21 +374,13 @@ var EventManager = /** @class */ (function () {
                 var filter = true;
                 var filterScript = it.getAttribute("".concat(attr, ":filter"));
                 var thisTarget = Object.assign(obj, {
-                    __render: Object.freeze({
-                        event: event,
-                        element: it,
-                        target: event.target,
-                        range: Range_1.Range.range,
-                        attribute: DomUtils_1.DomUtils.getAttributeToObject(it),
-                        router: config === null || config === void 0 ? void 0 : config.router,
-                        scripts: EventManager.setBindProperty(config === null || config === void 0 ? void 0 : config.scripts, obj)
-                    })
+                    __render: Object.freeze(__assign({ event: event, element: it, target: event.target, range: Range_1.Range.range, attribute: DomUtils_1.DomUtils.getAttributeToObject(it), router: config === null || config === void 0 ? void 0 : config.router, scripts: EventManager.setBindProperty(config === null || config === void 0 ? void 0 : config.scripts, obj) }, config === null || config === void 0 ? void 0 : config.eventVariables))
                 });
                 if (filterScript) {
-                    filter = ScriptUtils_1.ScriptUtils.eval("".concat(_this.bindScript, " return ").concat(filterScript), thisTarget);
+                    filter = ScriptUtils_1.ScriptUtils.eval("".concat(_this.getBindScript(config), " return ").concat(filterScript), thisTarget);
                 }
                 if (filter) {
-                    ScriptUtils_1.ScriptUtils.eval("".concat(_this.bindScript, " ").concat(script, " "), thisTarget);
+                    ScriptUtils_1.ScriptUtils.eval("".concat(_this.getBindScript(config), " ").concat(script, " "), thisTarget);
                 }
             });
         });
@@ -423,16 +403,8 @@ var EventManager = /** @class */ (function () {
                 });
                 bind.split(',').forEach(function (eventName) {
                     it.addEventListener(eventName.trim(), function (event) {
-                        ScriptUtils_1.ScriptUtils.eval("const $params = this.__render.params; ".concat(_this.bindScript, "  ").concat(script_1, " "), Object.assign(obj, {
-                            __render: Object.freeze({
-                                event: event,
-                                element: it,
-                                attribute: DomUtils_1.DomUtils.getAttributeToObject(it),
-                                target: event.target,
-                                range: Range_1.Range.range,
-                                scripts: EventManager.setBindProperty(config === null || config === void 0 ? void 0 : config.scripts, obj),
-                                params: params_1
-                            })
+                        ScriptUtils_1.ScriptUtils.eval("const $params = this.__render.params; ".concat(_this.getBindScript(config), "  ").concat(script_1, " "), Object.assign(obj, {
+                            __render: Object.freeze(__assign({ event: event, element: it, attribute: DomUtils_1.DomUtils.getAttributeToObject(it), target: event.target, range: Range_1.Range.range, scripts: EventManager.setBindProperty(config === null || config === void 0 ? void 0 : config.scripts, obj), params: params_1 }, config === null || config === void 0 ? void 0 : config.eventVariables))
                         }));
                     });
                 });
@@ -509,6 +481,22 @@ var EventManager = /** @class */ (function () {
             return newScripts;
         }
     };
+    EventManager.prototype.getBindScript = function (config) {
+        var _this = this;
+        if (config === null || config === void 0 ? void 0 : config.eventVariables) {
+            var bindScript = Object.entries(config.eventVariables).filter(function (_a) {
+                var key = _a[0], value = _a[1];
+                return !_this.bindScript.includes("const ".concat(key));
+            }).map(function (_a) {
+                var key = _a[0], value = _a[1];
+                return "const ".concat(key, " = this.__render.").concat(key, ";");
+            }).join(';');
+            return this.bindScript + '' + bindScript;
+        }
+        else {
+            return this.bindScript;
+        }
+    };
     EventManager.ownerVariablePathAttrName = 'dr-owner-variable-path';
     EventManager.attrPrefix = 'dr-';
     EventManager.onInitAttrName = EventManager.attrPrefix + 'on-init';

package/messenger/Messenger.d.ts

@@ -5,11 +5,11 @@ declare enum CallBackType {
     MAP = 1,
     SUBSCRIBE = 2
 }
-export declare type ChannelData = {
+export type ChannelData = {
     channel: Channel;
     data?: (any | undefined);
 };
-export declare type ChannelMetaData = {
+export type ChannelMetaData = {
     channel?: Channel;
     action?: string;
 };
@@ -47,13 +47,13 @@ export declare class Channel {
     subscribe<D = any>(subscribeCallback: (data: D, meta: ChannelMetaData) => any | void | undefined): ChannelSubscription;
     deleteChannel(): void;
 }
-declare type MessengerEventDetail = {
+type MessengerEventDetail = {
     key: string | object | ConstructorType<any>;
     data?: any;
     action?: string;
     result?: (c: ChannelData[]) => void;
 };
-declare type MessengerSubscribeEventDetail = {
+type MessengerSubscribeEventDetail = {
     obj: any;
     key?: string | object | ConstructorType<any>;
     init: (channel: Channel, subscription: ChannelSubscription) => void;

package/operators/Dr.js

@@ -40,7 +40,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) 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]) {

package/operators/DrAppender.js

@@ -40,7 +40,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) 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]) {
@@ -70,10 +70,8 @@ var OperatorExecuter_1 = require("./OperatorExecuter");
 var DrAppender = /** @class */ (function (_super) {
     __extends(DrAppender, _super);
     function DrAppender(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;
+        return _super.call(this, rawSet, render, returnContainer, elementSource, source, afterCallBack, false) || this;
     }
     DrAppender.prototype.executeAttrRequire = function (attr) {
         var _a, _b, _c, _d;

package/operators/DrFor.js

@@ -40,7 +40,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) 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]) {
@@ -70,10 +70,8 @@ var OperatorExecuter_1 = require("./OperatorExecuter");
 var DrFor = /** @class */ (function (_super) {
     __extends(DrFor, _super);
     function DrFor(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;
+        return _super.call(this, rawSet, render, returnContainer, elementSource, source, afterCallBack, false) || this;
     }
     DrFor.prototype.executeAttrRequire = function (attr) {
         var _a, _b, _c, _d;

package/operators/DrForOf.js

@@ -40,7 +40,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) 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]) {
@@ -70,10 +70,8 @@ var OperatorExecuter_1 = require("./OperatorExecuter");
 var DrForOf = /** @class */ (function (_super) {
     __extends(DrForOf, _super);
     function DrForOf(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;
+        return _super.call(this, rawSet, render, returnContainer, elementSource, source, afterCallBack, false) || this;
     }
     DrForOf.prototype.executeAttrRequire = function (attr) {
         var _a, _b, _c, _d;

package/operators/DrForm.js

@@ -40,7 +40,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) 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]) {

package/operators/DrIf.js

@@ -40,7 +40,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) 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]) {
@@ -70,10 +70,8 @@ var OperatorExecuter_1 = require("./OperatorExecuter");
 var DrIf = /** @class */ (function (_super) {
     __extends(DrIf, _super);
     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;
+        return _super.call(this, rawSet, render, returnContainer, elementSource, source, afterCallBack, false) || this;
     }
     DrIf.prototype.executeAttrRequire = function (attr) {
         var _a, _b, _c, _d;

package/operators/DrInnerHTML.js

@@ -40,7 +40,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) 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]) {

package/operators/DrInnerText.js

@@ -40,7 +40,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) 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]) {

package/operators/DrPre.js

@@ -29,7 +29,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) 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]) {
@@ -56,10 +56,8 @@ var OperatorExecuter_1 = require("./OperatorExecuter");
 var DrPre = /** @class */ (function (_super) {
     __extends(DrPre, _super);
     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;
+        return _super.call(this, rawSet, render, returnContainer, elementSource, source, afterCallBack) || this;
     }
     DrPre.prototype.execute = function (value) {
         return __awaiter(this, void 0, void 0, function () {

package/operators/DrRepeat.js

@@ -40,7 +40,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) 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]) {
@@ -71,10 +71,8 @@ var OperatorExecuter_1 = require("./OperatorExecuter");
 var DrRepeat = /** @class */ (function (_super) {
     __extends(DrRepeat, _super);
     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;
+        return _super.call(this, rawSet, render, returnContainer, elementSource, source, afterCallBack, false) || this;
     }
     DrRepeat.prototype.executeAttrRequire = function (attr) {
         var _a, _b, _c, _d;

package/operators/DrTargetAttr.js

@@ -29,7 +29,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) 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]) {
@@ -57,10 +57,8 @@ var OperatorExecuter_1 = require("./OperatorExecuter");
 var DrTargetAttr = /** @class */ (function (_super) {
     __extends(DrTargetAttr, _super);
     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;
+        return _super.call(this, rawSet, render, returnContainer, elementSource, source, afterCallBack, false) || this;
     }
     DrTargetAttr.prototype.execute = function () {
         var _a, _b, _c, _d;

package/operators/DrTargetElement.js

@@ -29,7 +29,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) 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]) {
@@ -58,10 +58,8 @@ var OperatorExecuter_1 = require("./OperatorExecuter");
 var DrTargetElement = /** @class */ (function (_super) {
     __extends(DrTargetElement, _super);
     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;
+        return _super.call(this, rawSet, render, returnContainer, elementSource, source, afterCallBack, false) || this;
     }
     DrTargetElement.prototype.execute = function () {
         var _a, _b, _c, _d;

package/operators/DrThis.js

@@ -29,7 +29,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) 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]) {

package/operators/OperatorExecuter.d.ts

@@ -5,7 +5,7 @@ import { RawSet } from '../rawsets/RawSet';
 import { Render } from '../rawsets/Render';
 import { Attrs } from '../rawsets/Attrs';
 import { Config } from '../configs/Config';
-export declare type OperatorAround = {
+export type OperatorAround = {
     beforeAttr?: (value: string | null | undefined, opratorExecutor: OperatorExecuter) => string | null | undefined;
     before?: (data: any, opratorExecutor: OperatorExecuter) => any;
     after?: (data: any, opratorExecutor: OperatorExecuter) => void;
@@ -15,22 +15,22 @@ export declare enum ExecuteState {
     NO_EXECUTE = 1,
     STOP = 2
 }
-export declare type AfterCallBack = {
+export type AfterCallBack = {
     onAttrInitCallBacks: AttrInitCallBack[];
     onElementInitCallBacks: ElementInitCallBack[];
     onThisComponentSetCallBacks: ComponentSet[];
 };
-export declare type ReturnContainer = {
+export type ReturnContainer = {
     raws: RawSet[];
     fag: DocumentFragment;
 };
-export declare type ElementSource = {
+export type ElementSource = {
     element: Element;
     attrs: Attrs;
     attr?: string | null;
     attrName?: string | undefined;
 };
-export declare type Source = {
+export type Source = {
     config: Config;
     operatorAround?: OperatorAround;
     obj: any;

package/operators/OperatorExecuter.js

@@ -14,7 +14,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) 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]) {

package/operators/OperatorExecuterAttrRequire.js

@@ -29,7 +29,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) 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]) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dom-render",
-  "version": "1.0.92",
+  "version": "1.0.93",
   "main": "DomRender.js",
   "license": "MIT",
   "description": "html view template engine",

package/rawsets/AttrInitCallBack.d.ts

@@ -1,4 +1,4 @@
-export declare type AttrInitCallBack = {
+export type AttrInitCallBack = {
     attrName: string;
     attrValue: string;
     obj: any;

package/rawsets/Attrs.d.ts

@@ -1,4 +1,4 @@
-export declare type Attrs = {
+export type Attrs = {
     dr: string | null;
     drIf: string | null;
     drAppender: string | null;

package/rawsets/CreatorMetaData.d.ts

@@ -1,7 +1,7 @@
 import { Router } from '../routers/Router';
 import { Attrs } from './Attrs';
 import { RawSet } from './RawSet';
-export declare type CreatorMetaData = {
+export type CreatorMetaData = {
     thisVariableName?: string | null;
     thisFullVariableName?: string | null;
     componentKey?: string | null;

package/rawsets/ElementInitCallBack.d.ts

@@ -1,6 +1,6 @@
 import { TargetElement } from '../configs/TargetElement';
 import { CreatorMetaData } from './CreatorMetaData';
-export declare type ElementInitCallBack = {
+export type ElementInitCallBack = {
     name: string;
     obj: any;
     targetElement: TargetElement;

package/rawsets/RawSet.js

@@ -25,7 +25,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) 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]) {

package/rawsets/Render.d.ts

@@ -1,7 +1,7 @@
 import { CreatorMetaData } from './CreatorMetaData';
 import { Router } from '../routers/Router';
 import { RawSet } from './RawSet';
-export declare type Render = {
+export type Render = {
     rawset?: RawSet;
     scripts?: {
         [n: string]: any;

package/routers/Router.d.ts

@@ -1,4 +1,4 @@
-export declare type RouteData = {
+export type RouteData = {
     path: string;
     url: string;
     data?: any;

package/utils/dom/DomUtils.d.ts

@@ -1,4 +1,4 @@
-export declare type Attr = {
+export type Attr = {
     name: string;
     value: any;
 };

package/utils/node/NodeUtils.d.ts

@@ -1,4 +1,4 @@
-export declare type Attr = {
+export type Attr = {
     name: string;
     value: any;
 };

package/validators/EmptyValidator.js

@@ -24,9 +24,9 @@ var EmptyValidator = /** @class */ (function (_super) {
         return _super.call(this, value, target, event, autoValid) || this;
     }
     EmptyValidator.prototype.valid = function () {
-        var _a, _b;
+        var _a;
         var value = this.value;
-        return value === undefined || value === null || ((_b = (_a = value) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0) <= 0;
+        return value === undefined || value === null || ((_a = value === null || value === void 0 ? void 0 : value.length) !== null && _a !== void 0 ? _a : 0) <= 0;
     };
     return EmptyValidator;
 }(Validator_1.Validator));

package/validators/NotEmptyValidator.js

@@ -24,10 +24,10 @@ var NotEmptyValidator = /** @class */ (function (_super) {
         return _super.call(this, value, target, event, autoValid) || this;
     }
     NotEmptyValidator.prototype.valid = function () {
-        var _a, _b;
+        var _a;
         var value = this.value;
         // console.log('NotEmptyValidator', value, value !== undefined && value !== null && ((value as any)?.length ?? 0) > 0)
-        return value !== undefined && value !== null && ((_b = (_a = value) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0) > 0;
+        return value !== undefined && value !== null && ((_a = value === null || value === void 0 ? void 0 : value.length) !== null && _a !== void 0 ? _a : 0) > 0;
     };
     return NotEmptyValidator;
 }(Validator_1.Validator));

package/validators/ValidMultipleValidator.d.ts

@@ -1,6 +1,6 @@
 import { Validator } from './Validator';
 import { MultipleValidator } from './MultipleValidator';
-export declare type ValidMulltiple<T = any, E = Element> = (validators: Validator<T, E>[], value?: T, target?: E, event?: Event) => boolean;
+export type ValidMulltiple<T = any, E = Element> = (validators: Validator<T, E>[], value?: T, target?: E, event?: Event) => boolean;
 export declare class ValidMultipleValidator<T = any, E = Element> extends MultipleValidator<T, E> {
     validMultipleCallback: ValidMulltiple<T, E>;
     validators: Validator<T, E>[];