@dooboostore/dom-render 1.0.109 → 1.0.110

package/dist/cjs/routers/PathRouter.js

@@ -26,7 +26,10 @@ class PathRouter extends import_Router.Router {
     super(config);
   }
   getSearchParams(data) {
-    const searchParams = new URL(this.config.window.document.location.href).searchParams;
+    if (!this.config.window.document?.location?.href) {
+      return new URLSearchParams();
+    }
+    const searchParams = new URL(this.config.window.document.location?.href).searchParams;
     data?.delete?.forEach((it) => {
       searchParams.delete(it);
     });
@@ -48,7 +51,7 @@ class PathRouter extends import_Router.Router {
   pushDeleteHashSearchParam(name, data, title) {
     const s = this.getHashSearchParams({ delete: [name] });
     const size = Array.from(s.entries()).length;
-    const href = `${this.config.window.location.pathname}${this.config.window.location.search}${size > 0 ? "#" + s.toString() : ""}`;
+    const href = `${this.config.window.location?.pathname ?? "/"}${this.config.window.location?.search}${size > 0 ? "#" + s.toString() : ""}`;
     super.pushState(data, title, href);
   }
   pushAddSearchParam(params, data, title) {
@@ -62,7 +65,7 @@ class PathRouter extends import_Router.Router {
   replaceDeleteHashSearchParam(name, data, title) {
     const s = this.getHashSearchParams({ delete: Array.isArray(name) ? name : [name] });
     const size = Array.from(s.entries()).length;
-    const href = `${this.config.window.location.pathname}${this.config.window.location.search}${size > 0 ? "#" + s.toString() : ""}`;
+    const href = `${this.config.window.location?.pathname ?? "/"}${this.config.window.location?.search}${size > 0 ? "#" + s.toString() : ""}`;
     super.replaceState(data, title, href);
   }
   replaceAddSearchParam(params, data, title) {
@@ -70,17 +73,20 @@ class PathRouter extends import_Router.Router {
     this.replace({ searchParams: s }, data, title);
   }
   getUrl() {
-    const url = new URL(this.config.window.document.location.href);
+    if (!this.config.window.document?.location?.href) {
+      return "/";
+    }
+    const url = new URL(this.config.window.document.location?.href);
     return url.pathname + url.search;
   }
   getHref() {
-    return this.config.window.location.href;
+    return this.config.window.location?.href ?? "/";
   }
   getPathName() {
-    return this.config.window.location.pathname;
+    return this.config.window.location?.pathname ?? "/";
   }
   getHashSearchParams(data) {
-    const searchParams = new URLSearchParams(this.config.window.location.hash.slice(1));
+    const searchParams = new URLSearchParams(this.config.window.location?.hash.slice(1) ?? "");
     data?.delete?.forEach((it) => {
       searchParams.delete(it);
     });

package/dist/cjs/routers/PathRouter.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/routers/PathRouter.ts"],
-  "sourcesContent": ["import { ChangeStateResult, RouteAction, Router, RouterConfig } from './Router';\n\nexport class PathRouter extends Router {\n  constructor(config: RouterConfig) {\n    super(config);\n  }\n\n  getSearchParams(data?:{delete?:string[], append?:[[string, string]]}): URLSearchParams {\n    const searchParams =  (new URL(this.config.window.document.location.href)).searchParams;\n    data?.delete?.forEach(it => {\n      searchParams.delete(it);\n    })\n\n    data?.append?.forEach(it => {\n      searchParams.append(it[0], it[1]);\n    })\n    return searchParams;\n\n  }\n\n  push(path: RouteAction, data?: any, title: string = ''): ChangeStateResult {\n    return super.pushState(data, title, this.toUrl(path));\n  }\n\n  replace(path: RouteAction, data?: any, title: string = ''): ChangeStateResult {\n    return super.replaceState(data, title, this.toUrl(path));\n  }\n\n  pushDeleteSearchParam(name: string, data?: any, title?: string): void {\n    const s = this.getSearchParams({delete: [name]});\n    this.push({searchParams: s}, data, title);\n  }\n\n  pushDeleteHashSearchParam(name: string, data?: any, title?: string) {\n    const s = this.getHashSearchParams({delete: [name]});\n    const size = Array.from(s.entries()).length;\n    const href = `${this.config.window.location.pathname}${this.config.window.location.search}${size > 0 ? '#' + s.toString() : ''}`;\n    super.pushState(data, title, href);\n  }\n\n  pushAddSearchParam(params:[[string, string]], data?: any, title?: string): void {\n    const s = this.getSearchParams({append: params});\n    this.push({searchParams: s}, data, title);\n  }\n  replaceDeleteSearchParam(name: string | string[], data?: any, title?: string): void {\n    const s = this.getSearchParams({delete: Array.isArray(name) ? name : [name]});\n    this.replace({searchParams: s}, data, title);\n  }\n\n  replaceDeleteHashSearchParam(name: string | string[], data?: any, title?: string) {\n    const s = this.getHashSearchParams({delete: Array.isArray(name) ? name : [name]});\n    const size = Array.from(s.entries()).length;\n    const href = `${this.config.window.location.pathname}${this.config.window.location.search}${size > 0 ? '#' + s.toString() : ''}`;\n    super.replaceState(data, title, href);\n  }\n\n  replaceAddSearchParam(params:[[string, string]], data?: any, title?: string): void {\n    const s = this.getSearchParams({append: params});\n    this.replace({searchParams: s}, data, title);\n  }\n\n\n  getUrl(): string {\n    const url = new URL(this.config.window.document.location.href);\n    return url.pathname + url.search;\n  }\n\n  getHref(): string {\n    return this.config.window.location.href;\n  }\n\n  getPathName(): string {\n    return this.config.window.location.pathname;\n  }\n\n  getHashSearchParams(data?:{delete?:string[], append?:[[string, string]]}): URLSearchParams {\n    // http://local.com/#wow=222&wow=bb&z=2\n    const searchParams =  new URLSearchParams(this.config.window.location.hash.slice(1));\n\n    data?.delete?.forEach(it => {\n      searchParams.delete(it);\n    })\n\n    data?.append?.forEach(it => {\n      searchParams.append(it[0], it[1]);\n    })\n    return searchParams;\n\n    // return undefined;\n  }\n\n\n}\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAAqE;AAE9D,MAAM,mBAAmB,qBAAO;AAAA,EACrC,YAAY,QAAsB;AAChC,UAAM,MAAM;AAAA,EACd;AAAA,EAEA,gBAAgB,MAAuE;AACrF,UAAM,eAAiB,IAAI,IAAI,KAAK,OAAO,OAAO,SAAS,SAAS,IAAI,EAAG;AAC3E,UAAM,QAAQ,QAAQ,QAAM;AAC1B,mBAAa,OAAO,EAAE;AAAA,IACxB,CAAC;AAED,UAAM,QAAQ,QAAQ,QAAM;AAC1B,mBAAa,OAAO,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC;AAAA,IAClC,CAAC;AACD,WAAO;AAAA,EAET;AAAA,EAEA,KAAK,MAAmB,MAAY,QAAgB,IAAuB;AACzE,WAAO,MAAM,UAAU,MAAM,OAAO,KAAK,MAAM,IAAI,CAAC;AAAA,EACtD;AAAA,EAEA,QAAQ,MAAmB,MAAY,QAAgB,IAAuB;AAC5E,WAAO,MAAM,aAAa,MAAM,OAAO,KAAK,MAAM,IAAI,CAAC;AAAA,EACzD;AAAA,EAEA,sBAAsB,MAAc,MAAY,OAAsB;AACpE,UAAM,IAAI,KAAK,gBAAgB,EAAC,QAAQ,CAAC,IAAI,EAAC,CAAC;AAC/C,SAAK,KAAK,EAAC,cAAc,EAAC,GAAG,MAAM,KAAK;AAAA,EAC1C;AAAA,EAEA,0BAA0B,MAAc,MAAY,OAAgB;AAClE,UAAM,IAAI,KAAK,oBAAoB,EAAC,QAAQ,CAAC,IAAI,EAAC,CAAC;AACnD,UAAM,OAAO,MAAM,KAAK,EAAE,QAAQ,CAAC,EAAE;AACrC,UAAM,OAAO,GAAG,KAAK,OAAO,OAAO,SAAS,QAAQ,GAAG,KAAK,OAAO,OAAO,SAAS,MAAM,GAAG,OAAO,IAAI,MAAM,EAAE,SAAS,IAAI,EAAE;AAC9H,UAAM,UAAU,MAAM,OAAO,IAAI;AAAA,EACnC;AAAA,EAEA,mBAAmB,QAA2B,MAAY,OAAsB;AAC9E,UAAM,IAAI,KAAK,gBAAgB,EAAC,QAAQ,OAAM,CAAC;AAC/C,SAAK,KAAK,EAAC,cAAc,EAAC,GAAG,MAAM,KAAK;AAAA,EAC1C;AAAA,EACA,yBAAyB,MAAyB,MAAY,OAAsB;AAClF,UAAM,IAAI,KAAK,gBAAgB,EAAC,QAAQ,MAAM,QAAQ,IAAI,IAAI,OAAO,CAAC,IAAI,EAAC,CAAC;AAC5E,SAAK,QAAQ,EAAC,cAAc,EAAC,GAAG,MAAM,KAAK;AAAA,EAC7C;AAAA,EAEA,6BAA6B,MAAyB,MAAY,OAAgB;AAChF,UAAM,IAAI,KAAK,oBAAoB,EAAC,QAAQ,MAAM,QAAQ,IAAI,IAAI,OAAO,CAAC,IAAI,EAAC,CAAC;AAChF,UAAM,OAAO,MAAM,KAAK,EAAE,QAAQ,CAAC,EAAE;AACrC,UAAM,OAAO,GAAG,KAAK,OAAO,OAAO,SAAS,QAAQ,GAAG,KAAK,OAAO,OAAO,SAAS,MAAM,GAAG,OAAO,IAAI,MAAM,EAAE,SAAS,IAAI,EAAE;AAC9H,UAAM,aAAa,MAAM,OAAO,IAAI;AAAA,EACtC;AAAA,EAEA,sBAAsB,QAA2B,MAAY,OAAsB;AACjF,UAAM,IAAI,KAAK,gBAAgB,EAAC,QAAQ,OAAM,CAAC;AAC/C,SAAK,QAAQ,EAAC,cAAc,EAAC,GAAG,MAAM,KAAK;AAAA,EAC7C;AAAA,EAGA,SAAiB;AACf,UAAM,MAAM,IAAI,IAAI,KAAK,OAAO,OAAO,SAAS,SAAS,IAAI;AAC7D,WAAO,IAAI,WAAW,IAAI;AAAA,EAC5B;AAAA,EAEA,UAAkB;AAChB,WAAO,KAAK,OAAO,OAAO,SAAS;AAAA,EACrC;AAAA,EAEA,cAAsB;AACpB,WAAO,KAAK,OAAO,OAAO,SAAS;AAAA,EACrC;AAAA,EAEA,oBAAoB,MAAuE;AAEzF,UAAM,eAAgB,IAAI,gBAAgB,KAAK,OAAO,OAAO,SAAS,KAAK,MAAM,CAAC,CAAC;AAEnF,UAAM,QAAQ,QAAQ,QAAM;AAC1B,mBAAa,OAAO,EAAE;AAAA,IACxB,CAAC;AAED,UAAM,QAAQ,QAAQ,QAAM;AAC1B,mBAAa,OAAO,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC;AAAA,IAClC,CAAC;AACD,WAAO;AAAA,EAGT;AAGF;",
+  "sourcesContent": ["import { ChangeStateResult, RouteAction, Router, RouterConfig } from './Router';\n\nexport class PathRouter extends Router {\n  constructor(config: RouterConfig) {\n    super(config);\n  }\n\n  getSearchParams(data?:{delete?:string[], append?:[[string, string]]}): URLSearchParams {\n    if (!this.config.window.document?.location?.href) {\n      return new URLSearchParams();\n    }\n\n    const searchParams =  (new URL(this.config.window.document.location?.href)).searchParams;\n    data?.delete?.forEach(it => {\n      searchParams.delete(it);\n    })\n\n    data?.append?.forEach(it => {\n      searchParams.append(it[0], it[1]);\n    })\n    return searchParams;\n\n  }\n\n  push(path: RouteAction, data?: any, title: string = ''): ChangeStateResult {\n    return super.pushState(data, title, this.toUrl(path));\n  }\n\n  replace(path: RouteAction, data?: any, title: string = ''): ChangeStateResult {\n    return super.replaceState(data, title, this.toUrl(path));\n  }\n\n  pushDeleteSearchParam(name: string, data?: any, title?: string): void {\n    const s = this.getSearchParams({delete: [name]});\n    this.push({searchParams: s}, data, title);\n  }\n\n  pushDeleteHashSearchParam(name: string, data?: any, title?: string) {\n    const s = this.getHashSearchParams({delete: [name]});\n    const size = Array.from(s.entries()).length;\n    const href = `${this.config.window.location?.pathname??'/'}${this.config.window.location?.search}${size > 0 ? '#' + s.toString() : ''}`;\n    super.pushState(data, title, href);\n  }\n\n  pushAddSearchParam(params:[[string, string]], data?: any, title?: string): void {\n    const s = this.getSearchParams({append: params});\n    this.push({searchParams: s}, data, title);\n  }\n  replaceDeleteSearchParam(name: string | string[], data?: any, title?: string): void {\n    const s = this.getSearchParams({delete: Array.isArray(name) ? name : [name]});\n    this.replace({searchParams: s}, data, title);\n  }\n\n  replaceDeleteHashSearchParam(name: string | string[], data?: any, title?: string) {\n    const s = this.getHashSearchParams({delete: Array.isArray(name) ? name : [name]});\n    const size = Array.from(s.entries()).length;\n    const href = `${this.config.window.location?.pathname??'/'}${this.config.window.location?.search}${size > 0 ? '#' + s.toString() : ''}`;\n    super.replaceState(data, title, href);\n  }\n\n  replaceAddSearchParam(params:[[string, string]], data?: any, title?: string): void {\n    const s = this.getSearchParams({append: params});\n    this.replace({searchParams: s}, data, title);\n  }\n\n\n  getUrl(): string {\n    if (!this.config.window.document?.location?.href) {\n      return '/';\n    }\n    const url = new URL(this.config.window.document.location?.href);\n    return url.pathname + url.search;\n  }\n\n  getHref(): string {\n    return this.config.window.location?.href??'/';\n  }\n\n  getPathName(): string {\n    return this.config.window.location?.pathname??'/';\n  }\n\n  getHashSearchParams(data?:{delete?:string[], append?:[[string, string]]}): URLSearchParams {\n    // http://local.com/#wow=222&wow=bb&z=2\n    const searchParams =  new URLSearchParams(this.config.window.location?.hash.slice(1)??'');\n\n    data?.delete?.forEach(it => {\n      searchParams.delete(it);\n    })\n\n    data?.append?.forEach(it => {\n      searchParams.append(it[0], it[1]);\n    })\n    return searchParams;\n\n    // return undefined;\n  }\n\n\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/cjs/routers/Router.js

@@ -17,14 +17,12 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var Router_exports = {};
 __export(Router_exports, {
-  Router: () => Router,
-  isPopStateCurrentTargetDomrenderRouter: () => isPopStateCurrentTargetDomrenderRouter
+  Router: () => Router
 });
 module.exports = __toCommonJS(Router_exports);
 var import_ConvertUtils = require("@dooboostore/core/convert/ConvertUtils");
 var import_BehaviorSubject = require("@dooboostore/core/message/BehaviorSubject");
 var import_Expression = require("@dooboostore/core/expression/Expression");
-const isPopStateCurrentTargetDomrenderRouter = (obj) => obj?.currentTargetName === "domRenderRouter";
 class Router {
   constructor(config) {
     this._config = config;
@@ -35,19 +33,18 @@ class Router {
         url: config.firstUrl,
         path: path[0],
         searchParams: new URLSearchParams(path[1] ?? ""),
-        router: this
+        router: this,
+        triggerPoint: "end"
       };
       this.behaviorSubject = new import_BehaviorSubject.BehaviorSubject(routeData);
       this.go(config.firstUrl);
     } else {
-      routeData = this.getRouteData();
+      routeData = { ...this.getRouteData(), triggerPoint: "end" };
       this.behaviorSubject = new import_BehaviorSubject.BehaviorSubject(routeData);
     }
     this.config.window.addEventListener("popstate", (event) => {
-      if (!isPopStateCurrentTargetDomrenderRouter(event.state)) {
-        const routeData2 = this.getRouteData();
-        this.behaviorSubject.next(routeData2);
-      }
+      const routeData2 = { ...this.getRouteData(), triggerPoint: "end" };
+      this.behaviorSubject.next(routeData2);
     });
   }
   get observable() {
@@ -89,9 +86,30 @@ class Router {
     }
   }
   getRouteData(config) {
+    let path = "";
+    let url = "";
+    if (config?.pathOrUrl) {
+      let isUrl = false;
+      try {
+        new URL(config.pathOrUrl);
+        isUrl = true;
+      } catch {
+        isUrl = false;
+      }
+      if (isUrl) {
+        const u = new URL(config.pathOrUrl);
+        path = u.pathname;
+        url = u.pathname + u.search;
+      } else {
+        path = config.pathOrUrl.split("?")[0];
+      }
+    } else {
+      path = this.getPathName();
+      url = this.getUrl();
+    }
     const newVar = {
-      path: this.getPathName(),
-      url: this.getUrl(),
+      path,
+      url,
       searchParams: this.getSearchParams()
     };
     const data = this.getData();
@@ -105,32 +123,40 @@ class Router {
       }
     }
     newVar.router = this;
-    newVar.currentTarget = config?.currentTarget;
     return Object.freeze(newVar);
   }
   pushState(data, title, path) {
-    this.config.window.history.pushState(data, title ?? "", path);
-    this.behaviorSubject.next(this.getRouteData({ currentTarget: { currentTargetName: "domRenderRouter" } }));
+    this.behaviorSubject.next({ ...this.getRouteData({ pathOrUrl: path }), triggerPoint: "start" });
+    this.config.window.history?.pushState(data, title ?? "", path);
+    this.behaviorSubject.next({ ...this.getRouteData({ pathOrUrl: path }), triggerPoint: "end" });
     return { data };
   }
   replaceState(data, title, path) {
-    this.config.window.history.replaceState(data, title ?? "", path);
-    this.behaviorSubject.next(this.getRouteData({ currentTarget: { currentTargetName: "domRenderRouter" } }));
+    this.behaviorSubject.next({ ...this.getRouteData({ pathOrUrl: path }), triggerPoint: "start" });
+    this.config.window.history?.replaceState(data, title ?? "", path);
+    this.behaviorSubject.next({ ...this.getRouteData({ pathOrUrl: path }), triggerPoint: "end" });
     return { data };
   }
-  dispatchPopStateEvent(data) {
-    this.config.window.dispatchEvent(new PopStateEvent("popstate", { state: { ...data, currentTargetName: "domRenderRouter" } }));
-  }
-  reload(data) {
-    this.config.window.dispatchEvent(new PopStateEvent("popstate", { state: data }));
-  }
   getData() {
-    return this.config.window.history.state;
+    return this.config.window.history?.state;
   }
   getPathData(urlExpression, currentUrl = this.getPathName()) {
     return import_Expression.Expression.Path.pathNameData(currentUrl, urlExpression);
   }
-  async go(config) {
+  back() {
+    this.behaviorSubject.next({ ...this.getRouteData(), triggerPoint: "start" });
+    this.config.window.history.back();
+  }
+  forward() {
+    this.behaviorSubject.next({ ...this.getRouteData(), triggerPoint: "start" });
+    this.config.window.history?.forward();
+  }
+  go(config) {
+    if (typeof config === "number") {
+      this.behaviorSubject.next({ ...this.getRouteData(), triggerPoint: "start" });
+      this.config.window.history?.go(config);
+      return;
+    }
     if (typeof config === "string") {
       config = { path: config };
     }
@@ -145,11 +171,9 @@ class Router {
       } catch (e) {
       }
     }
-    if (!config.disabledPopEvent) {
-      this.dispatchPopStateEvent(config?.data);
-    }
   }
   toUrl(data) {
+    console.log("toUrl", data);
     let targetPath;
     if (typeof data === "string") {
       targetPath = data;

package/dist/cjs/routers/Router.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/routers/Router.ts"],
-  "sourcesContent": ["import { ConvertUtils } from '@dooboostore/core/convert/ConvertUtils';\nimport { Observable } from '@dooboostore/core/message/Observable';\nimport { BehaviorSubject } from '@dooboostore/core/message/BehaviorSubject';\nimport { Expression } from '@dooboostore/core/expression/Expression';\nimport ToURLSearchParamsParams = ConvertUtils.ToURLSearchParamsParams;\n\nexport type RouteData = {\n  path: string;\n  url: string;\n  data?: any;\n  searchParams: URLSearchParams;\n  pathData?: any;\n  router: Router;\n  currentTarget?:PopCurrentState;\n}\nexport type PopStateCurrentTargetDomrenderRouter = { currentTargetName: 'domRenderRouter' };\nexport type PopCurrentState = PopStateCurrentTargetDomrenderRouter;\nexport const isPopStateCurrentTargetDomrenderRouter = (obj: any): obj is PopStateCurrentTargetDomrenderRouter =>\n  obj?.currentTargetName === 'domRenderRouter';\n\nexport type RouterConfig<T = any> = { rootObject?: T, window: Window, firstUrl?: string,\n  // changeStateConvertDate?:(data: any)=>any\n};\nexport type ChangeStateResult = {data?: any}\nexport type RouteAction = string | { path?: string, searchParams?: ToURLSearchParamsParams };\n\n/*\n    this.option.window.addEventListener('popstate', (event) => { // history.back, forward\uC5D0\uB9CC popstate \uBC1C\uC0DD\uB418\uACE0 \uAC12\uC774 \uB3C4\uCD9C\uB41C\uB2E4\n   console.log('popstate-------!!', event.state, this.domRenderConfig.window.history.state)\n   })\n */\nexport abstract class Router<T = any> {\n  private behaviorSubject: BehaviorSubject<RouteData>;\n  private _config: RouterConfig<T>;\n\n  constructor(config: RouterConfig<any>) {\n    this._config = config;\n\n    let routeData: RouteData;\n    if (config?.firstUrl) {\n      const path = config.firstUrl.split('?');\n      routeData = {\n        url: config.firstUrl,\n        path: path[0],\n        searchParams: new URLSearchParams(path[1]??''),\n        router: this,\n      }\n      this.behaviorSubject = new BehaviorSubject<RouteData>(routeData);\n      this.go(config.firstUrl);\n    } else {\n      routeData = this.getRouteData();\n      this.behaviorSubject = new BehaviorSubject<RouteData>(routeData);\n    }\n    this.config.window.addEventListener('popstate', (event: PopStateEvent) => {\n      // domrender\uC5D0\uC11C \uBC1C\uC0DD\uD558\uC9C0 \uC54A\uC740 \uC989 back, previous \uC77C\uB584\uC5D0\uB3C4 \uC774\uBCA4\uD2B8\uAC00\uB3C4\uB85D \uCC98\uB9AC\n      if(!isPopStateCurrentTargetDomrenderRouter(event.state)) {\n        // console.log('-------');\n        const routeData = this.getRouteData();\n        this.behaviorSubject.next(routeData);\n      }\n    })\n  }\n\n\n  get observable(): Observable<RouteData> {\n    return this.behaviorSubject.asObservable();\n  }\n\n  get searchParamObject() {\n    return ConvertUtils.toObject(this.getSearchParams());\n  }\n\n  get config() {\n    return this._config;\n  }\n\n  public getSearchFirstParamsObject<T = any>(defaultValue?: T) {\n    const a = ConvertUtils.toObject<T>(this.getSearchParams(), {firstValue: true});\n    return Object.assign({}, defaultValue, a);\n  }\n\n  public getHashSearchFirstParamsObject<T = any>() {\n    return ConvertUtils.toObject<T>(this.getHashSearchParams(), {firstValue: true});\n  }\n\n  // async attach(): Promise<void> {\n  //   // const proxy = getDomRenderProxy(this.config.rootObject)\n  //   // if (proxy) {\n  //   //   const key = `___${EventManager.ROUTER_VARNAME}`;\n  //   //   await proxy.render(key);\n  //   // }\n  // }\n\n  testRegexp(regexp?: string): boolean {\n    if (regexp) {\n      const b = RegExp(regexp).test(this.getPathName());\n      return b;\n    }else {\n      return false;\n    }\n  }\n\n  test(urlExpression?: string): boolean {\n    if (urlExpression && this.getPathData(urlExpression)) {\n      return true;\n    } else {\n      return false;\n    }\n  }\n\n  getRouteData(config?: {urlExpression?: string, currentTarget?: PopCurrentState}): RouteData {\n    const newVar = {\n      path: this.getPathName(),\n      url: this.getUrl(),\n      searchParams: this.getSearchParams()\n    } as RouteData;\n\n    const data = this.getData();\n    if (data) {\n      newVar.data = data;\n    }\n    if (config?.urlExpression) {\n      const data = this.getPathData(config.urlExpression);\n      if (data) {\n        newVar.pathData = data;\n      }\n    }\n    newVar.router = this;\n    newVar.currentTarget = config?.currentTarget;\n    return Object.freeze(newVar);\n  }\n\n  pushState(data: any, title: string | undefined, path: string):ChangeStateResult {\n    // data = this.config.changeStateConvertDate?this.config.changeStateConvertDate(data): data;\n    // console.log('--->pushState', data);\n    this.config.window.history.pushState(data, title??'', path);\n    this.behaviorSubject.next(this.getRouteData({currentTarget: {currentTargetName: 'domRenderRouter'}}));\n    return {data};\n  }\n\n  replaceState(data: any, title: string | undefined, path: string):ChangeStateResult {\n    // data = this.config.changeStateConvertDate?this.config.changeStateConvertDate(data): data;\n    // console.log('--->replaceState', data);\n    this.config.window.history.replaceState(data, title??'', path);\n    this.behaviorSubject.next(this.getRouteData({currentTarget: {currentTargetName: 'domRenderRouter'}}));\n    return {data};\n  }\n\n  private dispatchPopStateEvent(data?: any) {\n    this.config.window.dispatchEvent(new PopStateEvent('popstate', {state: {...data, currentTargetName: 'domRenderRouter'}}));\n  }\n\n  reload(data?: any) {\n    this.config.window.dispatchEvent(new PopStateEvent('popstate', {state: data}));\n  }\n\n  getData(): any {\n    return this.config.window.history.state;\n  }\n\n  getPathData(urlExpression: string, currentUrl = this.getPathName()): any {\n    return Expression.Path.pathNameData(currentUrl, urlExpression);\n  }\n\n  async go(config:  string | { path: RouteAction, data?: any, replace?: boolean, title?: string, disabledPopEvent?: boolean, scrollToTop?: boolean } | string): Promise<void> {\n    if (typeof config === 'string') {\n      config = { path: config };\n    }\n\n    // let data: ChangeStateResult | undefined = undefined;\n    if (config?.replace) {\n      this.replace(config.path, config.data, config.title);\n    } else {\n      this.push(config.path, config.data, config.title);\n    }\n    // if (!this.config.disableAttach) {\n    //   await this.attach();\n    // }\n    \n    // \uC2A4\uD06C\uB864 \uC81C\uC5B4 (\uAE30\uBCF8\uAC12: true - \uB9E8 \uC704\uB85C \uC2A4\uD06C\uB864)\n    if (config.scrollToTop !== false) {\n      try {\n      this._config.window?.scrollTo?.(0, 0);\n      }catch (e){}\n    }\n    \n    // console.log('----------', data, config)\n    if (!config.disabledPopEvent) {\n      this.dispatchPopStateEvent(config?.data);\n    }\n  }\n\n  toUrl(data: RouteAction) {\n    let targetPath: string;\n    if (typeof data === 'string') {\n      targetPath = data;\n    } else {\n      const tpath = data.path ?? this.getPathName();\n      const s = data.searchParams ? ConvertUtils.toURLSearchParams(data.searchParams).toString() : '';\n      // data.searchParams\n      targetPath = `${tpath}${s.length > 0 ? '?' : ''}${s}`;\n    }\n    return targetPath;\n  }\n\n\n  abstract push(path: RouteAction, data?: any, title?: string): void;\n\n  abstract replace(path: RouteAction, data?: any, title?: string): void;\n\n  abstract pushDeleteSearchParam(name: string | string[], data?: any, title?: string): void;\n\n  abstract pushDeleteHashSearchParam(name: string | string[], data?: any, title?: string): void;\n\n  abstract pushAddSearchParam(params:[[string, string]], data?: any, title?: string): void;\n\n  abstract replaceDeleteSearchParam(name: string | string[], data?: any, title?: string): void;\n\n  abstract replaceDeleteHashSearchParam(name: string | string[], data?: any, title?: string): void;\n\n  abstract replaceAddSearchParam(params:[[string, string]], data?: any, title?: string): void;\n\n  abstract getSearchParams(data?:{delete?:string[], append?:[[string, string]]}): URLSearchParams;\n\n  abstract getHashSearchParams(data?:{delete?:string[], append?:[[string, string]]}): URLSearchParams;\n\n  abstract getUrl(): string;\n\n  abstract getHref(): string;\n\n  abstract getPathName(): string;\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import { ConvertUtils } from '@dooboostore/core/convert/ConvertUtils';\nimport { Observable } from '@dooboostore/core/message/Observable';\nimport { BehaviorSubject } from '@dooboostore/core/message/BehaviorSubject';\nimport { Expression } from '@dooboostore/core/expression/Expression';\nimport ToURLSearchParamsParams = ConvertUtils.ToURLSearchParamsParams;\n\nexport type RouteData = {\n  path: string;\n  url: string;\n  data?: any;\n  searchParams: URLSearchParams;\n  pathData?: any;\n  router: Router;\n}\n\nexport type RouterConfig<T = any> = { rootObject?: T, window: Window, firstUrl?: string};\nexport type ChangeStateResult = {data?: any}\nexport type RouteAction = string | { path?: string, searchParams?: ToURLSearchParamsParams };\n\ntype RouterEventType = RouteData & { triggerPoint: 'start' | 'end' };\n\nexport abstract class Router<T = any> {\n  private behaviorSubject: BehaviorSubject<RouterEventType>;\n  private _config: RouterConfig<T>;\n\n  constructor(config: RouterConfig<any>) {\n    this._config = config;\n\n    let routeData: RouterEventType;\n    if (config?.firstUrl) {\n      const path = config.firstUrl.split('?');\n      routeData = {\n        url: config.firstUrl,\n        path: path[0],\n        searchParams: new URLSearchParams(path[1]??''),\n        router: this,\n        triggerPoint: 'end'\n      }\n      this.behaviorSubject = new BehaviorSubject<RouterEventType>(routeData);\n      this.go(config.firstUrl);\n    } else {\n      routeData = {...this.getRouteData(), triggerPoint: 'end'};\n      this.behaviorSubject = new BehaviorSubject<RouterEventType>(routeData);\n    }\n    this.config.window.addEventListener('popstate', (event: PopStateEvent) => {\n      // domrender\uC5D0\uC11C \uBC1C\uC0DD\uD558\uC9C0 \uC54A\uC740 \uC989 back, previous \uC77C\uB584\uC5D0\uB3C4 \uC774\uBCA4\uD2B8\uAC00\uB3C4\uB85D \uCC98\uB9AC\n      // if(!isPopStateCurrentTargetDomrenderRouter(event.state)) {\n      // console.log('-------');\n      const routeData: RouterEventType = {...this.getRouteData(), triggerPoint: 'end'};\n      this.behaviorSubject.next(routeData);\n      // }\n    })\n  }\n\n\n  get observable(): Observable<RouterEventType> {\n    return this.behaviorSubject.asObservable();\n  }\n\n  get searchParamObject() {\n    return ConvertUtils.toObject(this.getSearchParams());\n  }\n\n  get config() {\n    return this._config;\n  }\n\n  public getSearchFirstParamsObject<T = any>(defaultValue?: T) {\n    const a = ConvertUtils.toObject<T>(this.getSearchParams(), {firstValue: true});\n    return Object.assign({}, defaultValue, a);\n  }\n\n  public getHashSearchFirstParamsObject<T = any>() {\n    return ConvertUtils.toObject<T>(this.getHashSearchParams(), {firstValue: true});\n  }\n\n  // async attach(): Promise<void> {\n  //   // const proxy = getDomRenderProxy(this.config.rootObject)\n  //   // if (proxy) {\n  //   //   const key = `___${EventManager.ROUTER_VARNAME}`;\n  //   //   await proxy.render(key);\n  //   // }\n  // }\n\n  testRegexp(regexp?: string): boolean {\n    if (regexp) {\n      const b = RegExp(regexp).test(this.getPathName());\n      return b;\n    }else {\n      return false;\n    }\n  }\n\n  test(urlExpression?: string): boolean {\n    if (urlExpression && this.getPathData(urlExpression)) {\n      return true;\n    } else {\n      return false;\n    }\n  }\n\n  getRouteData(config?: {pathOrUrl?: string, urlExpression?: string}): RouteData {\n\n    let path = '';\n    let url ='';\n    if (config?.pathOrUrl) {\n      let isUrl = false;\n      try {\n        new URL(config.pathOrUrl);\n        isUrl = true;\n      } catch {\n        isUrl = false;\n      }\n      if(isUrl){\n        const u = new URL(config.pathOrUrl);\n        path = u.pathname;\n        url = u.pathname + u.search;\n      } else {\n        path = config.pathOrUrl.split('?')[0];\n      }\n    } else {\n      path = this.getPathName();\n      url = this.getUrl();\n    }\n    const newVar = {\n      path: path,\n      url: url,\n      searchParams: this.getSearchParams()\n    } as RouteData;\n\n    const data = this.getData();\n    if (data) {\n      newVar.data = data;\n    }\n    if (config?.urlExpression) {\n      const data = this.getPathData(config.urlExpression);\n      if (data) {\n        newVar.pathData = data;\n      }\n    }\n    newVar.router = this;\n    // newVar.currentTarget = config?.currentTarget;\n    return Object.freeze(newVar);\n  }\n\n  pushState(data: any, title: string | undefined, path: string):ChangeStateResult {\n    // data = this.config.changeStateConvertDate?this.config.changeStateConvertDate(data): data;\n    // console.log('--->pushState', data);\n    this.behaviorSubject.next({ ...this.getRouteData({pathOrUrl:path}), triggerPoint: 'start' });\n    this.config.window.history?.pushState(data, title ?? '', path);\n    this.behaviorSubject.next({ ...this.getRouteData({pathOrUrl:path}), triggerPoint: 'end' });\n    return {data};\n  }\n\n  replaceState(data: any, title: string | undefined, path: string):ChangeStateResult {\n    // data = this.config.changeStateConvertDate?this.config.changeStateConvertDate(data): data;\n    // console.log('--->replaceState', data);\n    this.behaviorSubject.next({ ...this.getRouteData({pathOrUrl:path}), triggerPoint: 'start' });\n    this.config.window.history?.replaceState(data, title ?? '', path);\n    this.behaviorSubject.next({ ...this.getRouteData({pathOrUrl:path}), triggerPoint: 'end' });\n    return {data};\n  }\n\n  getData(): any {\n    return this.config.window.history?.state;\n  }\n\n  getPathData(urlExpression: string, currentUrl = this.getPathName()): any {\n    return Expression.Path.pathNameData(currentUrl, urlExpression);\n  }\n\n  back(): void {\n    this.behaviorSubject.next({...this.getRouteData(),triggerPoint:'start'});\n    this.config.window.history.back();\n    //en\uBD80\uBD84\uC740 constructo\uC758  this.config.window.addEventListener('popstate'   \uC5D0\uC11C \uBC1B\uC544\uC11C \uCC98\uB9AC\uB41C\uB2E4 \uD638\uCD9C\uB41C\uB2E4.\n  }\n\n  forward(): void {\n    this.behaviorSubject.next({...this.getRouteData(),triggerPoint:'start'});\n    this.config.window.history?.forward();\n    //end\uBD80\uBD84\uC740 constructor\uC758  this.config.window.addEventListener('popstate'   \uC5D0\uC11C \uBC1B\uC544\uC11C \uCC98\uB9AC\uB41C\uB2E4 \uD638\uCD9C\uB41C\uB2E4.\n  }\n\n  go(i: number): void;\n  async go(config:  string | { path: RouteAction, data?: any, replace?: boolean, title?: string, scrollToTop?: boolean } | string): Promise<void> ;\n  go(config: number | string | { path: RouteAction, data?: any, replace?: boolean, title?: string, scrollToTop?: boolean } | string): Promise<void> | void {\n    if (typeof config === 'number') {\n      this.behaviorSubject.next({...this.getRouteData(),triggerPoint:'start'});\n      this.config.window.history?.go(config);\n      //end\uBD80\uBD84\uC740 constructor\uC758  this.config.window.addEventListener('popstate'   \uC5D0\uC11C \uBC1B\uC544\uC11C \uCC98\uB9AC\uB41C\uB2E4 \uD638\uCD9C\uB41C\uB2E4.\n      return;\n    }\n\n    if (typeof config === 'string') {\n      config = { path: config };\n    }\n\n    // let data: ChangeStateResult | undefined = undefined;\n    if (config?.replace) {\n      this.replace(config.path, config.data, config.title);\n    } else {\n      this.push(config.path, config.data, config.title);\n    }\n    // if (!this.config.disableAttach) {\n    //   await this.attach();\n    // }\n\n    // \uC2A4\uD06C\uB864 \uC81C\uC5B4 (\uAE30\uBCF8\uAC12: true - \uB9E8 \uC704\uB85C \uC2A4\uD06C\uB864)\n    if (config.scrollToTop !== false) {\n      try {\n        this._config.window?.scrollTo?.(0, 0);\n      }catch (e){}\n    }\n\n    // console.log('----------', data, config)\n    // if (!config.disabledPopEvent) {\n    //   this.dispatchPopStateEvent(config?.data);\n    // }\n  }\n\n  toUrl(data: RouteAction) {\n    console.log('toUrl', data);\n    let targetPath: string;\n    if (typeof data === 'string') {\n      targetPath = data;\n    } else {\n      const tpath = data.path ?? this.getPathName();\n      const s = data.searchParams ? ConvertUtils.toURLSearchParams(data.searchParams).toString() : '';\n      // data.searchParams\n      targetPath = `${tpath}${s.length > 0 ? '?' : ''}${s}`;\n    }\n    return targetPath;\n  }\n\n\n  abstract push(path: RouteAction, data?: any, title?: string): void;\n\n  abstract replace(path: RouteAction, data?: any, title?: string): void;\n\n  abstract pushDeleteSearchParam(name: string | string[], data?: any, title?: string): void;\n\n  abstract pushDeleteHashSearchParam(name: string | string[], data?: any, title?: string): void;\n\n  abstract pushAddSearchParam(params:[[string, string]], data?: any, title?: string): void;\n\n  abstract replaceDeleteSearchParam(name: string | string[], data?: any, title?: string): void;\n\n  abstract replaceDeleteHashSearchParam(name: string | string[], data?: any, title?: string): void;\n\n  abstract replaceAddSearchParam(params:[[string, string]], data?: any, title?: string): void;\n\n  abstract getSearchParams(data?:{delete?:string[], append?:[[string, string]]}): URLSearchParams;\n\n  abstract getHashSearchParams(data?:{delete?:string[], append?:[[string, string]]}): URLSearchParams;\n\n  abstract getUrl(): string;\n\n  abstract getHref(): string;\n\n  abstract getPathName(): string;\n}\n"],
+  "mappings": "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",
   "names": ["routeData", "data"]
 }

package/dist/esm/DomRenderProxy.js

@@ -19,7 +19,20 @@ import { ObjectUtils } from "@dooboostore/core/object/ObjectUtils";
 import { ValidUtils } from "@dooboostore/core/valid/ValidUtils";
 import { isOnProxyDomRender } from "./lifecycle/OnProxyDomRender.js";
 import { isOnRawSetRendered } from "./lifecycle/OnRawSetRendered.js";
-const excludeGetSetPropertys = ["onBeforeReturnGet", "onBeforeReturnSet", "__domrender_components", "__render", "_DomRender_isFinal", "_domRender_ref", "_rawSets", "_domRender_proxy", "_targets", "_DomRender_origin", "_DomRender_ref", "_DomRender_proxy"];
+const excludeGetSetPropertys = [
+  "onBeforeReturnGet",
+  "onBeforeReturnSet",
+  "__domrender_components",
+  "__render",
+  "_DomRender_isFinal",
+  "_domRender_ref",
+  "_rawSets",
+  "_domRender_proxy",
+  "_targets",
+  "_DomRender_origin",
+  "_DomRender_ref",
+  "_DomRender_proxy"
+];
 const isWrapProxyDomRenderProxy = (obj) => {
   return obj && typeof obj === "object" && "_DomRender_isProxy" in obj;
 };
@@ -62,7 +75,7 @@ class DomRenderProxy {
   static isFinal(obj) {
     return ValidUtils.isNull(obj) || DomRenderFinalProxy.isFinal(obj);
   }
-  run(objProxy) {
+  async run(objProxy) {
     this._domRender_proxy = objProxy;
     if (isOnProxyDomRender(objProxy)) {
       objProxy.onProxyDomRender(this._domRender_config);
@@ -87,18 +100,18 @@ class DomRenderProxy {
         }
       });
     }
-    this._targets.forEach((target) => {
-      this.initRender(target);
-    });
+    for (let target of this._targets) {
+      await this.initRender(target);
+    }
   }
-  initRender(target, rawSet) {
+  async initRender(target, rawSet) {
     if (target instanceof Element) {
       target.innerHTML = target.innerHTML.replace(/@this@/g, "this");
     }
     const onCreate = target.getAttribute?.(RawSet.DR_ON_CREATE_ARGUMENTS_OPTIONNAME);
     let createParam = [];
     if (onCreate) {
-      createParam = ScriptUtils.evaluateReturn(onCreate, this._domRender_proxy);
+      createParam = ObjectUtils.Script.evaluateReturn(onCreate, this._domRender_proxy);
       if (!Array.isArray(createParam)) {
         createParam = [createParam];
       }
@@ -111,7 +124,11 @@ class DomRenderProxy {
     }
     this._targets.add(target);
     const rawSets = RawSet.checkPointCreates(target, this._domRender_proxy, this._domRender_config);
-    this._domRender_config.eventManager.applyEvent(this._domRender_proxy, this._domRender_config.eventManager.findAttrElements(target, this._domRender_config), this._domRender_config);
+    this._domRender_config.eventManager.applyEvent(
+      this._domRender_proxy,
+      this._domRender_config.eventManager.findAttrElements(target, this._domRender_config),
+      this._domRender_config
+    );
     rawSets.forEach((it) => {
       const variables = it.getUsingTriggerVariables(this._domRender_config);
       if (variables.size <= 0) {
@@ -122,16 +139,20 @@ class DomRenderProxy {
         });
       }
     });
-    this.render(this.getRawSets()).then((it) => {
+    const targetRawSets = await this.render(this.getRawSets());
+    for (let targetRawSet of targetRawSets) {
       const onInit = target.getAttribute?.(RawSet.DR_ON_INIT_ARGUMENTS_OPTIONNAME);
       let initParam;
       if (onCreate) {
         initParam = ScriptUtils.evaluateReturn(onCreate, this._domRender_proxy);
       }
       if (isOnInitRender(this._domRender_proxy)) {
-        this._domRender_proxy.onInitRender(initParam, rawSet ?? { dataSet: { config: this._domRender_config } });
+        await this._domRender_proxy.onInitRender(
+          initParam,
+          rawSet ?? { dataSet: { config: this._domRender_config } }
+        );
       }
-    });
+    }
   }
   getRawSets() {
     const set = /* @__PURE__ */ new Set();
@@ -164,9 +185,12 @@ class DomRenderProxy {
         } else if (it.type === RawSetType.TARGET_ELEMENT && it.dataSet?.render?.currentThis && fullPathStr && targetAttrMap) {
           new Map(JSON.parse(targetAttrMap)).forEach((v, k) => {
             var _a;
-            const isUsing = EventManager.isUsingThisVar(v, `this.${fullPathStr}`);
+            const isUsing = v.variablePaths.some((it2) => EventManager.isUsingThisVar(it2.inner, `this.${fullPathStr}`));
             if (isUsing) {
-              const targetAttrObject = RawSet.getAttributeObject(it.point.node, { script: it.dataSet?.render?.renderScript ?? "", obj: Object.assign(this._domRender_proxy ?? {}, { __render: it.dataSet?.render }) });
+              const targetAttrObject = RawSet.getAttributeObject(it.point.node, {
+                script: it.dataSet?.render?.renderScript ?? "",
+                obj: Object.assign(this._domRender_proxy ?? {}, { __render: it.dataSet?.render })
+              });
               (_a = it.dataSet).render ?? (_a.render = {});
               it.dataSet.render.attribute = targetAttrObject;
               if (isOnChangeAttrRender(it.dataSet?.render?.currentThis)) {
@@ -210,7 +234,11 @@ class DomRenderProxy {
           it.forEach((sit) => {
             try {
               const concat = pathInfos.concat([[{ path: sit, obj: key }]]);
-              const items = key._DomRender_proxy?.root(concat, value, lastDoneExecute);
+              const items = key._DomRender_proxy?.root(
+                concat,
+                value,
+                lastDoneExecute
+              );
               fullPaths.push(items.flat());
             } catch (e) {
             }
@@ -246,10 +274,19 @@ class DomRenderProxy {
               if (value === void 0) {
                 const rawSet = it.getHasRawSet(lastPropertyName);
                 rawSet?.remove();
-                startElement.setAttribute(RawSet.DR_HAS_KEYS_OPTIONNAME, keys.filter((it2) => it2 !== lastPropertyName).join(","));
+                startElement.setAttribute(
+                  RawSet.DR_HAS_KEYS_OPTIONNAME,
+                  keys.filter((it2) => it2 !== lastPropertyName).join(",")
+                );
               }
               if (!keys.includes(lastPropertyName)) {
-                const raws = DrThisProperty.append(this._domRender_proxy, fullPathStr, lastPropertyName, it, this._domRender_config);
+                const raws = DrThisProperty.append(
+                  this._domRender_proxy,
+                  fullPathStr,
+                  lastPropertyName,
+                  it,
+                  this._domRender_config
+                );
                 if (raws) {
                   rawSets.push(...raws);
                 }
@@ -269,10 +306,19 @@ class DomRenderProxy {
           } else if (iterable) {
             rData = await this.render(Array.from(iterable), fullPathStr);
           }
+          const Node = this._domRender_config.window.Node;
           this._targets.forEach((it) => {
             if (it.nodeType === Node.DOCUMENT_FRAGMENT_NODE || it.nodeType === Node.ELEMENT_NODE) {
-              const targets = this._domRender_config.eventManager.findAttrElements(it, this._domRender_config);
-              this._domRender_config.eventManager.changeVar(this._domRender_proxy, targets, `this.${fullPathStr}`, this._domRender_config);
+              const targets = this._domRender_config.eventManager.findAttrElements(
+                it,
+                this._domRender_config
+              );
+              this._domRender_config.eventManager.changeVar(
+                this._domRender_proxy,
+                targets,
+                `this.${fullPathStr}`,
+                this._domRender_config
+              );
             }
           });
           if (rData?.length > 0 && isOnChildRenderedByProperty(data)) {
@@ -304,49 +350,64 @@ class DomRenderProxy {
       fullPathInfo = this.root([[{ path: p, obj: this._domRender_proxy }]], value);
     }
     const rootElement = this._domRender_config.rootElement ?? this._domRender_config.window.document;
-    DocumentUtils.querySelectorAllByAttributeName(rootElement, EventManager.normalAttrMapAttrName)?.forEach((elementInfo) => {
-      const targets = new Map(ScriptUtils.evaluateReturn(elementInfo.value));
-      Array.from(targets.entries()).filter(([key, value2]) => value2.trim()).filter(isDefined).flatMap(([key, valueScript]) => {
-        return fullPathInfo.flat().filter((it) => valueScript.includes(`this.${it.path}`)).flatMap((it) => ({ key, valueScript, pathInfo: it }));
-      }).forEach((it) => {
-        const optionalPath = ObjectUtils.Path.toOptionalChainPath(it.valueScript);
-        const value1 = ScriptUtils.evaluateReturn(optionalPath, it.pathInfo.obj);
-        if (value1 === null) {
-          elementInfo.element.removeAttribute(it.key);
-          elementInfo.element[it.key] = null;
-        } else {
-          elementInfo.element.setAttribute(it.key, value1);
-          elementInfo.element[it.key] = value1;
-        }
-      });
-    });
-    DocumentUtils.querySelectorAllByAttributeName(rootElement, EventManager.linkTargetMapAttrName)?.forEach((elementInfo) => {
-      const targets = new Map(ScriptUtils.evaluateReturn(elementInfo.value));
-      Array.from(targets.entries()).filter(([key, value2]) => value2.trim()).filter(isDefined).flatMap(([key, valueScript]) => {
-        return fullPathInfo.flat().filter((it) => valueScript.includes(`this.${it.path}`)).flatMap((it) => ({ key, valueScript, pathInfo: it }));
-      }).forEach((info) => {
-        const value1 = ScriptUtils.evaluateReturn(info.valueScript, info.pathInfo.obj);
-        const applyAttributeName = EventManager.linkAttrs.find((it) => it.name === info.key);
-        if (applyAttributeName) {
+    DocumentUtils.querySelectorAllByAttributeName(rootElement, EventManager.normalAttrMapAttrName)?.forEach(
+      (elementInfo) => {
+        const targets = new Map(
+          ObjectUtils.Script.evaluateReturn(elementInfo.value)
+        );
+        Array.from(targets.entries()).filter(isDefined).flatMap(([key, valueScript]) => {
+          return fullPathInfo.flat().filter((it) => valueScript.variablePaths?.some((vit) => vit.inner.includes(`this.${it.path}`))).flatMap((it) => ({ key, valueScript, pathInfo: it }));
+        }).forEach((it) => {
+          const variablePaths = it.valueScript.variablePaths;
+          let targetScript = it.valueScript.originalAttrValue;
+          variablePaths.forEach((it2) => {
+            let r = ObjectUtils.Path.toOptionalChainPath(it2.inner);
+            targetScript = targetScript.replaceAll(it2.origin, `\${${r}}`);
+          });
+          const value1 = ObjectUtils.Script.evaluateReturn("`" + targetScript + "`", it.pathInfo.obj);
           if (value1 === null) {
-            elementInfo.element.removeAttribute(applyAttributeName.property);
+            elementInfo.element.removeAttribute(it.key);
+            elementInfo.element[it.key] = null;
           } else {
-            elementInfo.element.setAttribute(applyAttributeName.property, value1);
+            elementInfo.element.setAttribute(it.key, value1);
+            elementInfo.element[it.key] = value1;
           }
-        }
-      });
-      Array.from(targets.entries()).filter(([key, value2]) => value2.trim()).filter(isDefined).flatMap(([key, valueScript]) => {
-        return fullPathInfo.flat().filter((it) => valueScript.includes(`this.${it.path}`)).flatMap((it) => ({ key, valueScript, pathInfo: it }));
-      }).forEach((info) => {
-        const linkInfo = EventManager.linkAttrs.find((it) => it.name === info.key);
-        if (linkInfo) {
-          elementInfo.element[linkInfo.property] = value;
-        }
-      });
-    });
+        });
+      }
+    );
+    DocumentUtils.querySelectorAllByAttributeName(rootElement, EventManager.linkTargetMapAttrName)?.forEach(
+      (elementInfo) => {
+        const targets = new Map(ScriptUtils.evaluateReturn(elementInfo.value));
+        Array.from(targets.entries()).filter(([key, value2]) => value2.trim()).filter(isDefined).flatMap(([key, valueScript]) => {
+          return fullPathInfo.flat().filter((it) => valueScript.includes(`this.${it.path}`)).flatMap((it) => ({ key, valueScript, pathInfo: it }));
+        }).forEach((info) => {
+          const value1 = ScriptUtils.evaluateReturn(info.valueScript, info.pathInfo.obj);
+          const applyAttributeName = EventManager.linkAttrs.find((it) => it.name === info.key);
+          if (applyAttributeName) {
+            if (value1 === null) {
+              elementInfo.element.removeAttribute(applyAttributeName.property);
+            } else {
+              elementInfo.element.setAttribute(applyAttributeName.property, value1);
+            }
+          }
+        });
+        Array.from(targets.entries()).filter(([key, value2]) => value2.trim()).filter(isDefined).flatMap(([key, valueScript]) => {
+          return fullPathInfo.flat().filter((it) => valueScript.includes(`this.${it.path}`)).flatMap((it) => ({ key, valueScript, pathInfo: it }));
+        }).forEach((info) => {
+          const linkInfo = EventManager.linkAttrs.find((it) => it.name === info.key);
+          if (linkInfo) {
+            elementInfo.element[linkInfo.property] = value;
+          }
+        });
+      }
+    );
     if ("onBeforeReturnSet" in receiver && typeof p === "string" && !(this._domRender_config.proxyExcludeOnBeforeReturnSets ?? []).concat(excludeGetSetPropertys).includes(p)) {
       if (isOnBeforeReturnSet(receiver)) {
-        receiver.onBeforeReturnSet?.(p, value, fullPathInfo.map((it) => it.map((it2) => it2.path).join()));
+        receiver.onBeforeReturnSet?.(
+          p,
+          value,
+          fullPathInfo.map((it) => it.map((it2) => it2.path).join())
+        );
       }
     }
     return true;
@@ -366,7 +427,11 @@ class DomRenderProxy {
         it = it._DomRender_origin;
       }
       if ("onBeforeReturnGet" in receiver && typeof p === "string" && !(this._domRender_config.proxyExcludeOnBeforeReturnGets ?? []).concat(excludeGetSetPropertys).includes(p)) {
-        receiver?.onBeforeReturnGet?.(p, it, this.root([[{ path: p, obj: this._domRender_proxy }]], it, false));
+        receiver?.onBeforeReturnGet?.(
+          p,
+          it,
+          this.root([[{ path: p, obj: this._domRender_proxy }]], it, false)
+        );
       }
       return it;
     }