@dooboostore/dom-render 1.0.111 → 1.0.112

package/dist/cjs/routers/HashRouter.js

@@ -90,6 +90,9 @@ class HashRouter extends import_Router.Router {
   getPathName() {
     return import_LocationUtils.LocationUtils.hashPath(this.config.window) || "/";
   }
+  getSearch() {
+    return import_LocationUtils.LocationUtils.hashSearch(this.config.window);
+  }
   getHashSearchParams(data) {
     const hash = this.config.window.location.hash;
     const queryIndex = hash.indexOf("?");

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/routers/HashRouter.ts"],
-  "sourcesContent": ["import { ChangeStateResult, RouteAction, Router, RouterConfig } from './Router';\nimport { LocationUtils } from '@dooboostore/core-web/location/LocationUtils';\n\n\nexport class HashRouter extends Router {\n\n  constructor(config: RouterConfig) {\n    super(config);\n  }\n\n\n  getSearchParams(data?: { delete?: string[], append?: [[string, string]] }): URLSearchParams {\n    const hashSearch = LocationUtils.hashSearch(this.config.window);\n    const searchParams = hashSearch ? new URLSearchParams(hashSearch) : (new URL(this.config.window.document.location.href)).searchParams;\n\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\n  push(path: RouteAction, data?: any, title: string = ''): ChangeStateResult {\n    if (path === '/') {\n      return super.pushState(data, title, '/');\n    } else {\n      return super.pushState(data, title, `#${this.toUrl(path)}`);\n    }\n  }\n\n  replace(path: RouteAction, data?: any, title?: string):ChangeStateResult {\n    if (path === '/') {\n      return super.replaceState(data, title, '/');\n    } else {\n      return super.replaceState(data, title, `#${this.toUrl(path)}`);\n    }\n  }\n\n  setDeleteHashSearchParam(name: string, data?: any, title?: string) {\n  }\n\n  pushDeleteHashSearchParam(name: string | string[], data: any, title: string | undefined): void {\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.pushState(data, title, href);\n  }\n\n  pushDeleteSearchParam(name: string | string[], data?: any, title?: string): void {\n    const s = this.getSearchParams({delete:Array.isArray(name) ? name : [name]});\n    this.push({searchParams: s}, data, title);\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\n  replaceDeleteHashSearchParam(name: string | string[], data: any, title: string | undefined): void {\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.pushState(data, title, href);\n  }\n\n  replaceDeleteSearchParam(name: string | string[], data?: any, title?: string): void {\n    const s = this.getSearchParams({delete: Array.isArray(name) ? name : [name]});\n    this.push({searchParams: s}, data, title);\n  }\n\n  replaceAddSearchParam(params:[[string, string]], data?: any, title?: string): void {\n    const s = this.getSearchParams({append: params});\n    this.push({searchParams: s}, data, title);\n  }\n\n  getUrl(): string {\n    return LocationUtils.hash(this.config.window) || '/';\n  }\n\n  getHref(): string {\n    return this.config.window.location.href;\n  }\n\n  getPathName(): string {\n    return LocationUtils.hashPath(this.config.window) || '/';\n  }\n\n  getHashSearchParams(data?:{delete?:string[], append?:[[string, string]]}): URLSearchParams {\n    const hash = this.config.window.location.hash;\n    const queryIndex = hash.indexOf('?');\n    const searchParams = (queryIndex !== -1) ? new URLSearchParams(hash.slice(queryIndex + 1)) :  new URLSearchParams();;\n    data?.delete?.forEach(it => {\n      searchParams.delete(it);\n    })\n    data?.append?.forEach(it => {\n      searchParams.append(it[0], it[1]);\n    })\n    return searchParams;\n\n  }\n\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import { ChangeStateResult, RouteAction, Router, RouterConfig } from './Router';\nimport { LocationUtils } from '@dooboostore/core-web/location/LocationUtils';\n\n\nexport class HashRouter extends Router {\n\n  constructor(config: RouterConfig) {\n    super(config);\n  }\n\n\n  getSearchParams(data?: { delete?: string[], append?: [[string, string]] }): URLSearchParams {\n    const hashSearch = LocationUtils.hashSearch(this.config.window);\n    const searchParams = hashSearch ? new URLSearchParams(hashSearch) : (new URL(this.config.window.document.location.href)).searchParams;\n\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\n  push(path: RouteAction, data?: any, title: string = ''): ChangeStateResult {\n    if (path === '/') {\n      return super.pushState(data, title, '/');\n    } else {\n      return super.pushState(data, title, `#${this.toUrl(path)}`);\n    }\n  }\n\n  replace(path: RouteAction, data?: any, title?: string):ChangeStateResult {\n    if (path === '/') {\n      return super.replaceState(data, title, '/');\n    } else {\n      return super.replaceState(data, title, `#${this.toUrl(path)}`);\n    }\n  }\n\n  setDeleteHashSearchParam(name: string, data?: any, title?: string) {\n  }\n\n  pushDeleteHashSearchParam(name: string | string[], data: any, title: string | undefined): void {\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.pushState(data, title, href);\n  }\n\n  pushDeleteSearchParam(name: string | string[], data?: any, title?: string): void {\n    const s = this.getSearchParams({delete:Array.isArray(name) ? name : [name]});\n    this.push({searchParams: s}, data, title);\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\n  replaceDeleteHashSearchParam(name: string | string[], data: any, title: string | undefined): void {\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.pushState(data, title, href);\n  }\n\n  replaceDeleteSearchParam(name: string | string[], data?: any, title?: string): void {\n    const s = this.getSearchParams({delete: Array.isArray(name) ? name : [name]});\n    this.push({searchParams: s}, data, title);\n  }\n\n  replaceAddSearchParam(params:[[string, string]], data?: any, title?: string): void {\n    const s = this.getSearchParams({append: params});\n    this.push({searchParams: s}, data, title);\n  }\n\n  getUrl(): string {\n    return LocationUtils.hash(this.config.window) || '/';\n  }\n\n  getHref(): string {\n    return this.config.window.location.href;\n  }\n\n  getPathName(): string {\n    return LocationUtils.hashPath(this.config.window) || '/';\n  }\n\n  getSearch(): string {\n    return LocationUtils.hashSearch(this.config.window);\n  }\n\n  getHashSearchParams(data?:{delete?:string[], append?:[[string, string]]}): URLSearchParams {\n    const hash = this.config.window.location.hash;\n    const queryIndex = hash.indexOf('?');\n    const searchParams = (queryIndex !== -1) ? new URLSearchParams(hash.slice(queryIndex + 1)) :  new URLSearchParams();;\n    data?.delete?.forEach(it => {\n      searchParams.delete(it);\n    })\n    data?.append?.forEach(it => {\n      searchParams.append(it[0], it[1]);\n    })\n    return searchParams;\n\n  }\n\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/cjs/routers/PathRouter.js

@@ -85,6 +85,9 @@ class PathRouter extends import_Router.Router {
   getPathName() {
     return this.config.window.location?.pathname ?? "/";
   }
+  getSearch() {
+    return this.config.window.location?.search ?? "";
+  }
   getHashSearchParams(data) {
     const searchParams = new URLSearchParams(this.config.window.location?.hash.slice(1) ?? "");
     data?.delete?.forEach((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    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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",
+  "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      //if ((!this.config.window.document?.location?.href) || (this.config.window.document?.location?.href === 'about:blank')) {\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  getSearch(): string {\n    return this.config.window.location?.search??'';\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

@@ -23,17 +23,20 @@ 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");
+var import_ValidUtils = require("@dooboostore/core/valid/ValidUtils");
 class Router {
   constructor(config) {
     this._config = config;
     let routeData;
     if (config?.firstUrl) {
       const path = config.firstUrl.split("?");
+      const urlSearchParams = new URLSearchParams(path[1] ?? "");
       routeData = {
         url: config.firstUrl,
         path: path[0],
-        searchParams: new URLSearchParams(path[1] ?? ""),
+        searchParams: urlSearchParams,
         router: this,
+        search: urlSearchParams.size > 0 ? `?${urlSearchParams.toString()}` : "",
         triggerPoint: "end"
       };
       this.behaviorSubject = new import_BehaviorSubject.BehaviorSubject(routeData);
@@ -86,31 +89,30 @@ class Router {
     }
   }
   getRouteData(config) {
-    let path = "";
-    let url = "";
+    let path = this.getPathName();
+    let url = this.getUrl();
+    let searchParams = this.getSearchParams();
+    let search = this.getSearch();
     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;
+      const paths = config.pathOrUrl.split("?");
+      search = paths[1] ? `?${paths[1]}` : "";
+      searchParams = new URLSearchParams(search);
+      const firstUrl = paths[0];
+      if (import_ValidUtils.ValidUtils.isUrl(firstUrl)) {
+        path = new URL(firstUrl).pathname;
       } else {
-        path = config.pathOrUrl.split("?")[0];
+        path = firstUrl;
       }
-    } else {
-      path = this.getPathName();
-      url = this.getUrl();
+      url = config.pathOrUrl;
     }
     const newVar = {
       path,
       url,
-      searchParams: this.getSearchParams()
+      searchParams,
+      // 이렇게 하면 진짜 문자열이 변형이 될수 있다 따라서 그냥 문자열 자른 원본을넣어줘야한다
+      // search: searchParams.size > 0 ? `?${searchParams.toString()}` : '',
+      search,
+      router: this
     };
     const data = this.getData();
     if (data) {
@@ -122,7 +124,6 @@ class Router {
         newVar.pathData = data2;
       }
     }
-    newVar.router = this;
     return Object.freeze(newVar);
   }
   pushState(data, title, path) {
@@ -173,7 +174,6 @@ class Router {
     }
   }
   toUrl(data) {
-    console.log("toUrl", data);
     let targetPath;
     if (typeof data === "string") {
       targetPath = data;
@@ -184,5 +184,9 @@ class Router {
     }
     return targetPath;
   }
+  reload() {
+    const currentUrl = this.getUrl();
+    this.replace(currentUrl);
+  }
 }
 //# sourceMappingURL=Router.js.map

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}\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": ";;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,0BAA6B;AAE7B,6BAAgC;AAChC,wBAA2B;AAkBpB,MAAe,OAAgB;AAAA,EAIpC,YAAY,QAA2B;AACrC,SAAK,UAAU;AAEf,QAAI;AACJ,QAAI,QAAQ,UAAU;AACpB,YAAM,OAAO,OAAO,SAAS,MAAM,GAAG;AACtC,kBAAY;AAAA,QACV,KAAK,OAAO;AAAA,QACZ,MAAM,KAAK,CAAC;AAAA,QACZ,cAAc,IAAI,gBAAgB,KAAK,CAAC,KAAG,EAAE;AAAA,QAC7C,QAAQ;AAAA,QACR,cAAc;AAAA,MAChB;AACA,WAAK,kBAAkB,IAAI,uCAAiC,SAAS;AACrE,WAAK,GAAG,OAAO,QAAQ;AAAA,IACzB,OAAO;AACL,kBAAY,EAAC,GAAG,KAAK,aAAa,GAAG,cAAc,MAAK;AACxD,WAAK,kBAAkB,IAAI,uCAAiC,SAAS;AAAA,IACvE;AACA,SAAK,OAAO,OAAO,iBAAiB,YAAY,CAAC,UAAyB;AAIxE,YAAMA,aAA6B,EAAC,GAAG,KAAK,aAAa,GAAG,cAAc,MAAK;AAC/E,WAAK,gBAAgB,KAAKA,UAAS;AAAA,IAErC,CAAC;AAAA,EACH;AAAA,EAGA,IAAI,aAA0C;AAC5C,WAAO,KAAK,gBAAgB,aAAa;AAAA,EAC3C;AAAA,EAEA,IAAI,oBAAoB;AACtB,WAAO,iCAAa,SAAS,KAAK,gBAAgB,CAAC;AAAA,EACrD;AAAA,EAEA,IAAI,SAAS;AACX,WAAO,KAAK;AAAA,EACd;AAAA,EAEO,2BAAoC,cAAkB;AAC3D,UAAM,IAAI,iCAAa,SAAY,KAAK,gBAAgB,GAAG,EAAC,YAAY,KAAI,CAAC;AAC7E,WAAO,OAAO,OAAO,CAAC,GAAG,cAAc,CAAC;AAAA,EAC1C;AAAA,EAEO,iCAA0C;AAC/C,WAAO,iCAAa,SAAY,KAAK,oBAAoB,GAAG,EAAC,YAAY,KAAI,CAAC;AAAA,EAChF;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAUA,WAAW,QAA0B;AACnC,QAAI,QAAQ;AACV,YAAM,IAAI,OAAO,MAAM,EAAE,KAAK,KAAK,YAAY,CAAC;AAChD,aAAO;AAAA,IACT,OAAM;AACJ,aAAO;AAAA,IACT;AAAA,EACF;AAAA,EAEA,KAAK,eAAiC;AACpC,QAAI,iBAAiB,KAAK,YAAY,aAAa,GAAG;AACpD,aAAO;AAAA,IACT,OAAO;AACL,aAAO;AAAA,IACT;AAAA,EACF;AAAA,EAEA,aAAa,QAAkE;AAE7E,QAAI,OAAO;AACX,QAAI,MAAK;AACT,QAAI,QAAQ,WAAW;AACrB,UAAI,QAAQ;AACZ,UAAI;AACF,YAAI,IAAI,OAAO,SAAS;AACxB,gBAAQ;AAAA,MACV,QAAQ;AACN,gBAAQ;AAAA,MACV;AACA,UAAG,OAAM;AACP,cAAM,IAAI,IAAI,IAAI,OAAO,SAAS;AAClC,eAAO,EAAE;AACT,cAAM,EAAE,WAAW,EAAE;AAAA,MACvB,OAAO;AACL,eAAO,OAAO,UAAU,MAAM,GAAG,EAAE,CAAC;AAAA,MACtC;AAAA,IACF,OAAO;AACL,aAAO,KAAK,YAAY;AACxB,YAAM,KAAK,OAAO;AAAA,IACpB;AACA,UAAM,SAAS;AAAA,MACb;AAAA,MACA;AAAA,MACA,cAAc,KAAK,gBAAgB;AAAA,IACrC;AAEA,UAAM,OAAO,KAAK,QAAQ;AAC1B,QAAI,MAAM;AACR,aAAO,OAAO;AAAA,IAChB;AACA,QAAI,QAAQ,eAAe;AACzB,YAAMC,QAAO,KAAK,YAAY,OAAO,aAAa;AAClD,UAAIA,OAAM;AACR,eAAO,WAAWA;AAAA,MACpB;AAAA,IACF;AACA,WAAO,SAAS;AAEhB,WAAO,OAAO,OAAO,MAAM;AAAA,EAC7B;AAAA,EAEA,UAAU,MAAW,OAA2B,MAAgC;AAG9E,SAAK,gBAAgB,KAAK,EAAE,GAAG,KAAK,aAAa,EAAC,WAAU,KAAI,CAAC,GAAG,cAAc,QAAQ,CAAC;AAC3F,SAAK,OAAO,OAAO,SAAS,UAAU,MAAM,SAAS,IAAI,IAAI;AAC7D,SAAK,gBAAgB,KAAK,EAAE,GAAG,KAAK,aAAa,EAAC,WAAU,KAAI,CAAC,GAAG,cAAc,MAAM,CAAC;AACzF,WAAO,EAAC,KAAI;AAAA,EACd;AAAA,EAEA,aAAa,MAAW,OAA2B,MAAgC;AAGjF,SAAK,gBAAgB,KAAK,EAAE,GAAG,KAAK,aAAa,EAAC,WAAU,KAAI,CAAC,GAAG,cAAc,QAAQ,CAAC;AAC3F,SAAK,OAAO,OAAO,SAAS,aAAa,MAAM,SAAS,IAAI,IAAI;AAChE,SAAK,gBAAgB,KAAK,EAAE,GAAG,KAAK,aAAa,EAAC,WAAU,KAAI,CAAC,GAAG,cAAc,MAAM,CAAC;AACzF,WAAO,EAAC,KAAI;AAAA,EACd;AAAA,EAEA,UAAe;AACb,WAAO,KAAK,OAAO,OAAO,SAAS;AAAA,EACrC;AAAA,EAEA,YAAY,eAAuB,aAAa,KAAK,YAAY,GAAQ;AACvE,WAAO,6BAAW,KAAK,aAAa,YAAY,aAAa;AAAA,EAC/D;AAAA,EAEA,OAAa;AACX,SAAK,gBAAgB,KAAK,EAAC,GAAG,KAAK,aAAa,GAAE,cAAa,QAAO,CAAC;AACvE,SAAK,OAAO,OAAO,QAAQ,KAAK;AAAA,EAElC;AAAA,EAEA,UAAgB;AACd,SAAK,gBAAgB,KAAK,EAAC,GAAG,KAAK,aAAa,GAAE,cAAa,QAAO,CAAC;AACvE,SAAK,OAAO,OAAO,SAAS,QAAQ;AAAA,EAEtC;AAAA,EAIA,GAAG,QAAsJ;AACvJ,QAAI,OAAO,WAAW,UAAU;AAC9B,WAAK,gBAAgB,KAAK,EAAC,GAAG,KAAK,aAAa,GAAE,cAAa,QAAO,CAAC;AACvE,WAAK,OAAO,OAAO,SAAS,GAAG,MAAM;AAErC;AAAA,IACF;AAEA,QAAI,OAAO,WAAW,UAAU;AAC9B,eAAS,EAAE,MAAM,OAAO;AAAA,IAC1B;AAGA,QAAI,QAAQ,SAAS;AACnB,WAAK,QAAQ,OAAO,MAAM,OAAO,MAAM,OAAO,KAAK;AAAA,IACrD,OAAO;AACL,WAAK,KAAK,OAAO,MAAM,OAAO,MAAM,OAAO,KAAK;AAAA,IAClD;AAMA,QAAI,OAAO,gBAAgB,OAAO;AAChC,UAAI;AACF,aAAK,QAAQ,QAAQ,WAAW,GAAG,CAAC;AAAA,MACtC,SAAQ,GAAE;AAAA,MAAC;AAAA,IACb;AAAA,EAMF;AAAA,EAEA,MAAM,MAAmB;AACvB,YAAQ,IAAI,SAAS,IAAI;AACzB,QAAI;AACJ,QAAI,OAAO,SAAS,UAAU;AAC5B,mBAAa;AAAA,IACf,OAAO;AACL,YAAM,QAAQ,KAAK,QAAQ,KAAK,YAAY;AAC5C,YAAM,IAAI,KAAK,eAAe,iCAAa,kBAAkB,KAAK,YAAY,EAAE,SAAS,IAAI;AAE7F,mBAAa,GAAG,KAAK,GAAG,EAAE,SAAS,IAAI,MAAM,EAAE,GAAG,CAAC;AAAA,IACrD;AACA,WAAO;AAAA,EACT;AA4BF;",
+  "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;\nimport {ValidUtils} from \"@dooboostore/core/valid/ValidUtils\";\n\nexport type RouteData = {\n  path: string;\n  url: string;\n  data?: any;\n  search: string;\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      const urlSearchParams = new URLSearchParams(path[1] ?? '');\n      routeData = {\n        url: config.firstUrl,\n        path: path[0],\n        searchParams: urlSearchParams,\n        router: this,\n        search: urlSearchParams.size > 0 ? `?${urlSearchParams.toString()}` : '',\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 =  this.getPathName();\n    let url = this.getUrl();\n    let searchParams = this.getSearchParams();\n    let search = this.getSearch();\n\n    // console.log('pppppppppppppp', path,url,searchParams,search);\n    // \uC694\uCCAD URL\uC774 \uC788\uC744\uACBD\uC6B0 \uD574\uB2F9 URL\uB85C \uD30C\uC2F1\n    if (config?.pathOrUrl) {\n      const paths = config.pathOrUrl.split('?');\n      search = paths[1] ? `?${paths[1]}`: '';\n      searchParams = new URLSearchParams(search);\n      const firstUrl = paths[0];\n      if (ValidUtils.isUrl(firstUrl)) {\n        path = new URL(firstUrl).pathname;\n      } else {\n        path = firstUrl;\n      }\n      url = config.pathOrUrl;\n      // }\n    }\n    // console.log('url', url);\n    const newVar: RouteData = {\n      path: path,\n      url: url,\n      searchParams: searchParams,\n      // \uC774\uB807\uAC8C \uD558\uBA74 \uC9C4\uC9DC \uBB38\uC790\uC5F4\uC774 \uBCC0\uD615\uC774 \uB420\uC218 \uC788\uB2E4 \uB530\uB77C\uC11C \uADF8\uB0E5 \uBB38\uC790\uC5F4 \uC790\uB978 \uC6D0\uBCF8\uC744\uB123\uC5B4\uC918\uC57C\uD55C\uB2E4\n      // search: searchParams.size > 0 ? `?${searchParams.toString()}` : '',\n      search: search,\n      router: this\n    };\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    // console.log('Router go', config);\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\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  abstract getSearch(): string;\n\n  reload(): void {\n    const currentUrl = this.getUrl();\n    this.replace(currentUrl);\n  }\n}\n"],
+  "mappings": "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",
   "names": ["routeData", "data"]
 }

package/dist/esm/DomRenderProxy.js

@@ -1,6 +1,5 @@
 import { RawSet } from "./rawsets/RawSet.js";
 import { EventManager } from "./events/EventManager.js";
-import { ScriptUtils } from "@dooboostore/core-web/script/ScriptUtils";
 import { DomRenderFinalProxy, Shield } from "./types/Types.js";
 import { RawSetType } from "./rawsets/RawSetType.js";
 import { DrThisProperty } from "./operators/DrThisProperty.js";
@@ -19,6 +18,7 @@ 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";
+import { isOnChildRawSetRendered } from "./lifecycle/OnChildRawSetRendered.js";
 const excludeGetSetPropertys = [
   "onBeforeReturnGet",
   "onBeforeReturnSet",
@@ -55,12 +55,12 @@ const getDomRenderProxy = (obj) => {
   return void 0;
 };
 class DomRenderProxy {
+  // public name = Math.random();
   constructor(_domRender_origin, target, _domRender_config) {
     this._domRender_origin = _domRender_origin;
     this._domRender_config = _domRender_config;
     this._domRender_ref = /* @__PURE__ */ new Map();
     this._rawSets = /* @__PURE__ */ new Map();
-    // public _firstTarget: Node;
     this._targets = /* @__PURE__ */ new Set();
     if (target) {
       this._targets.add(target);
@@ -144,7 +144,7 @@ class DomRenderProxy {
       const onInit = target.getAttribute?.(RawSet.DR_ON_INIT_ARGUMENTS_OPTIONNAME);
       let initParam;
       if (onCreate) {
-        initParam = ScriptUtils.evaluateReturn(onCreate, this._domRender_proxy);
+        initParam = ObjectUtils.Script.evaluateReturn(onCreate, this._domRender_proxy);
       }
       if (isOnInitRender(this._domRender_proxy)) {
         await this._domRender_proxy.onInitRender(
@@ -173,46 +173,65 @@ class DomRenderProxy {
     }
     const removeRawSets = [];
     const rawSets = raws ?? this.getRawSets();
-    for (const it of rawSets) {
-      it.getUsingTriggerVariables(this._domRender_config).forEach((path) => {
-        this.addRawSet(path, it);
-      });
-      let renderResult;
-      if (it.isConnected) {
-        const targetAttrMap = it.point.node?.getAttribute?.(EventManager.normalAttrMapAttrName);
-        if (it.detect?.action) {
-          it.detect.action();
-        } 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 = 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 })
-              });
-              (_a = it.dataSet).render ?? (_a.render = {});
-              it.dataSet.render.attribute = targetAttrObject;
-              if (isOnChangeAttrRender(it.dataSet?.render?.currentThis)) {
-                it.dataSet?.render?.currentThis?.onChangeAttrRender?.(k, targetAttrObject[k], { rawSet: it });
+    const CHUNK_SIZE = 50;
+    const chunks = [];
+    const rawSetsArray = Array.from(rawSets);
+    for (let i = 0; i < rawSetsArray.length; i += CHUNK_SIZE) {
+      chunks.push(rawSetsArray.slice(i, i + CHUNK_SIZE));
+    }
+    for (const chunk of chunks) {
+      const promises = chunk.map(async (it) => {
+        it.getUsingTriggerVariables(this._domRender_config).forEach((path) => {
+          this.addRawSet(path, it);
+        });
+        let renderResult;
+        if (it.isConnected) {
+          const targetAttrMap = it.point.node?.getAttribute?.(EventManager.normalAttrMapAttrName);
+          if (it.detect?.action) {
+            it.detect.action();
+          } else if (it.type === RawSetType.TARGET_ELEMENT && it.dataSet?.render?.currentThis && fullPathStr && targetAttrMap) {
+            const attrStart = performance.now();
+            new Map(JSON.parse(targetAttrMap)).forEach((v, k) => {
+              var _a;
+              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 })
+                });
+                (_a = it.dataSet).render ?? (_a.render = {});
+                it.dataSet.render.attribute = targetAttrObject;
+                if (isOnChangeAttrRender(it.dataSet?.render?.currentThis)) {
+                  it.dataSet?.render?.currentThis?.onChangeAttrRender?.(k, targetAttrObject[k], { rawSet: it });
+                }
               }
+            });
+            const attrEnd = performance.now();
+          } else {
+            const renderStart = performance.now();
+            const rawSets2 = await it.render(this._domRender_proxy, this._domRender_config);
+            const renderEnd = performance.now();
+            renderResult = rawSets2;
+            if (rawSets2 && rawSets2.raws.length > 0) {
+              await this.render(rawSets2.raws);
             }
-          });
-        } else {
-          const rawSets2 = await it.render(this._domRender_proxy, this._domRender_config);
-          renderResult = rawSets2;
-          if (rawSets2 && rawSets2.raws.length > 0) {
-            await this.render(rawSets2.raws);
           }
+        } else {
+          removeRawSets.push(it);
         }
-      } else {
-        removeRawSets.push(it);
-      }
-      const t = it.findNearThis(this._domRender_proxy);
-      if (isOnRawSetRendered(t)) {
-        await t.onRawSetRendered(it, { path: fullPathStr, renderResult });
+        const t = it.findNearThis(this._domRender_proxy);
+        if (isOnRawSetRendered(t)) {
+          await t.onRawSetRendered(it, { path: fullPathStr, value: ObjectUtils.Script.evaluateReturn(`this.${fullPathStr}`, this._domRender_proxy), root: this._domRender_proxy, renderResult });
+        }
+      });
+      await Promise.all(promises);
+      if (chunks.length > 1) {
+        await new Promise((resolve) => requestAnimationFrame(resolve));
       }
     }
+    if (isOnChildRawSetRendered(this._domRender_proxy)) {
+      await this._domRender_proxy.onChildRawSetRendered();
+    }
     if (removeRawSets.length > 0) {
       this.removeRawSet(...removeRawSets);
     }
@@ -227,12 +246,15 @@ class DomRenderProxy {
   //   return current;
   // }
   root(pathInfos, value, lastDoneExecute = true) {
+    const rootStartTime = Date.now();
+    const pathKey = pathInfos.flat().map((i) => i.path).join(".");
     const fullPaths = [];
     if (this._domRender_ref.size > 0) {
       this._domRender_ref.forEach((it, key) => {
         if ("_DomRender_isProxy" in key) {
           it.forEach((sit) => {
             try {
+              const recursiveStartTime = Date.now();
               const concat = pathInfos.concat([[{ path: sit, obj: key }]]);
               const items = key._DomRender_proxy?.root(
                 concat,
@@ -246,6 +268,7 @@ class DomRenderProxy {
         }
       });
     } else {
+      const pathProcessStartTime = Date.now();
       const strings = pathInfos.reverse().map((it) => it.map((it2) => it2.path).join(","));
       const fullPathStr = strings.map((it) => isNaN(Number(it)) ? "." + it : `[${it}]`).join("").slice(1);
       if (lastDoneExecute) {
@@ -253,10 +276,13 @@ class DomRenderProxy {
         const front = strings.slice(0, strings.length - 1).map((it) => isNaN(Number(it)) ? "." + it : `[${it}]`).join("");
         const lastPropertyName = strings[strings.length - 1];
         const path = "this" + front;
-        const data = ScriptUtils.evaluateReturn(ObjectUtils.Path.toOptionalChainPath(path), this._domRender_proxy);
+        const data = ObjectUtils.Script.evaluateReturn(ObjectUtils.Path.toOptionalChainPath(path), this._domRender_proxy);
+        const promiseStartTime = Date.now();
         new Promise(async (resolve) => {
+          const promiseInnerStartTime = Date.now();
           let rData = [];
           const firstPathStr = front.slice(1);
+          const dictionaryCheckStartTime = Date.now();
           const firstTargets = this._rawSets.get(firstPathStr);
           const firstTargetDictionary = [];
           firstTargets?.forEach((it) => {
@@ -298,6 +324,7 @@ class DomRenderProxy {
               rData = await this.render(rawSets);
             }
           }
+          const renderStartTime = Date.now();
           if (lastPropertyName === "length" && Array.isArray(data)) {
             const aIterable = this._rawSets.get(firstPathStr);
             if (aIterable) {
@@ -306,13 +333,17 @@ class DomRenderProxy {
           } else if (iterable) {
             rData = await this.render(Array.from(iterable), fullPathStr);
           }
+          const eventProcessStartTime = Date.now();
           const Node = this._domRender_config.window.Node;
           this._targets.forEach((it) => {
             if (it.nodeType === Node.DOCUMENT_FRAGMENT_NODE || it.nodeType === Node.ELEMENT_NODE) {
+              const findAttrStartTime = Date.now();
               const targets = this._domRender_config.eventManager.findAttrElements(
                 it,
                 this._domRender_config
               );
+              const targetCount = targets?.size || targets?.length || 0;
+              const changeVarStartTime = Date.now();
               this._domRender_config.eventManager.changeVar(
                 this._domRender_proxy,
                 targets,
@@ -322,7 +353,7 @@ class DomRenderProxy {
             }
           });
           if (rData?.length > 0 && isOnChildRenderedByProperty(data)) {
-            const propertyValue = ScriptUtils.evaluateReturn(`this.${lastPropertyName}`, data);
+            const propertyValue = ObjectUtils.Script.evaluateReturn(`this.${lastPropertyName}`, data);
             data.onChildRenderedByProperty(lastPropertyName, propertyValue);
           }
           resolve(rData);
@@ -338,6 +369,7 @@ class DomRenderProxy {
       target[p] = value;
       return true;
     }
+    let start = performance.now();
     if (typeof p === "string") {
       value = this.proxy(receiver, value, p);
     }
@@ -375,9 +407,8 @@ class DomRenderProxy {
             script = targetScript;
           }
           const value1 = ObjectUtils.Script.evaluateReturn(script, it.pathInfo.obj);
-          if (value1 === null) {
+          if (value1 === null || value1 === void 0) {
             elementInfo.element.removeAttribute(it.key);
-            elementInfo.element[it.key] = null;
           } else {
             elementInfo.element.setAttribute(it.key, value1);
             elementInfo.element[it.key] = value1;
@@ -387,11 +418,11 @@ class DomRenderProxy {
     );
     DocumentUtils.querySelectorAllByAttributeName(rootElement, EventManager.linkTargetMapAttrName)?.forEach(
       (elementInfo) => {
-        const targets = new Map(ScriptUtils.evaluateReturn(elementInfo.value));
+        const targets = new Map(ObjectUtils.Script.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 value1 = ObjectUtils.Script.evaluateReturn(info.valueScript, info.pathInfo.obj);
           const applyAttributeName = EventManager.linkAttrs.find((it) => it.name === info.key);
           if (applyAttributeName) {
             if (value1 === null) {