@dooboostore/dom-render 1.0.108 → 1.0.110

package/src/rawsets/Render.ts

@@ -14,6 +14,7 @@ export type Render = {
     router?: Router;
     range?: any;
     value?: any;
+    innerHTML?: string;
     currentThis?: any;
     currentThisPath?: any;
     nearThisPath?: string,

package/src/routers/PathRouter.ts

@@ -6,7 +6,11 @@ export class PathRouter extends Router {
   }
 
   getSearchParams(data?:{delete?:string[], append?:[[string, string]]}): URLSearchParams {
-    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);
     })
@@ -34,7 +38,7 @@ export class PathRouter extends Router {
   pushDeleteHashSearchParam(name: string, data?: any, title?: string) {
     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);
   }
 
@@ -50,7 +54,7 @@ export class PathRouter extends Router {
   replaceDeleteHashSearchParam(name: string | string[], data?: any, title?: string) {
     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);
   }
 
@@ -61,21 +65,24 @@ export class PathRouter extends Router {
 
 
   getUrl(): string {
-    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(): string {
-    return this.config.window.location.href;
+    return this.config.window.location?.href??'/';
   }
 
   getPathName(): string {
-    return this.config.window.location.pathname;
+    return this.config.window.location?.pathname??'/';
   }
 
   getHashSearchParams(data?:{delete?:string[], append?:[[string, string]]}): URLSearchParams {
     // http://local.com/#wow=222&wow=bb&z=2
-    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/src/routers/Router.ts

@@ -11,29 +11,49 @@ export type RouteData = {
   searchParams: URLSearchParams;
   pathData?: any;
   router: Router;
-  currentTarget?:PopCurrentState;
 }
-export type PopStateCurrentTargetDomrenderRouter = { currentTargetName: 'domRenderRouter' };
-export type PopCurrentState = PopStateCurrentTargetDomrenderRouter;
-export const isPopStateCurrentTargetDomrenderRouter = (obj: any): obj is PopStateCurrentTargetDomrenderRouter =>
-  obj?.currentTargetName === 'domRenderRouter';
-
-export type RouterConfig<T = any> = { rootObject?: T, window: Window, disableAttach?: boolean,
-  // changeStateConvertDate?:(data: any)=>any
-};
+
+export type RouterConfig<T = any> = { rootObject?: T, window: Window, firstUrl?: string};
 export type ChangeStateResult = {data?: any}
 export type RouteAction = string | { path?: string, searchParams?: ToURLSearchParamsParams };
 
-/*
-    this.option.window.addEventListener('popstate', (event) => { // history.back, forward에만 popstate 발생되고 값이 도출된다
-   console.log('popstate-------!!', event.state, this.domRenderConfig.window.history.state)
-   })
- */
+type RouterEventType = RouteData & { triggerPoint: 'start' | 'end' };
+
 export abstract class Router<T = any> {
-  private behaviorSubject: BehaviorSubject<RouteData>;
+  private behaviorSubject: BehaviorSubject<RouterEventType>;
   private _config: RouterConfig<T>;
 
-  get observable(): Observable<RouteData> {
+  constructor(config: RouterConfig<any>) {
+    this._config = config;
+
+    let routeData: RouterEventType;
+    if (config?.firstUrl) {
+      const path = config.firstUrl.split('?');
+      routeData = {
+        url: config.firstUrl,
+        path: path[0],
+        searchParams: new URLSearchParams(path[1]??''),
+        router: this,
+        triggerPoint: 'end'
+      }
+      this.behaviorSubject = new BehaviorSubject<RouterEventType>(routeData);
+      this.go(config.firstUrl);
+    } else {
+      routeData = {...this.getRouteData(), triggerPoint: 'end'};
+      this.behaviorSubject = new BehaviorSubject<RouterEventType>(routeData);
+    }
+    this.config.window.addEventListener('popstate', (event: PopStateEvent) => {
+      // domrender에서 발생하지 않은 즉 back, previous 일떄에도 이벤트가도록 처리
+      // if(!isPopStateCurrentTargetDomrenderRouter(event.state)) {
+      // console.log('-------');
+      const routeData: RouterEventType = {...this.getRouteData(), triggerPoint: 'end'};
+      this.behaviorSubject.next(routeData);
+      // }
+    })
+  }
+
+
+  get observable(): Observable<RouterEventType> {
     return this.behaviorSubject.asObservable();
   }
 
@@ -45,18 +65,6 @@ export abstract class Router<T = any> {
     return this._config;
   }
 
-  constructor(config: RouterConfig<any>) {
-    this._config = config;
-    this.behaviorSubject = new BehaviorSubject<RouteData>(this.getRouteData());
-    this.config.window.addEventListener('popstate', (event: PopStateEvent) => {
-      if(!isPopStateCurrentTargetDomrenderRouter(event.state)) {
-        // console.log('-------');
-        const routeData = this.getRouteData();
-        this.behaviorSubject.next(routeData);
-      }
-    })
-  }
-
   public getSearchFirstParamsObject<T = any>(defaultValue?: T) {
     const a = ConvertUtils.toObject<T>(this.getSearchParams(), {firstValue: true});
     return Object.assign({}, defaultValue, a);
@@ -66,13 +74,13 @@ export abstract class Router<T = any> {
     return ConvertUtils.toObject<T>(this.getHashSearchParams(), {firstValue: true});
   }
 
-  async attach(): Promise<void> {
-    // const proxy = getDomRenderProxy(this.config.rootObject)
-    // if (proxy) {
-    //   const key = `___${EventManager.ROUTER_VARNAME}`;
-    //   await proxy.render(key);
-    // }
-  }
+  // async attach(): Promise<void> {
+  //   // const proxy = getDomRenderProxy(this.config.rootObject)
+  //   // if (proxy) {
+  //   //   const key = `___${EventManager.ROUTER_VARNAME}`;
+  //   //   await proxy.render(key);
+  //   // }
+  // }
 
   testRegexp(regexp?: string): boolean {
     if (regexp) {
@@ -91,10 +99,32 @@ export abstract class Router<T = any> {
     }
   }
 
-  getRouteData(config?: {urlExpression?: string, currentTarget?: PopCurrentState}): RouteData {
+  getRouteData(config?: {pathOrUrl?: string, urlExpression?: string}): RouteData {
+
+    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: path,
+      url: url,
       searchParams: this.getSearchParams()
     } as RouteData;
 
@@ -109,43 +139,58 @@ export abstract class Router<T = any> {
       }
     }
     newVar.router = this;
-    newVar.currentTarget = config?.currentTarget;
+    // newVar.currentTarget = config?.currentTarget;
     return Object.freeze(newVar);
   }
 
   pushState(data: any, title: string | undefined, path: string):ChangeStateResult {
     // data = this.config.changeStateConvertDate?this.config.changeStateConvertDate(data): data;
     // console.log('--->pushState', data);
-    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: any, title: string | undefined, path: string):ChangeStateResult {
     // data = this.config.changeStateConvertDate?this.config.changeStateConvertDate(data): data;
     // console.log('--->replaceState', data);
-    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};
   }
 
-  private dispatchPopStateEvent(data?: any) {
-    this.config.window.dispatchEvent(new PopStateEvent('popstate', {state: {...data, currentTargetName: 'domRenderRouter'}}));
+  getData(): any {
+    return this.config.window.history?.state;
   }
 
-  reload(data?: any) {
-    this.config.window.dispatchEvent(new PopStateEvent('popstate', {state: data}));
+  getPathData(urlExpression: string, currentUrl = this.getPathName()): any {
+    return Expression.Path.pathNameData(currentUrl, urlExpression);
   }
 
-  getData(): any {
-    return this.config.window.history.state;
+  back(): void {
+    this.behaviorSubject.next({...this.getRouteData(),triggerPoint:'start'});
+    this.config.window.history.back();
+    //en부분은 constructo의  this.config.window.addEventListener('popstate'   에서 받아서 처리된다 호출된다.
   }
 
-  getPathData(urlExpression: string, currentUrl = this.getPathName()): any {
-    return Expression.Path.pathNameData(currentUrl, urlExpression);
+  forward(): void {
+    this.behaviorSubject.next({...this.getRouteData(),triggerPoint:'start'});
+    this.config.window.history?.forward();
+    //end부분은 constructor의  this.config.window.addEventListener('popstate'   에서 받아서 처리된다 호출된다.
   }
 
-  async go(config:  string | { path: RouteAction, data?: any, replace?: boolean, title?: string, disabledPopEvent?: boolean, scrollToTop?: boolean } | string): Promise<void> {
+  go(i: number): void;
+  async go(config:  string | { path: RouteAction, data?: any, replace?: boolean, title?: string, scrollToTop?: boolean } | string): Promise<void> ;
+  go(config: number | string | { path: RouteAction, data?: any, replace?: boolean, title?: string, scrollToTop?: boolean } | string): Promise<void> | void {
+    if (typeof config === 'number') {
+      this.behaviorSubject.next({...this.getRouteData(),triggerPoint:'start'});
+      this.config.window.history?.go(config);
+      //end부분은 constructor의  this.config.window.addEventListener('popstate'   에서 받아서 처리된다 호출된다.
+      return;
+    }
+
     if (typeof config === 'string') {
       config = { path: config };
     }
@@ -156,24 +201,25 @@ export abstract class Router<T = any> {
     } else {
       this.push(config.path, config.data, config.title);
     }
-    if (!this.config.disableAttach) {
-      await this.attach();
-    }
-    
+    // if (!this.config.disableAttach) {
+    //   await this.attach();
+    // }
+
     // 스크롤 제어 (기본값: true - 맨 위로 스크롤)
     if (config.scrollToTop !== false) {
       try {
-      this._config.window?.scrollTo?.(0, 0);
+        this._config.window?.scrollTo?.(0, 0);
       }catch (e){}
     }
-    
+
     // console.log('----------', data, config)
-    if (!config.disabledPopEvent) {
-      this.dispatchPopStateEvent(config?.data);
-    }
+    // if (!config.disabledPopEvent) {
+    //   this.dispatchPopStateEvent(config?.data);
+    // }
   }
 
   toUrl(data: RouteAction) {
+    console.log('toUrl', data);
     let targetPath: string;
     if (typeof data === 'string') {
       targetPath = data;