dom-render 1.0.94 → 1.0.96

package/DomRenderProxy.d.ts

@@ -18,6 +18,7 @@ export declare class DomRenderProxy<T extends object> implements ProxyHandler<T>
     root(paths: string[], value?: any, lastDoneExecute?: boolean): string[];
     set(target: T, p: string | symbol, value: any, receiver: T): boolean;
     get(target: T, p: string | symbol, receiver: any): any;
+    deleteProperty(target: T, p: string | symbol): boolean;
     has(target: T, p: string | symbol): boolean;
     proxy(parentProxy: T, obj: T | any, p: string): any;
     addRef(parent: object, path: string): void;

package/DomRenderProxy.js

@@ -51,6 +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 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) {
@@ -102,7 +104,7 @@ var DomRenderProxy = /** @class */ (function () {
     };
     DomRenderProxy.prototype.initRender = function (target) {
         var _this = this;
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        var _a, _b, _c, _d, _e;
         var onCreate = (_b = (_a = target).getAttribute) === null || _b === void 0 ? void 0 : _b.call(_a, RawSet_1.RawSet.DR_ON_CREATE_ARGUMENTS_OPTIONNAME);
         var createParam = [];
         if (onCreate) {
@@ -129,22 +131,24 @@ var DomRenderProxy = /** @class */ (function () {
                 });
             }
         });
-        this.render(this.getRawSets());
-        // const render = {target} as Render;
-        // const creatorMetaData = {
-        //     creator: this._domRender_proxy,
-        //     rootCreator: this._domRender_proxy,
-        //     innerHTML
-        // } as CreatorMetaData;
-        var onInit = (_g = (_f = target).getAttribute) === null || _g === void 0 ? void 0 : _g.call(_f, RawSet_1.RawSet.DR_ON_INIT_ARGUMENTS_OPTIONNAME);
-        var initParam = [];
-        if (onCreate) {
-            initParam = ScriptUtils_1.ScriptUtils.evalReturn(onCreate, this._domRender_proxy);
-            if (!Array.isArray(initParam)) {
-                initParam = [initParam];
+        this.render(this.getRawSets()).then(function (it) {
+            var _a, _b, _c, _d;
+            // const render = {target} as Render;
+            // const creatorMetaData = {
+            //     creator: this._domRender_proxy,
+            //     rootCreator: this._domRender_proxy,
+            //     innerHTML
+            // } as CreatorMetaData;
+            var onInit = (_b = (_a = target).getAttribute) === null || _b === void 0 ? void 0 : _b.call(_a, RawSet_1.RawSet.DR_ON_INIT_ARGUMENTS_OPTIONNAME);
+            var initParam = [];
+            if (onCreate) {
+                initParam = ScriptUtils_1.ScriptUtils.evalReturn(onCreate, _this._domRender_proxy);
+                if (!Array.isArray(initParam)) {
+                    initParam = [initParam];
+                }
             }
-        }
-        (_j = (_h = this._domRender_proxy) === null || _h === void 0 ? void 0 : _h.onInitRender) === null || _j === void 0 ? void 0 : _j.call.apply(_j, __spreadArray([_h], initParam, false));
+            (_d = (_c = _this._domRender_proxy) === null || _c === void 0 ? void 0 : _c.onInitRender) === null || _d === void 0 ? void 0 : _d.call.apply(_d, __spreadArray([_c], initParam, false));
+        });
     };
     DomRenderProxy.prototype.getRawSets = function () {
         var set = new Set();
@@ -179,11 +183,11 @@ var DomRenderProxy = /** @class */ (function () {
                                 switch (_e.label) {
                                     case 0:
                                         it_1.getUsingTriggerVariables(this_1.config).forEach(function (path) { return _this.addRawSet(path, it_1); });
-                                        if (!it_1.isConnected) return [3 /*break*/, 5];
+                                        if (!it_1.isConnected) return [3 /*break*/, 6];
                                         targetAttrMap = (_b = (_a = it_1.point.node) === null || _a === void 0 ? void 0 : _a.getAttribute) === null || _b === void 0 ? void 0 : _b.call(_a, EventManager_1.EventManager.normalAttrMapAttrName);
                                         if (!((_c = it_1.detect) === null || _c === void 0 ? void 0 : _c.action)) return [3 /*break*/, 1];
                                         it_1.detect.action();
-                                        return [3 /*break*/, 4];
+                                        return [3 /*break*/, 5];
                                     case 1:
                                         if (!(it_1.type === RawSetType_1.RawSetType.TARGET_ELEMENT && it_1.data && fullPathStr && targetAttrMap && it_1.fragment.render)) return [3 /*break*/, 2];
                                         new Map(JSON.parse(targetAttrMap)).forEach(function (v, k) {
@@ -199,20 +203,20 @@ var DomRenderProxy = /** @class */ (function () {
                                             }
                                             // console.log('---?', v, fullPathStr, isUsing);
                                         });
-                                        return [3 /*break*/, 4];
+                                        return [3 /*break*/, 5];
                                     case 2: return [4 /*yield*/, it_1.render(this_1._domRender_proxy, this_1.config)];
                                     case 3:
                                         rawSets_2 = _e.sent();
-                                        // 그외 자식들 render
-                                        if (rawSets_2 && rawSets_2.length > 0) {
-                                            this_1.render(rawSets_2);
-                                        }
-                                        _e.label = 4;
-                                    case 4: return [3 /*break*/, 6];
-                                    case 5:
+                                        if (!(rawSets_2 && rawSets_2.length > 0)) return [3 /*break*/, 5];
+                                        return [4 /*yield*/, this_1.render(rawSets_2)];
+                                    case 4:
+                                        _e.sent();
+                                        _e.label = 5;
+                                    case 5: return [3 /*break*/, 7];
+                                    case 6:
                                         removeRawSets.push(it_1);
-                                        _e.label = 6;
-                                    case 6: return [2 /*return*/];
+                                        _e.label = 7;
+                                    case 7: return [2 /*return*/];
                                 }
                             });
                         };
@@ -262,18 +266,65 @@ var DomRenderProxy = /** @class */ (function () {
             });
         }
         else {
+            // 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);
+            // console.log('-------fullPathStr', fullPathStr, lastDoneExecute);
             if (lastDoneExecute) {
+                // const firstData = ScriptUtils.evalReturn('this.' + firstPathStr, this._domRender_proxy);
+                // console.log('-------', firstPathStr, firstData);
+                // if (firstData instanceof Dictionary) {
+                // }
                 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 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 = [];
+                    firstTargets === null || firstTargets === void 0 ? void 0 : firstTargets.forEach(function (it) {
+                        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 === RawSetOperatorType_1.RawSetOperatorType.DR_THIS_PROPERTY) {
+                            firstTargetDictionary.push(it);
+                        }
+                    });
+                    if (firstTargetDictionary.length > 0) {
+                        // console.log('ddddddddddd', firstTargetDictionary);
+                        var rawSets_3 = [];
+                        var skip_1 = false;
+                        firstTargetDictionary.forEach(function (it) {
+                            var _a, _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 = DrThisProperty_1.DrThisProperty.append(_this._domRender_proxy, fullPathStr_1, last_1, it, _this.config);
+                                if (raws) {
+                                    rawSets_3.push.apply(rawSets_3, raws);
+                                }
+                            }
+                            else {
+                                skip_1 = true;
+                            }
+                        });
+                        if (skip_1 === false || rawSets_3.length > 0) {
+                            return _this.render(rawSets_3);
+                        }
+                    }
                     if (last_1 === 'length' && Array.isArray(data_1)) {
-                        var aIterable = _this._rawSets.get(front_1.slice(1));
+                        var aIterable = _this._rawSets.get(firstPathStr);
                         if (aIterable) {
                             return _this.render(Array.from(aIterable));
                         }
@@ -282,8 +333,9 @@ 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('target------->,', 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);
@@ -299,6 +351,7 @@ var DomRenderProxy = /** @class */ (function () {
     };
     DomRenderProxy.prototype.set = function (target, p, value, receiver) {
         var _a, _b;
+        // console.log('set-->', p, value, target, receiver);
         if (typeof p === 'string' && p !== '__domrender_components' && excludeGetSetPropertys.includes(p)) {
             target[p] = value;
             return true;
@@ -360,6 +413,13 @@ var DomRenderProxy = /** @class */ (function () {
             return it_2;
         }
     };
+    DomRenderProxy.prototype.deleteProperty = function (target, p) {
+        delete target[p];
+        if (typeof p === 'string') {
+            this.root([p]);
+        }
+        return true;
+    };
     DomRenderProxy.prototype.has = function (target, p) {
         return p === '_DomRender_isProxy' || p in target;
     };