dom-render 1.0.95 → 1.0.96

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}

@@ -62,18 +62,18 @@ 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) {
         source.operatorAround = undefined;
         return _super.call(this, rawSet, render, returnContainer, elementSource, source, afterCallBack, false) || this;
     }
-    DrDictionary.prototype.executeAttrRequire = function (attr) {
+    DrThisProperty.prototype.executeAttrRequire = function (attr) {
         var _a, _b, _c, _d, _e;
         return __awaiter(this, void 0, void 0, function () {
             var itRandom, vars, newTemp, dictioanry, dictionaryKey, tempalte, rr;
@@ -83,14 +83,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                    ".concat(this.render.bindScript, "\n                    ").concat((_c = this.elementSource.attrs.drBeforeOption) !== null && _c !== void 0 ? _c : '', "\n                    var i = 0; \n                    const dictionary = ").concat(attr, ";\n                    const dictionaryKey = '").concat(dictionaryKey, "';\n                    const dictionaryStr = `").concat(attr, "`.trim();\n                    // console.log('----@#!@#@!#', this.__render.oldChild);\n                    if (dictionary) {\n                        for(const it in dictionary) {\n                            var destIt = dictionaryStr + '[\"' + it + '\"]';\n                            const n = this.__render.element.cloneNode(true);\n                            n.setAttribute('dr-this', destIt);\n                            n.setAttribute('dr-key', it);\n                            // n.setAttribute('dr-dictionary-key', it);\n                            this.__render.fag.append(n);\n                            i++;\n                        }\n                         this.__render.rawset.point.start.setAttribute('dr-has-keys',Object.keys(dictionary).join(','));\n                    }\n                    ").concat((_d = this.elementSource.attrs.drAfterOption) !== null && _d !== void 0 ? _d : '', "\n                    "), Object.assign(this.source.obj, {
                     __render: Object.freeze(__assign({ drStripOption: this.elementSource.attrs.drStripOption, drAttr: this.elementSource.attrs, drAttrsOriginName: RawSet_1.RawSet.drAttrsOriginName, fag: newTemp }, this.render))
                 }));
                 RawSet_1.RawSet.drVarDecoding(newTemp, vars);
@@ -106,29 +106,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 +115,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.".concat(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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dom-render",
-  "version": "1.0.95",
+  "version": "1.0.96",
   "main": "DomRender.js",
   "license": "MIT",
   "description": "html view template engine",

package/rawsets/Attrs.d.ts

@@ -4,7 +4,7 @@ export type Attrs = {
     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/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;
@@ -79,7 +84,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;

package/rawsets/RawSet.js

@@ -80,7 +80,8 @@ var DrTargetElement_1 = require("../operators/DrTargetElement");
 var DrTargetAttr_1 = require("../operators/DrTargetAttr");
 var DestroyOptionType_1 = require("./DestroyOptionType");
 var RawSetType_1 = require("./RawSetType");
-var DrDictionary_1 = require("../operators/DrDictionary");
+var DrThisProperty_1 = require("../operators/DrThisProperty");
+var RawSetOperatorType_1 = require("./RawSetOperatorType");
 var RawSet = /** @class */ (function () {
     function RawSet(uuid, type, point, fragment, detect, data) {
         this.uuid = uuid;
@@ -89,6 +90,7 @@ var RawSet = /** @class */ (function () {
         this.fragment = fragment;
         this.detect = detect;
         this.data = data;
+        point.start.rawSet = this;
         // console.log('rawset constructor->', (this.point.node as Element).getAttributeNames());
     }
     Object.defineProperty(RawSet.prototype, "isConnected", {
@@ -208,7 +210,7 @@ var RawSet = /** @class */ (function () {
                             drIf: this.getAttributeAndDelete(element, RawSet.DR_IF_NAME),
                             drFor: this.getAttributeAndDelete(element, RawSet.DR_FOR_NAME),
                             drForOf: this.getAttributeAndDelete(element, RawSet.DR_FOR_OF_NAME),
-                            drDictionary: this.getAttributeAndDelete(element, RawSet.DR_DICTIONARY_NAME),
+                            drThisProperty: this.getAttributeAndDelete(element, RawSet.DR_THIS_PROPERTY_NAME),
                             drAppender: this.getAttributeAndDelete(element, RawSet.DR_APPENDER_NAME),
                             drRepeat: this.getAttributeAndDelete(element, RawSet.DR_REPEAT_NAME),
                             drThis: this.getAttributeAndDelete(element, RawSet.DR_THIS_NAME),
@@ -224,7 +226,7 @@ var RawSet = /** @class */ (function () {
                             drCompleteOption: this.getAttributeAndDelete(element, RawSet.DR_COMPLETE_OPTIONNAME),
                             drStripOption: this.getAttributeAndDelete(element, RawSet.DR_STRIP_OPTIONNAME),
                             drDestroyOption: this.getAttributeAndDelete(element, RawSet.DR_DESTROY_OPTIONNAME),
-                            drDictionaryOption: this.getAttributeAndDelete(element, RawSet.DR_DICTIONARY_OPTIONKEYNAME)
+                            drKeyOption: this.getAttributeAndDelete(element, RawSet.DR_KEY_OPTIONNAME)
                         };
                         drAttrs.push(drAttr);
                         operators = [
@@ -237,7 +239,7 @@ var RawSet = /** @class */ (function () {
                             new DrInnerHTML_1.DrInnerHTML(this, __render, { raws: raws, fag: fag }, { element: element, attrName: RawSet.DR_INNERHTML_NAME, attr: drAttr.drInnerHTML, attrs: drAttr }, { config: config, obj: obj, operatorAround: (_h = config.operatorAround) === null || _h === void 0 ? void 0 : _h.drInnerHTML }, { onAttrInitCallBacks: onAttrInitCallBacks, onElementInitCallBacks: onElementInitCallBacks, onThisComponentSetCallBacks: onThisComponentSetCallBacks }),
                             new DrFor_1.DrFor(this, __render, { raws: raws, fag: fag }, { element: element, attrName: RawSet.DR_FOR_NAME, attr: drAttr.drFor, attrs: drAttr }, { config: config, obj: obj, operatorAround: (_j = config.operatorAround) === null || _j === void 0 ? void 0 : _j.drFor }, { onAttrInitCallBacks: onAttrInitCallBacks, onElementInitCallBacks: onElementInitCallBacks, onThisComponentSetCallBacks: onThisComponentSetCallBacks }),
                             new DrForOf_1.DrForOf(this, __render, { raws: raws, fag: fag }, { element: element, attrName: RawSet.DR_FOR_OF_NAME, attr: drAttr.drForOf, attrs: drAttr }, { config: config, obj: obj, operatorAround: (_k = config.operatorAround) === null || _k === void 0 ? void 0 : _k.drForOf }, { onAttrInitCallBacks: onAttrInitCallBacks, onElementInitCallBacks: onElementInitCallBacks, onThisComponentSetCallBacks: onThisComponentSetCallBacks }),
-                            new DrDictionary_1.DrDictionary(this, __render, { raws: raws, fag: fag }, { element: element, attrName: RawSet.DR_DICTIONARY_NAME, attr: drAttr.drDictionary, attrs: drAttr }, { config: config, obj: obj, operatorAround: (_l = config.operatorAround) === null || _l === void 0 ? void 0 : _l.drDictionary }, { onAttrInitCallBacks: onAttrInitCallBacks, onElementInitCallBacks: onElementInitCallBacks, onThisComponentSetCallBacks: onThisComponentSetCallBacks }),
+                            new DrThisProperty_1.DrThisProperty(this, __render, { raws: raws, fag: fag }, { element: element, attrName: RawSet.DR_THIS_PROPERTY_NAME, attr: drAttr.drThisProperty, attrs: drAttr }, { config: config, obj: obj, operatorAround: (_l = config.operatorAround) === null || _l === void 0 ? void 0 : _l.drThisProperty }, { onAttrInitCallBacks: onAttrInitCallBacks, onElementInitCallBacks: onElementInitCallBacks, onThisComponentSetCallBacks: onThisComponentSetCallBacks }),
                             new DrAppender_1.DrAppender(this, __render, { raws: raws, fag: fag }, { element: element, attrName: RawSet.DR_APPENDER_NAME, attr: drAttr.drAppender, attrs: drAttr }, { config: config, obj: obj, operatorAround: (_m = config.operatorAround) === null || _m === void 0 ? void 0 : _m.drAppender }, { onAttrInitCallBacks: onAttrInitCallBacks, onElementInitCallBacks: onElementInitCallBacks, onThisComponentSetCallBacks: onThisComponentSetCallBacks }),
                             new DrRepeat_1.DrRepeat(this, __render, { raws: raws, fag: fag }, { element: element, attrName: RawSet.DR_REPEAT_NAME, attr: drAttr.drRepeat, attrs: drAttr }, { config: config, obj: obj, operatorAround: (_o = config.operatorAround) === null || _o === void 0 ? void 0 : _o.drRepeat }, { onAttrInitCallBacks: onAttrInitCallBacks, onElementInitCallBacks: onElementInitCallBacks, onThisComponentSetCallBacks: onThisComponentSetCallBacks }),
                             new DrTargetElement_1.DrTargetElement(this, __render, { raws: raws, fag: fag }, { element: element, attrs: drAttr }, { config: config, obj: obj }, { onAttrInitCallBacks: onAttrInitCallBacks, onElementInitCallBacks: onElementInitCallBacks, onThisComponentSetCallBacks: onThisComponentSetCallBacks }),
@@ -558,19 +560,17 @@ var RawSet = /** @class */ (function () {
             var start = config.window.document.createElement('meta');
             var end = config.window.document.createElement('meta');
             start.setAttribute('id', "".concat(id, "-start"));
-            var dictionaryKey = element.getAttribute('dr-dictionary-key');
-            var dictionary = element.getAttribute('dr-dictionary');
-            if (dictionary) {
-                start.setAttribute('type', 'dictionary');
+            var keys = element.getAttribute(RawSet.DR_KEY_OPTIONNAME);
+            var thisPropertyType = element.getAttribute(RawSet.DR_THIS_PROPERTY_NAME);
+            if (thisPropertyType) {
+                start.setAttribute('type', RawSetOperatorType_1.RawSetOperatorType.DR_THIS_PROPERTY);
             }
-            if (dictionaryKey) {
-                start.setAttribute('dictionary-key', dictionaryKey);
+            if (keys) {
+                element.removeAttribute(RawSet.DR_KEY_OPTIONNAME);
+                start.setAttribute(RawSet.DR_KEY_OPTIONNAME, keys);
             }
             end.setAttribute('id', "".concat(id, "-end"));
-            return {
-                start: start,
-                end: end
-            };
+            return { start: start, end: end };
         }
         else if (type === RawSetType_1.RawSetType.STYLE_TEXT) {
             return {
@@ -585,6 +585,11 @@ var RawSet = /** @class */ (function () {
             };
         }
     };
+    RawSet.prototype.remove = function () {
+        this.childAllRemove();
+        this.point.end.remove();
+        this.point.start.remove();
+    };
     RawSet.prototype.childAllRemove = function () {
         var next = this.point.start.nextSibling;
         while (next) {
@@ -595,6 +600,31 @@ var RawSet = /** @class */ (function () {
             next = this.point.start.nextSibling;
         }
     };
+    RawSet.prototype.childs = function (stopNext) {
+        var childs = [];
+        var next = this.point.start.nextSibling;
+        while (next && next !== this.point.end) {
+            if (stopNext === null || stopNext === void 0 ? void 0 : stopNext(next)) {
+                return;
+            }
+            childs.push(next);
+            next = next.nextSibling;
+        }
+        return childs;
+    };
+    RawSet.prototype.getHasRawSet = function (key) {
+        var rawSet;
+        this.childs(function (node) {
+            var _a, _b;
+            var drKey = (_b = (_a = node).getAttribute) === null || _b === void 0 ? void 0 : _b.call(_a, 'dr-key');
+            if (drKey && drKey === key) {
+                rawSet = node.rawSet;
+                return true;
+            }
+            return false;
+        });
+        return rawSet;
+    };
     RawSet.drItOtherEncoding = function (element) {
         var random = RandomUtils_1.RandomUtils.uuid();
         var regex = /#it#/g;
@@ -1016,7 +1046,7 @@ var RawSet = /** @class */ (function () {
     RawSet.DR_IF_NAME = 'dr-if';
     RawSet.DR_FOR_NAME = 'dr-for';
     RawSet.DR_FOR_OF_NAME = 'dr-for-of';
-    RawSet.DR_DICTIONARY_NAME = 'dr-dictionary';
+    RawSet.DR_THIS_PROPERTY_NAME = 'dr-this-property';
     RawSet.DR_REPEAT_NAME = 'dr-repeat';
     RawSet.DR_THIS_NAME = 'dr-this';
     RawSet.DR_FORM_NAME = 'dr-form';
@@ -1035,7 +1065,8 @@ var RawSet = /** @class */ (function () {
     RawSet.DR_DESTROY_OPTIONNAME = 'dr-destroy';
     RawSet.DR_COMPONENT_NAME_OPTIONNAME = 'dr-component-name';
     RawSet.DR_COMPONENT_INNER_HTML_NAME_OPTIONNAME = 'dr-component-inner-html-name';
-    RawSet.DR_DICTIONARY_OPTIONKEYNAME = 'dr-dictionary-key';
+    RawSet.DR_KEY_OPTIONNAME = 'dr-key';
+    RawSet.DR_HAS_KEYS_OPTIONNAME = 'dr-has-keys';
     RawSet.DR_ON_CREATE_ARGUMENTS_OPTIONNAME = 'dr-on-create:arguments';
     RawSet.DR_ON_CREATED_CALLBACK_OPTIONNAME = 'dr-on-create:callback';
     RawSet.DR_ON_INIT_ARGUMENTS_OPTIONNAME = 'dr-on-init:arguments';
@@ -1045,7 +1076,7 @@ var RawSet = /** @class */ (function () {
         drIf: RawSet.DR_IF_NAME,
         drFor: RawSet.DR_FOR_NAME,
         drForOf: RawSet.DR_FOR_OF_NAME,
-        drDictionary: RawSet.DR_DICTIONARY_NAME,
+        drThisProperty: RawSet.DR_THIS_PROPERTY_NAME,
         drAppender: RawSet.DR_APPENDER_NAME,
         drRepeat: RawSet.DR_REPEAT_NAME,
         drThis: RawSet.DR_THIS_NAME,
@@ -1061,10 +1092,11 @@ var RawSet = /** @class */ (function () {
         drCompleteOption: RawSet.DR_COMPLETE_OPTIONNAME,
         drStripOption: RawSet.DR_STRIP_OPTIONNAME,
         drDestroyOption: RawSet.DR_DESTROY_OPTIONNAME,
-        drDictionaryOption: RawSet.DR_DICTIONARY_OPTIONKEYNAME
+        drHasKeysOption: RawSet.DR_HAS_KEYS_OPTIONNAME,
+        drKeyOption: RawSet.DR_KEY_OPTIONNAME
     };
     RawSet.DR_TAGS = [];
-    RawSet.DR_ATTRIBUTES = [RawSet.DR_NAME, RawSet.DR_APPENDER_NAME, RawSet.DR_IF_NAME, RawSet.DR_FOR_OF_NAME, RawSet.DR_DICTIONARY_NAME, RawSet.DR_FOR_NAME, RawSet.DR_THIS_NAME, RawSet.DR_FORM_NAME, RawSet.DR_PRE_NAME, RawSet.DR_INNERHTML_NAME, RawSet.DR_INNERTEXT_NAME, RawSet.DR_REPEAT_NAME, RawSet.DR_DETECT_NAME];
+    RawSet.DR_ATTRIBUTES = [RawSet.DR_NAME, RawSet.DR_APPENDER_NAME, RawSet.DR_IF_NAME, RawSet.DR_FOR_OF_NAME, RawSet.DR_THIS_PROPERTY_NAME, RawSet.DR_FOR_NAME, RawSet.DR_THIS_NAME, RawSet.DR_FORM_NAME, RawSet.DR_PRE_NAME, RawSet.DR_INNERHTML_NAME, RawSet.DR_INNERTEXT_NAME, RawSet.DR_REPEAT_NAME, RawSet.DR_DETECT_NAME];
     return RawSet;
 }());
 exports.RawSet = RawSet;

package/rawsets/RawSetOperatorType.d.ts

@@ -0,0 +1,3 @@
+export declare enum RawSetOperatorType {
+    DR_THIS_PROPERTY = "this-property"
+}

package/rawsets/RawSetOperatorType.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RawSetOperatorType = void 0;
+var RawSetOperatorType;
+(function (RawSetOperatorType) {
+    RawSetOperatorType["DR_THIS_PROPERTY"] = "this-property";
+})(RawSetOperatorType = exports.RawSetOperatorType || (exports.RawSetOperatorType = {}));