dom-render 1.0.95 → 1.0.97

package/operators/DrRepeat.js

@@ -40,7 +40,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+        while (_) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -71,8 +71,10 @@ var OperatorExecuter_1 = require("./OperatorExecuter");
 var DrRepeat = /** @class */ (function (_super) {
     __extends(DrRepeat, _super);
     function DrRepeat(rawSet, render, returnContainer, elementSource, source, afterCallBack) {
+        var _this = this;
         source.operatorAround = undefined;
-        return _super.call(this, rawSet, render, returnContainer, elementSource, source, afterCallBack, false) || this;
+        _this = _super.call(this, rawSet, render, returnContainer, elementSource, source, afterCallBack, false) || this;
+        return _this;
     }
     DrRepeat.prototype.executeAttrRequire = function (attr) {
         var _a, _b, _c, _d;
@@ -83,7 +85,7 @@ var DrRepeat = /** @class */ (function (_super) {
                 itRandom = RawSet_1.RawSet.drItOtherEncoding(this.elementSource.element);
                 vars = RawSet_1.RawSet.drVarEncoding(this.elementSource.element, (_a = this.elementSource.attrs.drVarOption) !== null && _a !== void 0 ? _a : '');
                 newTemp = this.source.config.window.document.createElement('temp');
-                ScriptUtils_1.ScriptUtils.eval("\n                    ".concat(this.render.bindScript, "\n                    ").concat((_b = this.elementSource.attrs.drBeforeOption) !== null && _b !== void 0 ? _b : '', "\n                    var i = 0; \n                    const repeat = ").concat(attr, ";\n                    const repeatStr = `").concat(attr, "`;\n                    let range = repeat;\n                    if (typeof repeat === 'number') {\n                        range = ").concat(EventManager_1.EventManager.RANGE_VARNAME, "(repeat);\n                    } \n                    for(const it of range) {\n                        var destIt = it;\n                        if (range.isRange) {\n                            destIt = it;\n                        }  else {\n                            destIt = repeatStr + '[' + i +']'\n                        }\n                        const n = this.__render.element.cloneNode(true);\n                        n.getAttributeNames().forEach(it => n.setAttribute(it, n.getAttribute(it).replace(/\\#it\\#/g, destIt).replace(/\\#nearRangeIt\\#/g, destIt).replace(/\\#nearRangeIndex\\#/g, destIt)))\n                        n.innerHTML = n.innerHTML.replace(/\\#it\\#/g, destIt).replace(/\\#index\\#/g, destIt);\n                        \n                        if (this.__render.drStripOption === 'true') {\n                            Array.from(n.childNodes).forEach(it => this.__render.fag.append(it));\n                        } else {\n                            this.__render.fag.append(n);\n                        }\n                        i++;\n                    }\n                    ").concat((_c = this.elementSource.attrs.drAfterOption) !== null && _c !== void 0 ? _c : '', "\n                    "), Object.assign(this.source.obj, {
+                ScriptUtils_1.ScriptUtils.eval("\n                    " + this.render.bindScript + "\n                    " + ((_b = this.elementSource.attrs.drBeforeOption) !== null && _b !== void 0 ? _b : '') + "\n                    var i = 0; \n                    const repeat = " + attr + ";\n                    const repeatStr = `" + attr + "`;\n                    let range = repeat;\n                    if (typeof repeat === 'number') {\n                        range = " + EventManager_1.EventManager.RANGE_VARNAME + "(repeat);\n                    } \n                    for(const it of range) {\n                        var destIt = it;\n                        if (range.isRange) {\n                            destIt = it;\n                        }  else {\n                            destIt = repeatStr + '[' + i +']'\n                        }\n                        const n = this.__render.element.cloneNode(true);\n                        n.getAttributeNames().forEach(it => n.setAttribute(it, n.getAttribute(it).replace(/\\#it\\#/g, destIt).replace(/\\#nearRangeIt\\#/g, destIt).replace(/\\#nearRangeIndex\\#/g, destIt)))\n                        n.innerHTML = n.innerHTML.replace(/\\#it\\#/g, destIt).replace(/\\#index\\#/g, destIt);\n                        \n                        if (this.__render.drStripOption === 'true') {\n                            Array.from(n.childNodes).forEach(it => this.__render.fag.append(it));\n                        } else {\n                            this.__render.fag.append(n);\n                        }\n                        i++;\n                    }\n                    " + ((_c = this.elementSource.attrs.drAfterOption) !== null && _c !== void 0 ? _c : '') + "\n                    ", Object.assign(this.source.obj, {
                     __render: Object.freeze(__assign({ fag: newTemp, drStripOption: this.elementSource.attrs.drStripOption }, this.render))
                 }));
                 RawSet_1.RawSet.drVarDecoding(newTemp, vars);

package/operators/DrTargetAttr.js

@@ -29,7 +29,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+        while (_) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -57,8 +57,10 @@ var OperatorExecuter_1 = require("./OperatorExecuter");
 var DrTargetAttr = /** @class */ (function (_super) {
     __extends(DrTargetAttr, _super);
     function DrTargetAttr(rawSet, render, returnContainer, elementSource, source, afterCallBack) {
+        var _this = this;
         source.operatorAround = undefined;
-        return _super.call(this, rawSet, render, returnContainer, elementSource, source, afterCallBack, false) || this;
+        _this = _super.call(this, rawSet, render, returnContainer, elementSource, source, afterCallBack, false) || this;
+        return _this;
     }
     DrTargetAttr.prototype.execute = function () {
         var _a, _b, _c, _d;

package/operators/DrTargetElement.js

@@ -29,7 +29,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+        while (_) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -58,8 +58,10 @@ var OperatorExecuter_1 = require("./OperatorExecuter");
 var DrTargetElement = /** @class */ (function (_super) {
     __extends(DrTargetElement, _super);
     function DrTargetElement(rawSet, render, returnContainer, elementSource, source, afterCallBack) {
+        var _this = this;
         source.operatorAround = undefined;
-        return _super.call(this, rawSet, render, returnContainer, elementSource, source, afterCallBack, false) || this;
+        _this = _super.call(this, rawSet, render, returnContainer, elementSource, source, afterCallBack, false) || this;
+        return _this;
     }
     DrTargetElement.prototype.execute = function () {
         var _a, _b, _c, _d;
@@ -83,7 +85,7 @@ var DrTargetElement = /** @class */ (function (_super) {
                             if (detectAction_1 && render_1) {
                                 this.rawSet.detect = {
                                     action: function () {
-                                        var script = "var $component = this.__render.component; var $element = this.__render.element; var $innerHTML = this.__render.innerHTML; var $attribute = this.__render.attribute;  ".concat(detectAction_1, " ");
+                                        var script = "var $component = this.__render.component; var $element = this.__render.element; var $innerHTML = this.__render.innerHTML; var $attribute = this.__render.attribute;  " + detectAction_1 + " ";
                                         ScriptUtils_1.ScriptUtils.eval(script, Object.assign(_this.source.obj, {
                                             __render: render_1
                                         }));

package/operators/DrThis.js

@@ -29,7 +29,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+        while (_) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -76,7 +76,7 @@ var DrThis = /** @class */ (function (_super) {
                             RawSet_1.RawSet.destroy(this.rawSet.data.obj, [], this.source.config, destroyOptions);
                         }
                         this.rawSet.data = attr;
-                        return [4 /*yield*/, RawSet_1.RawSet.drThisCreate(this.rawSet, this.elementSource.element, "".concat(this.elementSource.attrs.drThis).concat(attr.config.objPath ? ('.' + attr.config.objPath) : ''), (_c = this.elementSource.attrs.drVarOption) !== null && _c !== void 0 ? _c : '', this.elementSource.attrs.drStripOption, this.source.obj, this.source.config, attr)];
+                        return [4 /*yield*/, RawSet_1.RawSet.drThisCreate(this.rawSet, this.elementSource.element, "" + this.elementSource.attrs.drThis + (attr.config.objPath ? ('.' + attr.config.objPath) : ''), (_c = this.elementSource.attrs.drVarOption) !== null && _c !== void 0 ? _c : '', this.elementSource.attrs.drStripOption, this.source.obj, this.source.config, attr)];
                     case 1:
                         componentBody = _j.sent();
                         this.returnContainer.fag.append(componentBody);

package/operators/{DrDictionary.d.ts → DrThisProperty.d.ts}

@@ -3,9 +3,8 @@ import { RawSet } from '../rawsets/RawSet';
 import { Render } from '../rawsets/Render';
 import { AfterCallBack, ElementSource, ExecuteState, ReturnContainer, Source } from './OperatorExecuter';
 import { Config } from '../configs/Config';
-export declare class DrDictionary extends OperatorExecuterAttrRequire<string> {
+export declare class DrThisProperty extends OperatorExecuterAttrRequire<string> {
     constructor(rawSet: RawSet, render: Render, returnContainer: ReturnContainer, elementSource: ElementSource, source: Source, afterCallBack: AfterCallBack);
     executeAttrRequire(attr: string): Promise<ExecuteState>;
-    static getChildren(rawSet: RawSet, config: Config): Map<string, Node[]>;
     static append(obj: any, fullPath: string, key: string, rawSet: RawSet, config: Config): RawSet[];
 }

package/operators/{DrDictionary.js → DrThisProperty.js}

@@ -40,7 +40,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+        while (_) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -62,18 +62,20 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DrDictionary = void 0;
+exports.DrThisProperty = void 0;
 var OperatorExecuterAttrRequire_1 = require("./OperatorExecuterAttrRequire");
 var ScriptUtils_1 = require("../utils/script/ScriptUtils");
 var RawSet_1 = require("../rawsets/RawSet");
 var OperatorExecuter_1 = require("./OperatorExecuter");
-var DrDictionary = /** @class */ (function (_super) {
-    __extends(DrDictionary, _super);
-    function DrDictionary(rawSet, render, returnContainer, elementSource, source, afterCallBack) {
+var DrThisProperty = /** @class */ (function (_super) {
+    __extends(DrThisProperty, _super);
+    function DrThisProperty(rawSet, render, returnContainer, elementSource, source, afterCallBack) {
+        var _this = this;
         source.operatorAround = undefined;
-        return _super.call(this, rawSet, render, returnContainer, elementSource, source, afterCallBack, false) || this;
+        _this = _super.call(this, rawSet, render, returnContainer, elementSource, source, afterCallBack, false) || this;
+        return _this;
     }
-    DrDictionary.prototype.executeAttrRequire = function (attr) {
+    DrThisProperty.prototype.executeAttrRequire = function (attr) {
         var _a, _b, _c, _d, _e;
         return __awaiter(this, void 0, void 0, function () {
             var itRandom, vars, newTemp, dictioanry, dictionaryKey, tempalte, rr;
@@ -83,14 +85,14 @@ var DrDictionary = /** @class */ (function (_super) {
                 vars = RawSet_1.RawSet.drVarEncoding(this.elementSource.element, (_a = this.elementSource.attrs.drVarOption) !== null && _a !== void 0 ? _a : '');
                 newTemp = this.source.config.window.document.createElement('temp');
                 dictioanry = ScriptUtils_1.ScriptUtils.evalReturn(attr, this.source.obj);
-                dictionaryKey = (_b = this.elementSource.attrs.drDictionaryOption) !== null && _b !== void 0 ? _b : '';
+                dictionaryKey = (_b = this.elementSource.attrs.drKeyOption) !== null && _b !== void 0 ? _b : '';
                 // console.log('--->', attr, dictionaryKey)
                 // if (!(dictioanry instanceof Dictionary)) {
                 //     return ExecuteState.STOP;
                 // }
                 // await new Promise(resolve => setTimeout(resolve, 1000));
                 // console.log('!!!!!!!!!!!!!!', this.rawSet);
-                ScriptUtils_1.ScriptUtils.eval("\n                    ".concat(this.render.bindScript, "\n                    ").concat((_c = this.elementSource.attrs.drBeforeOption) !== null && _c !== void 0 ? _c : '', "\n                    var i = 0; \n                    const dictionary = ").concat(attr, ";\n                    const dictionaryKey = '").concat(dictionaryKey, "';\n                    const dictionaryStr = `").concat(attr, "`.trim();\n                    // console.log('----@#!@#@!#', this.__render.oldChild);\n                    if (dictionary) {\n                        for(const it in dictionary) {\n                            // const oldChild = this.__render.oldChild.get(it);\n                            // if (oldChild && oldChild.length > 0) {\n                            //     this.__render.fag.append(...oldChild);\n                            // } else {\n                            //     var destIt = dictionaryStr + '[\"' + it + '\"]';\n                            //     const n = this.__render.element.cloneNode(true);\n                            //     n.setAttribute('dr-this', destIt);\n                            //     // n.setAttribute('dr-dictionary', dictionaryStr);\n                            //     n.setAttribute('dr-dictionary-key', it);\n                            //     this.__render.fag.append(n);\n                            // }\n                            // if (!this.__render.oldChild.get(it)) {\n                            //     var destIt = dictionaryStr + '[\"' + it + '\"]';\n                            //     const n = this.__render.element.cloneNode(true);\n                            //     n.setAttribute('dr-this', destIt);\n                            //     // n.setAttribute('dr-dictionary', dictionaryStr);\n                            //     n.setAttribute('dr-dictionary-key', it);\n                            //     this.__render.fag.append(n);\n                            // }\n                            var destIt = dictionaryStr + '[\"' + it + '\"]';\n                            const n = this.__render.element.cloneNode(true);\n                            n.setAttribute('dr-this', destIt);\n                            // n.setAttribute('dr-dictionary', dictionaryStr);\n                            // n.setAttribute('dr-dictionary-key', it);\n                            this.__render.fag.append(n);\n                            i++;\n                        }\n                         this.__render.rawset.point.start.setAttribute('dictionary-keys',Object.keys(dictionary).join(','));\n                    }\n                    ").concat((_d = this.elementSource.attrs.drAfterOption) !== null && _d !== void 0 ? _d : '', "\n                    "), Object.assign(this.source.obj, {
+                ScriptUtils_1.ScriptUtils.eval("\n                    " + this.render.bindScript + "\n                    " + ((_c = this.elementSource.attrs.drBeforeOption) !== null && _c !== void 0 ? _c : '') + "\n                    var i = 0; \n                    const dictionary = " + attr + ";\n                    const dictionaryKey = '" + dictionaryKey + "';\n                    const dictionaryStr = `" + attr + "`.trim();\n                    // console.log('----@#!@#@!#', this.__render.oldChild);\n                    if (dictionary) {\n                        for(const it in dictionary) {\n                            var destIt = dictionaryStr + '[\"' + it + '\"]';\n                            const n = this.__render.element.cloneNode(true);\n                            n.setAttribute('dr-this', destIt);\n                            n.setAttribute('dr-key', it);\n                            // n.setAttribute('dr-dictionary-key', it);\n                            this.__render.fag.append(n);\n                            i++;\n                        }\n                         this.__render.rawset.point.start.setAttribute('dr-has-keys',Object.keys(dictionary).join(','));\n                    }\n                    " + ((_d = this.elementSource.attrs.drAfterOption) !== null && _d !== void 0 ? _d : '') + "\n                    ", Object.assign(this.source.obj, {
                     __render: Object.freeze(__assign({ drStripOption: this.elementSource.attrs.drStripOption, drAttr: this.elementSource.attrs, drAttrsOriginName: RawSet_1.RawSet.drAttrsOriginName, fag: newTemp }, this.render))
                 }));
                 RawSet_1.RawSet.drVarDecoding(newTemp, vars);
@@ -106,29 +108,7 @@ var DrDictionary = /** @class */ (function (_super) {
             });
         });
     };
-    DrDictionary.getChildren = function (rawSet, config) {
-        var _a, _b, _c;
-        var next = rawSet.point.start.nextSibling;
-        var oldChild = new Map();
-        var currentKey = '';
-        while (next) {
-            if (next === rawSet.point.end) {
-                break;
-            }
-            var dictionaryKey = (_b = (_a = next).getAttribute) === null || _b === void 0 ? void 0 : _b.call(_a, 'dictionary-key');
-            if (dictionaryKey) {
-                currentKey = dictionaryKey;
-                oldChild.set(dictionaryKey, []);
-            }
-            // console.log('next-------->', currentKey, next);
-            if (currentKey) {
-                (_c = oldChild.get(currentKey)) === null || _c === void 0 ? void 0 : _c.push(next);
-            }
-            next = next.nextSibling;
-        }
-        return oldChild;
-    };
-    DrDictionary.append = function (obj, fullPath, key, rawSet, config) {
+    DrThisProperty.append = function (obj, fullPath, key, rawSet, config) {
         var _this = this;
         var _a, _b;
         var genNode = config.window.document.importNode(rawSet.fragment, true);
@@ -137,30 +117,27 @@ var DrDictionary = /** @class */ (function (_super) {
         for (var _i = 0, _c = Array.from(genNode.childNodes.values()); _i < _c.length; _i++) {
             var cNode = _c[_i];
             var element = cNode.cloneNode(true);
-            element.removeAttribute('dr-dictionary');
-            element.setAttribute('dr-this', "this.".concat(fullPath));
+            element.removeAttribute(RawSet_1.RawSet.DR_THIS_PROPERTY_NAME);
+            element.setAttribute(RawSet_1.RawSet.DR_THIS_NAME, "this." + fullPath);
+            element.setAttribute(RawSet_1.RawSet.DR_KEY_OPTIONNAME, key);
             // rawSet.point.end.after(element);
             var fg = config.window.document.createDocumentFragment();
             fg.append(element);
             rawSets.push.apply(rawSets, RawSet_1.RawSet.checkPointCreates(fg, obj, config));
             rawSet.point.end.before(fg);
             var start = rawSet.point.start;
-            var keys = (_b = (_a = start.getAttribute('dictionary-keys')) === null || _a === void 0 ? void 0 : _a.split(',')) !== null && _b !== void 0 ? _b : [];
+            var keys = (_b = (_a = start.getAttribute(RawSet_1.RawSet.DR_HAS_KEYS_OPTIONNAME)) === null || _a === void 0 ? void 0 : _a.split(',')) !== null && _b !== void 0 ? _b : [];
             keys.push(key);
-            start.setAttribute('dictionary-keys', keys.join(','));
+            start.setAttribute(RawSet_1.RawSet.DR_HAS_KEYS_OPTIONNAME, keys.join(','));
             rawSets.forEach(function (it) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, it.render(obj, config)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             }); }); });
-            // console.log('WWW', fg, Array.from(fg.childNodes));
-            // console.log('--------------------------rawSets', rawSets);
         }
         return rawSets;
-        // rawSet.
-        // rawSet.point.end.before()
     };
-    return DrDictionary;
+    return DrThisProperty;
 }(OperatorExecuterAttrRequire_1.OperatorExecuterAttrRequire));
-exports.DrDictionary = DrDictionary;
+exports.DrThisProperty = DrThisProperty;

package/operators/OperatorExecuter.d.ts

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

package/operators/OperatorExecuter.js

@@ -14,7 +14,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+        while (_) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -69,7 +69,7 @@ var OperatorExecuter = /** @class */ (function () {
                         }
                         r = attrValue;
                         if (r && this.startingExecute) {
-                            r = ScriptUtils_1.ScriptUtils.eval(" ".concat(this.render.bindScript, "; return ").concat(attrValue), Object.assign(this.source.obj, { __render: this.render }));
+                            r = ScriptUtils_1.ScriptUtils.eval(" " + this.render.bindScript + "; return " + attrValue, Object.assign(this.source.obj, { __render: this.render }));
                         }
                         if ((_c = this.source.operatorAround) === null || _c === void 0 ? void 0 : _c.before) {
                             r = (_d = this.source.operatorAround) === null || _d === void 0 ? void 0 : _d.before(r, this);

package/operators/OperatorExecuterAttrRequire.js

@@ -29,7 +29,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+        while (_) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dom-render",
-  "version": "1.0.95",
+  "version": "1.0.97",
   "main": "DomRender.js",
   "license": "MIT",
   "description": "html view template engine",
@@ -58,8 +58,8 @@
     "bundle:watch": "rollup -c -w",
     "dev:start": "npm run start --workspace=dev",
     "dev:serve": "npm run serve --workspace=dev",
-    "npm-build": "npm run build && cp package.json dist && cp .npmignore dist && cp README.MD dist && rm -rf dist/dist/bundle.js.map",
-    "npm-publish": "npm run npm-build && npm publish ./dist",
+    "npm:build": "npm run build && cp package.json dist && cp .npmignore dist && cp README.MD dist && rm -rf dist/dist/bundle.js.map",
+    "npm:publish": "npm run npm:build && npm publish ./dist",
     "tsc": "tsc",
     "tsc:watch": "rm -rf ./dist && mkdir dist && cp package.json dist && tsc --watch --outDir dist --declarationDir dist --sourceMap true",
     "test": "jest --detectOpenHandles --forceExit"

package/rawsets/AttrInitCallBack.d.ts

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

package/rawsets/Attrs.d.ts

@@ -1,10 +1,10 @@
-export type Attrs = {
+export declare type Attrs = {
     dr: string | null;
     drIf: string | null;
     drAppender: string | null;
     drFor: string | null;
     drForOf: string | null;
-    drDictionary: string | null;
+    drThisProperty: string | null;
     drRepeat: string | null;
     drThis: string | null;
     drForm: string | null;
@@ -19,5 +19,6 @@ export type Attrs = {
     drCompleteOption: string | null;
     drStripOption: string | null;
     drDestroyOption: string | null;
-    drDictionaryOption: string | null;
+    drHasKeysOption: string | null;
+    drKeyOption: string | null;
 };

package/rawsets/CreatorMetaData.d.ts

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

package/rawsets/ElementInitCallBack.d.ts

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

package/rawsets/RawSet.d.ts

@@ -9,7 +9,9 @@ export declare class RawSet {
     uuid: string;
     type: RawSetType;
     point: {
-        start: Comment | Text | HTMLMetaElement;
+        start: (Comment | Text | HTMLMetaElement) & {
+            rawSet?: RawSet;
+        };
         node: Node;
         end: Comment | Text | HTMLMetaElement;
         thisVariableName?: string | null;
@@ -24,7 +26,7 @@ export declare class RawSet {
     static readonly DR_IF_NAME = "dr-if";
     static readonly DR_FOR_NAME = "dr-for";
     static readonly DR_FOR_OF_NAME = "dr-for-of";
-    static readonly DR_DICTIONARY_NAME = "dr-dictionary";
+    static readonly DR_THIS_PROPERTY_NAME = "dr-this-property";
     static readonly DR_REPEAT_NAME = "dr-repeat";
     static readonly DR_THIS_NAME = "dr-this";
     static readonly DR_FORM_NAME = "dr-form";
@@ -43,16 +45,19 @@ export declare class RawSet {
     static readonly DR_DESTROY_OPTIONNAME = "dr-destroy";
     static readonly DR_COMPONENT_NAME_OPTIONNAME = "dr-component-name";
     static readonly DR_COMPONENT_INNER_HTML_NAME_OPTIONNAME = "dr-component-inner-html-name";
-    static readonly DR_DICTIONARY_OPTIONKEYNAME = "dr-dictionary-key";
+    static readonly DR_KEY_OPTIONNAME = "dr-key";
+    static readonly DR_HAS_KEYS_OPTIONNAME = "dr-has-keys";
     static readonly DR_ON_CREATE_ARGUMENTS_OPTIONNAME = "dr-on-create:arguments";
     static readonly DR_ON_CREATED_CALLBACK_OPTIONNAME = "dr-on-create:callback";
     static readonly DR_ON_INIT_ARGUMENTS_OPTIONNAME = "dr-on-init:arguments";
     static readonly DR_ON_CONSTRUCTOR_ARGUMENTS_OPTIONNAME = "dr-on-constructor:arguments";
     static readonly drAttrsOriginName: Attrs;
     static readonly DR_TAGS: never[];
-    static readonly DR_ATTRIBUTES: readonly ["dr", "dr-appender", "dr-if", "dr-for-of", "dr-dictionary", "dr-for", "dr-this", "dr-form", "dr-pre", "dr-inner-html", "dr-inner-text", "dr-repeat", "dr-detect"];
+    static readonly DR_ATTRIBUTES: readonly ["dr", "dr-appender", "dr-if", "dr-for-of", "dr-this-property", "dr-for", "dr-this", "dr-form", "dr-pre", "dr-inner-html", "dr-inner-text", "dr-repeat", "dr-detect"];
     constructor(uuid: string, type: RawSetType, point: {
-        start: Comment | Text | HTMLMetaElement;
+        start: (Comment | Text | HTMLMetaElement) & {
+            rawSet?: RawSet;
+        };
         node: Node;
         end: Comment | Text | HTMLMetaElement;
         thisVariableName?: string | null;
@@ -63,9 +68,13 @@ export declare class RawSet {
     get isConnected(): boolean;
     getUsingTriggerVariables(config?: Config): Set<string>;
     render(obj: any, config: Config): Promise<RawSet[]>;
-    static generateStyleSheetsLocal(): void;
+    /**
+     * @deprecated
+     * @param config
+     */
+    static generateStyleSheetsLocal(config: Config): void;
     static generateCSS(id: string, cssRule: CSSRule): void;
-    static generateStyleTransform(styleBody: string | string[], id: string, styleTagWrap?: boolean): string;
+    static generateStyleTransform(styleBody: string | string[], componentKey: string, styleTagWrap?: boolean): string;
     applyEvent(obj: any, fragment?: DocumentFragment, config?: Config): void;
     getAttribute(element: Element, attr: string): string | null;
     getAttributeAndDelete(element: Element, attr: string): string | null;
@@ -79,7 +88,10 @@ export declare class RawSet {
         start: Comment;
         end: Comment;
     };
+    remove(): void;
     childAllRemove(): void;
+    childs(stopNext?: (node: Node) => boolean): ChildNode[] | undefined;
+    getHasRawSet(key: string): RawSet | undefined;
     static drItOtherEncoding(element: Element | DocumentFragment): string;
     static drItOtherDecoding(element: Element | DocumentFragment, random: string): void;
     static drThisEncoding(element: Element, drThis: string): string;