@dooboostore/dom-render 1.0.110 → 1.0.111

package/src/node_modules/.bin/webpack-dev-server

@@ -2,13 +2,17 @@
 basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
 
 case `uname` in
-    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+    *CYGWIN*|*MINGW*|*MSYS*)
+        if command -v cygpath > /dev/null 2>&1; then
+            basedir=`cygpath -w "$basedir"`
+        fi
+    ;;
 esac
 
 if [ -z "$NODE_PATH" ]; then
-  export NODE_PATH="/Users/hyunhakim/workspace/dooboostore/source/dooboostore-develop/dooboostore-develop.github.io/source/packages/node_modules/.pnpm/webpack-dev-server@5.2.2_webpack-cli@5.1.4_webpack@5.101.3/node_modules/webpack-dev-server/bin/node_modules:/Users/hyunhakim/workspace/dooboostore/source/dooboostore-develop/dooboostore-develop.github.io/source/packages/node_modules/.pnpm/webpack-dev-server@5.2.2_webpack-cli@5.1.4_webpack@5.101.3/node_modules/webpack-dev-server/node_modules:/Users/hyunhakim/workspace/dooboostore/source/dooboostore-develop/dooboostore-develop.github.io/source/packages/node_modules/.pnpm/webpack-dev-server@5.2.2_webpack-cli@5.1.4_webpack@5.101.3/node_modules:/Users/hyunhakim/workspace/dooboostore/source/dooboostore-develop/dooboostore-develop.github.io/source/packages/node_modules/.pnpm/node_modules"
+  export NODE_PATH="/Users/hyunhakim/workspace/dooboostore/source/dooboostore/lazycollect/node_modules/.pnpm/webpack-dev-server@5.2.2_bufferutil@4.0.9_utf-8-validate@6.0.5_webpack-cli@5.1.4_webpack@5.101.3/node_modules/webpack-dev-server/bin/node_modules:/Users/hyunhakim/workspace/dooboostore/source/dooboostore/lazycollect/node_modules/.pnpm/webpack-dev-server@5.2.2_bufferutil@4.0.9_utf-8-validate@6.0.5_webpack-cli@5.1.4_webpack@5.101.3/node_modules/webpack-dev-server/node_modules:/Users/hyunhakim/workspace/dooboostore/source/dooboostore/lazycollect/node_modules/.pnpm/webpack-dev-server@5.2.2_bufferutil@4.0.9_utf-8-validate@6.0.5_webpack-cli@5.1.4_webpack@5.101.3/node_modules:/Users/hyunhakim/workspace/dooboostore/source/dooboostore/lazycollect/node_modules/.pnpm/node_modules"
 else
-  export NODE_PATH="/Users/hyunhakim/workspace/dooboostore/source/dooboostore-develop/dooboostore-develop.github.io/source/packages/node_modules/.pnpm/webpack-dev-server@5.2.2_webpack-cli@5.1.4_webpack@5.101.3/node_modules/webpack-dev-server/bin/node_modules:/Users/hyunhakim/workspace/dooboostore/source/dooboostore-develop/dooboostore-develop.github.io/source/packages/node_modules/.pnpm/webpack-dev-server@5.2.2_webpack-cli@5.1.4_webpack@5.101.3/node_modules/webpack-dev-server/node_modules:/Users/hyunhakim/workspace/dooboostore/source/dooboostore-develop/dooboostore-develop.github.io/source/packages/node_modules/.pnpm/webpack-dev-server@5.2.2_webpack-cli@5.1.4_webpack@5.101.3/node_modules:/Users/hyunhakim/workspace/dooboostore/source/dooboostore-develop/dooboostore-develop.github.io/source/packages/node_modules/.pnpm/node_modules:$NODE_PATH"
+  export NODE_PATH="/Users/hyunhakim/workspace/dooboostore/source/dooboostore/lazycollect/node_modules/.pnpm/webpack-dev-server@5.2.2_bufferutil@4.0.9_utf-8-validate@6.0.5_webpack-cli@5.1.4_webpack@5.101.3/node_modules/webpack-dev-server/bin/node_modules:/Users/hyunhakim/workspace/dooboostore/source/dooboostore/lazycollect/node_modules/.pnpm/webpack-dev-server@5.2.2_bufferutil@4.0.9_utf-8-validate@6.0.5_webpack-cli@5.1.4_webpack@5.101.3/node_modules/webpack-dev-server/node_modules:/Users/hyunhakim/workspace/dooboostore/source/dooboostore/lazycollect/node_modules/.pnpm/webpack-dev-server@5.2.2_bufferutil@4.0.9_utf-8-validate@6.0.5_webpack-cli@5.1.4_webpack@5.101.3/node_modules:/Users/hyunhakim/workspace/dooboostore/source/dooboostore/lazycollect/node_modules/.pnpm/node_modules:$NODE_PATH"
 fi
 if [ -x "$basedir/node" ]; then
   exec "$basedir/node"  "$basedir/../webpack-dev-server/bin/webpack-dev-server.js" "$@"

package/src/rawsets/RawSet.ts

@@ -825,9 +825,10 @@ export class RawSet {
           return r;
         }
         if (element.hasAttribute(EventManager.attrAttrName)) {
+        // console.log('elementAttrAttrName-->', element.outerHTML);
           const script = element.getAttribute(EventManager.attrAttrName) ?? '';
           // console.log('scriptscriptscriptscriptscriptscript,', script)
-          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]
           }));
@@ -855,7 +856,7 @@ export class RawSet {
         const linkNames = EventManager.linkAttrs.map(it => it.name);
         const isAttr =
           element.getAttributeNames().filter(it=>!EventManager.noDetectAttr.includes(it)).filter(it => {
-            const value = element.getAttribute(it);
+            const value = element.getAttribute(it)?.trim();
 
             // link일때
             if (value && linkNames.includes(it)) {
@@ -863,9 +864,10 @@ export class RawSet {
             } else if (value && RawSet.isExpression(value)) {
               // 표현식있을떄
               const variablePaths: { origin: string; inner: string }[] = RawSet.expressionGroups(value).map(it => ({
-                origin: it[0],
-                inner: it[1]
+                origin: it[0].trim(),
+                inner: it[1].trim()
               }));
+              const isStringTemplate = variablePaths.length > 1 || (variablePaths[0] && variablePaths[0].origin !== value);
               // normal Attribute 초반에 셋팅해주기.
               // TODO: 이거 하긴했는데 사이드 이팩트?
               // let variablePath: string = RawSet.expressionGroups(value)[0][1];
@@ -887,7 +889,7 @@ export class RawSet {
               } else {
                 element.setAttribute(it, cval);
               }
-              normalAttrs.set(it, { originalAttrValue: value, variablePaths: variablePaths });
+              normalAttrs.set(it, { originalAttrValue: value, variablePaths: variablePaths, isStringTemplate });
               // normalAttrs.set(it, originVariable);
               // console.log('normalAttribute', it, variablePath);
             }
@@ -991,7 +993,8 @@ export class RawSet {
           lasterIndex = regexArr.index + it.content.length;
         }
         template.content.append(config.window.document.createTextNode(text.substring(lasterIndex, text.length)));
-        currentNode?.parentNode?.replaceChild(template.content, currentNode); // <-- 여기서 text를 fragment로 replace했기때문에 추적 변경이 가능하다.
+        const p = currentNode?.parentNode;
+        p?.replaceChild(template.content, currentNode); // <-- 여기서 text를 fragment로 replace했기때문에 추적 변경이 가능하다.
       } else if (currentNode.nodeType === Node.ELEMENT_NODE) {
         // const uuid = `${RandomUtils.alphabet(40)}___${obj?.constructor?.name}`;
         const uuid = `${RandomUtils.alphabet(40)}`;
@@ -1721,58 +1724,6 @@ export class RawSet {
         // 추적 및 destroy 위해.
         instance.__rawSet = rawSet;
 
-        //
-        // const i = instance.__domrender_component_new = (instance.__domrender_component_new ?? new Proxy({}, new DomRenderFinalProxy())) as CreatorMetaData;
-        // i.thisVariableName = rawSet.point.thisVariableName;
-        // i.thisFullVariableName = `this.__domrender_components.${componentKey}`;
-        // i.componentKey = componentKey;
-        // i.rawSet = rawSet;
-        // i.attribute = attribute;
-        // i.router = config.router;
-        // i.scripts = render.scripts;
-        // i.drAttrs = attrs;
-        // i.innerHTML = element.innerHTML;
-        // i.rootCreator = new Proxy(obj, new DomRenderFinalProxy());
-        // i.creator = new Proxy(rawSet.point.thisVariableName ? ObjectUtils.Script.evalReturn(rawSet.point.thisVariableName, obj) : obj, new DomRenderFinalProxy());
-        // this.__creatorMetaData = i;
-        // render = {
-        //   component: instance,
-        //   creatorMetaData: i,
-        //   ...render
-        // };
-        //
-        // // 중요 dr-normal-attr-map
-        // const normalAttrMap = element.getAttribute(EventManager.normalAttrMapAttrName);
-        // if (isOnChangeAttrRender(instance) && normalAttrMap) {
-        //   new Map<string, string>(JSON.parse(normalAttrMap)).forEach((value, key) => {
-        //     const script = `${renderScript} return ${value} `;
-        //     const cval = ObjectUtils.Script.eval(script, Object.assign(obj, { __render: render }));
-        //     // element.setAttribute(key, cval);
-        //     instance.onChangeAttrRender(key, cval);
-        //   });
-        // }
-        //
-        // // dr-on-create data
-        // const onCreateDataScript = `return {rootParent: this, render: this.__render}`;
-        // const onCreateDataParam = ObjectUtils.Script.eval(onCreateDataScript, Object.assign(obj, { __render: render }));
-        // if (isOnCreateRenderData(instance)) {
-        //   instance?.onCreateRenderData(onCreateDataParam);
-        // }
-        //
-        // // dr-on-create onCreateRender
-        // const onCreate = element.getAttribute(RawSet.DR_ON_CREATE_ARGUMENTS_OPTIONNAME);
-        // this.__render = render;
-        // let createParam = [];
-        // if (onCreate) {
-        //   const script = `${renderScript} return ${onCreate} `;
-        //   createParam = ObjectUtils.Script.eval(script, Object.assign(obj, { __render: render }));
-        //   if (!Array.isArray(createParam)) {
-        //     createParam = [createParam];
-        //   }
-        // }
-        // if (isOnCreateRender(instance)) {
-        //   instance?.onCreateRender?.(...createParam);
-        // }
         let applayTemplate = element.innerHTML;
         let applayTemplateText = element.textContent?.trim() ?? '';
         let applayTemplateEscape =  ConvertUtils.escapeHTML(element.innerHTML);
@@ -1862,7 +1813,8 @@ export class RawSet {
           // d.innerHTML='<a></a>'
           // console.log('-----XX', ElementUtils.toInnerHTML(data, {document: config.window.document}));
           // template.innerHTML = template.innerHTML.replace(RegExp(innerHTMLThisRandom, 'g'), 'this.');
-          template.innerHTML = ElementUtils.toInnerHTML(data, {document: config.window.document}).replace(RegExp(innerHTMLThisRandom, 'g'), 'this.');;
+            let s = ElementUtils.toInnerHTML(data, {document: config.window.document});
+            template.innerHTML = s.replace(RegExp(innerHTMLThisRandom, 'g'), 'this.');;
           // console.log('ccc?', template.innerHTML);
           // template.innerHTML = '<div>zzzzzzz</div>'
           data = template.content;
@@ -1966,31 +1918,24 @@ export class RawSet {
         const variablePaths = v.variablePaths;
         let targetScript = v.originalAttrValue.trim();
 
-        let checktargetScript = v.originalAttrValue.trim();
-        variablePaths.forEach(it => {
-          checktargetScript = targetScript.replaceAll(it.origin, '');
-        })
-
-
         //중요!! expression 하나만 존재 및 그외것들이 없을때  그자체가 값이다 그외 여러개 있으면 문자열 합치는걸로 간주한다.
-        let isScriptValue = checktargetScript.length === 0 && variablePaths.length === 1;
-
-        if (isScriptValue) {
-          let r = ObjectUtils.Path.toOptionalChainPath(variablePaths[0].inner);
-          targetScript = targetScript.replaceAll(variablePaths[0].origin, r);
-        } else {
-          variablePaths.forEach(it => {
-            let r = ObjectUtils.Path.toOptionalChainPath(it.inner);
-            targetScript = targetScript.replaceAll(it.origin, `\${${r}}`);
-          });
-        }
+          if (v.isStringTemplate) {
+              variablePaths.forEach(it => {
+                  let r = ObjectUtils.Path.toOptionalChainPath(it.inner);
+                  targetScript = targetScript.replaceAll(it.origin, `\${${r}}`);
+              });
+          } else {
+              let r = ObjectUtils.Path.toOptionalChainPath(variablePaths[0].inner);
+              targetScript = targetScript.replaceAll(variablePaths[0].origin, r);
+          }
         const cval = ObjectUtils.Script.evaluateReturn(
-          { bodyScript: config.script, returnScript: isScriptValue ? targetScript : '`' + targetScript + '`' },
+          { bodyScript: config.script, returnScript: v.isStringTemplate ? '`' + targetScript + '`' : targetScript },
           Object.assign(config.obj, config.renderData ? { __render: config.renderData } : undefined)
         );
         attribute[k] = cval;
       });
     }
+      // console.log('attribute', attribute);
     return attribute;
   }
 }