dom-render 1.0.85 → 1.0.86

package/DomRender.d.ts

@@ -1,13 +1,13 @@
-import { Config } from './Config';
+import { Config } from './configs/Config';
 import { ConstructorType } from './types/Types';
 import { RawSet } from './RawSet';
 export declare class DomRender {
-    static run<T extends object>(obj: T, target?: Node, config?: Config): T;
+    static run<T extends object>(obj: T, target?: Node | null, oConfig?: Omit<Config, 'window'>): T;
     static createComponent(param: {
-        type: ConstructorType<any>;
+        type: ConstructorType<any> | any;
         tagName?: string;
         template?: string;
         styles?: string[] | string;
-    }, config: Config): import("./Config").TargetElement;
-    static createAttribute(attrName: string, getThisObj: (element: Element, attrValue: string, obj: any, rawSet: RawSet) => any, factory: (element: Element, attrValue: string, obj: any, rawSet: RawSet) => DocumentFragment): import("./Config").TargetAttr;
+    }): import("./configs/TargetElement").TargetElement;
+    static createAttribute(attrName: string, getThisObj: (element: Element, attrValue: string, obj: any, rawSet: RawSet) => any, factory: (element: Element, attrValue: string, obj: any, rawSet: RawSet) => DocumentFragment): import("./configs/TargetAttr").TargetAttr;
 }

package/DomRender.js

@@ -19,7 +19,7 @@ var DefaultMessenger_1 = require("./messenger/DefaultMessenger");
 var DomRender = /** @class */ (function () {
     function DomRender() {
     }
-    DomRender.run = function (obj, target, config) {
+    DomRender.run = function (obj, target, oConfig) {
         var _a, _b, _c;
         var robj = obj;
         if ('_DomRender_isProxy' in obj) {
@@ -29,9 +29,13 @@ var DomRender = /** @class */ (function () {
             robj = obj;
             return robj;
         }
+        var config = oConfig;
         if (!config) {
             config = { window: window };
         }
+        if (config && !config.window) {
+            config.window = window;
+        }
         config.routerType = config.routerType || 'none';
         config.messenger = Types_1.DomRenderFinalProxy.final((_a = config.messenger) !== null && _a !== void 0 ? _a : new DefaultMessenger_1.DefaultMessenger(config));
         var domRender = new DomRenderProxy_1.DomRenderProxy(obj, target, config);
@@ -46,12 +50,13 @@ var DomRender = /** @class */ (function () {
         domRender.run(robj);
         return robj;
     };
-    DomRender.createComponent = function (param, config) {
+    DomRender.createComponent = function (param) {
         var _a, _b;
-        var component = RawSet_1.RawSet.createComponentTargetElement((_a = param.tagName) !== null && _a !== void 0 ? _a : param.type.name, function (e, o, r2, counstructorParam) {
+        // console.log('===>', typeof param.type, param.type.name, param.type.constructor.name)
+        var component = RawSet_1.RawSet.createComponentTargetElement((_a = param.tagName) !== null && _a !== void 0 ? _a : (typeof param.type === 'function' ? param.type.name : param.type.constructor.name), function (e, o, r2, counstructorParam) {
             var _a;
-            return new ((_a = param.type).bind.apply(_a, __spreadArray([void 0], counstructorParam, false)))();
-        }, (_b = param.template) !== null && _b !== void 0 ? _b : '', Array.isArray(param.styles) ? param.styles : (param.styles ? [param.styles] : undefined), config);
+            return typeof param.type === 'function' ? new ((_a = param.type).bind.apply(_a, __spreadArray([void 0], counstructorParam, false)))() : param.type;
+        }, (_b = param.template) !== null && _b !== void 0 ? _b : '', Array.isArray(param.styles) ? param.styles : (param.styles ? [param.styles] : undefined));
         return component;
     };
     DomRender.createAttribute = function (attrName, getThisObj, factory) {

package/DomRenderProxy.d.ts

@@ -1,5 +1,5 @@
 import { RawSet } from './RawSet';
-import { Config } from './Config';
+import { Config } from './configs/Config';
 export declare class DomRenderProxy<T extends object> implements ProxyHandler<T> {
     _domRender_origin: T;
     config: Config;
@@ -7,7 +7,7 @@ export declare class DomRenderProxy<T extends object> implements ProxyHandler<T>
     _rawSets: Map<string, Set<RawSet>>;
     _domRender_proxy?: T;
     _targets: Set<Node>;
-    constructor(_domRender_origin: T, target: Node | undefined, config: Config);
+    constructor(_domRender_origin: T, target: Node | null | undefined, config: Config);
     static unFinal<T = any>(obj: T): T;
     static final<T = any>(obj: T): T;
     static isFinal<T = any>(obj: T): boolean;

package/README.MD

@@ -7,7 +7,7 @@ DOM-RENDER
 
 # 🚀 Quick start 
 ```html
-<script src="https://cdn.jsdelivr.net/npm/dom-render@1.0.85/dist/bundle.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/dom-render@1.0.86/dist/bundle.js"></script>
 ```
 ```html
 <!DOCTYPE html>
@@ -18,7 +18,7 @@ DOM-RENDER
 </head>
 <body id="app">
 ${this.name}$
-<script src="https://cdn.jsdelivr.net/npm/dom-render@1.0.85/dist/bundle.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/dom-render@1.0.86/dist/bundle.js"></script>
 <script>
   let data = {
     name: 'my name is dom-render'
@@ -404,9 +404,9 @@ const config: Config = {
   window
 };
 config.targetElements = [
-  DomRender.createComponent({type: Main, tagName: 'page-main', template: MainTemplate}, config),
-  DomRender.createComponent({type: Second, tagName: 'page-second', template: SecondTemplate}, config),
-  DomRender.createComponent({type: Detail, tagName: 'page-detail', template: DetailTemplate}, config)
+  DomRender.createComponent({type: Main, tagName: 'page-main', template: MainTemplate}),
+  DomRender.createComponent({type: Second, tagName: 'page-second', template: SecondTemplate}),
+  DomRender.createComponent({type: Detail, tagName: 'page-detail', template: DetailTemplate})
 ]
 config.routerType = 'hash'; // 'hash' | 'path' | 'none';
 const data = DomRender.run(new Data(), document.querySelector('#app')!, config);
@@ -644,8 +644,8 @@ link attribute
 ```
 ```typescript
 config.targetElements = [
-  DomRender.createComponent({type: Profile, template: ProfileTemplate}, config),
-  DomRender.createComponent({type: Home, template: HomeTemplate, styles: HomeStyle}, config)
+  DomRender.createComponent({type: Profile, template: ProfileTemplate}),
+  DomRender.createComponent({type: Home, template: HomeTemplate, styles: HomeStyle})
 ]
 
 config.targetAttrs = [

package/RawSet.d.ts

@@ -1,5 +1,7 @@
-import { Config, TargetAttr, TargetElement } from './Config';
+import { Config } from './configs/Config';
 import { ComponentSet } from './components/ComponentSet';
+import { TargetElement } from './configs/TargetElement';
+import { TargetAttr } from './configs/TargetAttr';
 export declare enum DestroyOptionType {
     NO_DESTROY = "NO_DESTROY",
     NO_MESSENGER_DESTROY = "NO_MESSENGER_DESTROY"
@@ -145,7 +147,7 @@ export declare class RawSet {
     }[]): void;
     static drThisCreate(rawSet: RawSet, element: Element, drThis: string, drVarOption: string, drStripOption: boolean | string | null, obj: any, config: Config, set?: ComponentSet): DocumentFragment;
     static createComponentTargetAttribute(name: string, getThisObj: (element: Element, attrValue: string, obj: any, rawSet: RawSet) => any, factory: (element: Element, attrValue: string, obj: any, rawSet: RawSet) => DocumentFragment): TargetAttr;
-    static createComponentTargetElement(name: string, objFactory: (element: Element, obj: any, rawSet: RawSet, counstructorParam: any[]) => any, template: string | undefined, styles: string[] | undefined, config: Config): TargetElement;
+    static createComponentTargetElement(name: string, objFactory: (element: Element, obj: any, rawSet: RawSet, counstructorParam: any[]) => any, template?: string, styles?: string[]): TargetElement;
     static isExporesion(data: string | null): boolean;
     static exporesionGrouops(data: string | null): RegExpExecArray[];
     static styleTransformLocal(styleBody: string | string[], id: string, styleTagWrap?: boolean): string;

package/RawSet.js

@@ -669,14 +669,14 @@ var RawSet = /** @class */ (function () {
         };
         return targetAttribute;
     };
-    RawSet.createComponentTargetElement = function (name, objFactory, template, styles, config) {
+    RawSet.createComponentTargetElement = function (name, objFactory, template, styles) {
         if (template === void 0) { template = ''; }
         if (styles === void 0) { styles = []; }
         var targetElement = {
             name: name,
             styles: styles,
             template: template,
-            callBack: function (element, obj, rawSet, attrs) {
+            callBack: function (element, obj, rawSet, attrs, config) {
                 var _a, _b, _c, _d, _e, _f;
                 // console.log('callback------->', element)
                 if (!obj.__domrender_components) {

package/configs/Config.d.ts

@@ -0,0 +1,26 @@
+import { ConstructorType } from '../types/Types';
+import { RawSet } from '../RawSet';
+import { Router } from '../routers/Router';
+import { Messenger } from '../messenger/Messenger';
+import { TargetElement } from './TargetElement';
+import { TargetAttr } from './TargetAttr';
+export declare type Config = {
+    window: Window;
+    targetElements?: TargetElement[];
+    targetAttrs?: TargetAttr[];
+    onElementInit?: (name: string, obj: any, rawSet: RawSet, targetElement: TargetElement) => any;
+    onAttrInit?: (name: string, attrValue: string, obj: any, rawSet: RawSet) => any;
+    proxyExcludeTyps?: ConstructorType<any>[];
+    proxyExcludeOnBeforeReturnSets?: string[];
+    proxyExcludeOnBeforeReturnGets?: string[];
+    scripts?: {
+        [n: string]: any;
+    };
+    routerType?: 'hash' | 'path' | 'none';
+    router?: Router;
+    messenger?: Messenger;
+    applyEvents?: {
+        attrName: string;
+        callBack: (elements: Element, attrValue: string, obj: any) => void;
+    }[];
+};

package/configs/TargetAttr.d.ts

@@ -0,0 +1,6 @@
+import { RawSet } from '../RawSet';
+export declare type TargetAttr = {
+    name: string;
+    callBack: (target: Element, attrValue: string, obj: any, rawSet: RawSet) => DocumentFragment;
+    complete?: (target: Element, attrValue: string, obj: any, rawSet: RawSet) => void;
+};

package/configs/TargetAttr.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/configs/TargetElement.d.ts

@@ -0,0 +1,11 @@
+import { Attrs, CreatorMetaData, RawSet, Render } from '../RawSet';
+import { Config } from './Config';
+export declare type TargetElement = {
+    name: string;
+    template?: string;
+    styles?: string[];
+    callBack: (target: Element, obj: any, rawSet: RawSet, attrs: Attrs, config: Config) => DocumentFragment;
+    complete?: (target: Element, obj: any, rawSet: RawSet) => void;
+    __render?: Render;
+    __creatorMetaData?: CreatorMetaData;
+};

package/configs/TargetElement.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/bundle.js

@@ -1705,7 +1705,7 @@ var DrTargetElement = /** @class */ (function (_super) {
         var _b, _c, _d, _e;
         var targetElement = (_c = (_b = this.source.config) === null || _b === void 0 ? void 0 : _b.targetElements) === null || _c === void 0 ? void 0 : _c.find(function (it) { return it.name.toLowerCase() === _this.elementSource.element.tagName.toLowerCase(); });
         if (targetElement) {
-            var documentFragment = targetElement.callBack(this.elementSource.element, this.source.obj, this.rawSet, this.elementSource.attrs);
+            var documentFragment = targetElement.callBack(this.elementSource.element, this.source.obj, this.rawSet, this.elementSource.attrs, this.source.config);
             if (documentFragment) {
                 // const targetAttrMap = this.elementSource.element.getAttribute(EventManager.normalAttrMapAttrName);
                 var detectAction_1 = this.elementSource.element.getAttribute(RawSet.DR_DETECT_NAME);
@@ -2427,14 +2427,14 @@ var RawSet = /** @class */ (function () {
         };
         return targetAttribute;
     };
-    RawSet.createComponentTargetElement = function (name, objFactory, template, styles, config) {
+    RawSet.createComponentTargetElement = function (name, objFactory, template, styles) {
         if (template === void 0) { template = ''; }
         if (styles === void 0) { styles = []; }
         var targetElement = {
             name: name,
             styles: styles,
             template: template,
-            callBack: function (element, obj, rawSet, attrs) {
+            callBack: function (element, obj, rawSet, attrs, config) {
                 var _a, _b, _c, _d, _e, _f;
                 // console.log('callback------->', element)
                 if (!obj.__domrender_components) {
@@ -3436,7 +3436,7 @@ var DefaultMessenger = /** @class */ (function (_super) {
 var DomRender = /** @class */ (function () {
     function DomRender() {
     }
-    DomRender.run = function (obj, target, config) {
+    DomRender.run = function (obj, target, oConfig) {
         var _a, _b, _c;
         var robj = obj;
         if ('_DomRender_isProxy' in obj) {
@@ -3446,9 +3446,13 @@ var DomRender = /** @class */ (function () {
             robj = obj;
             return robj;
         }
+        var config = oConfig;
         if (!config) {
             config = { window: window };
         }
+        if (config && !config.window) {
+            config.window = window;
+        }
         config.routerType = config.routerType || 'none';
         config.messenger = DomRenderFinalProxy.final((_a = config.messenger) !== null && _a !== void 0 ? _a : new DefaultMessenger(config));
         var domRender = new DomRenderProxy(obj, target, config);
@@ -3463,12 +3467,13 @@ var DomRender = /** @class */ (function () {
         domRender.run(robj);
         return robj;
     };
-    DomRender.createComponent = function (param, config) {
+    DomRender.createComponent = function (param) {
         var _a, _b;
-        var component = RawSet.createComponentTargetElement((_a = param.tagName) !== null && _a !== void 0 ? _a : param.type.name, function (e, o, r2, counstructorParam) {
+        // console.log('===>', typeof param.type, param.type.name, param.type.constructor.name)
+        var component = RawSet.createComponentTargetElement((_a = param.tagName) !== null && _a !== void 0 ? _a : (typeof param.type === 'function' ? param.type.name : param.type.constructor.name), function (e, o, r2, counstructorParam) {
             var _a;
-            return new ((_a = param.type).bind.apply(_a, __spreadArray([void 0], counstructorParam, false)))();
-        }, (_b = param.template) !== null && _b !== void 0 ? _b : '', Array.isArray(param.styles) ? param.styles : (param.styles ? [param.styles] : undefined), config);
+            return typeof param.type === 'function' ? new ((_a = param.type).bind.apply(_a, __spreadArray([void 0], counstructorParam, false)))() : param.type;
+        }, (_b = param.template) !== null && _b !== void 0 ? _b : '', Array.isArray(param.styles) ? param.styles : (param.styles ? [param.styles] : undefined));
         return component;
     };
     DomRender.createAttribute = function (attrName, getThisObj, factory) {
@@ -3478,6 +3483,21 @@ var DomRender = /** @class */ (function () {
     return DomRender;
 }());
 
+var RenderManager = /** @class */ (function () {
+    function RenderManager() {
+    }
+    RenderManager.render = function (obj, target) {
+        if (target === void 0) { target = Object.keys(obj); }
+        var domRenderProxy = obj._DomRender_proxy;
+        if (domRenderProxy) {
+            target.forEach(function (it) {
+                domRenderProxy.root([it], obj[it]);
+            });
+        }
+    };
+    return RenderManager;
+}());
+
 var Appender = /** @class */ (function () {
     function Appender(defaultDatas) {
         this.length = 0;
@@ -3531,6 +3551,19 @@ var Appender = /** @class */ (function () {
     return Appender;
 }());
 
+var AllUnCheckedValidatorArray = /** @class */ (function (_super) {
+    __extends(AllUnCheckedValidatorArray, _super);
+    function AllUnCheckedValidatorArray(value, target, event, autoValid) {
+        if (autoValid === void 0) { autoValid = true; }
+        return _super.call(this, value, target, event, autoValid) || this;
+    }
+    AllUnCheckedValidatorArray.prototype.valid = function () {
+        var _a;
+        return !(((_a = this.value) !== null && _a !== void 0 ? _a : []).filter(function (it) { return it.checked; }).length > 0);
+    };
+    return AllUnCheckedValidatorArray;
+}(ValidatorArray));
+
 var AllCheckedValidatorArray = /** @class */ (function (_super) {
     __extends(AllCheckedValidatorArray, _super);
     function AllCheckedValidatorArray(value, target, event, autoValid) {
@@ -3544,20 +3577,35 @@ var AllCheckedValidatorArray = /** @class */ (function (_super) {
     return AllCheckedValidatorArray;
 }(ValidatorArray));
 
-var RenderManager = /** @class */ (function () {
-    function RenderManager() {
+var CountEqualsCheckedValidatorArray = /** @class */ (function (_super) {
+    __extends(CountEqualsCheckedValidatorArray, _super);
+    function CountEqualsCheckedValidatorArray(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;
     }
-    RenderManager.render = function (obj, target) {
-        if (target === void 0) { target = Object.keys(obj); }
-        var domRenderProxy = obj._DomRender_proxy;
-        if (domRenderProxy) {
-            target.forEach(function (it) {
-                domRenderProxy.root([it], obj[it]);
-            });
-        }
+    CountEqualsCheckedValidatorArray.prototype.valid = function () {
+        var _a;
+        return ((_a = this.value) !== null && _a !== void 0 ? _a : []).filter(function (it) { return it.checked; }).length === this.count;
     };
-    return RenderManager;
-}());
+    return CountEqualsCheckedValidatorArray;
+}(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 CheckedValidator = /** @class */ (function (_super) {
     __extends(CheckedValidator, _super);
@@ -3572,19 +3620,6 @@ var CheckedValidator = /** @class */ (function (_super) {
     return CheckedValidator;
 }(Validator));
 
-var AllUnCheckedValidatorArray = /** @class */ (function (_super) {
-    __extends(AllUnCheckedValidatorArray, _super);
-    function AllUnCheckedValidatorArray(value, target, event, autoValid) {
-        if (autoValid === void 0) { autoValid = true; }
-        return _super.call(this, value, target, event, autoValid) || this;
-    }
-    AllUnCheckedValidatorArray.prototype.valid = function () {
-        var _a;
-        return !(((_a = this.value) !== null && _a !== void 0 ? _a : []).filter(function (it) { return it.checked; }).length > 0);
-    };
-    return AllUnCheckedValidatorArray;
-}(ValidatorArray));
-
 var CountGreaterThanCheckedValidatorArray = /** @class */ (function (_super) {
     __extends(CountGreaterThanCheckedValidatorArray, _super);
     function CountGreaterThanCheckedValidatorArray(count, value, target, event, autoValid) {
@@ -3615,21 +3650,6 @@ var CountGreaterThanEqualsUnCheckedValidatorArray = /** @class */ (function (_su
     return CountGreaterThanEqualsUnCheckedValidatorArray;
 }(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) {
@@ -3660,19 +3680,19 @@ var CountGreaterThanUnCheckedValidatorArray = /** @class */ (function (_super) {
     return CountGreaterThanUnCheckedValidatorArray;
 }(ValidatorArray));
 
-var CountEqualsCheckedValidatorArray = /** @class */ (function (_super) {
-    __extends(CountEqualsCheckedValidatorArray, _super);
-    function CountEqualsCheckedValidatorArray(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;
     }
-    CountEqualsCheckedValidatorArray.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 CountEqualsCheckedValidatorArray;
+    return CountLessThanCheckedValidatorArray;
 }(ValidatorArray));
 
 var CountLessThanEqualsUnCheckedValidatorArray = /** @class */ (function (_super) {
@@ -3705,20 +3725,19 @@ var CountLessThanEqualsCheckedValidatorArray = /** @class */ (function (_super)
     return CountLessThanEqualsCheckedValidatorArray;
 }(ValidatorArray));
 
-var CountLessThanCheckedValidatorArray = /** @class */ (function (_super) {
-    __extends(CountLessThanCheckedValidatorArray, _super);
-    function CountLessThanCheckedValidatorArray(count, value, target, event, autoValid) {
+var EmptyValidator = /** @class */ (function (_super) {
+    __extends(EmptyValidator, _super);
+    function EmptyValidator(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;
+        return _super.call(this, value, target, event, autoValid) || this;
     }
-    CountLessThanCheckedValidatorArray.prototype.valid = function () {
-        var _a;
-        return ((_a = this.value) !== null && _a !== void 0 ? _a : []).filter(function (it) { return it.checked; }).length < this.count;
+    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 CountLessThanCheckedValidatorArray;
-}(ValidatorArray));
+    return EmptyValidator;
+}(Validator));
 
 var CountUnCheckedValidatorArray = /** @class */ (function (_super) {
     __extends(CountUnCheckedValidatorArray, _super);
@@ -3775,28 +3794,6 @@ var FormValidator = /** @class */ (function (_super) {
     return FormValidator;
 }(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;
-        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 IncludeCheckedValidatorArray;
-}(ValidatorArray));
-
 var MultipleValidator = /** @class */ (function (_super) {
     __extends(MultipleValidator, _super);
     function MultipleValidator(validators, value, target, event, autoValid) {
@@ -3826,40 +3823,64 @@ var MultipleValidator = /** @class */ (function (_super) {
     return MultipleValidator;
 }(Validator));
 
-var EmptyValidator = /** @class */ (function (_super) {
-    __extends(EmptyValidator, _super);
-    function EmptyValidator(value, target, event, autoValid) {
+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;
+        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 IncludeCheckedValidatorArray;
+}(ValidatorArray));
+
+var NotEmptyValidator = /** @class */ (function (_super) {
+    __extends(NotEmptyValidator, _super);
+    function NotEmptyValidator(value, target, event, autoValid) {
         if (autoValid === void 0) { autoValid = true; }
         return _super.call(this, value, target, event, autoValid) || this;
     }
-    EmptyValidator.prototype.valid = function () {
+    NotEmptyValidator.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;
+        // 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 EmptyValidator;
+    return NotEmptyValidator;
 }(Validator));
 
-var NotRegExpTestValidator = /** @class */ (function (_super) {
-    __extends(NotRegExpTestValidator, _super);
-    function NotRegExpTestValidator(regexp, value, target, event, autoValid) {
+var RegExpTestValidator = /** @class */ (function (_super) {
+    __extends(RegExpTestValidator, _super);
+    function RegExpTestValidator(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 () {
+    RegExpTestValidator.prototype.valid = function () {
         var _a;
         var value = this.value;
         var regExp = (_a = this.regexp._DomRender_origin) !== null && _a !== void 0 ? _a : this.regexp;
+        // console.log('regexp-->', value, this.regexp, regExp.test(value))
         if (value) {
-            return !regExp.test(value);
+            return regExp.test(value);
         }
         else {
-            return true;
+            return false;
         }
     };
-    return NotRegExpTestValidator;
+    return RegExpTestValidator;
 }(Validator));
 
 var PassValidator = /** @class */ (function (_super) {
@@ -3874,27 +3895,26 @@ var PassValidator = /** @class */ (function (_super) {
     return PassValidator;
 }(Validator));
 
-var RegExpTestValidator = /** @class */ (function (_super) {
-    __extends(RegExpTestValidator, _super);
-    function RegExpTestValidator(regexp, 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.regexp = DomRenderProxy.final(regexp);
         return _this;
     }
-    RegExpTestValidator.prototype.valid = function () {
+    NotRegExpTestValidator.prototype.valid = function () {
         var _a;
         var value = this.value;
         var regExp = (_a = this.regexp._DomRender_origin) !== null && _a !== void 0 ? _a : this.regexp;
-        // console.log('regexp-->', value, this.regexp, regExp.test(value))
         if (value) {
-            return regExp.test(value);
+            return !regExp.test(value);
         }
         else {
-            return false;
+            return true;
         }
     };
-    return RegExpTestValidator;
+    return NotRegExpTestValidator;
 }(Validator));
 
 var UnCheckedValidator = /** @class */ (function (_super) {
@@ -3910,21 +3930,6 @@ var UnCheckedValidator = /** @class */ (function (_super) {
     return UnCheckedValidator;
 }(Validator));
 
-var NotEmptyValidator = /** @class */ (function (_super) {
-    __extends(NotEmptyValidator, _super);
-    function NotEmptyValidator(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, _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 NotEmptyValidator;
-}(Validator));
-
 var ValidMultipleValidator = /** @class */ (function (_super) {
     __extends(ValidMultipleValidator, _super);
     function ValidMultipleValidator(validMultipleCallback, validators, value, target, event, autoValid) {
@@ -3940,20 +3945,19 @@ var ValidMultipleValidator = /** @class */ (function (_super) {
     return ValidMultipleValidator;
 }(MultipleValidator));
 
-var CountLessThanUnCheckedValidatorArray = /** @class */ (function (_super) {
-    __extends(CountLessThanUnCheckedValidatorArray, _super);
-    function CountLessThanUnCheckedValidatorArray(count, value, target, event, autoValid) {
+var RequiredValidator = /** @class */ (function (_super) {
+    __extends(RequiredValidator, _super);
+    function RequiredValidator(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;
+        return _super.call(this, value, target, event, autoValid) || 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;
+    RequiredValidator.prototype.valid = function () {
+        var value = this.value;
+        // console.log('required', value, value !== undefined && value !== null)
+        return value !== undefined && value !== null;
     };
-    return CountLessThanUnCheckedValidatorArray;
-}(ValidatorArray));
+    return RequiredValidator;
+}(Validator));
 
 var ValidValidator = /** @class */ (function (_super) {
     __extends(ValidValidator, _super);
@@ -3969,18 +3973,33 @@ var ValidValidator = /** @class */ (function (_super) {
     return ValidValidator;
 }(Validator));
 
-var RequiredValidator = /** @class */ (function (_super) {
-    __extends(RequiredValidator, _super);
-    function RequiredValidator(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;
     }
-    RequiredValidator.prototype.valid = function () {
-        var value = this.value;
-        // console.log('required', value, value !== undefined && value !== null)
-        return value !== undefined && value !== null;
+    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 RequiredValidator;
+    return CountLessThanUnCheckedValidatorArray;
+}(ValidatorArray));
+
+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;
+    }
+    ValueEqualsValidator.prototype.valid = function () {
+        return this.value === this.equalsValue;
+    };
+    return ValueEqualsValidator;
 }(Validator));
 
 var ValidValidatorArray = /** @class */ (function (_super) {
@@ -4011,42 +4030,6 @@ var ValueNotEqualsValidator = /** @class */ (function (_super) {
     return ValueNotEqualsValidator;
 }(Validator));
 
-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;
-    }
-    ValueEqualsValidator.prototype.valid = function () {
-        return this.value === this.equalsValue;
-    };
-    return ValueEqualsValidator;
-}(Validator));
-
-var ClipBoardUtils = /** @class */ (function () {
-    function ClipBoardUtils() {
-    }
-    ClipBoardUtils.readText = function (clipboard) {
-        if (clipboard === void 0) { clipboard = navigator.clipboard; }
-        return clipboard.readText();
-    };
-    ClipBoardUtils.read = function (clipboard) {
-        if (clipboard === void 0) { clipboard = navigator.clipboard; }
-        return clipboard.read();
-    };
-    ClipBoardUtils.writeText = function (data, clipboard) {
-        if (clipboard === void 0) { clipboard = navigator.clipboard; }
-        return clipboard.writeText(data);
-    };
-    ClipBoardUtils.write = function (data, clipboard) {
-        if (clipboard === void 0) { clipboard = navigator.clipboard; }
-        return clipboard.write(data);
-    };
-    return ClipBoardUtils;
-}());
-
 var NodeUtils = /** @class */ (function () {
     function NodeUtils() {
     }
@@ -4116,6 +4099,28 @@ var StorageUtils = /** @class */ (function () {
     return StorageUtils;
 }());
 
+var ClipBoardUtils = /** @class */ (function () {
+    function ClipBoardUtils() {
+    }
+    ClipBoardUtils.readText = function (clipboard) {
+        if (clipboard === void 0) { clipboard = navigator.clipboard; }
+        return clipboard.readText();
+    };
+    ClipBoardUtils.read = function (clipboard) {
+        if (clipboard === void 0) { clipboard = navigator.clipboard; }
+        return clipboard.read();
+    };
+    ClipBoardUtils.writeText = function (data, clipboard) {
+        if (clipboard === void 0) { clipboard = navigator.clipboard; }
+        return clipboard.writeText(data);
+    };
+    ClipBoardUtils.write = function (data, clipboard) {
+        if (clipboard === void 0) { clipboard = navigator.clipboard; }
+        return clipboard.write(data);
+    };
+    return ClipBoardUtils;
+}());
+
 exports.AllCheckedValidatorArray = AllCheckedValidatorArray;
 exports.AllUnCheckedValidatorArray = AllUnCheckedValidatorArray;
 exports.Appender = Appender;

package/events/EventManager.d.ts

@@ -1,4 +1,4 @@
-import { Config } from '../Config';
+import { Config } from '../configs/Config';
 export declare class EventManager {
     static ownerVariablePathAttrName: string;
     static readonly attrPrefix = "dr-";

package/lifecycle/OnProxyDomRender.d.ts

@@ -1,4 +1,4 @@
-import { Config } from '../Config';
+import { Config } from '../configs/Config';
 export interface OnProxyDomRender {
     onProxyDomRender(config: Config): void;
 }

package/messenger/Messenger.d.ts

@@ -1,5 +1,5 @@
 import { ConstructorType } from '../types/Types';
-import { Config } from '../Config';
+import { Config } from '../configs/Config';
 declare enum CallBackType {
     FILTER = 0,
     MAP = 1,

package/operators/DrTargetElement.js

@@ -30,7 +30,7 @@ var DrTargetElement = /** @class */ (function (_super) {
         var _b, _c, _d, _e;
         var targetElement = (_c = (_b = this.source.config) === null || _b === void 0 ? void 0 : _b.targetElements) === null || _c === void 0 ? void 0 : _c.find(function (it) { return it.name.toLowerCase() === _this.elementSource.element.tagName.toLowerCase(); });
         if (targetElement) {
-            var documentFragment = targetElement.callBack(this.elementSource.element, this.source.obj, this.rawSet, this.elementSource.attrs);
+            var documentFragment = targetElement.callBack(this.elementSource.element, this.source.obj, this.rawSet, this.elementSource.attrs, this.source.config);
             if (documentFragment) {
                 // const targetAttrMap = this.elementSource.element.getAttribute(EventManager.normalAttrMapAttrName);
                 var detectAction_1 = this.elementSource.element.getAttribute(RawSet_1.RawSet.DR_DETECT_NAME);

package/operators/OperatorRender.d.ts

@@ -1,6 +1,6 @@
 import { AttrInitCallBack, Attrs, ElementInitCallBack, RawSet, Render } from '../RawSet';
 import { ComponentSet } from '../components/ComponentSet';
-import { Config } from '../Config';
+import { Config } from '../configs/Config';
 export declare enum ExecuteState {
     EXECUTE = 0,
     NO_EXECUTE = 1,

package/package.json

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

package/Config.d.ts

@@ -1,38 +0,0 @@
-import { ConstructorType } from './types/Types';
-import { Attrs, CreatorMetaData, RawSet, Render } from './RawSet';
-import { Router } from './routers/Router';
-import { Messenger } from './messenger/Messenger';
-export declare type TargetElement = {
-    name: string;
-    template?: string;
-    styles?: string[];
-    callBack: (target: Element, obj: any, rawSet: RawSet, attrs?: Attrs) => DocumentFragment;
-    complete?: (target: Element, obj: any, rawSet: RawSet) => void;
-    __render?: Render;
-    __creatorMetaData?: CreatorMetaData;
-};
-export declare type TargetAttr = {
-    name: string;
-    callBack: (target: Element, attrValue: string, obj: any, rawSet: RawSet) => DocumentFragment;
-    complete?: (target: Element, attrValue: string, obj: any, rawSet: RawSet) => void;
-};
-export declare type Config = {
-    window: Window;
-    targetElements?: TargetElement[];
-    targetAttrs?: TargetAttr[];
-    onElementInit?: (name: string, obj: any, rawSet: RawSet, targetElement: TargetElement) => any;
-    onAttrInit?: (name: string, attrValue: string, obj: any, rawSet: RawSet) => any;
-    proxyExcludeTyps?: ConstructorType<any>[];
-    proxyExcludeOnBeforeReturnSets?: string[];
-    proxyExcludeOnBeforeReturnGets?: string[];
-    scripts?: {
-        [n: string]: any;
-    };
-    routerType?: 'hash' | 'path' | 'none';
-    router?: Router;
-    messenger?: Messenger;
-    applyEvents?: {
-        attrName: string;
-        callBack: (elements: Element, attrValue: string, obj: any) => void;
-    }[];
-};