dom-render 1.0.95 → 1.0.97

package/DomRender.d.ts

@@ -2,7 +2,7 @@ import { Config } from './configs/Config';
 import { ConstructorType } from './types/Types';
 import { RawSet } from './rawsets/RawSet';
 export declare class DomRender {
-    static run<T extends object>(obj: T, target?: Node | null, oConfig?: Omit<Config, 'window'>): T;
+    static run<T extends object>(obj: T, target?: Node | null, oConfig?: Config): T;
     static createComponent(param: {
         type: ConstructorType<any> | any;
         tagName?: string;

package/DomRender.js

@@ -20,7 +20,7 @@ var DomRender = /** @class */ (function () {
     function DomRender() {
     }
     DomRender.run = function (obj, target, oConfig) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         var robj = obj;
         if ('_DomRender_isProxy' in obj) {
             if (target) {
@@ -48,8 +48,8 @@ var DomRender = /** @class */ (function () {
             config.router = (_c = config.router) !== null && _c !== void 0 ? _c : new HashRouter_1.HashRouter(robj, config.window);
         }
         else { // default
-            config.routerType = 'hash';
-            config.router = (_d = config.router) !== null && _d !== void 0 ? _d : new HashRouter_1.HashRouter(robj, config.window);
+            // config.routerType = 'hash';
+            // config.router = config.router ?? new HashRouter(robj, config.window);
         }
         domRender.run(robj);
         return robj;

package/DomRenderProxy.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]) {
@@ -51,7 +51,8 @@ var EventManager_1 = require("./events/EventManager");
 var ScriptUtils_1 = require("./utils/script/ScriptUtils");
 var Types_1 = require("./types/Types");
 var RawSetType_1 = require("./rawsets/RawSetType");
-var DrDictionary_1 = require("./operators/DrDictionary");
+var DrThisProperty_1 = require("./operators/DrThisProperty");
+var RawSetOperatorType_1 = require("./rawsets/RawSetOperatorType");
 var excludeGetSetPropertys = ['onBeforeReturnGet', 'onBeforeReturnSet', '__domrender_components', '__render', '_DomRender_isFinal', '_domRender_ref', '_rawSets', '_domRender_proxy', '_targets', '_DomRender_origin', '_DomRender_ref', '_DomRender_proxy'];
 var DomRenderProxy = /** @class */ (function () {
     function DomRenderProxy(_domRender_origin, target, config) {
@@ -75,9 +76,9 @@ var DomRenderProxy = /** @class */ (function () {
     };
     DomRenderProxy.prototype.run = function (objProxy) {
         var _this = this;
-        var _a;
+        var _a, _b;
         this._domRender_proxy = objProxy;
-        (_a = objProxy === null || objProxy === void 0 ? void 0 : objProxy.onProxyDomRender) === null || _a === void 0 ? void 0 : _a.call(objProxy, this.config);
+        (_b = (_a = objProxy) === null || _a === void 0 ? void 0 : _a.onProxyDomRender) === null || _b === void 0 ? void 0 : _b.call(_a, this.config);
         var obj = objProxy._DomRender_origin;
         if (obj) {
             Object.keys(obj).forEach(function (it) {
@@ -192,11 +193,11 @@ var DomRenderProxy = /** @class */ (function () {
                                         new Map(JSON.parse(targetAttrMap)).forEach(function (v, k) {
                                             var _a;
                                             // it?.data.onChangeAttrRender(k, null, v);
-                                            var isUsing = EventManager_1.EventManager.isUsingThisVar(v, "this.".concat(fullPathStr));
+                                            var isUsing = EventManager_1.EventManager.isUsingThisVar(v, "this." + fullPathStr);
                                             if (isUsing) {
                                                 var render = it_1.fragment.render;
                                                 // console.log('render-->', (it.fragment as any).render)
-                                                var script = "".concat(render.renderScript, " return ").concat(v, " ");
+                                                var script = render.renderScript + " return " + v + " ";
                                                 var cval = ScriptUtils_1.ScriptUtils.eval(script, Object.assign((_a = _this._domRender_proxy) !== null && _a !== void 0 ? _a : {}, { __render: render }));
                                                 it_1.data.onChangeAttrRender(k, cval);
                                             }
@@ -268,7 +269,7 @@ var DomRenderProxy = /** @class */ (function () {
             // const firstPathStr = paths.slice(1).reverse().join('.');
             var strings = paths.reverse();
             // array같은경우도 키값으로 접근하기때문에 특정 인덱스를 찾아서 그부분만 바꿔줄수 있다.
-            var fullPathStr_1 = strings.map(function (it) { return isNaN(Number(it)) ? '.' + it : "[".concat(it, "]"); }).join('').slice(1);
+            var fullPathStr_1 = strings.map(function (it) { return isNaN(Number(it)) ? '.' + it : "[" + it + "]"; }).join('').slice(1);
             // console.log('-------fullPathStr', fullPathStr, lastDoneExecute);
             if (lastDoneExecute) {
                 // const firstData = ScriptUtils.evalReturn('this.' + firstPathStr, this._domRender_proxy);
@@ -277,12 +278,13 @@ var DomRenderProxy = /** @class */ (function () {
                 // }
                 var iterable_1 = this._rawSets.get(fullPathStr_1);
                 // array check
-                var front_1 = strings.slice(0, strings.length - 1).map(function (it) { return isNaN(Number(it)) ? '.' + it : "[".concat(it, "]"); }).join('');
+                var front_1 = strings.slice(0, strings.length - 1).map(function (it) { return isNaN(Number(it)) ? '.' + it : "[" + it + "]"; }).join('');
                 var last_1 = strings[strings.length - 1];
                 var data_1 = ScriptUtils_1.ScriptUtils.evalReturn('this' + front_1, this._domRender_proxy);
                 // console.log('-------!!!!!', fullPathStr, iterable, data, front, last);
                 new Promise(function (resolve) {
                     var firstPathStr = front_1.slice(1);
+                    // check dictionary
                     // console.log('-promise-------', firstPathStr, this)
                     var firstTargets = _this._rawSets.get(firstPathStr);
                     var firstTargetDictionary = [];
@@ -290,7 +292,7 @@ var DomRenderProxy = /** @class */ (function () {
                         var _a, _b;
                         // console.log('----forEach---', it);
                         var type = (_b = (_a = it.point.start).getAttribute) === null || _b === void 0 ? void 0 : _b.call(_a, 'type');
-                        if (type === 'dictionary') {
+                        if (type === RawSetOperatorType_1.RawSetOperatorType.DR_THIS_PROPERTY) {
                             firstTargetDictionary.push(it);
                         }
                     });
@@ -300,10 +302,15 @@ var DomRenderProxy = /** @class */ (function () {
                         var skip_1 = false;
                         firstTargetDictionary.forEach(function (it) {
                             var _a, _b;
-                            var keys = (_b = (_a = it.point.start.getAttribute('dictionary-keys')) === null || _a === void 0 ? void 0 : _a.split(',')) !== null && _b !== void 0 ? _b : [];
+                            var startElement = it.point.start;
+                            var keys = (_b = (_a = startElement.getAttribute(RawSet_1.RawSet.DR_HAS_KEYS_OPTIONNAME)) === null || _a === void 0 ? void 0 : _a.split(',')) !== null && _b !== void 0 ? _b : [];
+                            if (value === undefined) {
+                                var rawSet = it.getHasRawSet(last_1);
+                                rawSet === null || rawSet === void 0 ? void 0 : rawSet.remove();
+                                startElement.setAttribute(RawSet_1.RawSet.DR_HAS_KEYS_OPTIONNAME, keys.filter(function (it) { return it !== last_1; }).join(','));
+                            }
                             if (!keys.includes(last_1)) {
-                                var raws = DrDictionary_1.DrDictionary.append(_this._domRender_proxy, fullPathStr_1, last_1, it, _this.config);
-                                // console.log('----append---', raws);
+                                var raws = DrThisProperty_1.DrThisProperty.append(_this._domRender_proxy, fullPathStr_1, last_1, it, _this.config);
                                 if (raws) {
                                     rawSets_3.push.apply(rawSets_3, raws);
                                 }
@@ -315,18 +322,7 @@ var DomRenderProxy = /** @class */ (function () {
                         if (skip_1 === false || rawSets_3.length > 0) {
                             return _this.render(rawSets_3);
                         }
-                        // console.log('rawSets-->#$$$$$$$$$$$', this._rawSets);
-                        // rawSets.forEach(it => this.addRawSet(fullPathStr, it));
-                        // DrDictionary.append(this._domRender_proxy, fullPathStr, it, this.config);
-                        // it.render(this._domRender_proxy, this.config);
                     }
-                    /* if (data instanceof Dictionary) {
-                         const a = this._rawSets.get(firstPathStr);
-                         // a?.forEach(it => {
-                         //     if (it.type === RawSetType.TARGET_ATTR)
-                         // })
-                         console.log('dictionary-->', data, last, value, this._rawSets, a);
-                     } else */
                     if (last_1 === 'length' && Array.isArray(data_1)) {
                         var aIterable = _this._rawSets.get(firstPathStr);
                         if (aIterable) {
@@ -337,14 +333,12 @@ var DomRenderProxy = /** @class */ (function () {
                         return _this.render(Array.from(iterable_1), fullPathStr_1);
                     }
                 }).then(function (it) {
-                    console.log('target1------->,', it);
                     _this._targets.forEach(function (it) {
-                        console.log('target2------->,', it);
                         // return;
                         if (it.nodeType === Node.DOCUMENT_FRAGMENT_NODE || it.nodeType === Node.ELEMENT_NODE) {
                             var targets = EventManager_1.eventManager.findAttrElements(it, _this.config);
                             // console.log('------>', targets);
-                            EventManager_1.eventManager.changeVar(_this._domRender_proxy, targets, "this.".concat(fullPathStr_1), _this.config);
+                            EventManager_1.eventManager.changeVar(_this._domRender_proxy, targets, "this." + fullPathStr_1, _this.config);
                         }
                     });
                 });
@@ -354,7 +348,7 @@ var DomRenderProxy = /** @class */ (function () {
         return fullPaths;
     };
     DomRenderProxy.prototype.set = function (target, p, value, receiver) {
-        var _a, _b;
+        var _a, _b, _c;
         // console.log('set-->', p, value, target, receiver);
         if (typeof p === 'string' && p !== '__domrender_components' && excludeGetSetPropertys.includes(p)) {
             target[p] = value;
@@ -376,12 +370,12 @@ var DomRenderProxy = /** @class */ (function () {
         }
         // console.log('full path:', fullPath);
         if (('onBeforeReturnSet' in receiver) && typeof p === 'string' && !((_a = this.config.proxyExcludeOnBeforeReturnSets) !== null && _a !== void 0 ? _a : []).concat(excludeGetSetPropertys).includes(p)) {
-            (_b = receiver === null || receiver === void 0 ? void 0 : receiver.onBeforeReturnSet) === null || _b === void 0 ? void 0 : _b.call(receiver, p, value, fullPath);
+            (_c = (_b = receiver) === null || _b === void 0 ? void 0 : _b.onBeforeReturnSet) === null || _c === void 0 ? void 0 : _c.call(_b, p, value, fullPath);
         }
         return true;
     };
     DomRenderProxy.prototype.get = function (target, p, receiver) {
-        var _a, _b;
+        var _a, _b, _c;
         // console.log('get-->', target, p, receiver);
         if (p === '_DomRender_origin') {
             return this._domRender_origin;
@@ -412,7 +406,7 @@ var DomRenderProxy = /** @class */ (function () {
                 it_2 = it_2._DomRender_origin;
             }
             if (('onBeforeReturnGet' in receiver) && typeof p === 'string' && !((_a = this.config.proxyExcludeOnBeforeReturnGets) !== null && _a !== void 0 ? _a : []).concat(excludeGetSetPropertys).includes(p)) {
-                (_b = receiver === null || receiver === void 0 ? void 0 : receiver.onBeforeReturnGet) === null || _b === void 0 ? void 0 : _b.call(receiver, p, it_2, this.root([p], it_2, false));
+                (_c = (_b = receiver) === null || _b === void 0 ? void 0 : _b.onBeforeReturnGet) === null || _c === void 0 ? void 0 : _c.call(_b, p, it_2, this.root([p], it_2, false));
             }
             return it_2;
         }

package/README.MD

@@ -222,6 +222,47 @@ window-event-popstate: <input type="text" dr-window-event-popstate="alert(this.n
 </details>
 
 
+## this
+<details>
+  <summary>dr-this<strong>🔻(click)</strong></summary>
+* dr-this
+  * object mapping
+
+```typescript
+class data {
+  dictionary = {
+      name: 'visualkhh'
+  }
+}
+```
+```html
+<div dr-this="this.dictionary">
+  ${this.name}$
+</div>
+```
+</details>
+
+<details>
+  <summary>dr-this-property<strong>🔻(click)</strong></summary>
+* dr-property
+  * property forEach in object
+  * dynamic add, delete  
+
+```typescript
+class data {
+  dictionary = {
+      name1: 'visualkhh1',
+      name2: 'visualkhh2',
+      name3: 'visualkhh3'
+  }
+}
+```
+```html
+<home dr-this-property="this.dictionary" dr-on-init:arguments="[2,#this#]">
+  ${this}$
+</home>
+```
+</details>
 
 ## value
 <details>

package/components/ComponentSet.d.ts

@@ -1,4 +1,4 @@
-export type ComponentSetConfig = {
+export declare type ComponentSetConfig = {
     objPath?: string | null;
 };
 export declare class ComponentSet {

package/configs/Config.d.ts

@@ -6,7 +6,7 @@ import { TargetElement } from './TargetElement';
 import { TargetAttr } from './TargetAttr';
 import { Attrs } from '../rawsets/Attrs';
 import { OperatorAround } from '../operators/OperatorExecuter';
-export type Config = {
+export declare type Config = {
     window: Window;
     targetElements?: TargetElement[];
     targetAttrs?: TargetAttr[];

package/configs/TargetAttr.d.ts

@@ -1,5 +1,5 @@
 import { RawSet } from '../rawsets/RawSet';
-export type TargetAttr = {
+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/TargetElement.d.ts

@@ -3,7 +3,7 @@ import { Config } from './Config';
 import { Attrs } from '../rawsets/Attrs';
 import { CreatorMetaData } from '../rawsets/CreatorMetaData';
 import { Render } from '../rawsets/Render';
-export type TargetElement = {
+export declare type TargetElement = {
     name: string;
     template?: string;
     styles?: string[];

package/css/parse/index.d.ts

@@ -0,0 +1 @@
+export default function _default(css: any, options: any): any;