dom-render 1.0.67 → 1.0.68

package/DomRender.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DomRender = void 0;
 var DomRenderProxy_1 = require("./DomRenderProxy");
-var DomRender = (function () {
+var DomRender = /** @class */ (function () {
     function DomRender() {
     }
     DomRender.run = function (obj, target, config) {
@@ -26,3 +26,4 @@ var DomRender = (function () {
     return DomRender;
 }());
 exports.DomRender = DomRender;
+// export default DomRender;

package/DomRenderProxy.d.ts

@@ -23,6 +23,7 @@ export declare class DomRenderProxy<T extends object> implements ProxyHandler<T>
     addRef(parent: object, path: string): void;
     addRawSetAndRender(path: string, rawSet: RawSet): void;
     addRawSet(path: string, rawSet: RawSet): void;
-    removeRawSet(raws: RawSet): void;
-    garbageRawSet(): void;
+    removeRawSet(...raws: RawSet[]): void;
+    private targetGarbageRawSet;
+    private garbageRawSet;
 }

package/DomRenderProxy.js

@@ -6,7 +6,7 @@ var EventManager_1 = require("./events/EventManager");
 var ScriptUtils_1 = require("./utils/script/ScriptUtils");
 var Types_1 = require("./types/Types");
 var excludeGetSetPropertys = ['onBeforeReturnGet', 'onBeforeReturnSet', '__domrender_components', '__render', '_DomRender_isFinal', '_domRender_ref', '_rawSets', '_domRender_proxy', '_targets', '_DomRender_origin', '_DomRender_ref', '_DomRender_proxy'];
-var DomRenderProxy = (function () {
+var DomRenderProxy = /** @class */ (function () {
     function DomRenderProxy(_domRender_origin, target, config) {
         this._domRender_origin = _domRender_origin;
         this.config = config;
@@ -33,6 +33,7 @@ var DomRenderProxy = (function () {
         if (obj) {
             Object.keys(obj).forEach(function (it) {
                 var _a, _b;
+                // console.log('key-------->', it)
                 var target = obj[it];
                 if (target !== undefined && target !== null && typeof target === 'object' && !DomRenderProxy.isFinal(target) && !Object.isFrozen(target) && !(obj instanceof Types_1.Shield)) {
                     var filter = (_b = (_a = _this.config.proxyExcludeTyps) === null || _a === void 0 ? void 0 : _a.filter(function (it) { return target instanceof it; })) !== null && _b !== void 0 ? _b : [];
@@ -83,6 +84,7 @@ var DomRenderProxy = (function () {
     };
     DomRenderProxy.prototype.render = function (raws) {
         var _this = this;
+        var removeRawSets = [];
         (raws !== null && raws !== void 0 ? raws : this.getRawSets()).forEach(function (it) {
             it.getUsingTriggerVariables(_this.config).forEach(function (path) { return _this.addRawSet(path, it); });
             if (it.point.start.isConnected && it.point.start.isConnected) {
@@ -90,13 +92,18 @@ var DomRenderProxy = (function () {
                 _this.render(rawSets);
             }
             else {
-                _this.removeRawSet(it);
+                removeRawSets.push(it);
+                // this.removeRawSet(it)
             }
         });
+        if (removeRawSets.length > 0) {
+            this.removeRawSet.apply(this, removeRawSets);
+        }
     };
     DomRenderProxy.prototype.root = function (paths, value, lastDoneExecute) {
         var _this = this;
         if (lastDoneExecute === void 0) { lastDoneExecute = true; }
+        // console.log('root--->', paths, value, this._domRender_ref, this._domRender_origin);
         var fullPaths = [];
         if (this._domRender_ref.size > 0) {
             this._domRender_ref.forEach(function (it, key) {
@@ -111,13 +118,20 @@ var DomRenderProxy = (function () {
         }
         else {
             var strings = paths.reverse();
-            var fullPathStr_1 = strings.join('.');
+            // const fullPathStr = strings.join('.');
+            var fullPathStr_1 = strings.map(function (it) { return isNaN(Number(it)) ? '.' + it : "[".concat(it, "]"); }).join('').slice(1);
             if (lastDoneExecute) {
                 var iterable = this._rawSets.get(fullPathStr_1);
-                var front = strings.slice(0, strings.length - 1).join('.');
+                // array check
+                var front = strings.slice(0, strings.length - 1).map(function (it) { return isNaN(Number(it)) ? '.' + it : "[".concat(it, "]"); }).join('');
+                // front = front.replace(/\.\[/g, '[');
+                // const front = strings.slice(0, strings.length - 1).join('.');
+                // front = front.replace(/\.\[/g, '[');
                 var last = strings[strings.length - 1];
-                if (!isNaN(Number(last)) && Array.isArray(ScriptUtils_1.ScriptUtils.evalReturn('this.' + front, this._domRender_proxy))) {
-                    var aIterable = this._rawSets.get(front);
+                // console.log('root-else-->', fullPathStr, iterable, front, last)
+                // if (!isNaN(Number(last)) && Array.isArray(ScriptUtils.evalReturn('this' + front, this._domRender_proxy))) {
+                if (last === 'length' && Array.isArray(ScriptUtils_1.ScriptUtils.evalReturn('this' + front, this._domRender_proxy))) {
+                    var aIterable = this._rawSets.get(front.slice(1));
                     if (aIterable) {
                         this.render(Array.from(aIterable));
                     }
@@ -138,6 +152,16 @@ var DomRenderProxy = (function () {
     };
     DomRenderProxy.prototype.set = function (target, p, value, receiver) {
         var _a, _b, _c;
+        if (typeof p === 'string' && p !== '__domrender_components' && excludeGetSetPropertys.includes(p)) {
+            target[p] = value;
+            return true;
+        }
+        // console.log('set proxy-->', target, p, value, this._rawSets, this._domRender_ref)
+        // if (typeof p === 'string' && '__render' === p) {
+        //     (target as any)[p] = value;
+        //     return true;
+        // }
+        // console.log('set--?', p, target, value);
         if (typeof p === 'string') {
             value = this.proxy(receiver, value, p);
         }
@@ -153,6 +177,7 @@ var DomRenderProxy = (function () {
     };
     DomRenderProxy.prototype.get = function (target, p, receiver) {
         var _a, _b, _c;
+        // console.log('get-->', target, p, receiver);
         if (p === '_DomRender_origin') {
             return this._domRender_origin;
         }
@@ -163,6 +188,20 @@ var DomRenderProxy = (function () {
             return this;
         }
         else {
+            // Date라던지 이런놈들은-_-프록시가 이상하게 동작해서
+            // console.log('--->', p, target, target.bind, 'bind' in target)
+            // if ((p in target) && ('bind' in target)) {
+            //     try{
+            //     return (target as any)[p].bind(target);
+            //     }catch (e) {
+            //         console.error(e)
+            //     }
+            // } else {
+            //     return (target as any)[p]
+            // }
+            // return (p in target) ? (target as any)[p].bind(target) : (target as any)[p]
+            // console.log('-->', p, Object.prototype.toString.call((target as any)[p]), (target as any)[p])
+            // return (target as any)[p]
             var it_1 = target[p];
             if (it_1 && typeof it_1 === 'object' && ('_DomRender_isProxy' in it_1) && Object.prototype.toString.call(it_1._DomRender_origin) === '[object Date]') {
                 it_1 = it_1._DomRender_origin;
@@ -208,16 +247,42 @@ var DomRenderProxy = (function () {
     };
     DomRenderProxy.prototype.addRawSet = function (path, rawSet) {
         var _a;
+        // console.log('addRawSet-->', path, rawSet)
         if (!this._rawSets.get(path)) {
             this._rawSets.set(path, new Set());
         }
         (_a = this._rawSets.get(path)) === null || _a === void 0 ? void 0 : _a.add(rawSet);
     };
-    DomRenderProxy.prototype.removeRawSet = function (raws) {
+    // public removeRawSet(...raws: RawSet[]) {
+    //     this._rawSets.forEach(it => {
+    //         raws.forEach(sit => it.delete(sit));
+    //     })
+    //     this.garbageRawSet();
+    // }
+    DomRenderProxy.prototype.removeRawSet = function () {
+        var raws = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            raws[_i] = arguments[_i];
+        }
         this._rawSets.forEach(function (it) {
-            it.delete(raws);
+            it.forEach(function (sit) {
+                if (!sit.isConnected) {
+                    it.delete(sit);
+                }
+                else if (raws.includes(sit)) {
+                    it.delete(sit);
+                }
+            });
+        });
+        this.targetGarbageRawSet();
+    };
+    DomRenderProxy.prototype.targetGarbageRawSet = function () {
+        var _this = this;
+        this._targets.forEach(function (it) {
+            if (!it.isConnected) {
+                _this._targets.delete(it);
+            }
         });
-        this.garbageRawSet();
     };
     DomRenderProxy.prototype.garbageRawSet = function () {
         var _this = this;