dom-render 1.0.95 → 1.0.96

package/dist/bundle.js

@@ -1975,13 +1975,13 @@ exports.RawSetType = void 0;
     RawSetType["UNKOWN"] = "UNKOWN";
 })(exports.RawSetType || (exports.RawSetType = {}));
 
-var DrDictionary = /** @class */ (function (_super) {
-    __extends(DrDictionary, _super);
-    function DrDictionary(rawSet, render, returnContainer, elementSource, source, afterCallBack) {
+var DrThisProperty = /** @class */ (function (_super) {
+    __extends(DrThisProperty, _super);
+    function DrThisProperty(rawSet, render, returnContainer, elementSource, source, afterCallBack) {
         source.operatorAround = undefined;
         return _super.call(this, rawSet, render, returnContainer, elementSource, source, afterCallBack, false) || this;
     }
-    DrDictionary.prototype.executeAttrRequire = function (attr) {
+    DrThisProperty.prototype.executeAttrRequire = function (attr) {
         var _a, _b, _c, _d, _e;
         return __awaiter(this, void 0, void 0, function () {
             var itRandom, vars, newTemp, dictionaryKey, tempalte, rr;
@@ -1991,14 +1991,14 @@ var DrDictionary = /** @class */ (function (_super) {
                 vars = RawSet.drVarEncoding(this.elementSource.element, (_a = this.elementSource.attrs.drVarOption) !== null && _a !== void 0 ? _a : '');
                 newTemp = this.source.config.window.document.createElement('temp');
                 ScriptUtils.evalReturn(attr, this.source.obj);
-                dictionaryKey = (_b = this.elementSource.attrs.drDictionaryOption) !== null && _b !== void 0 ? _b : '';
+                dictionaryKey = (_b = this.elementSource.attrs.drKeyOption) !== null && _b !== void 0 ? _b : '';
                 // console.log('--->', attr, dictionaryKey)
                 // if (!(dictioanry instanceof Dictionary)) {
                 //     return ExecuteState.STOP;
                 // }
                 // await new Promise(resolve => setTimeout(resolve, 1000));
                 // console.log('!!!!!!!!!!!!!!', this.rawSet);
-                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 dictionary = ").concat(attr, ";\n                    const dictionaryKey = '").concat(dictionaryKey, "';\n                    const dictionaryStr = `").concat(attr, "`.trim();\n                    // console.log('----@#!@#@!#', this.__render.oldChild);\n                    if (dictionary) {\n                        for(const it in dictionary) {\n                            // const oldChild = this.__render.oldChild.get(it);\n                            // if (oldChild && oldChild.length > 0) {\n                            //     this.__render.fag.append(...oldChild);\n                            // } else {\n                            //     var destIt = dictionaryStr + '[\"' + it + '\"]';\n                            //     const n = this.__render.element.cloneNode(true);\n                            //     n.setAttribute('dr-this', destIt);\n                            //     // n.setAttribute('dr-dictionary', dictionaryStr);\n                            //     n.setAttribute('dr-dictionary-key', it);\n                            //     this.__render.fag.append(n);\n                            // }\n                            // if (!this.__render.oldChild.get(it)) {\n                            //     var destIt = dictionaryStr + '[\"' + it + '\"]';\n                            //     const n = this.__render.element.cloneNode(true);\n                            //     n.setAttribute('dr-this', destIt);\n                            //     // n.setAttribute('dr-dictionary', dictionaryStr);\n                            //     n.setAttribute('dr-dictionary-key', it);\n                            //     this.__render.fag.append(n);\n                            // }\n                            var destIt = dictionaryStr + '[\"' + it + '\"]';\n                            const n = this.__render.element.cloneNode(true);\n                            n.setAttribute('dr-this', destIt);\n                            // n.setAttribute('dr-dictionary', dictionaryStr);\n                            // n.setAttribute('dr-dictionary-key', it);\n                            this.__render.fag.append(n);\n                            i++;\n                        }\n                         this.__render.rawset.point.start.setAttribute('dictionary-keys',Object.keys(dictionary).join(','));\n                    }\n                    ").concat((_d = this.elementSource.attrs.drAfterOption) !== null && _d !== void 0 ? _d : '', "\n                    "), Object.assign(this.source.obj, {
+                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 dictionary = ").concat(attr, ";\n                    const dictionaryKey = '").concat(dictionaryKey, "';\n                    const dictionaryStr = `").concat(attr, "`.trim();\n                    // console.log('----@#!@#@!#', this.__render.oldChild);\n                    if (dictionary) {\n                        for(const it in dictionary) {\n                            var destIt = dictionaryStr + '[\"' + it + '\"]';\n                            const n = this.__render.element.cloneNode(true);\n                            n.setAttribute('dr-this', destIt);\n                            n.setAttribute('dr-key', it);\n                            // n.setAttribute('dr-dictionary-key', it);\n                            this.__render.fag.append(n);\n                            i++;\n                        }\n                         this.__render.rawset.point.start.setAttribute('dr-has-keys',Object.keys(dictionary).join(','));\n                    }\n                    ").concat((_d = this.elementSource.attrs.drAfterOption) !== null && _d !== void 0 ? _d : '', "\n                    "), Object.assign(this.source.obj, {
                     __render: Object.freeze(__assign({ drStripOption: this.elementSource.attrs.drStripOption, drAttr: this.elementSource.attrs, drAttrsOriginName: RawSet.drAttrsOriginName, fag: newTemp }, this.render))
                 }));
                 RawSet.drVarDecoding(newTemp, vars);
@@ -2014,29 +2014,7 @@ var DrDictionary = /** @class */ (function (_super) {
             });
         });
     };
-    DrDictionary.getChildren = function (rawSet, config) {
-        var _a, _b, _c;
-        var next = rawSet.point.start.nextSibling;
-        var oldChild = new Map();
-        var currentKey = '';
-        while (next) {
-            if (next === rawSet.point.end) {
-                break;
-            }
-            var dictionaryKey = (_b = (_a = next).getAttribute) === null || _b === void 0 ? void 0 : _b.call(_a, 'dictionary-key');
-            if (dictionaryKey) {
-                currentKey = dictionaryKey;
-                oldChild.set(dictionaryKey, []);
-            }
-            // console.log('next-------->', currentKey, next);
-            if (currentKey) {
-                (_c = oldChild.get(currentKey)) === null || _c === void 0 ? void 0 : _c.push(next);
-            }
-            next = next.nextSibling;
-        }
-        return oldChild;
-    };
-    DrDictionary.append = function (obj, fullPath, key, rawSet, config) {
+    DrThisProperty.append = function (obj, fullPath, key, rawSet, config) {
         var _this = this;
         var _a, _b;
         var genNode = config.window.document.importNode(rawSet.fragment, true);
@@ -2045,33 +2023,35 @@ var DrDictionary = /** @class */ (function (_super) {
         for (var _i = 0, _c = Array.from(genNode.childNodes.values()); _i < _c.length; _i++) {
             var cNode = _c[_i];
             var element = cNode.cloneNode(true);
-            element.removeAttribute('dr-dictionary');
-            element.setAttribute('dr-this', "this.".concat(fullPath));
+            element.removeAttribute(RawSet.DR_THIS_PROPERTY_NAME);
+            element.setAttribute(RawSet.DR_THIS_NAME, "this.".concat(fullPath));
+            element.setAttribute(RawSet.DR_KEY_OPTIONNAME, key);
             // rawSet.point.end.after(element);
             var fg = config.window.document.createDocumentFragment();
             fg.append(element);
             rawSets.push.apply(rawSets, RawSet.checkPointCreates(fg, obj, config));
             rawSet.point.end.before(fg);
             var start = rawSet.point.start;
-            var keys = (_b = (_a = start.getAttribute('dictionary-keys')) === null || _a === void 0 ? void 0 : _a.split(',')) !== null && _b !== void 0 ? _b : [];
+            var keys = (_b = (_a = start.getAttribute(RawSet.DR_HAS_KEYS_OPTIONNAME)) === null || _a === void 0 ? void 0 : _a.split(',')) !== null && _b !== void 0 ? _b : [];
             keys.push(key);
-            start.setAttribute('dictionary-keys', keys.join(','));
+            start.setAttribute(RawSet.DR_HAS_KEYS_OPTIONNAME, keys.join(','));
             rawSets.forEach(function (it) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, it.render(obj, config)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             }); }); });
-            // console.log('WWW', fg, Array.from(fg.childNodes));
-            // console.log('--------------------------rawSets', rawSets);
         }
         return rawSets;
-        // rawSet.
-        // rawSet.point.end.before()
     };
-    return DrDictionary;
+    return DrThisProperty;
 }(OperatorExecuterAttrRequire));
 
+exports.RawSetOperatorType = void 0;
+(function (RawSetOperatorType) {
+    RawSetOperatorType["DR_THIS_PROPERTY"] = "this-property";
+})(exports.RawSetOperatorType || (exports.RawSetOperatorType = {}));
+
 var RawSet = /** @class */ (function () {
     function RawSet(uuid, type, point, fragment, detect, data) {
         this.uuid = uuid;
@@ -2080,6 +2060,7 @@ var RawSet = /** @class */ (function () {
         this.fragment = fragment;
         this.detect = detect;
         this.data = data;
+        point.start.rawSet = this;
         // console.log('rawset constructor->', (this.point.node as Element).getAttributeNames());
     }
     Object.defineProperty(RawSet.prototype, "isConnected", {
@@ -2199,7 +2180,7 @@ var RawSet = /** @class */ (function () {
                             drIf: this.getAttributeAndDelete(element, RawSet.DR_IF_NAME),
                             drFor: this.getAttributeAndDelete(element, RawSet.DR_FOR_NAME),
                             drForOf: this.getAttributeAndDelete(element, RawSet.DR_FOR_OF_NAME),
-                            drDictionary: this.getAttributeAndDelete(element, RawSet.DR_DICTIONARY_NAME),
+                            drThisProperty: this.getAttributeAndDelete(element, RawSet.DR_THIS_PROPERTY_NAME),
                             drAppender: this.getAttributeAndDelete(element, RawSet.DR_APPENDER_NAME),
                             drRepeat: this.getAttributeAndDelete(element, RawSet.DR_REPEAT_NAME),
                             drThis: this.getAttributeAndDelete(element, RawSet.DR_THIS_NAME),
@@ -2215,7 +2196,7 @@ var RawSet = /** @class */ (function () {
                             drCompleteOption: this.getAttributeAndDelete(element, RawSet.DR_COMPLETE_OPTIONNAME),
                             drStripOption: this.getAttributeAndDelete(element, RawSet.DR_STRIP_OPTIONNAME),
                             drDestroyOption: this.getAttributeAndDelete(element, RawSet.DR_DESTROY_OPTIONNAME),
-                            drDictionaryOption: this.getAttributeAndDelete(element, RawSet.DR_DICTIONARY_OPTIONKEYNAME)
+                            drKeyOption: this.getAttributeAndDelete(element, RawSet.DR_KEY_OPTIONNAME)
                         };
                         drAttrs.push(drAttr);
                         operators = [
@@ -2228,7 +2209,7 @@ var RawSet = /** @class */ (function () {
                             new DrInnerHTML(this, __render, { raws: raws, fag: fag }, { element: element, attrName: RawSet.DR_INNERHTML_NAME, attr: drAttr.drInnerHTML, attrs: drAttr }, { config: config, obj: obj, operatorAround: (_h = config.operatorAround) === null || _h === void 0 ? void 0 : _h.drInnerHTML }, { onAttrInitCallBacks: onAttrInitCallBacks, onElementInitCallBacks: onElementInitCallBacks, onThisComponentSetCallBacks: onThisComponentSetCallBacks }),
                             new DrFor(this, __render, { raws: raws, fag: fag }, { element: element, attrName: RawSet.DR_FOR_NAME, attr: drAttr.drFor, attrs: drAttr }, { config: config, obj: obj, operatorAround: (_j = config.operatorAround) === null || _j === void 0 ? void 0 : _j.drFor }, { onAttrInitCallBacks: onAttrInitCallBacks, onElementInitCallBacks: onElementInitCallBacks, onThisComponentSetCallBacks: onThisComponentSetCallBacks }),
                             new DrForOf(this, __render, { raws: raws, fag: fag }, { element: element, attrName: RawSet.DR_FOR_OF_NAME, attr: drAttr.drForOf, attrs: drAttr }, { config: config, obj: obj, operatorAround: (_k = config.operatorAround) === null || _k === void 0 ? void 0 : _k.drForOf }, { onAttrInitCallBacks: onAttrInitCallBacks, onElementInitCallBacks: onElementInitCallBacks, onThisComponentSetCallBacks: onThisComponentSetCallBacks }),
-                            new DrDictionary(this, __render, { raws: raws, fag: fag }, { element: element, attrName: RawSet.DR_DICTIONARY_NAME, attr: drAttr.drDictionary, attrs: drAttr }, { config: config, obj: obj, operatorAround: (_l = config.operatorAround) === null || _l === void 0 ? void 0 : _l.drDictionary }, { onAttrInitCallBacks: onAttrInitCallBacks, onElementInitCallBacks: onElementInitCallBacks, onThisComponentSetCallBacks: onThisComponentSetCallBacks }),
+                            new DrThisProperty(this, __render, { raws: raws, fag: fag }, { element: element, attrName: RawSet.DR_THIS_PROPERTY_NAME, attr: drAttr.drThisProperty, attrs: drAttr }, { config: config, obj: obj, operatorAround: (_l = config.operatorAround) === null || _l === void 0 ? void 0 : _l.drThisProperty }, { onAttrInitCallBacks: onAttrInitCallBacks, onElementInitCallBacks: onElementInitCallBacks, onThisComponentSetCallBacks: onThisComponentSetCallBacks }),
                             new DrAppender(this, __render, { raws: raws, fag: fag }, { element: element, attrName: RawSet.DR_APPENDER_NAME, attr: drAttr.drAppender, attrs: drAttr }, { config: config, obj: obj, operatorAround: (_m = config.operatorAround) === null || _m === void 0 ? void 0 : _m.drAppender }, { onAttrInitCallBacks: onAttrInitCallBacks, onElementInitCallBacks: onElementInitCallBacks, onThisComponentSetCallBacks: onThisComponentSetCallBacks }),
                             new DrRepeat(this, __render, { raws: raws, fag: fag }, { element: element, attrName: RawSet.DR_REPEAT_NAME, attr: drAttr.drRepeat, attrs: drAttr }, { config: config, obj: obj, operatorAround: (_o = config.operatorAround) === null || _o === void 0 ? void 0 : _o.drRepeat }, { onAttrInitCallBacks: onAttrInitCallBacks, onElementInitCallBacks: onElementInitCallBacks, onThisComponentSetCallBacks: onThisComponentSetCallBacks }),
                             new DrTargetElement(this, __render, { raws: raws, fag: fag }, { element: element, attrs: drAttr }, { config: config, obj: obj }, { onAttrInitCallBacks: onAttrInitCallBacks, onElementInitCallBacks: onElementInitCallBacks, onThisComponentSetCallBacks: onThisComponentSetCallBacks }),
@@ -2549,19 +2530,17 @@ var RawSet = /** @class */ (function () {
             var start = config.window.document.createElement('meta');
             var end = config.window.document.createElement('meta');
             start.setAttribute('id', "".concat(id, "-start"));
-            var dictionaryKey = element.getAttribute('dr-dictionary-key');
-            var dictionary = element.getAttribute('dr-dictionary');
-            if (dictionary) {
-                start.setAttribute('type', 'dictionary');
+            var keys = element.getAttribute(RawSet.DR_KEY_OPTIONNAME);
+            var thisPropertyType = element.getAttribute(RawSet.DR_THIS_PROPERTY_NAME);
+            if (thisPropertyType) {
+                start.setAttribute('type', exports.RawSetOperatorType.DR_THIS_PROPERTY);
             }
-            if (dictionaryKey) {
-                start.setAttribute('dictionary-key', dictionaryKey);
+            if (keys) {
+                element.removeAttribute(RawSet.DR_KEY_OPTIONNAME);
+                start.setAttribute(RawSet.DR_KEY_OPTIONNAME, keys);
             }
             end.setAttribute('id', "".concat(id, "-end"));
-            return {
-                start: start,
-                end: end
-            };
+            return { start: start, end: end };
         }
         else if (type === exports.RawSetType.STYLE_TEXT) {
             return {
@@ -2576,6 +2555,11 @@ var RawSet = /** @class */ (function () {
             };
         }
     };
+    RawSet.prototype.remove = function () {
+        this.childAllRemove();
+        this.point.end.remove();
+        this.point.start.remove();
+    };
     RawSet.prototype.childAllRemove = function () {
         var next = this.point.start.nextSibling;
         while (next) {
@@ -2586,6 +2570,31 @@ var RawSet = /** @class */ (function () {
             next = this.point.start.nextSibling;
         }
     };
+    RawSet.prototype.childs = function (stopNext) {
+        var childs = [];
+        var next = this.point.start.nextSibling;
+        while (next && next !== this.point.end) {
+            if (stopNext === null || stopNext === void 0 ? void 0 : stopNext(next)) {
+                return;
+            }
+            childs.push(next);
+            next = next.nextSibling;
+        }
+        return childs;
+    };
+    RawSet.prototype.getHasRawSet = function (key) {
+        var rawSet;
+        this.childs(function (node) {
+            var _a, _b;
+            var drKey = (_b = (_a = node).getAttribute) === null || _b === void 0 ? void 0 : _b.call(_a, 'dr-key');
+            if (drKey && drKey === key) {
+                rawSet = node.rawSet;
+                return true;
+            }
+            return false;
+        });
+        return rawSet;
+    };
     RawSet.drItOtherEncoding = function (element) {
         var random = RandomUtils.uuid();
         var regex = /#it#/g;
@@ -3007,7 +3016,7 @@ var RawSet = /** @class */ (function () {
     RawSet.DR_IF_NAME = 'dr-if';
     RawSet.DR_FOR_NAME = 'dr-for';
     RawSet.DR_FOR_OF_NAME = 'dr-for-of';
-    RawSet.DR_DICTIONARY_NAME = 'dr-dictionary';
+    RawSet.DR_THIS_PROPERTY_NAME = 'dr-this-property';
     RawSet.DR_REPEAT_NAME = 'dr-repeat';
     RawSet.DR_THIS_NAME = 'dr-this';
     RawSet.DR_FORM_NAME = 'dr-form';
@@ -3026,7 +3035,8 @@ var RawSet = /** @class */ (function () {
     RawSet.DR_DESTROY_OPTIONNAME = 'dr-destroy';
     RawSet.DR_COMPONENT_NAME_OPTIONNAME = 'dr-component-name';
     RawSet.DR_COMPONENT_INNER_HTML_NAME_OPTIONNAME = 'dr-component-inner-html-name';
-    RawSet.DR_DICTIONARY_OPTIONKEYNAME = 'dr-dictionary-key';
+    RawSet.DR_KEY_OPTIONNAME = 'dr-key';
+    RawSet.DR_HAS_KEYS_OPTIONNAME = 'dr-has-keys';
     RawSet.DR_ON_CREATE_ARGUMENTS_OPTIONNAME = 'dr-on-create:arguments';
     RawSet.DR_ON_CREATED_CALLBACK_OPTIONNAME = 'dr-on-create:callback';
     RawSet.DR_ON_INIT_ARGUMENTS_OPTIONNAME = 'dr-on-init:arguments';
@@ -3036,7 +3046,7 @@ var RawSet = /** @class */ (function () {
         drIf: RawSet.DR_IF_NAME,
         drFor: RawSet.DR_FOR_NAME,
         drForOf: RawSet.DR_FOR_OF_NAME,
-        drDictionary: RawSet.DR_DICTIONARY_NAME,
+        drThisProperty: RawSet.DR_THIS_PROPERTY_NAME,
         drAppender: RawSet.DR_APPENDER_NAME,
         drRepeat: RawSet.DR_REPEAT_NAME,
         drThis: RawSet.DR_THIS_NAME,
@@ -3052,10 +3062,11 @@ var RawSet = /** @class */ (function () {
         drCompleteOption: RawSet.DR_COMPLETE_OPTIONNAME,
         drStripOption: RawSet.DR_STRIP_OPTIONNAME,
         drDestroyOption: RawSet.DR_DESTROY_OPTIONNAME,
-        drDictionaryOption: RawSet.DR_DICTIONARY_OPTIONKEYNAME
+        drHasKeysOption: RawSet.DR_HAS_KEYS_OPTIONNAME,
+        drKeyOption: RawSet.DR_KEY_OPTIONNAME
     };
     RawSet.DR_TAGS = [];
-    RawSet.DR_ATTRIBUTES = [RawSet.DR_NAME, RawSet.DR_APPENDER_NAME, RawSet.DR_IF_NAME, RawSet.DR_FOR_OF_NAME, RawSet.DR_DICTIONARY_NAME, RawSet.DR_FOR_NAME, RawSet.DR_THIS_NAME, RawSet.DR_FORM_NAME, RawSet.DR_PRE_NAME, RawSet.DR_INNERHTML_NAME, RawSet.DR_INNERTEXT_NAME, RawSet.DR_REPEAT_NAME, RawSet.DR_DETECT_NAME];
+    RawSet.DR_ATTRIBUTES = [RawSet.DR_NAME, RawSet.DR_APPENDER_NAME, RawSet.DR_IF_NAME, RawSet.DR_FOR_OF_NAME, RawSet.DR_THIS_PROPERTY_NAME, RawSet.DR_FOR_NAME, RawSet.DR_THIS_NAME, RawSet.DR_FORM_NAME, RawSet.DR_PRE_NAME, RawSet.DR_INNERHTML_NAME, RawSet.DR_INNERTEXT_NAME, RawSet.DR_REPEAT_NAME, RawSet.DR_DETECT_NAME];
     return RawSet;
 }());
 
@@ -3290,6 +3301,7 @@ var DomRenderProxy = /** @class */ (function () {
                 // console.log('-------!!!!!', fullPathStr, iterable, data, front, last);
                 new Promise(function (resolve) {
                     var firstPathStr = front_1.slice(1);
+                    // check dictionary
                     // console.log('-promise-------', firstPathStr, this)
                     var firstTargets = _this._rawSets.get(firstPathStr);
                     var firstTargetDictionary = [];
@@ -3297,7 +3309,7 @@ var DomRenderProxy = /** @class */ (function () {
                         var _a, _b;
                         // console.log('----forEach---', it);
                         var type = (_b = (_a = it.point.start).getAttribute) === null || _b === void 0 ? void 0 : _b.call(_a, 'type');
-                        if (type === 'dictionary') {
+                        if (type === exports.RawSetOperatorType.DR_THIS_PROPERTY) {
                             firstTargetDictionary.push(it);
                         }
                     });
@@ -3307,10 +3319,15 @@ var DomRenderProxy = /** @class */ (function () {
                         var skip_1 = false;
                         firstTargetDictionary.forEach(function (it) {
                             var _a, _b;
-                            var keys = (_b = (_a = it.point.start.getAttribute('dictionary-keys')) === null || _a === void 0 ? void 0 : _a.split(',')) !== null && _b !== void 0 ? _b : [];
+                            var startElement = it.point.start;
+                            var keys = (_b = (_a = startElement.getAttribute(RawSet.DR_HAS_KEYS_OPTIONNAME)) === null || _a === void 0 ? void 0 : _a.split(',')) !== null && _b !== void 0 ? _b : [];
+                            if (value === undefined) {
+                                var rawSet = it.getHasRawSet(last_1);
+                                rawSet === null || rawSet === void 0 ? void 0 : rawSet.remove();
+                                startElement.setAttribute(RawSet.DR_HAS_KEYS_OPTIONNAME, keys.filter(function (it) { return it !== last_1; }).join(','));
+                            }
                             if (!keys.includes(last_1)) {
-                                var raws = DrDictionary.append(_this._domRender_proxy, fullPathStr_1, last_1, it, _this.config);
-                                // console.log('----append---', raws);
+                                var raws = DrThisProperty.append(_this._domRender_proxy, fullPathStr_1, last_1, it, _this.config);
                                 if (raws) {
                                     rawSets_3.push.apply(rawSets_3, raws);
                                 }
@@ -3322,18 +3339,7 @@ var DomRenderProxy = /** @class */ (function () {
                         if (skip_1 === false || rawSets_3.length > 0) {
                             return _this.render(rawSets_3);
                         }
-                        // console.log('rawSets-->#$$$$$$$$$$$', this._rawSets);
-                        // rawSets.forEach(it => this.addRawSet(fullPathStr, it));
-                        // DrDictionary.append(this._domRender_proxy, fullPathStr, it, this.config);
-                        // it.render(this._domRender_proxy, this.config);
                     }
-                    /* if (data instanceof Dictionary) {
-                         const a = this._rawSets.get(firstPathStr);
-                         // a?.forEach(it => {
-                         //     if (it.type === RawSetType.TARGET_ATTR)
-                         // })
-                         console.log('dictionary-->', data, last, value, this._rawSets, a);
-                     } else */
                     if (last_1 === 'length' && Array.isArray(data_1)) {
                         var aIterable = _this._rawSets.get(firstPathStr);
                         if (aIterable) {
@@ -4088,6 +4094,19 @@ var Appender = /** @class */ (function () {
     return Appender;
 }());
 
+var AllCheckedValidatorArray = /** @class */ (function (_super) {
+    __extends(AllCheckedValidatorArray, _super);
+    function AllCheckedValidatorArray(value, target, event, autoValid) {
+        if (autoValid === void 0) { autoValid = true; }
+        return _super.call(this, value, target, event, autoValid) || this;
+    }
+    AllCheckedValidatorArray.prototype.valid = function () {
+        var _a;
+        return !(((_a = this.value) !== null && _a !== void 0 ? _a : []).filter(function (it) { return !it.checked; }).length > 0);
+    };
+    return AllCheckedValidatorArray;
+}(ValidatorArray));
+
 var AllUnCheckedValidatorArray = /** @class */ (function (_super) {
     __extends(AllUnCheckedValidatorArray, _super);
     function AllUnCheckedValidatorArray(value, target, event, autoValid) {
@@ -4101,18 +4120,18 @@ var AllUnCheckedValidatorArray = /** @class */ (function (_super) {
     return AllUnCheckedValidatorArray;
 }(ValidatorArray));
 
-var AllCheckedValidatorArray = /** @class */ (function (_super) {
-    __extends(AllCheckedValidatorArray, _super);
-    function AllCheckedValidatorArray(value, target, event, autoValid) {
+var CheckedValidator = /** @class */ (function (_super) {
+    __extends(CheckedValidator, _super);
+    function CheckedValidator(value, target, event, autoValid) {
         if (autoValid === void 0) { autoValid = true; }
         return _super.call(this, value, target, event, autoValid) || this;
     }
-    AllCheckedValidatorArray.prototype.valid = function () {
-        var _a;
-        return !(((_a = this.value) !== null && _a !== void 0 ? _a : []).filter(function (it) { return !it.checked; }).length > 0);
+    CheckedValidator.prototype.valid = function () {
+        var _a, _b;
+        return (_b = (_a = this.getTarget()) === null || _a === void 0 ? void 0 : _a.checked) !== null && _b !== void 0 ? _b : false;
     };
-    return AllCheckedValidatorArray;
-}(ValidatorArray));
+    return CheckedValidator;
+}(Validator));
 
 var CountEqualsCheckedValidatorArray = /** @class */ (function (_super) {
     __extends(CountEqualsCheckedValidatorArray, _super);
@@ -4129,19 +4148,6 @@ var CountEqualsCheckedValidatorArray = /** @class */ (function (_super) {
     return CountEqualsCheckedValidatorArray;
 }(ValidatorArray));
 
-var CheckedValidator = /** @class */ (function (_super) {
-    __extends(CheckedValidator, _super);
-    function CheckedValidator(value, target, event, autoValid) {
-        if (autoValid === void 0) { autoValid = true; }
-        return _super.call(this, value, target, event, autoValid) || this;
-    }
-    CheckedValidator.prototype.valid = function () {
-        var _a, _b;
-        return (_b = (_a = this.getTarget()) === null || _a === void 0 ? void 0 : _a.checked) !== null && _b !== void 0 ? _b : false;
-    };
-    return CheckedValidator;
-}(Validator));
-
 var CountEqualsUnCheckedValidatorArray = /** @class */ (function (_super) {
     __extends(CountEqualsUnCheckedValidatorArray, _super);
     function CountEqualsUnCheckedValidatorArray(count, value, target, event, autoValid) {
@@ -4172,36 +4178,6 @@ var CountGreaterThanEqualsCheckedValidatorArray = /** @class */ (function (_supe
     return CountGreaterThanEqualsCheckedValidatorArray;
 }(ValidatorArray));
 
-var CountGreaterThanCheckedValidatorArray = /** @class */ (function (_super) {
-    __extends(CountGreaterThanCheckedValidatorArray, _super);
-    function CountGreaterThanCheckedValidatorArray(count, value, target, event, autoValid) {
-        if (autoValid === void 0) { autoValid = true; }
-        var _this = _super.call(this, value, target, event, autoValid) || this;
-        _this.count = count;
-        return _this;
-    }
-    CountGreaterThanCheckedValidatorArray.prototype.valid = function () {
-        var _a;
-        return ((_a = this.value) !== null && _a !== void 0 ? _a : []).filter(function (it) { return it.checked; }).length > this.count;
-    };
-    return CountGreaterThanCheckedValidatorArray;
-}(ValidatorArray));
-
-var CountLessThanEqualsCheckedValidatorArray = /** @class */ (function (_super) {
-    __extends(CountLessThanEqualsCheckedValidatorArray, _super);
-    function CountLessThanEqualsCheckedValidatorArray(count, value, target, event, autoValid) {
-        if (autoValid === void 0) { autoValid = true; }
-        var _this = _super.call(this, value, target, event, autoValid) || this;
-        _this.count = count;
-        return _this;
-    }
-    CountLessThanEqualsCheckedValidatorArray.prototype.valid = function () {
-        var _a;
-        return ((_a = this.value) !== null && _a !== void 0 ? _a : []).filter(function (it) { return it.checked; }).length <= this.count;
-    };
-    return CountLessThanEqualsCheckedValidatorArray;
-}(ValidatorArray));
-
 var CountGreaterThanEqualsUnCheckedValidatorArray = /** @class */ (function (_super) {
     __extends(CountGreaterThanEqualsUnCheckedValidatorArray, _super);
     function CountGreaterThanEqualsUnCheckedValidatorArray(count, value, target, event, autoValid) {
@@ -4232,34 +4208,34 @@ var CountGreaterThanUnCheckedValidatorArray = /** @class */ (function (_super) {
     return CountGreaterThanUnCheckedValidatorArray;
 }(ValidatorArray));
 
-var CountLessThanEqualsUnCheckedValidatorArray = /** @class */ (function (_super) {
-    __extends(CountLessThanEqualsUnCheckedValidatorArray, _super);
-    function CountLessThanEqualsUnCheckedValidatorArray(count, value, target, event, autoValid) {
+var CountGreaterThanCheckedValidatorArray = /** @class */ (function (_super) {
+    __extends(CountGreaterThanCheckedValidatorArray, _super);
+    function CountGreaterThanCheckedValidatorArray(count, value, target, event, autoValid) {
         if (autoValid === void 0) { autoValid = true; }
         var _this = _super.call(this, value, target, event, autoValid) || this;
         _this.count = count;
         return _this;
     }
-    CountLessThanEqualsUnCheckedValidatorArray.prototype.valid = function () {
+    CountGreaterThanCheckedValidatorArray.prototype.valid = function () {
         var _a;
-        return ((_a = this.value) !== null && _a !== void 0 ? _a : []).filter(function (it) { return !it.checked; }).length <= this.count;
+        return ((_a = this.value) !== null && _a !== void 0 ? _a : []).filter(function (it) { return it.checked; }).length > this.count;
     };
-    return CountLessThanEqualsUnCheckedValidatorArray;
+    return CountGreaterThanCheckedValidatorArray;
 }(ValidatorArray));
 
-var CountLessThanUnCheckedValidatorArray = /** @class */ (function (_super) {
-    __extends(CountLessThanUnCheckedValidatorArray, _super);
-    function CountLessThanUnCheckedValidatorArray(count, value, target, event, autoValid) {
+var CountLessThanCheckedValidatorArray = /** @class */ (function (_super) {
+    __extends(CountLessThanCheckedValidatorArray, _super);
+    function CountLessThanCheckedValidatorArray(count, value, target, event, autoValid) {
         if (autoValid === void 0) { autoValid = true; }
         var _this = _super.call(this, value, target, event, autoValid) || this;
         _this.count = count;
         return _this;
     }
-    CountLessThanUnCheckedValidatorArray.prototype.valid = function () {
+    CountLessThanCheckedValidatorArray.prototype.valid = function () {
         var _a;
-        return ((_a = this.value) !== null && _a !== void 0 ? _a : []).filter(function (it) { return !it.checked; }).length < this.count;
+        return ((_a = this.value) !== null && _a !== void 0 ? _a : []).filter(function (it) { return it.checked; }).length < this.count;
     };
-    return CountLessThanUnCheckedValidatorArray;
+    return CountLessThanCheckedValidatorArray;
 }(ValidatorArray));
 
 var EmptyValidator = /** @class */ (function (_super) {
@@ -4276,6 +4252,21 @@ var EmptyValidator = /** @class */ (function (_super) {
     return EmptyValidator;
 }(Validator));
 
+var CountLessThanUnCheckedValidatorArray = /** @class */ (function (_super) {
+    __extends(CountLessThanUnCheckedValidatorArray, _super);
+    function CountLessThanUnCheckedValidatorArray(count, value, target, event, autoValid) {
+        if (autoValid === void 0) { autoValid = true; }
+        var _this = _super.call(this, value, target, event, autoValid) || this;
+        _this.count = count;
+        return _this;
+    }
+    CountLessThanUnCheckedValidatorArray.prototype.valid = function () {
+        var _a;
+        return ((_a = this.value) !== null && _a !== void 0 ? _a : []).filter(function (it) { return !it.checked; }).length < this.count;
+    };
+    return CountLessThanUnCheckedValidatorArray;
+}(ValidatorArray));
+
 var CountUnCheckedValidatorArray = /** @class */ (function (_super) {
     __extends(CountUnCheckedValidatorArray, _super);
     function CountUnCheckedValidatorArray(count, value, target, event, autoValid) {
@@ -4313,19 +4304,55 @@ var ExcludeCheckedValidatorArray = /** @class */ (function (_super) {
     return ExcludeCheckedValidatorArray;
 }(ValidatorArray));
 
-var CountLessThanCheckedValidatorArray = /** @class */ (function (_super) {
-    __extends(CountLessThanCheckedValidatorArray, _super);
-    function CountLessThanCheckedValidatorArray(count, value, target, event, autoValid) {
+var MultipleValidator = /** @class */ (function (_super) {
+    __extends(MultipleValidator, _super);
+    function MultipleValidator(validators, value, target, event, autoValid) {
         if (autoValid === void 0) { autoValid = true; }
         var _this = _super.call(this, value, target, event, autoValid) || this;
-        _this.count = count;
+        _this.validators = validators.map(function (it) {
+            it.setAutoValid(false);
+            it.setAutoValidAction(false);
+            return it;
+        });
+        _this.validators.forEach(function (it) {
+            it.set(_this.value, _this.getTarget(), _this.getEvent());
+        });
         return _this;
     }
-    CountLessThanCheckedValidatorArray.prototype.valid = function () {
+    MultipleValidator.prototype.changeValue = function (value) {
+        var _this = this;
+        this.validators.forEach(function (it) { return it.set(_this.value, _this.getTarget(), _this.getEvent()); });
+    };
+    MultipleValidator.prototype.validAction = function () {
+        return !(this.validators.filter(function (it) { return !it.validAction(); }).length > 0);
+    };
+    MultipleValidator.prototype.valid = function () {
+        // console.log('mm', this.validators)
+        return !(this.validators.filter(function (it) { return !it.valid(); }).length > 0);
+    };
+    return MultipleValidator;
+}(Validator));
+
+var IncludeCheckedValidatorArray = /** @class */ (function (_super) {
+    __extends(IncludeCheckedValidatorArray, _super);
+    function IncludeCheckedValidatorArray(include, allRequired, value, target, event, autoValid) {
+        if (allRequired === void 0) { allRequired = false; }
+        if (autoValid === void 0) { autoValid = true; }
+        var _this = _super.call(this, value, target, event, autoValid) || this;
+        _this.include = include;
+        _this.allRequired = allRequired;
+        return _this;
+    }
+    IncludeCheckedValidatorArray.prototype.valid = function () {
+        var _this = this;
         var _a;
-        return ((_a = this.value) !== null && _a !== void 0 ? _a : []).filter(function (it) { return it.checked; }).length < this.count;
+        var valus = (_a = this.value) !== null && _a !== void 0 ? _a : [];
+        var checkedValue = valus.filter(function (it) { return it.checked; }).map(function (it) { return it.value; });
+        return checkedValue.length > 0 &&
+            (!(checkedValue.filter(function (it) { return !_this.include.includes(it); }).length > 0)) &&
+            (this.allRequired ? checkedValue.filter(function (it) { return _this.include.includes(it); }).length === this.include.length : true);
     };
-    return CountLessThanCheckedValidatorArray;
+    return IncludeCheckedValidatorArray;
 }(ValidatorArray));
 
 var FormValidator = /** @class */ (function (_super) {
@@ -4346,77 +4373,71 @@ var FormValidator = /** @class */ (function (_super) {
     return FormValidator;
 }(Validator));
 
-var NotRegExpTestValidator = /** @class */ (function (_super) {
-    __extends(NotRegExpTestValidator, _super);
-    function NotRegExpTestValidator(regexp, value, target, event, autoValid) {
+var NotEmptyValidator = /** @class */ (function (_super) {
+    __extends(NotEmptyValidator, _super);
+    function NotEmptyValidator(value, target, event, autoValid) {
         if (autoValid === void 0) { autoValid = true; }
-        var _this = _super.call(this, value, target, event, autoValid) || this;
-        _this.regexp = DomRenderProxy.final(regexp);
-        return _this;
+        return _super.call(this, value, target, event, autoValid) || this;
     }
-    NotRegExpTestValidator.prototype.valid = function () {
+    NotEmptyValidator.prototype.valid = function () {
         var _a;
         var value = this.value;
-        var regExp = (_a = this.regexp._DomRender_origin) !== null && _a !== void 0 ? _a : this.regexp;
-        if (value) {
-            return !regExp.test(value);
-        }
-        else {
-            return true;
-        }
+        // console.log('NotEmptyValidator', value, value !== undefined && value !== null && ((value as any)?.length ?? 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 NotRegExpTestValidator;
+    return NotEmptyValidator;
 }(Validator));
 
-var IncludeCheckedValidatorArray = /** @class */ (function (_super) {
-    __extends(IncludeCheckedValidatorArray, _super);
-    function IncludeCheckedValidatorArray(include, allRequired, value, target, event, autoValid) {
-        if (allRequired === void 0) { allRequired = false; }
+var CountLessThanEqualsCheckedValidatorArray = /** @class */ (function (_super) {
+    __extends(CountLessThanEqualsCheckedValidatorArray, _super);
+    function CountLessThanEqualsCheckedValidatorArray(count, value, target, event, autoValid) {
         if (autoValid === void 0) { autoValid = true; }
         var _this = _super.call(this, value, target, event, autoValid) || this;
-        _this.include = include;
-        _this.allRequired = allRequired;
+        _this.count = count;
         return _this;
     }
-    IncludeCheckedValidatorArray.prototype.valid = function () {
-        var _this = this;
+    CountLessThanEqualsCheckedValidatorArray.prototype.valid = function () {
         var _a;
-        var valus = (_a = this.value) !== null && _a !== void 0 ? _a : [];
-        var checkedValue = valus.filter(function (it) { return it.checked; }).map(function (it) { return it.value; });
-        return checkedValue.length > 0 &&
-            (!(checkedValue.filter(function (it) { return !_this.include.includes(it); }).length > 0)) &&
-            (this.allRequired ? checkedValue.filter(function (it) { return _this.include.includes(it); }).length === this.include.length : true);
+        return ((_a = this.value) !== null && _a !== void 0 ? _a : []).filter(function (it) { return it.checked; }).length <= this.count;
     };
-    return IncludeCheckedValidatorArray;
+    return CountLessThanEqualsCheckedValidatorArray;
 }(ValidatorArray));
 
-var MultipleValidator = /** @class */ (function (_super) {
-    __extends(MultipleValidator, _super);
-    function MultipleValidator(validators, value, target, event, autoValid) {
+var CountLessThanEqualsUnCheckedValidatorArray = /** @class */ (function (_super) {
+    __extends(CountLessThanEqualsUnCheckedValidatorArray, _super);
+    function CountLessThanEqualsUnCheckedValidatorArray(count, value, target, event, autoValid) {
         if (autoValid === void 0) { autoValid = true; }
         var _this = _super.call(this, value, target, event, autoValid) || this;
-        _this.validators = validators.map(function (it) {
-            it.setAutoValid(false);
-            it.setAutoValidAction(false);
-            return it;
-        });
-        _this.validators.forEach(function (it) {
-            it.set(_this.value, _this.getTarget(), _this.getEvent());
-        });
+        _this.count = count;
         return _this;
     }
-    MultipleValidator.prototype.changeValue = function (value) {
-        var _this = this;
-        this.validators.forEach(function (it) { return it.set(_this.value, _this.getTarget(), _this.getEvent()); });
-    };
-    MultipleValidator.prototype.validAction = function () {
-        return !(this.validators.filter(function (it) { return !it.validAction(); }).length > 0);
+    CountLessThanEqualsUnCheckedValidatorArray.prototype.valid = function () {
+        var _a;
+        return ((_a = this.value) !== null && _a !== void 0 ? _a : []).filter(function (it) { return !it.checked; }).length <= this.count;
     };
-    MultipleValidator.prototype.valid = function () {
-        // console.log('mm', this.validators)
-        return !(this.validators.filter(function (it) { return !it.valid(); }).length > 0);
+    return CountLessThanEqualsUnCheckedValidatorArray;
+}(ValidatorArray));
+
+var NotRegExpTestValidator = /** @class */ (function (_super) {
+    __extends(NotRegExpTestValidator, _super);
+    function NotRegExpTestValidator(regexp, value, target, event, autoValid) {
+        if (autoValid === void 0) { autoValid = true; }
+        var _this = _super.call(this, value, target, event, autoValid) || this;
+        _this.regexp = DomRenderProxy.final(regexp);
+        return _this;
+    }
+    NotRegExpTestValidator.prototype.valid = function () {
+        var _a;
+        var value = this.value;
+        var regExp = (_a = this.regexp._DomRender_origin) !== null && _a !== void 0 ? _a : this.regexp;
+        if (value) {
+            return !regExp.test(value);
+        }
+        else {
+            return true;
+        }
     };
-    return MultipleValidator;
+    return NotRegExpTestValidator;
 }(Validator));
 
 var PassValidator = /** @class */ (function (_super) {
@@ -4454,33 +4475,17 @@ var RegExpTestValidator = /** @class */ (function (_super) {
     return RegExpTestValidator;
 }(Validator));
 
-var RequiredValidator = /** @class */ (function (_super) {
-    __extends(RequiredValidator, _super);
-    function RequiredValidator(value, target, event, autoValid) {
-        if (autoValid === void 0) { autoValid = true; }
-        return _super.call(this, value, target, event, autoValid) || this;
-    }
-    RequiredValidator.prototype.valid = function () {
-        var value = this.value;
-        // console.log('required', value, value !== undefined && value !== null)
-        return value !== undefined && value !== null;
-    };
-    return RequiredValidator;
-}(Validator));
-
-var NotEmptyValidator = /** @class */ (function (_super) {
-    __extends(NotEmptyValidator, _super);
-    function NotEmptyValidator(value, target, event, autoValid) {
+var UnCheckedValidator = /** @class */ (function (_super) {
+    __extends(UnCheckedValidator, _super);
+    function UnCheckedValidator(value, target, event, autoValid) {
         if (autoValid === void 0) { autoValid = true; }
         return _super.call(this, value, target, event, autoValid) || this;
     }
-    NotEmptyValidator.prototype.valid = function () {
-        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 && ((_a = value === null || value === void 0 ? void 0 : value.length) !== null && _a !== void 0 ? _a : 0) > 0;
+    UnCheckedValidator.prototype.valid = function () {
+        var _a, _b;
+        return !((_b = (_a = this.getTarget()) === null || _a === void 0 ? void 0 : _a.checked) !== null && _b !== void 0 ? _b : false);
     };
-    return NotEmptyValidator;
+    return UnCheckedValidator;
 }(Validator));
 
 var ValidMultipleValidator = /** @class */ (function (_super) {
@@ -4498,17 +4503,18 @@ var ValidMultipleValidator = /** @class */ (function (_super) {
     return ValidMultipleValidator;
 }(MultipleValidator));
 
-var UnCheckedValidator = /** @class */ (function (_super) {
-    __extends(UnCheckedValidator, _super);
-    function UnCheckedValidator(value, target, event, autoValid) {
+var RequiredValidator = /** @class */ (function (_super) {
+    __extends(RequiredValidator, _super);
+    function RequiredValidator(value, target, event, autoValid) {
         if (autoValid === void 0) { autoValid = true; }
         return _super.call(this, value, target, event, autoValid) || this;
     }
-    UnCheckedValidator.prototype.valid = function () {
-        var _a, _b;
-        return !((_b = (_a = this.getTarget()) === null || _a === void 0 ? void 0 : _a.checked) !== null && _b !== void 0 ? _b : false);
+    RequiredValidator.prototype.valid = function () {
+        var value = this.value;
+        // console.log('required', value, value !== undefined && value !== null)
+        return value !== undefined && value !== null;
     };
-    return UnCheckedValidator;
+    return RequiredValidator;
 }(Validator));
 
 var ValidValidator = /** @class */ (function (_super) {
@@ -4539,32 +4545,32 @@ var ValidValidatorArray = /** @class */ (function (_super) {
     return ValidValidatorArray;
 }(ValidatorArray));
 
-var ValueEqualsValidator = /** @class */ (function (_super) {
-    __extends(ValueEqualsValidator, _super);
-    function ValueEqualsValidator(equalsValue, value, target, event, autoValid) {
+var ValueNotEqualsValidator = /** @class */ (function (_super) {
+    __extends(ValueNotEqualsValidator, _super);
+    function ValueNotEqualsValidator(equalsValue, value, target, event, autoValid) {
         if (autoValid === void 0) { autoValid = true; }
         var _this = _super.call(this, value, target, event, autoValid) || this;
         _this.equalsValue = equalsValue;
         return _this;
     }
-    ValueEqualsValidator.prototype.valid = function () {
-        return this.value === this.equalsValue;
+    ValueNotEqualsValidator.prototype.valid = function () {
+        return this.value !== this.equalsValue;
     };
-    return ValueEqualsValidator;
+    return ValueNotEqualsValidator;
 }(Validator));
 
-var ValueNotEqualsValidator = /** @class */ (function (_super) {
-    __extends(ValueNotEqualsValidator, _super);
-    function ValueNotEqualsValidator(equalsValue, value, target, event, autoValid) {
+var ValueEqualsValidator = /** @class */ (function (_super) {
+    __extends(ValueEqualsValidator, _super);
+    function ValueEqualsValidator(equalsValue, value, target, event, autoValid) {
         if (autoValid === void 0) { autoValid = true; }
         var _this = _super.call(this, value, target, event, autoValid) || this;
         _this.equalsValue = equalsValue;
         return _this;
     }
-    ValueNotEqualsValidator.prototype.valid = function () {
-        return this.value !== this.equalsValue;
+    ValueEqualsValidator.prototype.valid = function () {
+        return this.value === this.equalsValue;
     };
-    return ValueNotEqualsValidator;
+    return ValueEqualsValidator;
 }(Validator));
 
 var ClipBoardUtils = /** @class */ (function () {
@@ -4589,6 +4595,30 @@ var ClipBoardUtils = /** @class */ (function () {
     return ClipBoardUtils;
 }());
 
+var NodeUtils = /** @class */ (function () {
+    function NodeUtils() {
+    }
+    // https://stackoverflow.com/questions/3955229/remove-all-child-elements-of-a-dom-node-in-javascript
+    NodeUtils.removeAllChildNode = function (node) {
+        while (node === null || node === void 0 ? void 0 : node.firstChild) {
+            node.firstChild.remove();
+        }
+    };
+    NodeUtils.appendChild = function (parentNode, childNode) {
+        return parentNode.appendChild(childNode);
+    };
+    NodeUtils.replaceNode = function (targetNode, newNode) {
+        var _a;
+        // console.log('repalceNode', targetNode, newNode, targetNode.parentNode)
+        return (_a = targetNode.parentNode) === null || _a === void 0 ? void 0 : _a.replaceChild(newNode, targetNode);
+    };
+    NodeUtils.addNode = function (targetNode, newNode) {
+        var _a;
+        return (_a = targetNode.parentNode) === null || _a === void 0 ? void 0 : _a.insertBefore(newNode, targetNode.nextSibling);
+    };
+    return NodeUtils;
+}());
+
 var StorageUtils = /** @class */ (function () {
     function StorageUtils() {
     }
@@ -4634,30 +4664,6 @@ var StorageUtils = /** @class */ (function () {
     return StorageUtils;
 }());
 
-var NodeUtils = /** @class */ (function () {
-    function NodeUtils() {
-    }
-    // https://stackoverflow.com/questions/3955229/remove-all-child-elements-of-a-dom-node-in-javascript
-    NodeUtils.removeAllChildNode = function (node) {
-        while (node === null || node === void 0 ? void 0 : node.firstChild) {
-            node.firstChild.remove();
-        }
-    };
-    NodeUtils.appendChild = function (parentNode, childNode) {
-        return parentNode.appendChild(childNode);
-    };
-    NodeUtils.replaceNode = function (targetNode, newNode) {
-        var _a;
-        // console.log('repalceNode', targetNode, newNode, targetNode.parentNode)
-        return (_a = targetNode.parentNode) === null || _a === void 0 ? void 0 : _a.replaceChild(newNode, targetNode);
-    };
-    NodeUtils.addNode = function (targetNode, newNode) {
-        var _a;
-        return (_a = targetNode.parentNode) === null || _a === void 0 ? void 0 : _a.insertBefore(newNode, targetNode.nextSibling);
-    };
-    return NodeUtils;
-}());
-
 exports.AllCheckedValidatorArray = AllCheckedValidatorArray;
 exports.AllUnCheckedValidatorArray = AllUnCheckedValidatorArray;
 exports.Appender = Appender;
@@ -4685,7 +4691,6 @@ exports.DomRenderProxy = DomRenderProxy;
 exports.DomUtils = DomUtils;
 exports.Dr = Dr;
 exports.DrAppender = DrAppender;
-exports.DrDictionary = DrDictionary;
 exports.DrFor = DrFor;
 exports.DrForOf = DrForOf;
 exports.DrForm = DrForm;
@@ -4697,6 +4702,7 @@ exports.DrRepeat = DrRepeat;
 exports.DrTargetAttr = DrTargetAttr;
 exports.DrTargetElement = DrTargetElement;
 exports.DrThis = DrThis;
+exports.DrThisProperty = DrThisProperty;
 exports.EmptyValidator = EmptyValidator;
 exports.EventManager = EventManager;
 exports.ExcludeCheckedValidatorArray = ExcludeCheckedValidatorArray;