dom-render 1.0.77 → 1.0.78

package/DomRenderProxy.d.ts

@@ -14,7 +14,7 @@ export declare class DomRenderProxy<T extends object> implements ProxyHandler<T>
     run(objProxy: T): void;
     initRender(target: Node): void;
     getRawSets(): RawSet[];
-    render(raws?: RawSet[] | string): void;
+    render(raws?: RawSet[] | string, fullPathStr?: string): void;
     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;

package/DomRenderProxy.js

@@ -57,7 +57,7 @@ var DomRenderProxy = /** @class */ (function () {
         var _this = this;
         var _a, _b, _c, _d, _e, _f, _g;
         var onCreate = (_b = (_a = target).getAttribute) === null || _b === void 0 ? void 0 : _b.call(_a, "".concat(EventManager_1.EventManager.attrPrefix, "on-create"));
-        var createParam = undefined;
+        var createParam;
         if (onCreate) {
             createParam = ScriptUtils_1.ScriptUtils.evalReturn(onCreate, this._domRender_proxy);
         }
@@ -65,7 +65,7 @@ var DomRenderProxy = /** @class */ (function () {
         var innerHTML = (_e = target.innerHTML) !== null && _e !== void 0 ? _e : '';
         this._targets.add(target);
         var rawSets = RawSet_1.RawSet.checkPointCreates(target, this.config);
-        // console.log('-------rawSet', rawSets)
+        // console.log('initRender -------rawSet', rawSets)
         // 중요 초기에 한번 튕겨줘야함.
         EventManager_1.eventManager.applyEvent(this._domRender_proxy, EventManager_1.eventManager.findAttrElements(target, this.config), this.config);
         rawSets.forEach(function (it) {
@@ -95,7 +95,8 @@ var DomRenderProxy = /** @class */ (function () {
         });
         return Array.from(set);
     };
-    DomRenderProxy.prototype.render = function (raws) {
+    // 중요 important
+    DomRenderProxy.prototype.render = function (raws, fullPathStr) {
         var _this = this;
         if (typeof raws === 'string') {
             var iter = this._rawSets.get(raws);
@@ -108,15 +109,40 @@ var DomRenderProxy = /** @class */ (function () {
         }
         var removeRawSets = [];
         (raws !== null && raws !== void 0 ? raws : this.getRawSets()).forEach(function (it) {
-            var _a;
+            var _a, _b, _c;
             it.getUsingTriggerVariables(_this.config).forEach(function (path) { return _this.addRawSet(path, it); });
-            // console.log('------->', it, it.isConnected)
+            // console.log('------->', it, it.isConnected);
             if (it.isConnected) {
-                if ((_a = it.detect) === null || _a === void 0 ? void 0 : _a.action) {
+                // 중요 render될때 targetAttribute 체크 해야함.
+                var targetAttrMap = (_b = (_a = it.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.detect) === null || _c === void 0 ? void 0 : _c.action) {
                     it.detect.action();
                 }
+                else if (it.type === RawSet_1.RawSetType.TARGET_ELEMENT && it.data && fullPathStr && targetAttrMap && it.fragment.render) {
+                    new Map(JSON.parse(targetAttrMap)).forEach(function (v, k) {
+                        // it?.data.onChangeAttrRender(k, null, v);
+                        var isUsing = EventManager_1.EventManager.isUsingThisVar(v, "this.".concat(fullPathStr));
+                        if (isUsing) {
+                            var render = it.fragment.render;
+                            // console.log('render-->', (it.fragment as any).render)
+                            var script = "".concat(render.renderScript, " return ").concat(v, " ");
+                            var cval = ScriptUtils_1.ScriptUtils.eval(script, Object.assign(_this._domRender_proxy, { __render: render }));
+                            it.data.onChangeAttrRender(k, cval);
+                        }
+                        // console.log('---?', v, fullPathStr, isUsing);
+                    });
+                    // ------------------->
+                }
                 else {
                     var rawSets = it.render(_this._domRender_proxy, _this.config);
+                    // 대상 attribute 있으면
+                    // const targetAttrs = (it.point.node as Element).getAttribute(EventManager.normalAttrMapAttrName);
+                    // if (it?.data.onChangeAttrRender && it.type === RawSetType.TARGET_ELEMENT && targetAttrs) {
+                    //     new Map<string, string>(JSON.parse(targetAttrs)).forEach((v, k) => {
+                    //         it?.data.onChangeAttrRender(k, null, v);
+                    //     });
+                    // }
+                    // 그외 자식들 render
                     if (rawSets && rawSets.length > 0) {
                         _this.render(rawSets);
                     }
@@ -159,6 +185,7 @@ var DomRenderProxy = /** @class */ (function () {
             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);
+                // console.log('----->', iterable);
                 // array check
                 var front = strings.slice(0, strings.length - 1).map(function (it) { return isNaN(Number(it)) ? '.' + it : "[".concat(it, "]"); }).join('');
                 var last = strings[strings.length - 1];
@@ -170,8 +197,7 @@ var DomRenderProxy = /** @class */ (function () {
                     }
                 }
                 else if (iterable) {
-                    // console.log('----->', iterable)
-                    this.render(Array.from(iterable));
+                    this.render(Array.from(iterable), fullPathStr_1);
                 }
                 this._targets.forEach(function (it) {
                     // console.log('target------->,', it)
@@ -285,7 +311,7 @@ var DomRenderProxy = /** @class */ (function () {
     };
     DomRenderProxy.prototype.addRawSet = function (path, rawSet) {
         var _a;
-        // console.log('addRawSet-->', path, rawSet)
+        // console.log('addRawSet--> path:', path, 'rawSet:', rawSet)
         if (!this._rawSets.get(path)) {
             this._rawSets.set(path, new Set());
         }

package/README.MD

@@ -7,7 +7,7 @@ DOM-RENDER
 
 # 🚀 Quick start 
 ```html
-<script src="https://cdn.jsdelivr.net/npm/dom-render@1.0.77/dist/bundle.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/dom-render@1.0.78/dist/bundle.js"></script>
 ```
 ```html
 <!DOCTYPE html>

package/RawSet.d.ts

@@ -47,6 +47,12 @@ export declare type ElementInitCallBack = {
     targetElement: TargetElement;
     creatorMetaData: CreatorMetaData;
 };
+export declare enum RawSetType {
+    TEXT = "TEXT",
+    TARGET_ELEMENT = "TARGET_ELEMENT",
+    TARGET_ATTR = "TARGET_ATTR",
+    UNKOWN = "UNKOWN"
+}
 export declare type Render = {
     rawset?: RawSet;
     scripts?: {
@@ -63,8 +69,10 @@ export declare type Render = {
 };
 export declare class RawSet {
     uuid: string;
+    type: RawSetType;
     point: {
         start: Comment;
+        node: Node;
         end: Comment;
         thisVariableName?: string | null;
     };
@@ -72,7 +80,7 @@ export declare class RawSet {
     detect?: {
         action: Function;
     } | undefined;
-    data: any;
+    data?: any;
     static readonly DR = "dr";
     static readonly DR_IF_NAME = "dr-if";
     static readonly DR_FOR_NAME = "dr-for";
@@ -96,8 +104,9 @@ export declare class RawSet {
     static readonly drAttrsOriginName: Attrs;
     static readonly DR_TAGS: never[];
     static readonly DR_ATTRIBUTES: string[];
-    constructor(uuid: string, point: {
+    constructor(uuid: string, type: RawSetType, point: {
         start: Comment;
+        node: Node;
         end: Comment;
         thisVariableName?: string | null;
     }, fragment: DocumentFragment, detect?: {

package/RawSet.js

@@ -20,7 +20,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     return to.concat(ar || Array.prototype.slice.call(from));
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RawSet = exports.DestroyOptionType = void 0;
+exports.RawSet = exports.RawSetType = exports.DestroyOptionType = void 0;
 var RandomUtils_1 = require("./utils/random/RandomUtils");
 var StringUtils_1 = require("./utils/string/StringUtils");
 var ScriptUtils_1 = require("./utils/script/ScriptUtils");
@@ -47,14 +47,22 @@ var DestroyOptionType;
     DestroyOptionType["NO_DESTROY"] = "NO_DESTROY";
     DestroyOptionType["NO_MESSENGER_DESTROY"] = "NO_MESSENGER_DESTROY";
 })(DestroyOptionType = exports.DestroyOptionType || (exports.DestroyOptionType = {}));
+var RawSetType;
+(function (RawSetType) {
+    RawSetType["TEXT"] = "TEXT";
+    RawSetType["TARGET_ELEMENT"] = "TARGET_ELEMENT";
+    RawSetType["TARGET_ATTR"] = "TARGET_ATTR";
+    RawSetType["UNKOWN"] = "UNKOWN";
+})(RawSetType = exports.RawSetType || (exports.RawSetType = {}));
 var RawSet = /** @class */ (function () {
-    function RawSet(uuid, point, fragment, detect, data) {
-        if (data === void 0) { data = {}; }
+    function RawSet(uuid, type, point, fragment, detect, data) {
         this.uuid = uuid;
+        this.type = type;
         this.point = point;
         this.fragment = fragment;
         this.detect = detect;
         this.data = data;
+        // console.log('rawset constructor->', (this.point.node as Element).getAttributeNames());
     }
     Object.defineProperty(RawSet.prototype, "isConnected", {
         get: function () {
@@ -75,11 +83,17 @@ var RawSet = /** @class */ (function () {
             }
             else if (cNode.nodeType === Node.ELEMENT_NODE) {
                 var element_1 = cNode;
-                var targetAttrNames = ((_c = (_b = config === null || config === void 0 ? void 0 : config.targetAttrs) === null || _b === void 0 ? void 0 : _b.map(function (it) { return it.name; })) !== null && _c !== void 0 ? _c : []).concat(RawSet.DR_ATTRIBUTES);
-                script = targetAttrNames.map(function (it) {
-                    // console.log('-?', element.getAttribute(it))
-                    return element_1.getAttribute(it);
-                }).filter(function (it) { return it; }).join(';');
+                var targetAttrNames = ((_c = (_b = config === null || config === void 0 ? void 0 : config.targetAttrs) === null || _b === void 0 ? void 0 : _b.map(function (it) { return it.name; })) !== null && _c !== void 0 ? _c : []).concat(RawSet.DR_ATTRIBUTES); // .concat(EventManager.normalAttrMapAttrName);
+                var targetScripts_1 = targetAttrNames.map(function (it) { return element_1.getAttribute(it); }).filter(function (it) { return it; });
+                var targetAttrMap = element_1.getAttribute(EventManager_1.EventManager.normalAttrMapAttrName);
+                if (targetAttrMap) {
+                    // console.log('----->', targetAttr);
+                    new Map(JSON.parse(targetAttrMap)).forEach(function (v, k) {
+                        targetScripts_1.push(v);
+                    });
+                }
+                script = targetScripts_1.join(';');
+                // attribute쪽 체크하는거 추가
                 // console.log('----!!!!!-->', targetAttrNames)
                 // const otherAttrs = element.getAttributeNames()
                 //     .filter(it => !targetAttrNames.includes(it.toLowerCase()) && RawSet.isExporesion(element.getAttribute(it)))
@@ -104,6 +118,7 @@ var RawSet = /** @class */ (function () {
         // console.log('usingTriggerVariable----------->', usingTriggerVariables)
         return usingTriggerVariables;
     };
+    // 중요 render
     RawSet.prototype.render = function (obj, config) {
         var _this = this;
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
@@ -287,9 +302,9 @@ var RawSet = /** @class */ (function () {
         this.childAllRemove();
         (_a = this.point.start.parentNode) === null || _a === void 0 ? void 0 : _a.insertBefore(genNode, this.point.start.nextSibling);
     };
-    // 중요
+    // 중요 important
     RawSet.checkPointCreates = function (element, config) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         var thisVariableName = element.__domrender_this_variable_name;
         // console.log('checkPointCreates thisVariableName', thisVariableName);
         var nodeIterator = config.window.document.createNodeIterator(element, NodeFilter.SHOW_ALL, {
@@ -298,7 +313,7 @@ var RawSet = /** @class */ (function () {
                 if (node.nodeType === Node.TEXT_NODE) {
                     // console.log('????????', node.parentElement, node.parentElement?.getAttribute('dr-pre'));
                     // console.log('???????/',node.textContent, node.parentElement?.getAttribute('dr-pre'))
-                    // 나중에
+                    // TODO: 나중에
                     // const between = StringUtils.betweenRegexpStr('[$#]\\{', '\\}', StringUtils.deleteEnter((node as Text).data ?? ''))
                     var between = RawSet.exporesionGrouops(StringUtils_1.StringUtils.deleteEnter((_a = node.data) !== null && _a !== void 0 ? _a : ''));
                     // console.log('bbbb', between)
@@ -335,52 +350,53 @@ var RawSet = /** @class */ (function () {
         var _loop_1 = function () {
             if (currentNode.nodeType === Node.TEXT_NODE) {
                 var text = (_a = currentNode.textContent) !== null && _a !== void 0 ? _a : '';
-                var template_1 = config.window.document.createElement('template');
+                var template = config.window.document.createElement('template');
                 // const a = StringUtils.regexExec(/\$\{.*?\}/g, text);
                 // const a = StringUtils.regexExec(/[$#]\{.*?\}/g, text);
-                // const a = StringUtils.betweenRegexpStr('[$#]\\{', '\\}', text); // <--나중에..
-                var a = RawSet.exporesionGrouops(text); // <--나중에..
-                var map = a.map(function (it) {
-                    return {
-                        uuid: RandomUtils_1.RandomUtils.uuid(),
-                        content: it[0],
-                        regexArr: it
-                    };
-                });
-                var lasterIndex_1 = 0;
-                map.forEach(function (it) {
-                    var regexArr = it.regexArr;
-                    var preparedText = regexArr.input.substring(lasterIndex_1, regexArr.index);
-                    var start = config.window.document.createComment("start text ".concat(it.uuid));
-                    var end = config.window.document.createComment("end text ".concat(it.uuid));
+                // const a = StringUtils.betweenRegexpStr('[$#]\\{', '\\}', text); // <--TODO: 나중에..
+                var groups = RawSet.exporesionGrouops(text);
+                var map = groups.map(function (it) { return ({ uuid: RandomUtils_1.RandomUtils.uuid(), content: it[0], regexArr: it }); });
+                var lasterIndex = 0;
+                for (var i = 0; i < map.length; i++) {
+                    var it_4 = map[i];
+                    var regexArr = it_4.regexArr;
+                    var preparedText = regexArr.input.substring(lasterIndex, regexArr.index);
+                    var start = config.window.document.createComment("start text ".concat(it_4.uuid));
+                    var end = config.window.document.createComment("end text ".concat(it_4.uuid));
                     // layout setting
-                    template_1.content.append(document.createTextNode(preparedText)); // 사이사이값.
-                    template_1.content.append(start);
-                    template_1.content.append(end);
+                    template.content.append(document.createTextNode(preparedText)); // 사이사이값.
+                    template.content.append(start);
+                    template.content.append(end);
                     // content
                     var fragment = config.window.document.createDocumentFragment();
-                    fragment.append(config.window.document.createTextNode(it.content));
-                    pars.push(new RawSet(it.uuid, {
+                    fragment.append(config.window.document.createTextNode(it_4.content));
+                    pars.push(new RawSet(it_4.uuid, RawSetType.TEXT, {
                         start: start,
+                        node: currentNode,
                         end: end,
                         thisVariableName: thisVariableName
                     }, fragment));
-                    lasterIndex_1 = regexArr.index + it.content.length;
-                });
-                template_1.content.append(config.window.document.createTextNode(text.substring(lasterIndex_1, text.length)));
-                (_b = currentNode === null || currentNode === void 0 ? void 0 : currentNode.parentNode) === null || _b === void 0 ? void 0 : _b.replaceChild(template_1.content, currentNode);
+                    lasterIndex = regexArr.index + it_4.content.length;
+                }
+                template.content.append(config.window.document.createTextNode(text.substring(lasterIndex, text.length)));
+                (_b = currentNode === null || currentNode === void 0 ? void 0 : currentNode.parentNode) === null || _b === void 0 ? void 0 : _b.replaceChild(template.content, currentNode);
             }
-            else {
+            else if (currentNode.nodeType === Node.ELEMENT_NODE) {
                 var uuid = RandomUtils_1.RandomUtils.uuid();
+                var element_3 = currentNode;
                 var fragment = config.window.document.createDocumentFragment();
                 var start = config.window.document.createComment("start ".concat(uuid));
                 var end = config.window.document.createComment("end ".concat(uuid));
                 // console.log('start--', uuid)
-                (_c = currentNode === null || currentNode === void 0 ? void 0 : currentNode.parentNode) === null || _c === void 0 ? void 0 : _c.insertBefore(start, currentNode);
-                (_d = currentNode === null || currentNode === void 0 ? void 0 : currentNode.parentNode) === null || _d === void 0 ? void 0 : _d.insertBefore(end, currentNode.nextSibling);
+                var isElement = ((_d = (_c = config.targetElements) === null || _c === void 0 ? void 0 : _c.map(function (it) { return it.name.toLowerCase(); })) !== null && _d !== void 0 ? _d : []).includes(element_3.tagName.toLowerCase());
+                var targetAttrNames_2 = ((_f = (_e = config.targetAttrs) === null || _e === void 0 ? void 0 : _e.map(function (it) { return it.name; })) !== null && _f !== void 0 ? _f : []).concat(RawSet.DR_ATTRIBUTES);
+                var isAttr = element_3.getAttributeNames().filter(function (it) { return targetAttrNames_2.includes(it.toLowerCase()); }).length > 0;
+                (_g = currentNode === null || currentNode === void 0 ? void 0 : currentNode.parentNode) === null || _g === void 0 ? void 0 : _g.insertBefore(start, currentNode);
+                (_h = currentNode === null || currentNode === void 0 ? void 0 : currentNode.parentNode) === null || _h === void 0 ? void 0 : _h.insertBefore(end, currentNode.nextSibling);
                 fragment.append(currentNode);
-                pars.push(new RawSet(uuid, {
+                pars.push(new RawSet(uuid, isElement ? RawSetType.TARGET_ELEMENT : (isAttr ? RawSetType.TARGET_ATTR : RawSetType.UNKOWN), {
                     start: start,
+                    node: currentNode,
                     end: end,
                     thisVariableName: thisVariableName
                 }, fragment));
@@ -458,8 +474,8 @@ var RawSet = /** @class */ (function () {
             var nodeIterator = config.window.document.createNodeIterator(subElement, NodeFilter.SHOW_ELEMENT, {
                 acceptNode: function (node) {
                     if (node.nodeType === Node.ELEMENT_NODE) {
-                        var element_3 = node;
-                        return element_3.hasAttribute(as) ? NodeFilter.FILTER_ACCEPT : NodeFilter.FILTER_REJECT;
+                        var element_4 = node;
+                        return element_4.hasAttribute(as) ? NodeFilter.FILTER_ACCEPT : NodeFilter.FILTER_REJECT;
                     }
                     else {
                         return NodeFilter.FILTER_REJECT;
@@ -469,9 +485,9 @@ var RawSet = /** @class */ (function () {
             var node;
             // eslint-disable-next-line no-cond-assign
             while (node = nodeIterator.nextNode()) {
-                var element_4 = node;
-                element_4.setAttribute(to, (_a = element_4.getAttribute(as)) !== null && _a !== void 0 ? _a : '');
-                element_4.removeAttribute(as);
+                var element_5 = node;
+                element_5.setAttribute(to, (_a = element_5.getAttribute(as)) !== null && _a !== void 0 ? _a : '');
+                element_5.removeAttribute(as);
             }
         });
     };
@@ -581,7 +597,7 @@ var RawSet = /** @class */ (function () {
             template: template,
             callBack: function (element, obj, rawSet, attrs) {
                 var _a, _b, _c, _d;
-                // console.log('callback------->')
+                // console.log('callback------->', element)
                 if (!obj.__domrender_components) {
                     obj.__domrender_components = {};
                 }
@@ -590,6 +606,7 @@ var RawSet = /** @class */ (function () {
                 var attribute = DomUtils_1.DomUtils.getAttributeToObject(element);
                 var renderScript = 'var $component = this.__render.component; var $element = this.__render.element; var $router = this.__render.router; var $innerHTML = this.__render.innerHTML; var $attribute = this.__render.attribute; var $creatorMetaData = this.__render.creatorMetaData;';
                 var render = Object.freeze({
+                    renderScript: renderScript,
                     element: element,
                     innerHTML: element.innerHTML,
                     attribute: attribute,
@@ -625,6 +642,16 @@ var RawSet = /** @class */ (function () {
                 i.creator = new Proxy(rawSet.point.thisVariableName ? ScriptUtils_1.ScriptUtils.evalReturn(rawSet.point.thisVariableName, obj) : obj, new Types_1.DomRenderFinalProxy());
                 this.__creatorMetaData = i;
                 render = __assign({ component: instance, creatorMetaData: i }, render);
+                // 중요 dr-normal-attr-map
+                var normalAttrMap = element.getAttribute(EventManager_1.EventManager.normalAttrMapAttrName);
+                if (instance.onChangeAttrRender && normalAttrMap) {
+                    new Map(JSON.parse(normalAttrMap)).forEach(function (value, key) {
+                        var script = "".concat(renderScript, " return ").concat(value, " ");
+                        var cval = ScriptUtils_1.ScriptUtils.eval(script, Object.assign(obj, { __render: render }));
+                        // element.setAttribute(key, cval);
+                        instance.onChangeAttrRender(key, cval);
+                    });
+                }
                 // dr-on-create onCreateRender
                 var onCreate = element.getAttribute("".concat(EventManager_1.EventManager.attrPrefix, "on-create"));
                 this.__render = render;
@@ -662,10 +689,10 @@ var RawSet = /** @class */ (function () {
                 var data = RawSet.drThisCreate(element, "this.__domrender_components.".concat(componentKey), '', true, obj, config);
                 // 넘어온 innerHTML에 this가 있는걸 다시 복호화해서 제대로 작동하도록한다.
                 if (innerHTMLThisRandom) {
-                    var template_2 = config.window.document.createElement('template');
-                    template_2.content.append(data);
-                    template_2.innerHTML = template_2.innerHTML.replace(RegExp(innerHTMLThisRandom, 'g'), 'this.');
-                    data = template_2.content;
+                    var template_1 = config.window.document.createElement('template');
+                    template_1.content.append(data);
+                    template_1.innerHTML = template_1.innerHTML.replace(RegExp(innerHTMLThisRandom, 'g'), 'this.');
+                    data = template_1.content;
                 }
                 data.render = render;
                 return data;