@dooboostore/dom-render 1.0.109 → 1.0.111

package/dist/cjs/rawsets/RawSet.js

@@ -54,6 +54,7 @@ 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");
+var import_ConvertUtils = require("@dooboostore/core/convert/ConvertUtils");
 const _RawSet = class _RawSet {
   constructor(uuid, type, point, dataSet, detect) {
     this.uuid = uuid;
@@ -124,7 +125,8 @@ const _RawSet = class _RawSet {
         const targetAttrMap = element.getAttribute(import_EventManager.EventManager.normalAttrMapAttrName);
         if (targetAttrMap) {
           new Map(JSON.parse(targetAttrMap)).forEach((v, k) => {
-            targetScripts.push(`(${v})`);
+            const variablePaths = v.variablePaths;
+            variablePaths.forEach((it) => targetScripts.push(`(${it.inner})`));
           });
         }
         script = targetScripts.join(";");
@@ -185,12 +187,18 @@ const _RawSet = class _RawSet {
         const runText = _RawSet.expressionGroups(textContent)[0][1];
         let newNode;
         if (textContent?.startsWith("#")) {
-          const r = import_ObjectUtils.ObjectUtils.Script.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_ObjectUtils.ObjectUtils.Script.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);
@@ -229,23 +237,140 @@ const _RawSet = class _RawSet {
         };
         drAttrs.push(drAttr);
         const operators = [
-          new import_DrPre.DrPre(this, __render, { raws, fag }, { element, attrName: _RawSet.DR_PRE_NAME, attr: drAttr.drPre, attrs: drAttr }, { config, obj, operatorAround: config.operatorAround?.drPre }, { onAttrInitCallBacks, onElementInitCallBacks, onThisComponentSetCallBacks }),
-          new import_Dr.Dr(this, __render, { raws, fag }, { element, attrName: _RawSet.DR_NAME, attr: drAttr.dr, attrs: drAttr }, { config, obj, operatorAround: config.operatorAround?.dr }, { onAttrInitCallBacks, onElementInitCallBacks, onThisComponentSetCallBacks }),
+          new import_DrPre.DrPre(
+            this,
+            __render,
+            { raws, fag },
+            { element, attrName: _RawSet.DR_PRE_NAME, attr: drAttr.drPre, attrs: drAttr },
+            { config, obj, operatorAround: config.operatorAround?.drPre },
+            { onAttrInitCallBacks, onElementInitCallBacks, onThisComponentSetCallBacks }
+          ),
+          new import_Dr.Dr(
+            this,
+            __render,
+            { raws, fag },
+            { element, attrName: _RawSet.DR_NAME, attr: drAttr.dr, attrs: drAttr },
+            { config, obj, operatorAround: config.operatorAround?.dr },
+            { onAttrInitCallBacks, onElementInitCallBacks, onThisComponentSetCallBacks }
+          ),
           // new Dr(this, __render, {raws, fag}, {element, attrName: EventManager.onRenderedInitAttrName, attr: drAttr.dr, attrs: drAttr}, {config, obj, operatorAround: config.operatorAround?.dr}, {onAttrInitCallBacks, onElementInitCallBacks, onThisComponentSetCallBacks}),
-          new import_DrIf.DrIf(this, __render, { raws, fag }, { element, attrName: _RawSet.DR_IF_NAME, attr: drAttr.drIf, attrs: drAttr }, { config, obj, operatorAround: config.operatorAround?.drIf }, { onAttrInitCallBacks, onElementInitCallBacks, onThisComponentSetCallBacks }),
-          new import_DrStripElement.DrStripElement(this, __render, { raws, fag }, { element, attrName: _RawSet.DR_STRIP_NAME, attr: drAttr.drStripElement, attrs: drAttr }, { config, obj, operatorAround: config.operatorAround?.drThis }, { onAttrInitCallBacks, onElementInitCallBacks, onThisComponentSetCallBacks }),
-          new import_DrThis.DrThis(this, __render, { raws, fag }, { element, attrName: _RawSet.DR_THIS_NAME, attr: drAttr.drThis, attrs: drAttr }, { config, obj, operatorAround: config.operatorAround?.drThis }, { onAttrInitCallBacks, onElementInitCallBacks, onThisComponentSetCallBacks }),
-          new import_DrForm.DrForm(this, __render, { raws, fag }, { element, attrName: _RawSet.DR_FOR_NAME, attr: drAttr.drForm, attrs: drAttr }, { config, obj, operatorAround: config.operatorAround?.drForm }, { onAttrInitCallBacks, onElementInitCallBacks, onThisComponentSetCallBacks }),
-          new import_DrInnerText.DrInnerText(this, __render, { raws, fag }, { element, attrName: _RawSet.DR_INNERTEXT_NAME, attr: drAttr.drInnerText, attrs: drAttr }, { config, obj, operatorAround: config.operatorAround?.drInnerText }, { onAttrInitCallBacks, onElementInitCallBacks, onThisComponentSetCallBacks }),
-          new import_DrInnerHTML.DrInnerHTML(this, __render, { raws, fag }, { element, attrName: _RawSet.DR_INNERHTML_NAME, attr: drAttr.drInnerHTML, attrs: drAttr }, { config, obj, operatorAround: config.operatorAround?.drInnerHTML }, { onAttrInitCallBacks, onElementInitCallBacks, onThisComponentSetCallBacks }),
-          new import_DrFor.DrFor(this, __render, { raws, fag }, { element, attrName: _RawSet.DR_FOR_NAME, attr: drAttr.drFor, attrs: drAttr }, { config, obj, operatorAround: config.operatorAround?.drFor }, { onAttrInitCallBacks, onElementInitCallBacks, onThisComponentSetCallBacks }),
-          new import_DrForOf.DrForOf(this, __render, { raws, fag }, { element, attrName: _RawSet.DR_FOR_OF_NAME, attr: drAttr.drForOf, attrs: drAttr }, { config, obj, operatorAround: config.operatorAround?.drForOf }, { onAttrInitCallBacks, onElementInitCallBacks, onThisComponentSetCallBacks }),
-          new import_DrThisProperty.DrThisProperty(this, __render, { raws, fag }, { element, attrName: _RawSet.DR_THIS_PROPERTY_NAME, attr: drAttr.drThisProperty, attrs: drAttr }, { config, obj, operatorAround: config.operatorAround?.drThisProperty }, { onAttrInitCallBacks, onElementInitCallBacks, onThisComponentSetCallBacks }),
-          new import_DrAppender.DrAppender(this, __render, { raws, fag }, { element, attrName: _RawSet.DR_APPENDER_NAME, attr: drAttr.drAppender, attrs: drAttr }, { config, obj, operatorAround: config.operatorAround?.drAppender }, { onAttrInitCallBacks, onElementInitCallBacks, onThisComponentSetCallBacks }),
-          new import_DrRepeat.DrRepeat(this, __render, { raws, fag }, { element, attrName: _RawSet.DR_REPEAT_NAME, attr: drAttr.drRepeat, attrs: drAttr }, { config, obj, operatorAround: config.operatorAround?.drRepeat }, { onAttrInitCallBacks, onElementInitCallBacks, onThisComponentSetCallBacks }),
-          new import_DrTargetElementIsElement.DrTargetElementIsElement(this, __render, { raws, fag }, { element, attrName: _RawSet.DR_REPLACE_TARGET_ELEMENT_IS_NAME, attr: drAttr.drReplaceTargetElementIs, attrs: drAttr }, { config, obj }, { onAttrInitCallBacks, onElementInitCallBacks, onThisComponentSetCallBacks }),
-          new import_DrTargetElement.DrTargetElement(this, __render, { raws, fag }, { element, attrs: drAttr }, { config, obj }, { onAttrInitCallBacks, onElementInitCallBacks, onThisComponentSetCallBacks }),
-          new import_DrTargetAttr.DrTargetAttr(this, __render, { raws, fag }, { element, attrs: drAttr }, { config, obj }, { onAttrInitCallBacks, onElementInitCallBacks, onThisComponentSetCallBacks })
+          new import_DrIf.DrIf(
+            this,
+            __render,
+            { raws, fag },
+            { element, attrName: _RawSet.DR_IF_NAME, attr: drAttr.drIf, attrs: drAttr },
+            { config, obj, operatorAround: config.operatorAround?.drIf },
+            { onAttrInitCallBacks, onElementInitCallBacks, onThisComponentSetCallBacks }
+          ),
+          new import_DrStripElement.DrStripElement(
+            this,
+            __render,
+            { raws, fag },
+            { element, attrName: _RawSet.DR_STRIP_NAME, attr: drAttr.drStripElement, attrs: drAttr },
+            { config, obj, operatorAround: config.operatorAround?.drThis },
+            { onAttrInitCallBacks, onElementInitCallBacks, onThisComponentSetCallBacks }
+          ),
+          new import_DrThis.DrThis(
+            this,
+            __render,
+            { raws, fag },
+            { element, attrName: _RawSet.DR_THIS_NAME, attr: drAttr.drThis, attrs: drAttr },
+            { config, obj, operatorAround: config.operatorAround?.drThis },
+            { onAttrInitCallBacks, onElementInitCallBacks, onThisComponentSetCallBacks }
+          ),
+          new import_DrForm.DrForm(
+            this,
+            __render,
+            { raws, fag },
+            { element, attrName: _RawSet.DR_FOR_NAME, attr: drAttr.drForm, attrs: drAttr },
+            { config, obj, operatorAround: config.operatorAround?.drForm },
+            { onAttrInitCallBacks, onElementInitCallBacks, onThisComponentSetCallBacks }
+          ),
+          new import_DrInnerText.DrInnerText(
+            this,
+            __render,
+            { raws, fag },
+            { element, attrName: _RawSet.DR_INNERTEXT_NAME, attr: drAttr.drInnerText, attrs: drAttr },
+            { config, obj, operatorAround: config.operatorAround?.drInnerText },
+            { onAttrInitCallBacks, onElementInitCallBacks, onThisComponentSetCallBacks }
+          ),
+          new import_DrInnerHTML.DrInnerHTML(
+            this,
+            __render,
+            { raws, fag },
+            { element, attrName: _RawSet.DR_INNERHTML_NAME, attr: drAttr.drInnerHTML, attrs: drAttr },
+            { config, obj, operatorAround: config.operatorAround?.drInnerHTML },
+            { onAttrInitCallBacks, onElementInitCallBacks, onThisComponentSetCallBacks }
+          ),
+          new import_DrFor.DrFor(
+            this,
+            __render,
+            { raws, fag },
+            { element, attrName: _RawSet.DR_FOR_NAME, attr: drAttr.drFor, attrs: drAttr },
+            { config, obj, operatorAround: config.operatorAround?.drFor },
+            { onAttrInitCallBacks, onElementInitCallBacks, onThisComponentSetCallBacks }
+          ),
+          new import_DrForOf.DrForOf(
+            this,
+            __render,
+            { raws, fag },
+            { element, attrName: _RawSet.DR_FOR_OF_NAME, attr: drAttr.drForOf, attrs: drAttr },
+            { config, obj, operatorAround: config.operatorAround?.drForOf },
+            { onAttrInitCallBacks, onElementInitCallBacks, onThisComponentSetCallBacks }
+          ),
+          new import_DrThisProperty.DrThisProperty(
+            this,
+            __render,
+            { raws, fag },
+            { element, attrName: _RawSet.DR_THIS_PROPERTY_NAME, attr: drAttr.drThisProperty, attrs: drAttr },
+            { config, obj, operatorAround: config.operatorAround?.drThisProperty },
+            { onAttrInitCallBacks, onElementInitCallBacks, onThisComponentSetCallBacks }
+          ),
+          new import_DrAppender.DrAppender(
+            this,
+            __render,
+            { raws, fag },
+            { element, attrName: _RawSet.DR_APPENDER_NAME, attr: drAttr.drAppender, attrs: drAttr },
+            { config, obj, operatorAround: config.operatorAround?.drAppender },
+            { onAttrInitCallBacks, onElementInitCallBacks, onThisComponentSetCallBacks }
+          ),
+          new import_DrRepeat.DrRepeat(
+            this,
+            __render,
+            { raws, fag },
+            { element, attrName: _RawSet.DR_REPEAT_NAME, attr: drAttr.drRepeat, attrs: drAttr },
+            { config, obj, operatorAround: config.operatorAround?.drRepeat },
+            { onAttrInitCallBacks, onElementInitCallBacks, onThisComponentSetCallBacks }
+          ),
+          new import_DrTargetElementIsElement.DrTargetElementIsElement(
+            this,
+            __render,
+            { raws, fag },
+            {
+              element,
+              attrName: _RawSet.DR_REPLACE_TARGET_ELEMENT_IS_NAME,
+              attr: drAttr.drReplaceTargetElementIs,
+              attrs: drAttr
+            },
+            { config, obj },
+            { onAttrInitCallBacks, onElementInitCallBacks, onThisComponentSetCallBacks }
+          ),
+          new import_DrTargetElement.DrTargetElement(
+            this,
+            __render,
+            { raws, fag },
+            { element, attrs: drAttr },
+            { config, obj },
+            { onAttrInitCallBacks, onElementInitCallBacks, onThisComponentSetCallBacks }
+          ),
+          new import_DrTargetAttr.DrTargetAttr(
+            this,
+            __render,
+            { raws, fag },
+            { element, attrs: drAttr },
+            { config, obj },
+            { onAttrInitCallBacks, onElementInitCallBacks, onThisComponentSetCallBacks }
+          )
         ];
         for (const operator of operators) {
           const state = await operator.start();
@@ -285,12 +410,12 @@ const _RawSet = class _RawSet {
     });
     for (const it of onThisComponentSetCallBacks) {
       if ((0, import_OnInitRender.isOnInitRender)(it.obj)) {
-        it.obj?.onInitRender?.({}, this);
+        await it.obj?.onInitRender?.({}, this);
       }
     }
     for (const it of onElementInitCallBacks) {
       if ((0, import_OnInitRender.isOnInitRender)(this.dataSet.render?.currentThis)) {
-        this.dataSet.render.currentThis.onInitRender({}, this);
+        await this.dataSet.render.currentThis.onInitRender({}, this);
       }
       config?.onElementInit?.(it.name, obj, this, it.targetElement);
     }
@@ -392,7 +517,10 @@ const _RawSet = class _RawSet {
   getDrAppendAttributeAndDelete(element, obj) {
     let data = element.getAttribute(_RawSet.DR_APPENDER_NAME);
     if (data && !/\[.+\]/g.test(data)) {
-      const currentIndex = import_ObjectUtils.ObjectUtils.Script.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);
     }
@@ -423,7 +551,7 @@ const _RawSet = class _RawSet {
           }
           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) => ({
+            const keyValuePairs = Array.from(script.matchAll(/['"]?(\w+)['"]?:\s*([^,}]+)/g)).map((match) => ({
               key: match[1],
               value: match[2]
             }));
@@ -438,22 +566,29 @@ const _RawSet = class _RawSet {
           const normalAttrs = /* @__PURE__ */ new Map();
           const linkVariables = /* @__PURE__ */ new Map();
           const linkNames = import_EventManager.EventManager.linkAttrs.map((it) => it.name);
-          const isAttr = element2.getAttributeNames().filter((it) => {
-            const value = element2.getAttribute(it);
+          const isAttr = element2.getAttributeNames().filter((it) => !import_EventManager.EventManager.noDetectAttr.includes(it)).filter((it) => {
+            const value = element2.getAttribute(it)?.trim();
             if (value && linkNames.includes(it)) {
               linkVariables.set(it, value);
             } else if (value && _RawSet.isExpression(value)) {
-              let variablePath = _RawSet.expressionGroups(value)[0][1];
-              const originVariable = variablePath;
-              variablePath = variablePath.replace(/#[^#]*#/g, "({})");
-              const optionalChainPath = import_ObjectUtils.ObjectUtils.Path.toOptionalChainPath(variablePath);
-              const cval = import_ObjectUtils.ObjectUtils.Script.evaluateReturn(optionalChainPath, Object.assign(obj));
+              const variablePaths = _RawSet.expressionGroups(value).map((it2) => ({
+                origin: it2[0].trim(),
+                inner: it2[1].trim()
+              }));
+              const isStringTemplate = variablePaths.length > 1 || variablePaths[0] && variablePaths[0].origin !== value;
+              let targetScript = value;
+              variablePaths.forEach((it2) => {
+                let r3 = it2.inner.replace(/#[^#]*#/g, "({})");
+                r3 = import_ObjectUtils.ObjectUtils.Path.toOptionalChainPath(r3);
+                targetScript = targetScript.replaceAll(it2.origin, `\${${r3}}`);
+              });
+              const cval = import_ObjectUtils.ObjectUtils.Script.evaluateReturn("`" + targetScript + "`", Object.assign(obj));
               if (cval === null) {
                 element2.removeAttribute(it);
               } else {
                 element2.setAttribute(it, cval);
               }
-              normalAttrs.set(it, originVariable);
+              normalAttrs.set(it, { originalAttrValue: value, variablePaths, isStringTemplate });
             }
             const isTargetAttr = targetAttrNames.includes(it.toLowerCase());
             return isTargetAttr;
@@ -524,7 +659,8 @@ const _RawSet = class _RawSet {
           lasterIndex = regexArr.index + it.content.length;
         }
         template.content.append(config.window.document.createTextNode(text.substring(lasterIndex, text.length)));
-        currentNode2?.parentNode?.replaceChild(template.content, currentNode2);
+        const p = currentNode2?.parentNode;
+        p?.replaceChild(template.content, currentNode2);
       } else if (currentNode2.nodeType === Node2.ELEMENT_NODE) {
         const uuid = `${import_RandomUtils.RandomUtils.alphabet(40)}`;
         const element2 = currentNode2;
@@ -867,11 +1003,33 @@ const _RawSet = class _RawSet {
     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";
+    const innerText = element.textContent?.trim() ?? "";
+    const escapedInnerHTML = import_ConvertUtils.ConvertUtils.escapeHTML(element.innerHTML);
+    const innerHTMLName = targetElement.getAttribute(_RawSet.DR_INNER_HTML_NAME_OPTIONNAME) ?? "innerHTML";
+    const innerTEXTName = targetElement.getAttribute(_RawSet.DR_INNER_TEXT_NAME_OPTIONNAME) ?? "innerTEXT";
+    const innerHTMLEscapedName = targetElement.getAttribute(_RawSet.DR_INNER_HTML_ESCAPED_NAME_OPTIONNAME) ?? "innerHTMLEscaped";
+    const templateReplacements = [];
     if (innerHTMLName) {
-      _RawSet.replaceInnerHTML(targetElement, { asIs: `#${innerHTMLName}#`, toBe: element.innerHTML });
+      templateReplacements.push({
+        regex: new RegExp(`#${innerHTMLName}#`, "g"),
+        callback: () => element.innerHTML
+      });
+    }
+    if (innerTEXTName) {
+      templateReplacements.push({
+        regex: new RegExp(`#${innerTEXTName}#`, "g"),
+        callback: () => innerText
+      });
+    }
+    if (innerHTMLEscapedName) {
+      templateReplacements.push({
+        regex: new RegExp(`#${innerHTMLEscapedName}#`, "g"),
+        callback: () => escapedInnerHTML
+      });
+    }
+    if (templateReplacements.length > 0) {
+      targetElement.innerHTML = import_StringUtils.StringUtils.replaceSequentially(targetElement.innerHTML, templateReplacements);
     }
     const optionThisName = targetElement.getAttribute(_RawSet.DR_THIS_NAME_OPTIONNAME);
     targetElement.getAttributeNames().forEach((it) => targetElement.setAttribute(it, targetElement.getAttribute(it).replace(/#this#/g, drThis)));
@@ -948,7 +1106,6 @@ const _RawSet = class _RawSet {
         obj.__domrender_components ?? (obj.__domrender_components = {});
         const domrenderComponents = obj.__domrender_components;
         const renderScript = ` /*createComponentTargetElement*/
-            // console.log('-------------------',this.__render);
             var ${import_EventManager.EventManager.RAWSET_VARNAME} = this.__render.rawSet; 
             var ${import_EventManager.EventManager.COMPONENT_VARNAME} = this.__render.component; 
             var ${import_EventManager.EventManager.ELEMENT_VARNAME} = this.__render.element; 
@@ -1003,15 +1160,40 @@ const _RawSet = class _RawSet {
         rawSet.dataSet.render = render;
         instance.__rawSet = rawSet;
         let applayTemplate = element.innerHTML;
+        let applayTemplateText = element.textContent?.trim() ?? "";
+        let applayTemplateEscape = import_ConvertUtils.ConvertUtils.escapeHTML(element.innerHTML);
         let innerHTMLThisRandom;
-        const componentName = element.getAttribute(_RawSet.DR_COMPONENT_NAME_OPTIONNAME) ?? "component";
-        const innerHTMLName = element.getAttribute(_RawSet.DR_COMPONENT_INNER_HTML_NAME_OPTIONNAME) ?? "innerHTML";
+        const componentName = element.getAttribute(_RawSet.DR_VARIABLE_NAME_OPTIONNAME) ?? "component";
+        const innerHTMLName = element.getAttribute(_RawSet.DR_INNER_HTML_NAME_OPTIONNAME) ?? "innerHTML";
+        const innerTEXTName = element.getAttribute(_RawSet.DR_INNER_TEXT_NAME_OPTIONNAME) ?? "innerTEXT";
+        const innerHTMLEscapedName = element.getAttribute(_RawSet.DR_INNER_HTML_ESCAPED_NAME_OPTIONNAME) ?? "innerHTMLEscaped";
         if (applayTemplate) {
           innerHTMLThisRandom = import_RandomUtils.RandomUtils.uuid();
-          applayTemplate = applayTemplate.replace(/this\./g, innerHTMLThisRandom);
-          applayTemplate = applayTemplate.replace(RegExp(`#${componentName}#`, "g"), "this");
+          applayTemplate = import_StringUtils.StringUtils.replaceSequentially(applayTemplate, [
+            {
+              regex: /this\./g,
+              callback: () => innerHTMLThisRandom
+            },
+            {
+              regex: new RegExp(`#${componentName}#`, "g"),
+              callback: () => nearThisPath
+            }
+          ]);
         }
-        applayTemplate = (this.template ?? "").replace(RegExp(`#${innerHTMLName}#`, "g"), applayTemplate);
+        applayTemplate = import_StringUtils.StringUtils.replaceSequentially(this.template ?? "", [
+          {
+            regex: new RegExp(`#${innerHTMLName}#`, "g"),
+            callback: () => applayTemplate
+          },
+          {
+            regex: new RegExp(`#${innerTEXTName}#`, "g"),
+            callback: () => applayTemplateText
+          },
+          {
+            regex: new RegExp(`#${innerHTMLEscapedName}#`, "g"),
+            callback: () => applayTemplateEscape
+          }
+        ]);
         const style = _RawSet.generateStyleTransform(this.styles, rawSet.uuid, true);
         element.innerHTML = style + (applayTemplate ?? "");
         let data = await _RawSet.drThisCreate(
@@ -1025,8 +1207,9 @@ const _RawSet = class _RawSet {
         );
         if (data && innerHTMLThisRandom) {
           const template2 = config.window.document.createElement("template");
-          template2.content.append(data);
-          template2.innerHTML = template2.innerHTML.replace(RegExp(innerHTMLThisRandom, "g"), "this.");
+          let s = import_ElementUtils.ElementUtils.toInnerHTML(data, { document: config.window.document });
+          template2.innerHTML = s.replace(RegExp(innerHTMLThisRandom, "g"), "this.");
+          ;
           data = template2.content;
         }
         return data;
@@ -1063,8 +1246,19 @@ const _RawSet = class _RawSet {
     const normalAttribute = attribute[import_EventManager.EventManager.normalAttrMapAttrName];
     if (normalAttribute) {
       new Map(JSON.parse(normalAttribute)).forEach((v, k) => {
+        const variablePaths = v.variablePaths;
+        let targetScript = v.originalAttrValue.trim();
+        if (v.isStringTemplate) {
+          variablePaths.forEach((it) => {
+            let r = import_ObjectUtils.ObjectUtils.Path.toOptionalChainPath(it.inner);
+            targetScript = targetScript.replaceAll(it.origin, `\${${r}}`);
+          });
+        } else {
+          let r = import_ObjectUtils.ObjectUtils.Path.toOptionalChainPath(variablePaths[0].inner);
+          targetScript = targetScript.replaceAll(variablePaths[0].origin, r);
+        }
         const cval = import_ObjectUtils.ObjectUtils.Script.evaluateReturn(
-          { bodyScript: config.script, returnScript: v },
+          { bodyScript: config.script, returnScript: v.isStringTemplate ? "`" + targetScript + "`" : targetScript },
           Object.assign(config.obj, config.renderData ? { __render: config.renderData } : void 0)
         );
         attribute[k] = cval;
@@ -1107,11 +1301,12 @@ _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
- */
-_RawSet.DR_COMPONENT_NAME_OPTIONNAME = "dr-option-component-name";
-_RawSet.DR_COMPONENT_INNER_HTML_NAME_OPTIONNAME = "dr-option-component-inner-html-name";
+_RawSet.DR_VARIABLE_NAME_OPTIONNAME = "dr-option-variable-name";
+_RawSet.DR_ITEM_VARIABLE_NAME_OPTIONNAME = "dr-option-item-variable-name";
+_RawSet.DR_ITEM_INDEX_VARIABLE_NAME_OPTIONNAME = "dr-option-item-index-variable-name";
+_RawSet.DR_INNER_HTML_NAME_OPTIONNAME = "dr-option-inner-html-name";
+_RawSet.DR_INNER_TEXT_NAME_OPTIONNAME = "dr-option-inner-text-name";
+_RawSet.DR_INNER_HTML_ESCAPED_NAME_OPTIONNAME = "dr-option-inner-html-escaped-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";