dom-render 1.0.81 → 1.0.82

package/RawSet.d.ts

@@ -145,5 +145,7 @@ export declare class RawSet {
     static isExporesion(data: string | null): boolean;
     static exporesionGrouops(data: string | null): RegExpExecArray[];
     static styleTransformLocal(styleBody: string | string[], id: string, styleTagWrap?: boolean, locale?: boolean): string;
+    static metaStart(id: string): string;
+    static metaEnd(id: string): string;
     static destroy(obj: any | undefined, parameter: any[], config: Config, destroyOptions?: (DestroyOptionType | string)[]): void;
 }

package/RawSet.js

@@ -118,7 +118,7 @@ var RawSet = /** @class */ (function () {
         // console.log('usingTriggerVariable----------->', usingTriggerVariables)
         return usingTriggerVariables;
     };
-    // 중요 render
+    // 중요 render 처리 부분
     RawSet.prototype.render = function (obj, config) {
         var _this = this;
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
@@ -234,6 +234,33 @@ var RawSet = /** @class */ (function () {
         }
         for (var _q = 0, onElementInitCallBacks_1 = onElementInitCallBacks; _q < onElementInitCallBacks_1.length; _q++) {
             var it_2 = onElementInitCallBacks_1[_q];
+            // 중요 style isolation 나중에 :scope로 대체 가능할듯.
+            Array.from(window.document.styleSheets).filter(function (it) { return it.ownerNode && it.ownerNode instanceof Element && it.ownerNode.getAttribute('id') && !it.ownerNode.getAttribute('completed'); }).forEach(function (it) {
+                var _a;
+                var styleElement = it.ownerNode;
+                var id = (_a = styleElement.getAttribute('id')) === null || _a === void 0 ? void 0 : _a.split('-')[0];
+                if (id) {
+                    // console.log('------->', id)
+                    var start_1 = "#".concat(id, "-start");
+                    var end_1 = "#".concat(id, "-end");
+                    Array.from(it.cssRules).filter(function (it) { return it.constructor.name === 'CSSStyleRule'; }).forEach(function (it) {
+                        var rule = it;
+                        // rule.selectorText = `${start} ~ *:not(${start} ~ ${end} ~ *) ${rule.selectorText}`;
+                        // rule.selectorText = `${start} ~ *:not(${start} ~ ${end} ~ ${rule.selectorText})`;
+                        // console.log('-----', rule, rule.selectorText)
+                        if (!rule.selectorText.startsWith(':root')) {
+                            rule.selectorText = "".concat(start_1, " ~ ").concat(rule.selectorText, ":not(").concat(start_1, " ~ ").concat(end_1, " ~ *)");
+                            // if (rule.selectorText.startsWith('.')) {
+                            //     rule.selectorText = `${start} ~ *:not(${start} ~ ${end} ~ *)${rule.selectorText}`;
+                            // } else {
+                            //     rule.selectorText = `${rule.selectorText} ~ ${start} ~ *:not(${start} ~ ${end} ~ *)`;
+                            // }
+                        }
+                        // console.log(rule.selectorText);
+                    });
+                }
+                it.ownerNode.setAttribute('completed', 'true');
+            });
             (_g = (_f = (_e = (_d = it_2.targetElement) === null || _d === void 0 ? void 0 : _d.__render) === null || _e === void 0 ? void 0 : _e.component) === null || _f === void 0 ? void 0 : _f.onInitRender) === null || _g === void 0 ? void 0 : _g.call(_f, Object.freeze({ render: (_h = it_2.targetElement) === null || _h === void 0 ? void 0 : _h.__render, creatorMetaData: (_j = it_2.targetElement) === null || _j === void 0 ? void 0 : _j.__creatorMetaData }));
             (_k = config === null || config === void 0 ? void 0 : config.onElementInit) === null || _k === void 0 ? void 0 : _k.call(config, it_2.name, obj, this, it_2.targetElement);
         }
@@ -530,7 +557,10 @@ var RawSet = /** @class */ (function () {
         var n = element.cloneNode(true);
         if (set) {
             var id = RandomUtils_1.RandomUtils.getRandomString(20);
-            n.innerHTML = RawSet.styleTransformLocal((_a = set.styles) !== null && _a !== void 0 ? _a : [], id, true, set.styleLocale) + ((_b = set.template) !== null && _b !== void 0 ? _b : '');
+            var style = RawSet.styleTransformLocal((_a = set.styles) !== null && _a !== void 0 ? _a : [], id, true, set.styleLocale);
+            var metaStart = RawSet.metaStart(id);
+            var metaEnd = RawSet.metaEnd(id);
+            n.innerHTML = metaStart + style + ((_b = set.template) !== null && _b !== void 0 ? _b : '') + metaEnd;
             // dr-on-create onCreateRender
             var onCreate = element.getAttribute("".concat(EventManager_1.EventManager.attrPrefix, "on-create"));
             var renderScript = '';
@@ -685,8 +715,10 @@ var RawSet = /** @class */ (function () {
                         __render: render
                     }));
                 }
-                var innerHTML = RawSet.styleTransformLocal(styles, componentKey, true, styleLocale) + (applayTemplate !== null && applayTemplate !== void 0 ? applayTemplate : '');
-                element.innerHTML = innerHTML;
+                var style = RawSet.styleTransformLocal(styles, componentKey, true, styleLocale);
+                var metaStart = RawSet.metaStart(componentKey);
+                var metaEnd = RawSet.metaEnd(componentKey);
+                element.innerHTML = metaStart + style + (applayTemplate !== null && applayTemplate !== void 0 ? applayTemplate : '') + metaEnd;
                 // console.log('------>', element.innerHTML, obj)
                 var data = RawSet.drThisCreate(element, "this.__domrender_components.".concat(componentKey), '', true, obj, config);
                 // 넘어온 innerHTML에 this가 있는걸 다시 복호화해서 제대로 작동하도록한다.
@@ -712,6 +744,7 @@ var RawSet = /** @class */ (function () {
         var reg = /(?:[$#]\{(?:(([$#]\{)??[^$#]?[^{]*?)\}[$#]))/g;
         return StringUtils_1.StringUtils.regexExec(reg, data !== null && data !== void 0 ? data : '');
     };
+    // 중요 스타일 적용 부분
     RawSet.styleTransformLocal = function (styleBody, id, styleTagWrap, locale) {
         if (styleTagWrap === void 0) { styleTagWrap = true; }
         if (locale === void 0) { locale = false; }
@@ -733,10 +766,16 @@ var RawSet = /** @class */ (function () {
             });
         }
         if (styleTagWrap) {
-            styleBody = "<style id='".concat(id, "' domstyle>").concat(styleBody, "</style>");
+            styleBody = "<style id='".concat(id, "-style' domstyle>").concat(styleBody, "</style>");
         }
         return styleBody;
     };
+    RawSet.metaStart = function (id) {
+        return "<meta id='".concat(id, "-start' />");
+    };
+    RawSet.metaEnd = function (id) {
+        return "<meta id='".concat(id, "-end' />");
+    };
     RawSet.destroy = function (obj, parameter, config, destroyOptions) {
         var _a;
         if (destroyOptions === void 0) { destroyOptions = []; }

package/dist/bundle.js

@@ -1213,7 +1213,7 @@ var Validator = /** @class */ (function () {
                 target.value = this._value;
             }
             catch (e) {
-                console.log('set value function is blocked ');
+                console.error('set value function is blocked ');
             }
         }
         if (this.getAutoValidAction()) {
@@ -1755,6 +1755,7 @@ 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 exports.ExecuteState.EXECUTE;
@@ -1875,7 +1876,7 @@ var RawSet = /** @class */ (function () {
         // console.log('usingTriggerVariable----------->', usingTriggerVariables)
         return usingTriggerVariables;
     };
-    // 중요 render
+    // 중요 render 처리 부분
     RawSet.prototype.render = function (obj, config) {
         var _this = this;
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
@@ -1991,6 +1992,33 @@ var RawSet = /** @class */ (function () {
         }
         for (var _q = 0, onElementInitCallBacks_1 = onElementInitCallBacks; _q < onElementInitCallBacks_1.length; _q++) {
             var it_2 = onElementInitCallBacks_1[_q];
+            // 중요 style isolation 나중에 :scope로 대체 가능할듯.
+            Array.from(window.document.styleSheets).filter(function (it) { return it.ownerNode && it.ownerNode instanceof Element && it.ownerNode.getAttribute('id') && !it.ownerNode.getAttribute('completed'); }).forEach(function (it) {
+                var _a;
+                var styleElement = it.ownerNode;
+                var id = (_a = styleElement.getAttribute('id')) === null || _a === void 0 ? void 0 : _a.split('-')[0];
+                if (id) {
+                    // console.log('------->', id)
+                    var start_1 = "#".concat(id, "-start");
+                    var end_1 = "#".concat(id, "-end");
+                    Array.from(it.cssRules).filter(function (it) { return it.constructor.name === 'CSSStyleRule'; }).forEach(function (it) {
+                        var rule = it;
+                        // rule.selectorText = `${start} ~ *:not(${start} ~ ${end} ~ *) ${rule.selectorText}`;
+                        // rule.selectorText = `${start} ~ *:not(${start} ~ ${end} ~ ${rule.selectorText})`;
+                        // console.log('-----', rule, rule.selectorText)
+                        if (!rule.selectorText.startsWith(':root')) {
+                            rule.selectorText = "".concat(start_1, " ~ ").concat(rule.selectorText, ":not(").concat(start_1, " ~ ").concat(end_1, " ~ *)");
+                            // if (rule.selectorText.startsWith('.')) {
+                            //     rule.selectorText = `${start} ~ *:not(${start} ~ ${end} ~ *)${rule.selectorText}`;
+                            // } else {
+                            //     rule.selectorText = `${rule.selectorText} ~ ${start} ~ *:not(${start} ~ ${end} ~ *)`;
+                            // }
+                        }
+                        // console.log(rule.selectorText);
+                    });
+                }
+                it.ownerNode.setAttribute('completed', 'true');
+            });
             (_g = (_f = (_e = (_d = it_2.targetElement) === null || _d === void 0 ? void 0 : _d.__render) === null || _e === void 0 ? void 0 : _e.component) === null || _f === void 0 ? void 0 : _f.onInitRender) === null || _g === void 0 ? void 0 : _g.call(_f, Object.freeze({ render: (_h = it_2.targetElement) === null || _h === void 0 ? void 0 : _h.__render, creatorMetaData: (_j = it_2.targetElement) === null || _j === void 0 ? void 0 : _j.__creatorMetaData }));
             (_k = config === null || config === void 0 ? void 0 : config.onElementInit) === null || _k === void 0 ? void 0 : _k.call(config, it_2.name, obj, this, it_2.targetElement);
         }
@@ -2287,7 +2315,10 @@ var RawSet = /** @class */ (function () {
         var n = element.cloneNode(true);
         if (set) {
             var id = RandomUtils.getRandomString(20);
-            n.innerHTML = RawSet.styleTransformLocal((_a = set.styles) !== null && _a !== void 0 ? _a : [], id, true, set.styleLocale) + ((_b = set.template) !== null && _b !== void 0 ? _b : '');
+            var style = RawSet.styleTransformLocal((_a = set.styles) !== null && _a !== void 0 ? _a : [], id, true, set.styleLocale);
+            var metaStart = RawSet.metaStart(id);
+            var metaEnd = RawSet.metaEnd(id);
+            n.innerHTML = metaStart + style + ((_b = set.template) !== null && _b !== void 0 ? _b : '') + metaEnd;
             // dr-on-create onCreateRender
             var onCreate = element.getAttribute("".concat(EventManager.attrPrefix, "on-create"));
             var renderScript = '';
@@ -2442,8 +2473,10 @@ var RawSet = /** @class */ (function () {
                         __render: render
                     }));
                 }
-                var innerHTML = RawSet.styleTransformLocal(styles, componentKey, true, styleLocale) + (applayTemplate !== null && applayTemplate !== void 0 ? applayTemplate : '');
-                element.innerHTML = innerHTML;
+                var style = RawSet.styleTransformLocal(styles, componentKey, true, styleLocale);
+                var metaStart = RawSet.metaStart(componentKey);
+                var metaEnd = RawSet.metaEnd(componentKey);
+                element.innerHTML = metaStart + style + (applayTemplate !== null && applayTemplate !== void 0 ? applayTemplate : '') + metaEnd;
                 // console.log('------>', element.innerHTML, obj)
                 var data = RawSet.drThisCreate(element, "this.__domrender_components.".concat(componentKey), '', true, obj, config);
                 // 넘어온 innerHTML에 this가 있는걸 다시 복호화해서 제대로 작동하도록한다.
@@ -2469,6 +2502,7 @@ var RawSet = /** @class */ (function () {
         var reg = /(?:[$#]\{(?:(([$#]\{)??[^$#]?[^{]*?)\}[$#]))/g;
         return StringUtils.regexExec(reg, data !== null && data !== void 0 ? data : '');
     };
+    // 중요 스타일 적용 부분
     RawSet.styleTransformLocal = function (styleBody, id, styleTagWrap, locale) {
         if (styleTagWrap === void 0) { styleTagWrap = true; }
         if (locale === void 0) { locale = false; }
@@ -2490,10 +2524,16 @@ var RawSet = /** @class */ (function () {
             });
         }
         if (styleTagWrap) {
-            styleBody = "<style id='".concat(id, "' domstyle>").concat(styleBody, "</style>");
+            styleBody = "<style id='".concat(id, "-style' domstyle>").concat(styleBody, "</style>");
         }
         return styleBody;
     };
+    RawSet.metaStart = function (id) {
+        return "<meta id='".concat(id, "-start' />");
+    };
+    RawSet.metaEnd = function (id) {
+        return "<meta id='".concat(id, "-end' />");
+    };
     RawSet.destroy = function (obj, parameter, config, destroyOptions) {
         var _a;
         if (destroyOptions === void 0) { destroyOptions = []; }
@@ -3258,7 +3298,7 @@ var Messenger = /** @class */ (function () {
         this.config.window.addEventListener(Messenger.EVENT_PUBLISH_KEY, function (e) {
             var _a, _b;
             var detail = e.detail;
-            console.log('--->', detail);
+            // console.log('--->', detail)
             var rtns = [];
             (_a = _this.getChannels(detail.key)) === null || _a === void 0 ? void 0 : _a.forEach(function (it) {
                 try {
@@ -3275,7 +3315,7 @@ var Messenger = /** @class */ (function () {
         });
         this.config.window.addEventListener(Messenger.EVENT_SUBSCRIBE_KEY, function (e) {
             var detail = e.detail;
-            console.log('--->', detail);
+            // console.log('--->', detail)
             var channel = _this.createChannel(detail.obj, detail.key);
             detail.init(channel, channel.subscribe(detail.subscribe));
         });
@@ -3301,7 +3341,7 @@ var Messenger = /** @class */ (function () {
         if (obj) {
             this.channels.forEach(function (it) {
                 if (it.obj === obj) {
-                    console.log('dddddddddddd', obj);
+                    // console.log('dddddddddddd', obj)
                     _this.deleteChannel(it);
                 }
             });
@@ -3451,18 +3491,18 @@ var Appender = /** @class */ (function () {
     return Appender;
 }());
 
-var CheckedValidator = /** @class */ (function (_super) {
-    __extends(CheckedValidator, _super);
-    function CheckedValidator(value, target, event, autoValid) {
+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;
     }
-    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;
+    AllCheckedValidatorArray.prototype.valid = function () {
+        var _a;
+        return !(((_a = this.value) !== null && _a !== void 0 ? _a : []).filter(function (it) { return !it.checked; }).length > 0);
     };
-    return CheckedValidator;
-}(Validator));
+    return AllCheckedValidatorArray;
+}(ValidatorArray));
 
 var AllUnCheckedValidatorArray = /** @class */ (function (_super) {
     __extends(AllUnCheckedValidatorArray, _super);
@@ -3492,18 +3532,18 @@ var CountEqualsCheckedValidatorArray = /** @class */ (function (_super) {
     return CountEqualsCheckedValidatorArray;
 }(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 CountGreaterThanCheckedValidatorArray = /** @class */ (function (_super) {
     __extends(CountGreaterThanCheckedValidatorArray, _super);
@@ -3520,21 +3560,6 @@ var CountGreaterThanCheckedValidatorArray = /** @class */ (function (_super) {
     return CountGreaterThanCheckedValidatorArray;
 }(ValidatorArray));
 
-var CountEqualsUnCheckedValidatorArray = /** @class */ (function (_super) {
-    __extends(CountEqualsUnCheckedValidatorArray, _super);
-    function CountEqualsUnCheckedValidatorArray(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;
-    }
-    CountEqualsUnCheckedValidatorArray.prototype.valid = function () {
-        var _a;
-        return ((_a = this.value) !== null && _a !== void 0 ? _a : []).filter(function (it) { return !it.checked; }).length === this.count;
-    };
-    return CountEqualsUnCheckedValidatorArray;
-}(ValidatorArray));
-
 var CountGreaterThanEqualsCheckedValidatorArray = /** @class */ (function (_super) {
     __extends(CountGreaterThanEqualsCheckedValidatorArray, _super);
     function CountGreaterThanEqualsCheckedValidatorArray(count, value, target, event, autoValid) {
@@ -3565,34 +3590,34 @@ var CountGreaterThanEqualsUnCheckedValidatorArray = /** @class */ (function (_su
     return CountGreaterThanEqualsUnCheckedValidatorArray;
 }(ValidatorArray));
 
-var CountGreaterThanUnCheckedValidatorArray = /** @class */ (function (_super) {
-    __extends(CountGreaterThanUnCheckedValidatorArray, _super);
-    function CountGreaterThanUnCheckedValidatorArray(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;
     }
-    CountGreaterThanUnCheckedValidatorArray.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 CountGreaterThanUnCheckedValidatorArray;
+    return CountLessThanCheckedValidatorArray;
 }(ValidatorArray));
 
-var CountLessThanCheckedValidatorArray = /** @class */ (function (_super) {
-    __extends(CountLessThanCheckedValidatorArray, _super);
-    function CountLessThanCheckedValidatorArray(count, value, target, event, autoValid) {
+var CountGreaterThanUnCheckedValidatorArray = /** @class */ (function (_super) {
+    __extends(CountGreaterThanUnCheckedValidatorArray, _super);
+    function CountGreaterThanUnCheckedValidatorArray(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;
     }
-    CountLessThanCheckedValidatorArray.prototype.valid = function () {
+    CountGreaterThanUnCheckedValidatorArray.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 CountLessThanCheckedValidatorArray;
+    return CountGreaterThanUnCheckedValidatorArray;
 }(ValidatorArray));
 
 var CountLessThanEqualsCheckedValidatorArray = /** @class */ (function (_super) {
@@ -3610,52 +3635,35 @@ var CountLessThanEqualsCheckedValidatorArray = /** @class */ (function (_super)
     return CountLessThanEqualsCheckedValidatorArray;
 }(ValidatorArray));
 
-var CountLessThanEqualsUnCheckedValidatorArray = /** @class */ (function (_super) {
-    __extends(CountLessThanEqualsUnCheckedValidatorArray, _super);
-    function CountLessThanEqualsUnCheckedValidatorArray(count, value, target, event, autoValid) {
+var CountEqualsUnCheckedValidatorArray = /** @class */ (function (_super) {
+    __extends(CountEqualsUnCheckedValidatorArray, _super);
+    function CountEqualsUnCheckedValidatorArray(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 () {
+    CountEqualsUnCheckedValidatorArray.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 CountEqualsUnCheckedValidatorArray;
 }(ValidatorArray));
 
-var FormValidator = /** @class */ (function (_super) {
-    __extends(FormValidator, _super);
-    function FormValidator(target, event, autoValid) {
-        if (autoValid === void 0) { autoValid = true; }
-        return _super.call(this, undefined, target, event, autoValid) || this;
-    }
-    FormValidator.prototype.validAction = function () {
-        return _super.prototype.childValidAction.call(this);
-    };
-    FormValidator.prototype.valid = function () {
-        return this.childValid();
-    };
-    FormValidator.prototype.reset = function () {
-        this.targetReset();
-    };
-    return FormValidator;
-}(Validator));
-
-var EmptyValidator = /** @class */ (function (_super) {
-    __extends(EmptyValidator, _super);
-    function EmptyValidator(value, target, event, autoValid) {
+var CountLessThanUnCheckedValidatorArray = /** @class */ (function (_super) {
+    __extends(CountLessThanUnCheckedValidatorArray, _super);
+    function CountLessThanUnCheckedValidatorArray(count, value, target, event, autoValid) {
         if (autoValid === void 0) { autoValid = true; }
-        return _super.call(this, value, target, event, autoValid) || this;
+        var _this = _super.call(this, value, target, event, autoValid) || this;
+        _this.count = count;
+        return _this;
     }
-    EmptyValidator.prototype.valid = function () {
-        var _a, _b;
-        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;
+    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 EmptyValidator;
-}(Validator));
+    return CountLessThanUnCheckedValidatorArray;
+}(ValidatorArray));
 
 var CountUnCheckedValidatorArray = /** @class */ (function (_super) {
     __extends(CountUnCheckedValidatorArray, _super);
@@ -3672,21 +3680,35 @@ var CountUnCheckedValidatorArray = /** @class */ (function (_super) {
     return CountUnCheckedValidatorArray;
 }(ValidatorArray));
 
-var CountLessThanUnCheckedValidatorArray = /** @class */ (function (_super) {
-    __extends(CountLessThanUnCheckedValidatorArray, _super);
-    function CountLessThanUnCheckedValidatorArray(count, 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.count = count;
         return _this;
     }
-    CountLessThanUnCheckedValidatorArray.prototype.valid = function () {
+    CountLessThanEqualsUnCheckedValidatorArray.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 CountLessThanEqualsUnCheckedValidatorArray;
 }(ValidatorArray));
 
+var EmptyValidator = /** @class */ (function (_super) {
+    __extends(EmptyValidator, _super);
+    function EmptyValidator(value, target, event, autoValid) {
+        if (autoValid === void 0) { autoValid = true; }
+        return _super.call(this, value, target, event, autoValid) || this;
+    }
+    EmptyValidator.prototype.valid = function () {
+        var _a, _b;
+        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 EmptyValidator;
+}(Validator));
+
 var ExcludeCheckedValidatorArray = /** @class */ (function (_super) {
     __extends(ExcludeCheckedValidatorArray, _super);
     function ExcludeCheckedValidatorArray(include, allRequired, value, target, event, autoValid) {
@@ -3709,35 +3731,6 @@ var ExcludeCheckedValidatorArray = /** @class */ (function (_super) {
     return ExcludeCheckedValidatorArray;
 }(ValidatorArray));
 
-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.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;
-    }
-    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) {
@@ -3772,6 +3765,67 @@ var PassValidator = /** @class */ (function (_super) {
     return PassValidator;
 }(Validator));
 
+var FormValidator = /** @class */ (function (_super) {
+    __extends(FormValidator, _super);
+    function FormValidator(target, event, autoValid) {
+        if (autoValid === void 0) { autoValid = true; }
+        return _super.call(this, undefined, target, event, autoValid) || this;
+    }
+    FormValidator.prototype.validAction = function () {
+        return _super.prototype.childValidAction.call(this);
+    };
+    FormValidator.prototype.valid = function () {
+        return this.childValid();
+    };
+    FormValidator.prototype.reset = function () {
+        this.targetReset();
+    };
+    return FormValidator;
+}(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 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.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;
+    }
+    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 RegExpTestValidator = /** @class */ (function (_super) {
     __extends(RegExpTestValidator, _super);
     function RegExpTestValidator(regexp, value, target, event, autoValid) {
@@ -3795,47 +3849,39 @@ 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 () {
+    UnCheckedValidator.prototype.valid = function () {
         var _a, _b;
-        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 !((_b = (_a = this.getTarget()) === null || _a === void 0 ? void 0 : _a.checked) !== null && _b !== void 0 ? _b : false);
     };
-    return NotEmptyValidator;
+    return UnCheckedValidator;
 }(Validator));
 
-var ValidValidator = /** @class */ (function (_super) {
-    __extends(ValidValidator, _super);
-    function ValidValidator(validCallBack, value, target, event, autoValid) {
+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.validCallBack = validCallBack;
+        _this.regexp = DomRenderProxy.final(regexp);
         return _this;
     }
-    ValidValidator.prototype.valid = function (value, target, event) {
-        return this.validCallBack(value, target, event);
+    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 ValidValidator;
+    return NotRegExpTestValidator;
 }(Validator));
 
 var ValidMultipleValidator = /** @class */ (function (_super) {
@@ -3853,31 +3899,33 @@ var ValidMultipleValidator = /** @class */ (function (_super) {
     return ValidMultipleValidator;
 }(MultipleValidator));
 
-var ValidValidatorArray = /** @class */ (function (_super) {
-    __extends(ValidValidatorArray, _super);
-    function ValidValidatorArray(validCallBack, 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.validCallBack = validCallBack;
-        return _this;
+        return _super.call(this, value, target, event, autoValid) || this;
     }
-    ValidValidatorArray.prototype.valid = function () {
-        return this.validCallBack(this.value, this.getTarget(), this.getEvent());
+    NotEmptyValidator.prototype.valid = function () {
+        var _a, _b;
+        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 ValidValidatorArray;
-}(ValidatorArray));
+    return NotEmptyValidator;
+}(Validator));
 
-var UnCheckedValidator = /** @class */ (function (_super) {
-    __extends(UnCheckedValidator, _super);
-    function UnCheckedValidator(value, target, event, autoValid) {
+var ValidValidator = /** @class */ (function (_super) {
+    __extends(ValidValidator, _super);
+    function ValidValidator(validCallBack, value, target, event, autoValid) {
         if (autoValid === void 0) { autoValid = true; }
-        return _super.call(this, value, target, event, autoValid) || this;
+        var _this = _super.call(this, value, target, event, autoValid) || this;
+        _this.validCallBack = validCallBack;
+        return _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);
+    ValidValidator.prototype.valid = function (value, target, event) {
+        return this.validCallBack(value, target, event);
     };
-    return UnCheckedValidator;
+    return ValidValidator;
 }(Validator));
 
 var ValueEqualsValidator = /** @class */ (function (_super) {
@@ -3894,27 +3942,19 @@ var ValueEqualsValidator = /** @class */ (function (_super) {
     return ValueEqualsValidator;
 }(Validator));
 
-var NotRegExpTestValidator = /** @class */ (function (_super) {
-    __extends(NotRegExpTestValidator, _super);
-    function NotRegExpTestValidator(regexp, value, target, event, autoValid) {
+var ValidValidatorArray = /** @class */ (function (_super) {
+    __extends(ValidValidatorArray, _super);
+    function ValidValidatorArray(validCallBack, 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);
+        _this.validCallBack = validCallBack;
         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;
-        }
+    ValidValidatorArray.prototype.valid = function () {
+        return this.validCallBack(this.value, this.getTarget(), this.getEvent());
     };
-    return NotRegExpTestValidator;
-}(Validator));
+    return ValidValidatorArray;
+}(ValidatorArray));
 
 var ValueNotEqualsValidator = /** @class */ (function (_super) {
     __extends(ValueNotEqualsValidator, _super);

package/messenger/Messenger.js

@@ -127,7 +127,7 @@ var Messenger = /** @class */ (function () {
         this.config.window.addEventListener(Messenger.EVENT_PUBLISH_KEY, function (e) {
             var _a, _b;
             var detail = e.detail;
-            console.log('--->', detail);
+            // console.log('--->', detail)
             var rtns = [];
             (_a = _this.getChannels(detail.key)) === null || _a === void 0 ? void 0 : _a.forEach(function (it) {
                 try {
@@ -144,7 +144,7 @@ var Messenger = /** @class */ (function () {
         });
         this.config.window.addEventListener(Messenger.EVENT_SUBSCRIBE_KEY, function (e) {
             var detail = e.detail;
-            console.log('--->', detail);
+            // console.log('--->', detail)
             var channel = _this.createChannel(detail.obj, detail.key);
             detail.init(channel, channel.subscribe(detail.subscribe));
         });
@@ -170,7 +170,7 @@ var Messenger = /** @class */ (function () {
         if (obj) {
             this.channels.forEach(function (it) {
                 if (it.obj === obj) {
-                    console.log('dddddddddddd', obj);
+                    // console.log('dddddddddddd', obj)
                     _this.deleteChannel(it);
                 }
             });

package/operators/DrTargetElement.js

@@ -80,6 +80,7 @@ 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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dom-render",
-  "version": "1.0.81",
+  "version": "1.0.82",
   "main": "DomRender.js",
   "license": "MIT",
   "description": "dom-render",

package/validators/Validator.js

@@ -93,7 +93,7 @@ var Validator = /** @class */ (function () {
                 target.value = this._value;
             }
             catch (e) {
-                console.log('set value function is blocked ');
+                console.error('set value function is blocked ');
             }
         }
         if (this.getAutoValidAction()) {