@dooboostore/simple-web-component 1.0.34 → 1.0.35

package/src/elements/register.ts

@@ -148,11 +148,17 @@ export const registerAllElements = (w: any): Record<string, Constructor<HTMLElem
 
     @elementDefine('swc-if', { extends: 'template', window: w })
   class SwcIf extends HTMLTemplateElement {
-  @attributeHost('value')
+  // id =
+  // @attributeHost('value')
   _value: any;
 
-  @attributeHost('replace-wrap')
-  _replaceWrap: string | null;
+  @attributeHost('replace-wrap-start')
+  _replaceWrapStart: string | null;
+  @attributeHost('replace-wrap-end')
+  _replaceWrapEnd: string | null;
+
+  @attributeHost('skip-if-same')
+  _skipIfSame: string | null;
 
   private _nodes: Node[] = [];
 
@@ -165,14 +171,37 @@ export const registerAllElements = (w: any): Record<string, Constructor<HTMLElem
     this.refresh(nv);
   }
 
-  private replaceExpressions(html: string, groupArgs: any, context: any, wrap?: string | null): string {
-    const config = wrap ? { wrapExpression: wrap } : undefined;
+  constructor() {
+    super();
+  }
+
+  @changedAttributeHost('value')
+  private setValue(value: any, o: string, n: string) {
+    this._value = value;
+    this.refresh(this._value);
+  }
+
+  // @changedAttributeHost('replace-wrap')
+  // private setReplaceWrap(replaceWrapAttr?: string | null) {
+  //   this.refresh();
+  // }
+
+  private replaceExpressions(html: string, groupArgs: any, context: any, wrap: {start: string, end: string}): string {
+    let config: any = undefined;
+    if (wrap) {
+      config = {
+        expression: {
+          replace: { start: `${wrap.start}`, end: `${wrap.end}` },
+          callReturn: { start: `${wrap.start}=`, end: `${wrap.end}` },
+          call: { start: `${wrap.start}@`, end: `${wrap.end}` }
+        }
+      };
+    }
     const ae = new ActionExpression(html, config);
-    const filterOptions = wrap ? { type: 'replace' as const, wrap } : 'replace';
     const win = this.ownerDocument?.defaultView || window;
-    
+
     // @ts-ignore
-    for (const expr of ae.getExpressions(filterOptions)) {
+    for (const expr of ae.getExpressions('replace')) {
       try {
         const value = FunctionUtils.executeReturn({
           script: ConvertUtils.decodeHtmlEntity(expr.script, win.document),
@@ -187,39 +216,47 @@ export const registerAllElements = (w: any): Record<string, Constructor<HTMLElem
     return ae.getUnprocessedTemplate();
   }
 
-  @changedAttributeHost('value')
-  private setValue(valueAttr?: string | null) {
-    this.refresh();
-  }
+  refresh(value?: any) {
+    const targetValue = value !== undefined ? value : (getAttributeValue(this, 'value') ?? this._value);
 
-  @changedAttributeHost('replace-wrap')
-  private setReplaceWrap(replaceWrapAttr?: string | null) {
-    this.refresh();
-  }
+    // skip-if-same 속성이 존재하고(true/빈 문자열), 이전 값과 새로운 값이 완전히 동일하면 렌더링 스킵!
+    if (this.hasAttribute('skip-if-same') && this._value === targetValue && this._nodes.length > 0) {
+      return;
+    }
 
-  refresh(value = this._value) {
     this.cleanup();
+    this._value = targetValue;
+
     const portal = this.parentElement;
-    if (!portal || !value) return;
+    if (!portal || !this._value) return;
 
     const win = this.ownerDocument?.defaultView || window;
     const helperSet = SwcUtils.getHelperAndHostSet(win, this);
 
     let htmlString = this.innerHTML;
-    const groupArgs = { ...helperSet, $value: value };
+    const groupArgs = { ...helperSet, $value: this._value, $templateHost: this };
 
-    htmlString = this.replaceExpressions(htmlString, groupArgs, this, this._replaceWrap);
+    htmlString = this.replaceExpressions(htmlString, groupArgs, this, {start:this._replaceWrapStart ?? '{#{', end: this._replaceWrapEnd ?? '}#}'});
 
     const result = this.ownerDocument?.createElement('template') || document.createElement('template');
     result.innerHTML = htmlString;
     const processedFragment = result.content;
 
     this._nodes = Array.from(processedFragment.childNodes);
+    this._nodes.forEach((node: any) => {
+      if (node instanceof HTMLElement) (node as any).__swc_template_host = this;
+    });
+
     portal.insertBefore(processedFragment, this.nextSibling);
   }
 
   private cleanup() {
-    this._nodes.forEach(n => n.parentElement?.removeChild(n));
+    this._nodes.forEach(n => {
+      const realNode = (n as any).__upgraded_instance || n;
+      if (realNode.parentElement) {
+        realNode.parentElement.removeChild(realNode);
+      }
+    });
     this._nodes = [];
   }
 
@@ -230,43 +267,64 @@ export const registerAllElements = (w: any): Record<string, Constructor<HTMLElem
 
     @elementDefine('swc-loop', { extends: 'template', window: w })
   class SwcLoop extends HTMLTemplateElement {
-  @attributeHost('value')
-  _value: any[];
+  _value: any[] = [];
 
-  @attributeHost('replace-wrap')
-  _replaceWrap: string | null;
+  @attributeHost('replace-wrap-start')
+  _replaceWrapStart: string | null;
+  @attributeHost('replace-wrap-end')
+  _replaceWrapEnd: string | null;
 
   private _nodeGroups: Node[][] = [];
 
   get value(): any[] {
     return this._value;
   }
+
   set value(nv: any[]) {
-    // this._value = Array.isArray(nv) ? [...nv] : [];
+    this._value = nv;
     this.refresh(nv);
   }
 
-  @changedAttributeHost('value')
-  private setValue() {
-    this.refresh();
+  getValue(index: number) {
+    return this._value?.[index];
   }
 
-  @changedAttributeHost('replace-wrap')
-  private setReplaceWrap() {
-    this.refresh();
+  constructor() {
+    super();
+    // console.log('swc SwcLoop constructor called!');
+    // console.log('swc SwcLoop', this.getAttribute('value'));
   }
 
-  private replaceExpressions(html: string, groupArgs: any, context: any, wrap?: string | null): string {
-    const config = wrap ? { wrapExpression: wrap } : undefined;
+  @changedAttributeHost('value')
+  private setValue(value: any, o: string, n: string) {
+    this._value = value;
+    this.refresh(this._value);
+  }
+
+  // @changedAttributeHost('replace-wrap')
+  // private setReplaceWrap(replaceWrapAttr?: string | null) {
+  //   this.refresh();
+  // }
+
+  private replaceExpressions(html: string, groupArgs: any, context: any, wrap: {start: string, end: string}): string {
+    let config: any = undefined;
+    config = {
+      expression: {
+        replace: { start: `${wrap.start}`, end: `${wrap.end}` },
+        callReturn: { start: `${wrap.start}=`, end: `${wrap.end}` },
+        call: { start: `${wrap.start}@`, end: `${wrap.end}` }
+      }
+    };
     const ae = new ActionExpression(html, config);
-    const filterOptions = wrap ? { type: 'replace' as const, wrap } : 'replace';
     const win = this.ownerDocument?.defaultView || window;
 
     // @ts-ignore
-    for (const expr of ae.getExpressions(filterOptions)) {
+    const expressions = ae.getExpressions('replace');
+    for (const expr of expressions) {
+      const script = ConvertUtils.decodeHtmlEntity(expr.script, win.document);
       try {
         const value = FunctionUtils.executeReturn({
-          script: ConvertUtils.decodeHtmlEntity(expr.script, win.document),
+          script: script,
           context,
           args: groupArgs
         });
@@ -278,35 +336,127 @@ export const registerAllElements = (w: any): Record<string, Constructor<HTMLElem
     return ae.getUnprocessedTemplate();
   }
 
-  refresh(value = this._value) {
-    this.cleanup();
-    if (value?.length<=0) return;
-    const portal = this.parentElement;
-    if (!portal) return;
-
+  private createFragmentAndNodes(items: any[], helperSet: any, startIndex: number = 0): { fragment: DocumentFragment; newNodesGroup: Node[][] } {
     const win = this.ownerDocument?.defaultView || window;
-    const helperSet = SwcUtils.getHelperAndHostSet(win, this);
     const fragment = win.document.createDocumentFragment();
+    const newNodesGroup: Node[][] = [];
 
-    value.forEach((item, index) => {
+    items.forEach((item, i) => {
+      const index = startIndex + i;
       let htmlString = this.innerHTML;
       const groupArgs = { ...helperSet, $item: item, $index: index, $value: this._value };
 
-      htmlString = this.replaceExpressions(htmlString, groupArgs, this, this._replaceWrap);
+      htmlString = this.replaceExpressions(htmlString, groupArgs, this, {start:this._replaceWrapStart ?? '{#{', end: this._replaceWrapEnd ?? '}#}'});
 
       const temp = this.ownerDocument?.createElement('template') || document.createElement('template');
       temp.innerHTML = htmlString;
 
       const content = temp.content;
       const nodes = Array.from(content.childNodes);
-      this._nodeGroups.push(nodes);
+
+      const setTemplateHost = (element: HTMLElement) => {
+        (element as any).__swc_template_host = this;
+        Array.from(element.children).forEach((child: any) => {
+          if (child instanceof HTMLElement) {
+            setTemplateHost(child);
+          }
+        });
+      };
+
+      nodes.forEach((node: any) => {
+        if (node instanceof HTMLElement) {
+          setTemplateHost(node as HTMLElement);
+        }
+      });
+      newNodesGroup.push(nodes);
       fragment.appendChild(content);
     });
 
+    return { fragment, newNodesGroup };
+  }
+
+  appendItem(...items: any[]) {
+    if (!items || items.length <= 0) return;
+    const portal = SwcUtils.getParentContainer(this);
+    if (!portal) return;
+
+    const win = this.ownerDocument?.defaultView || window;
+    const helperSet = SwcUtils.getHelperAndHostSet(win, this);
+
+    const startIndex = this._value ? this._value.length : 0;
+
+    // 내부 상태(value) 업데이트 (기존 배열에 새 아이템 추가)
+    if (this._value !== items) {
+      this._value = [...(this._value || []), ...items];
+    }
+
+    const { fragment, newNodesGroup } = this.createFragmentAndNodes(items, helperSet, startIndex);
+    this._nodeGroups.push(...newNodesGroup);
+
+    console.log('뭐야 씨발');
+    // append 위치 계산: 기존에 그려진 마지막 노드 뒤에 삽입, 없으면 템플릿 바로 뒤에 삽입
+    let insertReference: Node | null = this.nextSibling;
+    if (this._nodeGroups.length > items.length) {
+      const lastExistingGroup = this._nodeGroups[this._nodeGroups.length - items.length - 1];
+      if (lastExistingGroup && lastExistingGroup.length > 0) {
+        const lastNode = lastExistingGroup[lastExistingGroup.length - 1];
+        insertReference = lastNode.nextSibling;
+      }
+    }
+
+    portal.insertBefore(fragment, insertReference);
+  }
+
+  async prependItem(...items: any[]) {
+    if (!items || items.length <= 0) return;
+    const portal = SwcUtils.getParentContainer(this);
+    if (!portal) return;
+
+    const win = this.ownerDocument?.defaultView || window;
+    const helperSet = SwcUtils.getHelperAndHostSet(win, this);
+
+    // 내부 상태(value) 업데이트 (기존 배열의 앞쪽에 새 아이템 추가)
+    if (this._value !== items) {
+      this._value = [...items, ...(this._value || [])];
+    }
+
+    const { fragment, newNodesGroup } = this.createFragmentAndNodes(items, helperSet, 0);
+
+    // 기존의 nodeGroups 배열 맨 앞에 새로운 그룹들을 추가
+    this._nodeGroups = [...newNodesGroup, ...this._nodeGroups];
+
+    // prepend 위치: 이 템플릿(SwcLoop) 노드의 바로 다음 위치 (가장 위)
     portal.insertBefore(fragment, this.nextSibling);
   }
 
+  refresh(value?: any) {
+    // 1. 그릴 대상 확정
+    const targetValue = value !== undefined ? value : (getAttributeValue(this, 'value') ?? this._value ?? []);
+
+    // 2. 화면 정리
+    this.cleanup();
+
+    // 3. 상태 완전 교체 (이어붙이지 않음!)
+    this._value = targetValue;
+
+    if (!this._value || this._value.length <= 0) return;
+
+    // 4. 화면 다시 그리기 (appendItem을 쓰지 않고 바로 그리기)
+    const win = this.ownerDocument?.defaultView || window;
+    const helperSet = SwcUtils.getHelperAndHostSet(win, this);
+    helperSet.$templateHost = this;
+    const { fragment, newNodesGroup } = this.createFragmentAndNodes(this._value, helperSet, 0);
+
+    this._nodeGroups = newNodesGroup;
+    const portal = SwcUtils.getParentContainer(this);
+    if (portal) {
+      // console.log('append????!~~~~~!?',fragment)
+      portal.insertBefore(fragment, this.nextSibling);
+    }
+  }
+
   private cleanup() {
+    console.log('누가 cleanup');
     this._nodeGroups.forEach(nodes => nodes.forEach(n => n.parentElement?.removeChild(n)));
     this._nodeGroups = [];
   }
@@ -318,13 +468,12 @@ export const registerAllElements = (w: any): Record<string, Constructor<HTMLElem
 
     @elementDefine('swc-choose', { extends: 'template', window: w })
   class SwcChoose extends HTMLTemplateElement {
-  // @attributeHost('value')
-  // fetchValue: any;
-
   _value: any;
 
-  @attributeHost('replace-wrap')
-  _replaceWrap: string | null;
+  @attributeHost('replace-wrap-start')
+  _replaceWrapStart: string | null;
+  @attributeHost('replace-wrap-end')
+  _replaceWrapEnd: string | null;
 
   private _nodes: Node[] = [];
   private _previousTemplate: HTMLTemplateElement | null = null;
@@ -354,24 +503,32 @@ export const registerAllElements = (w: any): Record<string, Constructor<HTMLElem
 
   @changedAttributeHost('value')
   private setValue(value: any, o: string, n: string) {
-    // console.log('-----------------choooooooose attr setValue', value, o, n);
+    console.log('chooooooose value', value)
     this._value = value;
     this.refresh(this._value);
   }
 
-  @changedAttributeHost('replace-wrap')
-  private setReplaceWrap(replaceWrapAttr?: string | null) {
-    this.refresh();
-  }
+  // @changedAttributeHost('replace-wrap')
+  // private setReplaceWrap(replaceWrapAttr?: string | null) {
+  //   this.refresh();
+  // }
 
-  private replaceExpressions(html: string, groupArgs: any, context: any, wrap?: string | null): string {
-    const config = wrap ? { wrapExpression: wrap } : undefined;
+  private replaceExpressions(html: string, groupArgs: any, context: any, wrap: {start: string, end: string}): string {
+    let config: any = undefined;
+    if (wrap) {
+      config = {
+        expression: {
+          replace: { start: `${wrap.start}`, end: `${wrap.end}` },
+          callReturn: { start: `${wrap.start}=`, end: `${wrap.end}` },
+          call: { start: `${wrap.start}@`, end: `${wrap.end}` }
+        }
+      };
+    }
     const ae = new ActionExpression(html, config);
-    const filterOptions = wrap ? { type: 'replace' as const, wrap } : 'replace';
     const win = this.ownerDocument?.defaultView || window;
 
     // @ts-ignore
-    for (const expr of ae.getExpressions(filterOptions)) {
+    for (const expr of ae.getExpressions('replace')) {
       try {
         const value = FunctionUtils.executeReturn({
           script: ConvertUtils.decodeHtmlEntity(expr.script, win.document),
@@ -388,37 +545,48 @@ export const registerAllElements = (w: any): Record<string, Constructor<HTMLElem
 
   refresh(value?: any) {
     value = getAttributeValue(this, 'value') ?? this._value;
-    // console.log('chooooooooo refresh->', value);
-    const portal = this.parentElement;
-    if (!portal) return;
+    console.log('[DEBUG] SwcChoose.refresh called, value:', value);
+    const portal = SwcUtils.getParentContainer(this);
+    if (!portal) {
+      console.log('[DEBUG] SwcChoose portal is null!');
+      return;
+    }
 
     const win = (getElementConfig(this).window ?? this.ownerDocument?.defaultView) || window;
     const helperSet = SwcUtils.getHelperAndHostSet(win, this);
-    const groupArgs = { ...helperSet, $value: value };
+    const groupArgs = { ...helperSet, $value: value, $templateHost: this };
 
     const templates = Array.from(this.content.querySelectorAll('template'));
     let selected: HTMLTemplateElement | null = null;
 
     for (const t of templates) {
       if (t.getAttribute('is') === 'swc-when') {
-        const attrVal = t.getAttribute('value') || '';
+        const attrVal = t.getAttribute('test') || '';
         let matches = false;
 
+
+
+        const result = FunctionUtils.executeReturn({
+          script: attrVal,
+          context: t,
+          args: groupArgs
+        });
+        matches = !!result;
         // Use ActionExpression to parse and extract script from value attribute
-        const ae = new ActionExpression(attrVal);
-        const expr = ae.getFirstExpression('replace');
-
-        if (expr) {
-          const decodedScript = ConvertUtils.decodeHtmlEntity(expr.script, win.document);
-          const result = FunctionUtils.executeReturn({
-            script: decodedScript,
-            context: t,
-            args: groupArgs
-          });
-          matches = !!result;
-        } else {
-          matches = String(attrVal) === String(value);
-        }
+        // const ae = new ActionExpression(attrVal);
+        // const expr = ae.getFirstExpression('replace');
+
+        // if (expr) {
+        //   const decodedScript = ConvertUtils.decodeHtmlEntity(expr.script, win.document);
+        //   const result = FunctionUtils.executeReturn({
+        //     script: decodedScript,
+        //     context: t,
+        //     args: groupArgs
+        //   });
+        //   matches = !!result;
+        // } else {
+        //   matches = String(attrVal) === String(value);
+        // }
 
         if (matches) {
           selected = t;
@@ -443,14 +611,33 @@ export const registerAllElements = (w: any): Record<string, Constructor<HTMLElem
 
     if (target) {
       let htmlString = target.innerHTML;
-      htmlString = this.replaceExpressions(htmlString, groupArgs, this, this._replaceWrap);
+      htmlString = this.replaceExpressions(htmlString, groupArgs, this, {start:this._replaceWrapStart ?? '{#{', end: this._replaceWrapEnd ?? '}#}'});
 
       const result = this.ownerDocument?.createElement('template') || document.createElement('template');
       result.innerHTML = htmlString;
       const processedFragment = result.content;
 
+      // console.log('[DEBUG] SwcChoose processedFragment children:', processedFragment._childNodesInternal?.length);
       this._nodes = Array.from(processedFragment.childNodes);
+      
+      const setTemplateHost = (element: HTMLElement) => {
+        (element as any).__swc_template_host = this;
+        Array.from(element.children).forEach((child: any) => {
+          if (child instanceof HTMLElement) {
+            setTemplateHost(child);
+          }
+        });
+      };
+      
+      this._nodes.forEach((node: any) => {
+        if (node instanceof HTMLElement) {
+          setTemplateHost(node as HTMLElement);
+        }
+      });
+
+      console.log(`[DEBUG] SwcChoose before insertBefore, portal: ${portal?.tagName}, isConnected: ${(portal as any)?.isConnected}`);
       portal.insertBefore(processedFragment, this.nextSibling);
+      console.log('[DEBUG] SwcChoose after insertBefore');
     }
   }
 
@@ -468,11 +655,10 @@ export const registerAllElements = (w: any): Record<string, Constructor<HTMLElem
   class SwcAsync extends HTMLTemplateElement {
   @attributeHost('value')
   _value: any;
-
-  @attributeHost('replace-wrap')
-  _replaceWrap: string | null;
-
-  resultValue?: any;
+  @attributeHost('replace-wrap-start')
+  _replaceWrapStart: string | null;
+  @attributeHost('replace-wrap-end')
+  _replaceWrapEnd: string | null;  resultValue?: any;
 
   get value(): boolean {
     return this._value;
@@ -489,10 +675,10 @@ export const registerAllElements = (w: any): Record<string, Constructor<HTMLElem
     this.executeAsync(this._value);
   }
 
-  @changedAttributeHost('replace-wrap')
-  private setReplaceWrap() {
-    this.executeAsync(this._value);
-  }
+  // @changedAttributeHost('replace-wrap')
+  // private setReplaceWrap() {
+  //   this.executeAsync(this._value);
+  // }
 
   private executeAsync(result: any = this._value) {
     if (result === undefined || result === null) {
@@ -518,14 +704,22 @@ export const registerAllElements = (w: any): Record<string, Constructor<HTMLElem
     }
   }
 
-  private replaceExpressions(html: string, groupArgs: any, context: any, wrap?: string | null): string {
-    const config = wrap ? { wrapExpression: wrap } : undefined;
+  private replaceExpressions(html: string, groupArgs: any, context: any, wrap: {start: string, end: string}): string {
+    let config: any = undefined;
+    if (wrap) {
+      config = {
+        expression: {
+          replace: { start: `${wrap.start}`, end: `${wrap.end}` },
+          callReturn: { start: `${wrap.start}=`, end: `${wrap.end}` },
+          call: { start: `${wrap.start}@`, end: `${wrap.end}` }
+        }
+      };
+    }
     const ae = new ActionExpression(html, config);
-    const filterOptions = wrap ? { type: 'replace' as const, wrap } : 'replace';
     const win = this.ownerDocument?.defaultView || window;
 
     // @ts-ignore
-    for (const expr of ae.getExpressions(filterOptions)) {
+    for (const expr of ae.getExpressions('replace')) {
       try {
         const value = FunctionUtils.executeReturn({
           script: ConvertUtils.decodeHtmlEntity(expr.script, win.document),
@@ -541,9 +735,9 @@ export const registerAllElements = (w: any): Record<string, Constructor<HTMLElem
   }
 
   refresh(state: string = 'default') {
-    console.log('rrrrrrrrrrrrrrrrr', state);
+    // console.log('rrrrrrrrrrrrrrrrr', state);
     this.cleanup();
-    const portal = this.parentElement;
+    const portal = SwcUtils.getParentContainer(this);
     if (!portal) return;
 
     const win = this.ownerDocument?.defaultView || window;
@@ -552,15 +746,19 @@ export const registerAllElements = (w: any): Record<string, Constructor<HTMLElem
     const t = this.content.querySelector(`template[is="swc-${state}"]`) as HTMLTemplateElement;
     if (t) {
       let htmlString = t.innerHTML;
-      const groupArgs = { ...helperSet, $value: this._value, $state: state };
+      const groupArgs = { ...helperSet, $value: this._value, $state: state, $templateHost: this };
 
-      htmlString = this.replaceExpressions(htmlString, groupArgs, this, this._replaceWrap);
+      htmlString = this.replaceExpressions(htmlString, groupArgs, this, {start:this._replaceWrapStart ?? '{#{', end: this._replaceWrapEnd ?? '}#}'});
 
       const temp = this.ownerDocument?.createElement('template') || document.createElement('template');
       temp.innerHTML = htmlString;
       const content = temp.content;
 
       this._nodes = Array.from(content.childNodes);
+      this._nodes.forEach((node: any) => {
+        if (node instanceof HTMLElement)  (node as any).__template_swc_host = this;
+      });
+
       portal.insertBefore(content, this.nextSibling);
     }
   }

package/src/types.ts

@@ -35,6 +35,7 @@ export type HostSet = {
   $hosts: HTMLElement[]; // [root, ..., parent, self]
   $firstHost: HTMLElement | null; // Top-most SWC ancestor
   $lastHost: HTMLElement | null; // Same as $parentHost (for backward compatibility or clarity)
+  $templateHost: HTMLTemplateElement | null | undefined;
   $appHost: SwcAppInterface | null;
   $appHosts: SwcAppInterface[];
   $firstAppHost: SwcAppInterface | null;

package/src/utils/Utils.ts

@@ -1,6 +1,7 @@
 import { SwcAppInterface, HostSet, HelperSet, HelperHostSet } from '../types';
 import {getElementConfig} from "../decorators";
 import { getExpression, ExpressionResult, GetExpressionConfig, GetExpressionResult } from '@dooboostore/core';
+import {Router} from "@dooboostore/core-web";
 
 export const SWC_NOT_FOUND = Symbol.for('simple-web-component:not-found');
 
@@ -151,14 +152,30 @@ export const htmlArticleElement = (options?: { doc?: Document; attrs?: Record<st
 export namespace SwcUtils {
 
 
+  export const getParentContainer = (e: Node) => {
+    return e.parentElement ?? e.getRootNode() as any;
+  }
+
   export const parsePathPatternsSetAttributeString = (pathPattern: string[], path: string) => {
     return JSON.stringify(SwcUtils.parsePathPatternsSet(pathPattern, path)).replace(/"/g, "'");
   }
 
-  export const parsePathPatternsSet = (pathPattern: string[], path: string) => {
+  export const parsePathPatternsSet = (pathPattern: string[], urlAndRouter?: string | Router) => {
+    // if (!path) {
+    //   return;
+    // }
+    urlAndRouter ??= '/'
+    const p = typeof urlAndRouter === 'string' ? urlAndRouter : urlAndRouter.value.url;
+    const searchParams = new URLSearchParams();
+    const qs = p.split('?')[1];
+    qs?.split('&').forEach(it => {
+      const [k, v] = it.split('=');
+      searchParams.set(k,v);
+    })
     return {
-      path: path,
-      pathData: SwcUtils.parsePathPatterns(pathPattern, path)
+      path: p,
+      searchParams,
+      pathData: SwcUtils.parsePathPatterns(pathPattern, p)
     };
   };
   export const parsePathPatterns = (pathPattern: string[], path: string) => {
@@ -209,8 +226,8 @@ export namespace SwcUtils {
    * Checks __swc_host property first, then climbs the DOM tree.
    */
   export const findNearestSwcHost = (el: HTMLElement | Node): HTMLElement | undefined => {
-    if ((el as any).__swc_host) return (el as any).__swc_host;
-    // if ((el as any).__swc_proto_setup) return (el as any).__swc_proto_setup;
+    const el1 = el as any;
+    if (el1.__swc_host) return el1.__swc_host;
 
     let current: any = el.parentElement || (el.getRootNode?.() as any)?.host;
     const doc = el.ownerDocument;
@@ -348,6 +365,7 @@ export namespace SwcUtils {
       $hosts,
       $firstHost,
       $lastHost: $parentHost,
+      $templateHost: (el as any).__swc_template_host,
       $appHost,
       $appHosts,
       $firstAppHost,

package/tsconfig.json

@@ -6,9 +6,9 @@
     "declaration": true,
     "declarationMap": true,
     "stripInternal": true,
-    "target": "es2020",
+    "target": "es2022",
     "noEmit": true,
-    "lib": ["dom", "dom.iterable", "esnext"],
+    "lib": ["dom", "dom.iterable", "es2024", "esnext"],
     "experimentalDecorators": true,
     "emitDecoratorMetadata": true,
     "esModuleInterop": true,