dom-render 1.0.79 → 1.0.82

package/events/EventManager.js

@@ -105,7 +105,8 @@ var EventManager = /** @class */ (function () {
             map.forEach(function (v, k) {
                 var data = ScriptUtils_1.ScriptUtils.eval("const $element = this.element;  return ".concat(v, " "), Object.assign(obj, {
                     __render: Object.freeze({
-                        element: it
+                        element: it,
+                        attribute: DomUtils_1.DomUtils.getAttributeToObject(it)
                     })
                 }));
                 it.setAttribute(k, data);
@@ -117,26 +118,6 @@ var EventManager = /** @class */ (function () {
                 it.obj = obj;
             });
         });
-        // on-init event
-        this.procAttr(childNodes, EventManager.onInitAttrName, function (it, attribute) {
-            var script = attribute;
-            if (script) {
-                script = 'return ' + script;
-            }
-            if (script) {
-                ScriptUtils_1.ScriptUtils.eval("".concat(_this.bindScript, "; ").concat(script, " "), Object.assign(obj, {
-                    __render: Object.freeze({
-                        element: it
-                    })
-                }));
-                // console.log('onInit--->', obj, varName, it)
-                // if (typeof this.getValue(obj, varName) === 'function') {
-                //     this.getValue(obj, varName)(it);
-                // } else {
-                //     this.setValue(obj, varName, it);
-                // }
-            }
-        });
         // value-link event
         this.procAttr(childNodes, EventManager.valueLinkAttrName, function (it, varName) {
             if (varName) {
@@ -185,6 +166,7 @@ var EventManager = /** @class */ (function () {
                             __render: Object.freeze({
                                 event: event,
                                 element: it,
+                                attribute: DomUtils_1.DomUtils.getAttributeToObject(it),
                                 target: event.target,
                                 range: Range_1.Range.range,
                                 scripts: EventManager.setBindProperty(config === null || config === void 0 ? void 0 : config.scripts, obj)
@@ -200,6 +182,27 @@ var EventManager = /** @class */ (function () {
                 });
             }
         });
+        // on-init event
+        this.procAttr(childNodes, EventManager.onInitAttrName, function (it, attribute) {
+            var script = attribute;
+            if (script) {
+                script = 'return ' + script;
+            }
+            if (script) {
+                ScriptUtils_1.ScriptUtils.eval("".concat(_this.bindScript, "; ").concat(script, " "), Object.assign(obj, {
+                    __render: Object.freeze({
+                        element: it,
+                        attribute: DomUtils_1.DomUtils.getAttributeToObject(it)
+                    })
+                }));
+                // console.log('onInit--->', obj, varName, it)
+                // if (typeof this.getValue(obj, varName) === 'function') {
+                //     this.getValue(obj, varName)(it);
+                // } else {
+                //     this.setValue(obj, varName, it);
+                // }
+            }
+        });
         this.changeVar(obj, childNodes, undefined, config);
         // console.log('eventManager-applyEvent-->', config?.applyEvents)
         var elements = Array.from(childNodes).filter(function (it) { return it.nodeType === 1; }).map(function (it) { return it; });
@@ -247,7 +250,8 @@ var EventManager = /** @class */ (function () {
             if (EventManager.isUsingThisVar(script, varName) || varName === undefined) {
                 var data = ScriptUtils_1.ScriptUtils.eval("const $element = this.__render.element; ".concat(script, " "), Object.assign(obj, {
                     __render: Object.freeze({
-                        element: it
+                        element: it,
+                        attribute: DomUtils_1.DomUtils.getAttributeToObject(it)
                     })
                 }));
                 if (typeof data === 'string') {
@@ -298,7 +302,8 @@ var EventManager = /** @class */ (function () {
             if (EventManager.isUsingThisVar(script, varName) || varName === undefined) {
                 var data = ScriptUtils_1.ScriptUtils.eval("const $element = this.__render.element;  ".concat(script, " "), Object.assign(obj, {
                     __render: Object.freeze({
-                        element: it
+                        element: it,
+                        attribute: DomUtils_1.DomUtils.getAttributeToObject(it)
                     })
                 }));
                 if (typeof data === 'string') {
@@ -326,7 +331,8 @@ var EventManager = /** @class */ (function () {
             if (EventManager.isUsingThisVar(script, varName) || varName === undefined) {
                 var data = ScriptUtils_1.ScriptUtils.eval("const $element = this.element;  ".concat(script, " "), Object.assign(obj, {
                     __render: Object.freeze({
-                        element: it
+                        element: it,
+                        attribute: DomUtils_1.DomUtils.getAttributeToObject(it)
                     })
                 }));
                 if (typeof data === 'string') {
@@ -360,7 +366,8 @@ var EventManager = /** @class */ (function () {
                 if (isUsing) {
                     var data = ScriptUtils_1.ScriptUtils.eval("const $element = this.element;  return ".concat(v, " "), Object.assign(obj, {
                         __render: Object.freeze({
-                            element: it
+                            element: it,
+                            attribute: DomUtils_1.DomUtils.getAttributeToObject(it)
                         })
                     }));
                     it.setAttribute(k, data);
@@ -377,14 +384,13 @@ var EventManager = /** @class */ (function () {
             it.addEventListener(eventName, function (event) {
                 var filter = true;
                 var filterScript = it.getAttribute("".concat(attr, ":filter"));
-                var attribute = DomUtils_1.DomUtils.getAttributeToObject(it);
                 var thisTarget = Object.assign(obj, {
                     __render: Object.freeze({
                         event: event,
                         element: it,
                         target: event.target,
                         range: Range_1.Range.range,
-                        attribute: attribute,
+                        attribute: DomUtils_1.DomUtils.getAttributeToObject(it),
                         router: config === null || config === void 0 ? void 0 : config.router,
                         scripts: EventManager.setBindProperty(config === null || config === void 0 ? void 0 : config.scripts, obj)
                     })
@@ -420,6 +426,7 @@ var EventManager = /** @class */ (function () {
                             __render: Object.freeze({
                                 event: event,
                                 element: it,
+                                attribute: DomUtils_1.DomUtils.getAttributeToObject(it),
                                 target: event.target,
                                 range: Range_1.Range.range,
                                 scripts: EventManager.setBindProperty(config === null || config === void 0 ? void 0 : config.scripts, obj),

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/Appender.d.ts

@@ -1,7 +1,10 @@
-export declare class Appender {
-    [key: number]: any[] | undefined;
+export declare class Appender<T = any> implements Iterable<T> {
+    [key: number]: T[] | undefined;
     length: number;
-    constructor();
-    push(...items: any[]): void;
+    constructor(defaultDatas?: T[]);
+    [Symbol.iterator](): Iterator<T>;
+    getAll(): T[];
+    getAlls(): T[][];
+    push(...items: T[]): void;
     clear(): void;
 }

package/operators/Appender.js

@@ -2,11 +2,35 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Appender = void 0;
 var Appender = /** @class */ (function () {
-    // [keys: string]: any;
-    function Appender() {
+    function Appender(defaultDatas) {
         this.length = 0;
+        if (defaultDatas) {
+            this.push.apply(this, defaultDatas);
+        }
         // (this.childs as any).isAppender = true;
     }
+    Appender.prototype[Symbol.iterator] = function () {
+        var items = this.getAll();
+        var idx = 0;
+        return {
+            next: function (value) {
+                var r = { value: undefined, done: true };
+                if (items.length > idx) {
+                    r = { value: items[idx], done: false };
+                }
+                idx++;
+                return r;
+            }
+        };
+    };
+    Appender.prototype.getAll = function () {
+        return this.getAlls().flat();
+    };
+    Appender.prototype.getAlls = function () {
+        var _this = this;
+        var map = Array.from({ length: this.length }).filter(function (it, idx) { return _this[idx]; }).map(function (it, idx) { return _this[idx]; });
+        return map;
+    };
     Appender.prototype.push = function () {
         var items = [];
         for (var _i = 0; _i < arguments.length; _i++) {

package/operators/Dr.js

@@ -50,7 +50,7 @@ var Dr = /** @class */ (function (_super) {
             var tempalte = this.source.config.window.document.createElement('template');
             tempalte.innerHTML = newTemp.innerHTML;
             this.returnContainer.fag.append(tempalte.content);
-            var rr = RawSet_1.RawSet.checkPointCreates(this.returnContainer.fag, this.source.config);
+            var rr = RawSet_1.RawSet.checkPointCreates(this.returnContainer.fag, this.source.obj, this.source.config);
             (_c = this.elementSource.element.parentNode) === null || _c === void 0 ? void 0 : _c.replaceChild(this.returnContainer.fag, this.elementSource.element);
             (_a = this.returnContainer.raws).push.apply(_a, rr);
             return OperatorRender_1.ExecuteState.EXECUTE;

package/operators/DrAppender.js

@@ -52,7 +52,7 @@ var DrAppender = /** @class */ (function (_super) {
             var tempalte = this.source.config.window.document.createElement('template');
             tempalte.innerHTML = newTemp.innerHTML;
             this.returnContainer.fag.append(tempalte.content);
-            var rr = RawSet_1.RawSet.checkPointCreates(this.returnContainer.fag, this.source.config);
+            var rr = RawSet_1.RawSet.checkPointCreates(this.returnContainer.fag, this.source.obj, this.source.config);
             (_e = this.elementSource.element.parentNode) === null || _e === void 0 ? void 0 : _e.replaceChild(this.returnContainer.fag, this.elementSource.element);
             // const rrr = rr.flatMap(it => it.render(obj, config));// .flat();
             (_a = this.returnContainer.raws).push.apply(_a, rr);

package/operators/DrFor.js

@@ -50,7 +50,7 @@ var DrFor = /** @class */ (function (_super) {
             var tempalte = this.source.config.window.document.createElement('template');
             tempalte.innerHTML = newTemp.innerHTML;
             this.returnContainer.fag.append(tempalte.content);
-            var rr = RawSet_1.RawSet.checkPointCreates(this.returnContainer.fag, this.source.config);
+            var rr = RawSet_1.RawSet.checkPointCreates(this.returnContainer.fag, this.source.obj, this.source.config);
             (_e = this.elementSource.element.parentNode) === null || _e === void 0 ? void 0 : _e.replaceChild(this.returnContainer.fag, this.elementSource.element);
             (_a = this.returnContainer.raws).push.apply(_a, rr);
             return OperatorRender_1.ExecuteState.EXECUTE;

package/operators/DrForOf.js

@@ -52,7 +52,7 @@ var DrForOf = /** @class */ (function (_super) {
             var tempalte = this.source.config.window.document.createElement('template');
             tempalte.innerHTML = newTemp.innerHTML;
             this.returnContainer.fag.append(tempalte.content);
-            var rr = RawSet_1.RawSet.checkPointCreates(this.returnContainer.fag, this.source.config);
+            var rr = RawSet_1.RawSet.checkPointCreates(this.returnContainer.fag, this.source.obj, this.source.config);
             (_e = this.elementSource.element.parentNode) === null || _e === void 0 ? void 0 : _e.replaceChild(this.returnContainer.fag, this.elementSource.element);
             // const rrr = rr.flatMap(it => it.render(obj, config));// .flat();
             (_a = this.returnContainer.raws).push.apply(_a, rr);

package/operators/DrForm.js

@@ -90,7 +90,7 @@ var DrForm = /** @class */ (function (_super) {
                 }
             });
             RawSet_1.RawSet.drFormOtherMoveAttr(this.elementSource.element, 'temp-name', 'name', this.source.config);
-            (_a = this.returnContainer.raws).push.apply(_a, RawSet_1.RawSet.checkPointCreates(this.elementSource.element, this.source.config));
+            (_a = this.returnContainer.raws).push.apply(_a, RawSet_1.RawSet.checkPointCreates(this.elementSource.element, this.source.obj, this.source.config));
             return OperatorRender_1.ExecuteState.EXECUTE;
         }
         return OperatorRender_1.ExecuteState.NO_EXECUTE;

package/operators/DrIf.js

@@ -57,7 +57,7 @@ var DrIf = /** @class */ (function (_super) {
             tempalte.innerHTML = newTemp.innerHTML;
             // console.log(tempalte.innerHTML)
             this.returnContainer.fag.append(tempalte.content);
-            var rr = RawSet_1.RawSet.checkPointCreates(this.returnContainer.fag, this.source.config);
+            var rr = RawSet_1.RawSet.checkPointCreates(this.returnContainer.fag, this.source.obj, this.source.config);
             (_e = this.elementSource.element.parentNode) === null || _e === void 0 ? void 0 : _e.replaceChild(this.returnContainer.fag, this.elementSource.element);
             (_a = this.returnContainer.raws).push.apply(_a, rr);
             // if (bypass) {

package/operators/DrInnerHTML.js

@@ -48,7 +48,7 @@ var DrInnerHTML = /** @class */ (function (_super) {
             var tempalte = this.source.config.window.document.createElement('template');
             tempalte.innerHTML = newTemp.innerHTML;
             this.returnContainer.fag.append(tempalte.content);
-            var rr = RawSet_1.RawSet.checkPointCreates(this.returnContainer.fag, this.source.config);
+            var rr = RawSet_1.RawSet.checkPointCreates(this.returnContainer.fag, this.source.obj, this.source.config);
             (_d = this.elementSource.element.parentNode) === null || _d === void 0 ? void 0 : _d.replaceChild(this.returnContainer.fag, this.elementSource.element);
             (_a = this.returnContainer.raws).push.apply(_a, rr);
             return OperatorRender_1.ExecuteState.EXECUTE;

package/operators/DrInnerText.js

@@ -46,7 +46,7 @@ var DrInnerText = /** @class */ (function (_super) {
             var tempalte = this.source.config.window.document.createElement('template');
             tempalte.innerHTML = newTemp.innerHTML;
             this.returnContainer.fag.append(tempalte.content);
-            var rr = RawSet_1.RawSet.checkPointCreates(this.returnContainer.fag, this.source.config);
+            var rr = RawSet_1.RawSet.checkPointCreates(this.returnContainer.fag, this.source.obj, this.source.config);
             (_d = this.elementSource.element.parentNode) === null || _d === void 0 ? void 0 : _d.replaceChild(this.returnContainer.fag, this.elementSource.element);
             (_a = this.returnContainer.raws).push.apply(_a, rr);
             return OperatorRender_1.ExecuteState.EXECUTE;

package/operators/DrRepeat.js

@@ -51,7 +51,7 @@ var DrRepeat = /** @class */ (function (_super) {
             var tempalte = this.source.config.window.document.createElement('template');
             tempalte.innerHTML = newTemp.innerHTML;
             this.returnContainer.fag.append(tempalte.content);
-            var rr = RawSet_1.RawSet.checkPointCreates(this.returnContainer.fag, this.source.config);
+            var rr = RawSet_1.RawSet.checkPointCreates(this.returnContainer.fag, this.source.obj, this.source.config);
             (_e = this.elementSource.element.parentNode) === null || _e === void 0 ? void 0 : _e.replaceChild(this.returnContainer.fag, this.elementSource.element);
             (_a = this.returnContainer.raws).push.apply(_a, rr);
             return OperatorRender_1.ExecuteState.EXECUTE;

package/operators/DrTargetAttr.js

@@ -35,7 +35,7 @@ var DrTargetAttr = /** @class */ (function (_super) {
             if (attrValue && attrName && (!this.elementSource.attrs.drForOf && !this.elementSource.attrs.drFor && !this.elementSource.attrs.drRepeat)) {
                 var documentFragment = targetAttr.callBack(this.elementSource.element, attrValue, this.source.obj, this.rawSet);
                 if (documentFragment) {
-                    var rr = RawSet_1.RawSet.checkPointCreates(documentFragment, this.source.config);
+                    var rr = RawSet_1.RawSet.checkPointCreates(documentFragment, this.source.obj, this.source.config);
                     (_d = this.elementSource.element.parentNode) === null || _d === void 0 ? void 0 : _d.replaceChild(documentFragment, this.elementSource.element);
                     (_a = this.returnContainer.raws).push.apply(_a, rr);
                     this.afterCallBack.onAttrInitCallBacks.push({

package/operators/DrTargetElement.js

@@ -71,7 +71,7 @@ var DrTargetElement = /** @class */ (function (_super) {
                     };
                 }
                 // fag.append(documentFragment)
-                var rr = RawSet_1.RawSet.checkPointCreates(documentFragment, this.source.config);
+                var rr = RawSet_1.RawSet.checkPointCreates(documentFragment, this.source.obj, this.source.config);
                 (_d = this.elementSource.element.parentNode) === null || _d === void 0 ? void 0 : _d.replaceChild(documentFragment, this.elementSource.element);
                 (_a = this.returnContainer.raws).push.apply(_a, rr);
                 this.afterCallBack.onElementInitCallBacks.push({
@@ -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/operators/DrThis.js

@@ -43,7 +43,7 @@ var DrThis = /** @class */ (function (_super) {
                 else {
                     this.returnContainer.fag.append(RawSet_1.RawSet.drThisCreate(this.elementSource.element, this.elementSource.attrs.drThis, (_e = this.elementSource.attrs.drVarOption) !== null && _e !== void 0 ? _e : '', this.elementSource.attrs.drStripOption, this.source.obj, this.source.config));
                 }
-                var rr = RawSet_1.RawSet.checkPointCreates(this.returnContainer.fag, this.source.config);
+                var rr = RawSet_1.RawSet.checkPointCreates(this.returnContainer.fag, this.source.obj, this.source.config);
                 (_f = this.elementSource.element.parentNode) === null || _f === void 0 ? void 0 : _f.replaceChild(this.returnContainer.fag, this.elementSource.element);
                 (_a = this.returnContainer.raws).push.apply(_a, rr);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dom-render",
-  "version": "1.0.79",
+  "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()) {