npm - @dooboostore/dom-render - Versions diffs - 1.0.107 → 1.0.109 - Mend

@dooboostore/dom-render 1.0.107 → 1.0.109

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (1246) hide show

package/dist/cjs/rawsets/RawSet.js CHANGED Viewed

@@ -2,7 +2,6 @@ var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -16,7 +15,6 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 var RawSet_exports = {};
 __export(RawSet_exports, {
   RawSet: () => RawSet
@@ -24,7 +22,6 @@ __export(RawSet_exports, {
 module.exports = __toCommonJS(RawSet_exports);
 var import_RandomUtils = require("@dooboostore/core/random/RandomUtils");
 var import_StringUtils = require("@dooboostore/core/string/StringUtils");
-var import_ScriptUtils = require("@dooboostore/core-web/script/ScriptUtils");
 var import_EventManager = require("../events/EventManager");
 var import_Range = require("../iterators/Range");
 var import_ElementUtils = require("@dooboostore/core-web/element/ElementUtils");
@@ -56,6 +53,7 @@ var import_OnCreatedThisChild = require("../lifecycle/OnCreatedThisChild");
 var import_OnDestroyRender = require("../lifecycle/OnDestroyRender");
 var import_DrTargetElementIsElement = require("../operators/DrTargetElementIsElement");
 var import_ObjectUtils = require("@dooboostore/core/object/ObjectUtils");
+var import_NodeUtils = require("@dooboostore/core-web/node/NodeUtils");
 const _RawSet = class _RawSet {
   constructor(uuid, type, point, dataSet, detect) {
     this.uuid = uuid;
@@ -63,46 +61,45 @@ const _RawSet = class _RawSet {
     this.point = point;
     this.dataSet = dataSet;
     this.detect = detect;
-    __publicField(this, "findNearThis", (obj, rawSet = this) => {
+    this.findNearThis = (obj, rawSet = this) => {
       const path = this.findNearThisPath(rawSet);
       if (path) {
         const optionalPath = import_ObjectUtils.ObjectUtils.Path.toOptionalChainPath(path);
-        return import_ScriptUtils.ScriptUtils.evaluateReturn(optionalPath, obj);
+        return import_ObjectUtils.ObjectUtils.Script.evaluateReturn(optionalPath, obj);
       }
-    });
-    __publicField(this, "findParentThis", (obj, rawSet = this) => {
+    };
+    this.findParentThis = (obj, rawSet = this) => {
       const path = this.findParentThisPath(rawSet);
       if (path) {
         const optionalPath = import_ObjectUtils.ObjectUtils.Path.toOptionalChainPath(path);
-        return import_ScriptUtils.ScriptUtils.evaluateReturn(optionalPath, obj);
+        return import_ObjectUtils.ObjectUtils.Script.evaluateReturn(optionalPath, obj);
       }
-    });
-    __publicField(this, "findNearThisPath", (rawSet = this) => {
+    };
+    this.findNearThisPath = (rawSet = this) => {
       const paths = this.findThisPaths(rawSet);
       return paths[paths.length - 1];
-    });
-    __publicField(this, "findParentThisPath", (rawSet = this) => {
+    };
+    this.findParentThisPath = (rawSet = this) => {
       const paths = this.findThisPaths(rawSet);
       return paths[paths.length - 2];
-    });
-    __publicField(this, "findThisPaths", (rawSet = this) => {
+    };
+    this.findThisPaths = (rawSet = this) => {
       const paths = [];
       const findPath = (rawSet2) => {
         if (rawSet2 && rawSet2.point) {
-          if ("getAttribute" in rawSet2.point.start && rawSet2.point.start.getAttribute("this-path")) {
+          if (rawSet2.point?.start && "getAttribute" in rawSet2.point.start && rawSet2.point.start.getAttribute("this-path")) {
             paths.push(rawSet2.point.start.getAttribute("this-path"));
           }
-          if (rawSet2.point.parentRawSet)
-            findPath(rawSet2.point.parentRawSet);
+          if (rawSet2.point.parentRawSet) findPath(rawSet2.point.parentRawSet);
         }
       };
       findPath(rawSet);
       paths.push("this");
       return paths.reverse();
-    });
+    };
   }
   get isConnected() {
-    return this.point.start.isConnected && this.point.end.isConnected;
+    return this.point && this.point.start && this.point.end && this.point.start.isConnected && this.point.end.isConnected;
   }
   // 중요
   getUsingTriggerVariables(config) {
@@ -117,7 +114,12 @@ const _RawSet = class _RawSet {
         }
       } else if (cNode.nodeType === Node.ELEMENT_NODE) {
         const element = cNode;
-        const targetAttrNames = (config?.targetAttrs?.map((it) => it.name) ?? []).concat(_RawSet.DR_ATTRIBUTES, _RawSet.DR_DETECT_FILTER_OPTIONNAME, _RawSet.DR_DETECT_IF_OPTIONNAME, _RawSet.DR_DETECT_ATTR_OPTIONNAME);
+        const targetAttrNames = (config?.targetAttrs?.map((it) => it.name) ?? []).concat(
+          _RawSet.DR_ATTRIBUTES,
+          _RawSet.DR_DETECT_FILTER_OPTIONNAME,
+          _RawSet.DR_DETECT_IF_OPTIONNAME,
+          _RawSet.DR_DETECT_ATTR_OPTIONNAME
+        );
         const targetScripts = targetAttrNames.map((it) => element.getAttribute(it)).filter((it) => it).map((it) => `(${it})`);
         const targetAttrMap = element.getAttribute(import_EventManager.EventManager.normalAttrMapAttrName);
         if (targetAttrMap) {
@@ -138,6 +140,8 @@ const _RawSet = class _RawSet {
     return usingTriggerVariables;
   }
   // 중요 render 처리 부분
+  // public async render(obj: any, config: DomRenderConfig): Promise<RawSet[]> {
+  // }
   async render(obj, config) {
     const genNode = config.window.document.importNode(this.dataSet.fragment, true);
     const raws = [];
@@ -145,6 +149,7 @@ const _RawSet = class _RawSet {
     const onElementInitCallBacks = [];
     const onThisComponentSetCallBacks = [];
     const drAttrs = [];
+    const executedOperators = [];
     for (const cNode of Array.from(genNode.childNodes.values())) {
       let attribute = {};
       if (cNode.nodeType === Node.ELEMENT_NODE) {
@@ -158,7 +163,7 @@ const _RawSet = class _RawSet {
         element: cNode,
         attribute,
         rootObject: obj,
-        scriptUtils: import_ScriptUtils.ScriptUtils,
+        scriptUtils: import_ObjectUtils.ObjectUtils.Script,
         nearThis: this.findNearThis(obj),
         parentThis: this.findParentThis(obj),
         bindScript: ` /** render **/
@@ -180,12 +185,12 @@ const _RawSet = class _RawSet {
         const runText = _RawSet.expressionGroups(textContent)[0][1];
         let newNode;
         if (textContent?.startsWith("#")) {
-          const r = import_ScriptUtils.ScriptUtils.evaluate(`${__render.bindScript} return ${runText}`, Object.assign(obj, { __render }));
+          const r = import_ObjectUtils.ObjectUtils.Script.evaluate(`${__render.bindScript} return ${runText}`, Object.assign(obj, { __render }));
           const template = config.window.document.createElement("template");
           template.innerHTML = r;
           newNode = template.content;
         } else {
-          const r = import_ScriptUtils.ScriptUtils.evaluate(`${__render.bindScript}  return ${runText}`, Object.assign(obj, { __render }));
+          const r = import_ObjectUtils.ObjectUtils.Script.evaluate(`${__render.bindScript}  return ${runText}`, Object.assign(obj, { __render }));
           newNode = config.window.document.createTextNode(r);
         }
         cNode.parentNode?.replaceChild(newNode, cNode);
@@ -245,9 +250,10 @@ const _RawSet = class _RawSet {
         for (const operator of operators) {
           const state = await operator.start();
           if (state === import_OperatorExecuter.ExecuteState.EXECUTE) {
+            executedOperators.push(operator);
             break;
           } else if (state === import_OperatorExecuter.ExecuteState.STOP) {
-            return raws;
+            return { raws, executedOperators };
           }
         }
       }
@@ -267,11 +273,14 @@ const _RawSet = class _RawSet {
           fag: genNode,
           scripts: import_EventManager.EventManager.setBindProperty(config?.scripts, obj)
         });
-        import_ScriptUtils.ScriptUtils.evaluate(`
+        import_ObjectUtils.ObjectUtils.Script.evaluate(
+          `
                 const ${import_EventManager.EventManager.FAG_VARNAME} = this.__render.fag;
                 const ${import_EventManager.EventManager.SCRIPTS_VARNAME} = this.__render.scripts;
                 const ${import_EventManager.EventManager.RAWSET_VARNAME} = this.__render.rawSet;
-                ${it.drCompleteOption}`, Object.assign(obj, { __render: render }));
+                ${it.drCompleteOption}`,
+          Object.assign(obj, { __render: render })
+        );
       }
     });
     for (const it of onThisComponentSetCallBacks) {
@@ -299,7 +308,7 @@ const _RawSet = class _RawSet {
         }
       });
     }
-    return raws;
+    return { raws, executedOperators };
   }
   // 중요 스타일 적용 부분
   static generateRuleSelector(start, end, sit) {
@@ -332,9 +341,7 @@ const _RawSet = class _RawSet {
         const isRoot = rule.selector.includes(":root");
         if (!isRoot) {
           const selectors = rule.selector.split(",").map((s) => s.trim());
-          const transformedSelectors = selectors.map(
-            (selector) => this.generateRuleSelector(start, end, selector)
-          );
+          const transformedSelectors = selectors.map((selector) => this.generateRuleSelector(start, end, selector));
           rule.selector = transformedSelectors.join(", ");
         }
       } else if ((0, import_CssParser.isAtRule)(rule)) {
@@ -346,9 +353,7 @@ const _RawSet = class _RawSet {
             rule.children.forEach((childRule) => {
               if ((0, import_CssParser.isStyleRule)(childRule)) {
                 const selectors = childRule.selector.split(",").map((s) => s.trim());
-                const transformedSelectors = selectors.map(
-                  (selector) => this.generateRuleSelector(start, end, selector)
-                );
+                const transformedSelectors = selectors.map((selector) => this.generateRuleSelector(start, end, selector));
                 childRule.selector = transformedSelectors.join(", ");
               }
             });
@@ -366,7 +371,11 @@ const _RawSet = class _RawSet {
     return styleBody;
   }
   applyEvent(obj, fragment = this.dataSet.fragment, config) {
-    this.dataSet.config.eventManager.applyEvent(obj, this.dataSet.config.eventManager.findAttrElements(fragment, config), config);
+    this.dataSet.config.eventManager.applyEvent(
+      obj,
+      this.dataSet.config.eventManager.findAttrElements(fragment, config),
+      config
+    );
   }
   onRenderedEvent(obj, nodes, config) {
     this.dataSet.config.eventManager.onRenderedEvent(obj, nodes, config);
@@ -383,7 +392,7 @@ const _RawSet = class _RawSet {
   getDrAppendAttributeAndDelete(element, obj) {
     let data = element.getAttribute(_RawSet.DR_APPENDER_NAME);
     if (data && !/\[.+\]/g.test(data)) {
-      const currentIndex = import_ScriptUtils.ScriptUtils.evaluateReturn(`${import_ObjectUtils.ObjectUtils.Path.toOptionalChainPath(data)}?.length -1`, obj);
+      const currentIndex = import_ObjectUtils.ObjectUtils.Script.evaluateReturn(`${import_ObjectUtils.ObjectUtils.Path.toOptionalChainPath(data)}?.length -1`, obj);
       data = `${data}[${currentIndex}]`;
       element.setAttribute(_RawSet.DR_APPENDER_NAME, data);
     }
@@ -396,19 +405,28 @@ const _RawSet = class _RawSet {
   }
   // 중요 important
   static checkPointCreates(element, obj, config) {
-    const nodeIterator = config.window.document?.createNodeIterator(element, NodeFilter.SHOW_ALL, {
-      acceptNode(node) {
-        if (node.nodeType === Node.TEXT_NODE) {
+    const NodeFilter2 = config.window.NodeFilter;
+    const Node2 = config.window.Node;
+    const processedNodes = /* @__PURE__ */ new Set();
+    const findNodes = import_NodeUtils.NodeUtils.findNodes(
+      element,
+      (node) => {
+        if (node.nodeType === Node2.TEXT_NODE) {
           const between = _RawSet.expressionGroups(import_StringUtils.StringUtils.deleteEnter(node.data ?? ""));
-          return between?.length > 0 ? NodeFilter.FILTER_ACCEPT : NodeFilter.FILTER_REJECT;
-        } else if (node.nodeType === Node.ELEMENT_NODE) {
+          const r2 = between?.length > 0 ? import_NodeUtils.NodeUtils.FindNodesFilterResult.MATCH_AND_SKIP_CHILDREN : import_NodeUtils.NodeUtils.FindNodesFilterResult.NO_MATCH_AND_SKIP_CHILDREN;
+          return r2;
+        } else if (node.nodeType === Node2.ELEMENT_NODE) {
           const element2 = node;
           if (element2.hasAttribute(_RawSet.DR_PRE_NAME)) {
-            return NodeFilter.FILTER_REJECT;
+            let r3 = import_NodeUtils.NodeUtils.FindNodesFilterResult.NO_MATCH_AND_SKIP_CHILDREN;
+            return r3;
           }
           if (element2.hasAttribute(import_EventManager.EventManager.attrAttrName)) {
             const script = element2.getAttribute(import_EventManager.EventManager.attrAttrName) ?? "";
-            const keyValuePairs = Array.from(script.matchAll(/(\w+):\s*([^,}]+)/g)).map((match) => ({ key: match[1], value: match[2] }));
+            const keyValuePairs = Array.from(script.matchAll(/(\w+):\s*([^,}]+)/g)).map((match) => ({
+              key: match[1],
+              value: match[2]
+            }));
             (keyValuePairs ?? []).forEach((it) => {
               element2.setAttribute(it.key, "${" + it.value + "}$");
             });
@@ -429,7 +447,7 @@ const _RawSet = class _RawSet {
               const originVariable = variablePath;
               variablePath = variablePath.replace(/#[^#]*#/g, "({})");
               const optionalChainPath = import_ObjectUtils.ObjectUtils.Path.toOptionalChainPath(variablePath);
-              const cval = import_ScriptUtils.ScriptUtils.evaluateReturn(optionalChainPath, Object.assign(obj));
+              const cval = import_ObjectUtils.ObjectUtils.Script.evaluateReturn(optionalChainPath, Object.assign(obj));
               if (cval === null) {
                 element2.removeAttribute(it);
               } else {
@@ -441,58 +459,75 @@ const _RawSet = class _RawSet {
             return isTargetAttr;
           }).length > 0;
           if (linkVariables.size) {
-            element2.setAttribute(import_EventManager.EventManager.linkTargetMapAttrName, JSON.stringify(Array.from(linkVariables.entries())));
+            element2.setAttribute(
+              import_EventManager.EventManager.linkTargetMapAttrName,
+              JSON.stringify(Array.from(linkVariables.entries()))
+            );
           }
           if (normalAttrs.size) {
             element2.setAttribute(import_EventManager.EventManager.normalAttrMapAttrName, JSON.stringify(Array.from(normalAttrs.entries())));
           }
-          const r = isAttr || isElement ? NodeFilter.FILTER_ACCEPT : NodeFilter.FILTER_REJECT;
-          return r;
+          const r2 = isAttr || isElement ? import_NodeUtils.NodeUtils.FindNodesFilterResult.MATCH_AND_SKIP_CHILDREN : import_NodeUtils.NodeUtils.FindNodesFilterResult.NO_MATCH_AND_CONTINUE;
+          return r2;
         }
-        return NodeFilter.FILTER_REJECT;
+        const r = import_NodeUtils.NodeUtils.FindNodesFilterResult.NO_MATCH_AND_CONTINUE;
+        return r;
       }
-    });
+    );
     const pars = [];
     let currentNode;
-    while (currentNode = nodeIterator?.nextNode()) {
-      if (currentNode.nodeType === Node.TEXT_NODE) {
-        const text = currentNode.textContent ?? "";
+    const name = import_RandomUtils.RandomUtils.uuid();
+    for (const currentNode2 of findNodes) {
+      processedNodes.add(currentNode2);
+      if (currentNode2.nodeType === Node2.TEXT_NODE) {
+        const text = currentNode2.textContent ?? "";
         const template = config.window.document?.createElement("template");
         if (!template) break;
         const groups = _RawSet.expressionGroups(text);
-        const map = groups.map((it) => ({ uuid: `${import_RandomUtils.RandomUtils.alphabet(40)}_${obj?.constructor?.name}`, content: it[0], regexArr: it }));
+        const map = groups.map((it) => ({
+          uuid: `${import_RandomUtils.RandomUtils.alphabet(40)}_${obj?.constructor?.name}`,
+          content: it[0],
+          regexArr: it
+        }));
         let lasterIndex = 0;
         for (let i = 0; i < map.length; i++) {
           const it = map[i];
           const regexArr = it.regexArr;
           const preparedText = regexArr.input.substring(lasterIndex, regexArr.index);
           let type;
-          if (currentNode.parentNode && currentNode.parentNode.nodeName.toUpperCase() === "STYLE") {
+          if (currentNode2.parentNode && currentNode2.parentNode.nodeName.toUpperCase() === "STYLE") {
             type = import_RawSetType.RawSetType.STYLE_TEXT;
           } else {
             type = import_RawSetType.RawSetType.TEXT;
           }
-          const node = document.createTextNode(preparedText);
+          const node = config.window.document.createTextNode(preparedText);
           const startEndPoint = _RawSet.createStartEndPoint({ id: it.uuid, type }, config);
           template.content.append(node);
           template.content.append(startEndPoint.start);
           template.content.append(startEndPoint.end);
           const fragment = config.window.document.createDocumentFragment();
           fragment.append(config.window.document.createTextNode(it.content));
-          pars.push(new _RawSet(it.uuid, type, {
-            start: startEndPoint.start,
-            node: currentNode,
-            end: startEndPoint.end,
-            parent: currentNode.parentNode
-            // thisVariableName: thisVariableName
-          }, { fragment, config }));
+          pars.push(
+            new _RawSet(
+              it.uuid,
+              type,
+              {
+                start: startEndPoint.start,
+                node: currentNode2,
+                end: startEndPoint.end,
+                parent: currentNode2.parentNode
+                // thisVariableName: thisVariableName
+              },
+              { fragment, config }
+            )
+          );
           lasterIndex = regexArr.index + it.content.length;
         }
         template.content.append(config.window.document.createTextNode(text.substring(lasterIndex, text.length)));
-        currentNode?.parentNode?.replaceChild(template.content, currentNode);
-      } else if (currentNode.nodeType === Node.ELEMENT_NODE) {
+        currentNode2?.parentNode?.replaceChild(template.content, currentNode2);
+      } else if (currentNode2.nodeType === Node2.ELEMENT_NODE) {
         const uuid = `${import_RandomUtils.RandomUtils.alphabet(40)}`;
-        const element2 = currentNode;
+        const element2 = currentNode2;
         const fragment = config.window.document.createDocumentFragment();
         const elementType = import_RawSetType.RawSetType.TARGET_ELEMENT;
         const startEndPoint = _RawSet.createStartEndPoint({ node: element2, id: uuid, type: elementType }, config);
@@ -501,19 +536,25 @@ const _RawSet = class _RawSet {
         const isElement = targetElementNames.includes(element2.tagName.toLowerCase()) || targetElementNames.includes(targetElementIs?.toLowerCase());
         const targetAttrNames = (config.targetAttrs?.map((it) => it.name) ?? []).concat(_RawSet.DR_ATTRIBUTES);
         const isAttr = element2.getAttributeNames().filter((it) => targetAttrNames.includes(it.toLowerCase())).length > 0;
-        currentNode?.parentNode?.insertBefore(startEndPoint.start, currentNode);
-        currentNode?.parentNode?.insertBefore(startEndPoint.end, currentNode.nextSibling);
-        fragment.append(currentNode);
-        const rawSet = new _RawSet(uuid, isElement ? elementType : isAttr ? import_RawSetType.RawSetType.TARGET_ATTR : import_RawSetType.RawSetType.UNKOWN, {
-          start: startEndPoint.start,
-          node: currentNode,
-          end: startEndPoint.end,
-          parent: currentNode.parentNode
-          // thisVariableName: thisVariableName
-        }, { config, fragment });
+        currentNode2?.parentNode?.insertBefore(startEndPoint.start, currentNode2);
+        currentNode2?.parentNode?.insertBefore(startEndPoint.end, currentNode2.nextSibling);
+        fragment.append(currentNode2);
+        const rawSet = new _RawSet(
+          uuid,
+          isElement ? elementType : isAttr ? import_RawSetType.RawSetType.TARGET_ATTR : import_RawSetType.RawSetType.UNKOWN,
+          {
+            start: startEndPoint.start,
+            node: currentNode2,
+            end: startEndPoint.end,
+            parent: currentNode2.parentNode
+            // thisVariableName: thisVariableName
+          },
+          { config, fragment }
+        );
         pars.push(rawSet);
       }
     }
+    const util = import_ElementUtils.ElementUtils;
     return pars;
   }
   static createStartEndPoint(data, config) {
@@ -589,13 +630,17 @@ const _RawSet = class _RawSet {
   static drItOtherEncoding(element, postFix) {
     const random = import_RandomUtils.RandomUtils.uuid() + postFix;
     const regex = /#it#/g;
-    element.querySelectorAll(`[${_RawSet.DR_IT_OPTIONNAME}], [${_RawSet.DR_FOR_OF_NAME}], [${_RawSet.DR_REPEAT_NAME}], [${_RawSet.DR_APPENDER_NAME}]`).forEach((it) => {
+    element.querySelectorAll(
+      `[${_RawSet.DR_IT_OPTIONNAME}], [${_RawSet.DR_FOR_OF_NAME}], [${_RawSet.DR_REPEAT_NAME}], [${_RawSet.DR_APPENDER_NAME}]`
+    ).forEach((it) => {
       it.innerHTML = it.innerHTML.replace(regex, random);
     });
     return random;
   }
   static drItOtherDecoding(element, random) {
-    element.querySelectorAll(`[${_RawSet.DR_IT_OPTIONNAME}], [${_RawSet.DR_FOR_OF_NAME}], [${_RawSet.DR_REPEAT_NAME}], [${_RawSet.DR_APPENDER_NAME}]`).forEach((it) => {
+    element.querySelectorAll(
+      `[${_RawSet.DR_IT_OPTIONNAME}], [${_RawSet.DR_FOR_OF_NAME}], [${_RawSet.DR_REPEAT_NAME}], [${_RawSet.DR_APPENDER_NAME}]`
+    ).forEach((it) => {
       it.innerHTML = it.innerHTML.replace(RegExp(random, "g"), "#it#");
     });
   }
@@ -736,7 +781,7 @@ const _RawSet = class _RawSet {
       const style = _RawSet.generateStyleTransform(set.styles ?? [], rawSet.uuid, true);
       targetElement.innerHTML = style + (set.template ?? "");
     } else {
-      targetObj = import_ScriptUtils.ScriptUtils.evaluateReturn(import_ObjectUtils.ObjectUtils.Path.toOptionalChainPath(drThis), obj);
+      targetObj = import_ObjectUtils.ObjectUtils.Script.evaluateReturn(import_ObjectUtils.ObjectUtils.Path.toOptionalChainPath(drThis), obj);
     }
     const componentKey = rawSet.uuid;
     const renderScript = ` /*drThisCreate*/
@@ -780,7 +825,10 @@ const _RawSet = class _RawSet {
     render.attribute = _RawSet.getAttributeObject(element, { script: renderScript, obj, renderData: render });
     render = Object.freeze(render);
     const onCreateDataScript = `return {rootParent: this, render: this.__render}`;
-    const onCreateDataParam = import_ScriptUtils.ScriptUtils.evaluate(onCreateDataScript, Object.assign(obj, { __render: render }));
+    const onCreateDataParam = import_ObjectUtils.ObjectUtils.Script.evaluate(
+      onCreateDataScript,
+      Object.assign(obj, { __render: render })
+    );
     if ((0, import_OnCreateRenderData.isOnCreateRenderData)(targetObj)) {
       targetObj?.onCreateRenderData(onCreateDataParam);
     }
@@ -790,7 +838,10 @@ const _RawSet = class _RawSet {
     const onCreate = element.getAttribute(_RawSet.DR_ON_CREATE_ARGUMENTS_OPTIONNAME);
     let createParam = [];
     if (onCreate) {
-      createParam = import_ScriptUtils.ScriptUtils.evaluateReturn({ bodyScript: renderScript, returnScript: import_ObjectUtils.ObjectUtils.Path.toOptionalChainPath(onCreate) }, obj);
+      createParam = import_ObjectUtils.ObjectUtils.Script.evaluateReturn(
+        { bodyScript: renderScript, returnScript: import_ObjectUtils.ObjectUtils.Path.toOptionalChainPath(onCreate) },
+        obj
+      );
       if (!Array.isArray(createParam)) {
         createParam = [createParam];
       }
@@ -811,12 +862,13 @@ const _RawSet = class _RawSet {
     const oninit = element.getAttribute(_RawSet.DR_ON_CREATED_CALLBACK_OPTIONNAME);
     if (oninit) {
       const script = `${renderScript}  ${oninit} `;
-      import_ScriptUtils.ScriptUtils.evaluate(script, Object.assign(obj, { __render: render }));
+      import_ObjectUtils.ObjectUtils.Script.evaluate(script, Object.assign(obj, { __render: render }));
     }
     targetElement.querySelectorAll(import_EventManager.EventManager.attrNames.map((it) => `[${it}]`).join(",")).forEach((it) => {
       it.setAttribute(import_EventManager.EventManager.ownerVariablePathAttrName, "this");
     });
     const componentNameReplaceKey = import_RandomUtils.RandomUtils.uuid();
+    rawSet.point.innerHTML = element.innerHTML;
     const innerHTMLName = targetElement.getAttribute(_RawSet.DR_COMPONENT_INNER_HTML_NAME_OPTIONNAME) ?? "innerHTML";
     if (innerHTMLName) {
       _RawSet.replaceInnerHTML(targetElement, { asIs: `#${innerHTMLName}#`, toBe: element.innerHTML });
@@ -827,8 +879,14 @@ const _RawSet = class _RawSet {
     if (optionThisName) {
       targetElement.innerHTML = targetElement.innerHTML.replaceAll(`@${optionThisName}@`, drThis);
     }
-    const nearThisRandom = this.drThisBindEncoding(targetElement, /@nearThis@/g, { config, otherReplaceVariablePath: rawSet.findNearThisPath() });
-    const parentThisRandom = this.drThisBindEncoding(targetElement, /@parentThis@/g, { config, otherReplaceVariablePath: rawSet.findParentThisPath() });
+    const nearThisRandom = this.drThisBindEncoding(targetElement, /@nearThis@/g, {
+      config,
+      otherReplaceVariablePath: rawSet.findNearThisPath()
+    });
+    const parentThisRandom = this.drThisBindEncoding(targetElement, /@parentThis@/g, {
+      config,
+      otherReplaceVariablePath: rawSet.findParentThisPath()
+    });
     const vars = this.drVarEncoding(targetElement, drVarOption);
     this.drVarDecoding(targetElement, vars);
     this.drThisDecoding(targetElement, { asIs: thisRandom, toBe: "@this@" });
@@ -871,7 +929,13 @@ const _RawSet = class _RawSet {
     };
     return targetAttribute;
   }
-  static createComponentTargetElement({ name, objFactory, template = "", styles = [], noStrip }) {
+  static createComponentTargetElement({
+    name,
+    objFactory,
+    template = "",
+    styles = [],
+    noStrip
+  }) {
     const targetElement = {
       name,
       styles,
@@ -921,7 +985,10 @@ const _RawSet = class _RawSet {
         render.attribute = _RawSet.getAttributeObject(element, { script: renderScript, obj, renderData: render });
         render = Object.freeze(render);
         if (constructor) {
-          let param = import_ScriptUtils.ScriptUtils.evaluateReturn({ bodyScript: renderScript, returnScript: import_ObjectUtils.ObjectUtils.Path.toOptionalChainPath(constructor) }, Object.assign(obj, { __render: render })) ?? [];
+          let param = import_ObjectUtils.ObjectUtils.Script.evaluateReturn(
+            { bodyScript: renderScript, returnScript: import_ObjectUtils.ObjectUtils.Path.toOptionalChainPath(constructor) },
+            Object.assign(obj, { __render: render })
+          ) ?? [];
           if (!Array.isArray(param)) {
             param = [param];
           }
@@ -947,7 +1014,15 @@ const _RawSet = class _RawSet {
         applayTemplate = (this.template ?? "").replace(RegExp(`#${innerHTMLName}#`, "g"), applayTemplate);
         const style = _RawSet.generateStyleTransform(this.styles, rawSet.uuid, true);
         element.innerHTML = style + (applayTemplate ?? "");
-        let data = await _RawSet.drThisCreate(rawSet, element, `this.__domrender_components.${rawSet.uuid}`, "", !noStrip, obj, config);
+        let data = await _RawSet.drThisCreate(
+          rawSet,
+          element,
+          `this.__domrender_components.${rawSet.uuid}`,
+          "",
+          !noStrip,
+          obj,
+          config
+        );
         if (data && innerHTMLThisRandom) {
           const template2 = config.window.document.createElement("template");
           template2.content.append(data);
@@ -988,62 +1063,65 @@ const _RawSet = class _RawSet {
     const normalAttribute = attribute[import_EventManager.EventManager.normalAttrMapAttrName];
     if (normalAttribute) {
       new Map(JSON.parse(normalAttribute)).forEach((v, k) => {
-        const cval = import_ScriptUtils.ScriptUtils.evaluateReturn({ bodyScript: config.script, returnScript: v }, Object.assign(config.obj, config.renderData ? { __render: config.renderData } : void 0));
+        const cval = import_ObjectUtils.ObjectUtils.Script.evaluateReturn(
+          { bodyScript: config.script, returnScript: v },
+          Object.assign(config.obj, config.renderData ? { __render: config.renderData } : void 0)
+        );
         attribute[k] = cval;
       });
     }
     return attribute;
   }
 };
-__publicField(_RawSet, "DR_NAME", "dr");
-__publicField(_RawSet, "DR_IF_NAME", "dr-if");
-__publicField(_RawSet, "DR_FOR_NAME", "dr-for");
-__publicField(_RawSet, "DR_FOR_OF_NAME", "dr-for-of");
-__publicField(_RawSet, "DR_THIS_PROPERTY_NAME", "dr-this-property");
-__publicField(_RawSet, "DR_REPEAT_NAME", "dr-repeat");
-__publicField(_RawSet, "DR_THIS_NAME", "dr-this");
-__publicField(_RawSet, "DR_FORM_NAME", "dr-form");
-__publicField(_RawSet, "DR_PRE_NAME", "dr-pre");
-__publicField(_RawSet, "DR_APPENDER_NAME", "dr-appender");
-__publicField(_RawSet, "DR_INNERHTML_NAME", "dr-inner-html");
-__publicField(_RawSet, "DR_INNERTEXT_NAME", "dr-inner-text");
-__publicField(_RawSet, "DR_DETECT_NAME", "dr-detect");
-__publicField(_RawSet, "DR_STRIP_NAME", "dr-strip");
-__publicField(_RawSet, "DR_REPLACE_TARGET_ELEMENT_IS_NAME", "dr-replace-target-element-is");
+_RawSet.DR_NAME = "dr";
+_RawSet.DR_IF_NAME = "dr-if";
+_RawSet.DR_FOR_NAME = "dr-for";
+_RawSet.DR_FOR_OF_NAME = "dr-for-of";
+_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";
+_RawSet.DR_PRE_NAME = "dr-pre";
+_RawSet.DR_APPENDER_NAME = "dr-appender";
+_RawSet.DR_INNERHTML_NAME = "dr-inner-html";
+_RawSet.DR_INNERTEXT_NAME = "dr-inner-text";
+_RawSet.DR_DETECT_NAME = "dr-detect";
+_RawSet.DR_STRIP_NAME = "dr-strip";
+_RawSet.DR_REPLACE_TARGET_ELEMENT_IS_NAME = "dr-replace-target-element-is";
 // 감지처리되는 옵션
-__publicField(_RawSet, "DR_DETECT_IF_OPTIONNAME", "dr-detect-option-if");
-__publicField(_RawSet, "DR_DETECT_FILTER_OPTIONNAME", "dr-detect-option-filter");
-__publicField(_RawSet, "DR_DETECT_ATTR_OPTIONNAME", "dr-detect-option-attr");
+_RawSet.DR_DETECT_IF_OPTIONNAME = "dr-detect-option-if";
+_RawSet.DR_DETECT_FILTER_OPTIONNAME = "dr-detect-option-filter";
+_RawSet.DR_DETECT_ATTR_OPTIONNAME = "dr-detect-option-attr";
 /**
  * @deprecated
  */
-__publicField(_RawSet, "DR_THIS_OPTIONNAME", "dr-option-this");
-__publicField(_RawSet, "DR_ATTR_OPTIONNAME", "dr-option-attr");
-__publicField(_RawSet, "DR_IF_OPTIONNAME", "dr-option-if");
-__publicField(_RawSet, "DR_IT_OPTIONNAME", "dr-option-it");
-__publicField(_RawSet, "DR_VAR_OPTIONNAME", "dr-option-var");
-__publicField(_RawSet, "DR_AFTER_OPTIONNAME", "dr-option-after");
-__publicField(_RawSet, "DR_NEXT_OPTIONNAME", "dr-option-next");
-__publicField(_RawSet, "DR_BEFORE_OPTIONNAME", "dr-option-before");
-__publicField(_RawSet, "DR_COMPLETE_OPTIONNAME", "dr-option-complete");
-__publicField(_RawSet, "DR_STRIP_OPTIONNAME", "dr-option-strip");
-__publicField(_RawSet, "DR_DESTROY_OPTIONNAME", "dr-option-destroy");
-__publicField(_RawSet, "DR_THIS_NAME_OPTIONNAME", "dr-option-this-name");
+_RawSet.DR_THIS_OPTIONNAME = "dr-option-this";
+_RawSet.DR_ATTR_OPTIONNAME = "dr-option-attr";
+_RawSet.DR_IF_OPTIONNAME = "dr-option-if";
+_RawSet.DR_IT_OPTIONNAME = "dr-option-it";
+_RawSet.DR_VAR_OPTIONNAME = "dr-option-var";
+_RawSet.DR_AFTER_OPTIONNAME = "dr-option-after";
+_RawSet.DR_NEXT_OPTIONNAME = "dr-option-next";
+_RawSet.DR_BEFORE_OPTIONNAME = "dr-option-before";
+_RawSet.DR_COMPLETE_OPTIONNAME = "dr-option-complete";
+_RawSet.DR_STRIP_OPTIONNAME = "dr-option-strip";
+_RawSet.DR_DESTROY_OPTIONNAME = "dr-option-destroy";
+_RawSet.DR_THIS_NAME_OPTIONNAME = "dr-option-this-name";
 /**
  * @deprecated
  */
-__publicField(_RawSet, "DR_COMPONENT_NAME_OPTIONNAME", "dr-option-component-name");
-__publicField(_RawSet, "DR_COMPONENT_INNER_HTML_NAME_OPTIONNAME", "dr-option-component-inner-html-name");
-__publicField(_RawSet, "DR_KEY_OPTIONNAME", "dr-option-key");
-__publicField(_RawSet, "DR_HAS_KEYS_OPTIONNAME", "dr-option-has-keys");
-__publicField(_RawSet, "DR_ON_CREATE_ARGUMENTS_OPTIONNAME", "dr-on-create:arguments");
-__publicField(_RawSet, "DR_ON_CREATED_CALLBACK_OPTIONNAME", "dr-on-create:callback");
+_RawSet.DR_COMPONENT_NAME_OPTIONNAME = "dr-option-component-name";
+_RawSet.DR_COMPONENT_INNER_HTML_NAME_OPTIONNAME = "dr-option-component-inner-html-name";
+_RawSet.DR_KEY_OPTIONNAME = "dr-option-key";
+_RawSet.DR_HAS_KEYS_OPTIONNAME = "dr-option-has-keys";
+_RawSet.DR_ON_CREATE_ARGUMENTS_OPTIONNAME = "dr-on-create:arguments";
+_RawSet.DR_ON_CREATED_CALLBACK_OPTIONNAME = "dr-on-create:callback";
 /**  우선 쓰는곳이 없어서 deprecated를 걸어놨음
 @deprecated
 */
-__publicField(_RawSet, "DR_ON_INIT_ARGUMENTS_OPTIONNAME", "dr-on-init:arguments");
-__publicField(_RawSet, "DR_ON_CONSTRUCTOR_ARGUMENTS_OPTIONNAME", "dr-on-constructor:arguments");
-__publicField(_RawSet, "drAttrsOriginName", {
+_RawSet.DR_ON_INIT_ARGUMENTS_OPTIONNAME = "dr-on-init:arguments";
+_RawSet.DR_ON_CONSTRUCTOR_ARGUMENTS_OPTIONNAME = "dr-on-constructor:arguments";
+_RawSet.drAttrsOriginName = {
   dr: _RawSet.DR_NAME,
   drIf: _RawSet.DR_IF_NAME,
   drFor: _RawSet.DR_FOR_NAME,
@@ -1070,12 +1148,12 @@ __publicField(_RawSet, "drAttrsOriginName", {
   drDestroyOption: _RawSet.DR_DESTROY_OPTIONNAME,
   drHasKeysOption: _RawSet.DR_HAS_KEYS_OPTIONNAME,
   drKeyOption: _RawSet.DR_KEY_OPTIONNAME
-});
-__publicField(_RawSet, "DR_TAGS", []);
+};
+_RawSet.DR_TAGS = [];
 // public static readonly DR_REPLACE_ACTION_ATTRIBUTES = [
 //   RawSet.DR_REPLACE_TARGET_ELEMENT_IS_NAME
 // ]
-__publicField(_RawSet, "DR_ATTRIBUTES", [
+_RawSet.DR_ATTRIBUTES = [
   _RawSet.DR_NAME,
   _RawSet.DR_APPENDER_NAME,
   _RawSet.DR_IF_NAME,
@@ -1090,6 +1168,6 @@ __publicField(_RawSet, "DR_ATTRIBUTES", [
   _RawSet.DR_REPEAT_NAME,
   _RawSet.DR_DETECT_NAME,
   _RawSet.DR_STRIP_NAME
-]);
+];
 let RawSet = _RawSet;
 //# sourceMappingURL=RawSet.js.map