@dooboostore/simple-web-component 1.0.33 → 1.0.35

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;
@@ -249,8 +266,10 @@ export namespace SwcUtils {
   };
 
   export const getAppHosts = (el: HTMLElement): SwcAppInterface[] => {
-    const hosts = getHosts(el);
-    return hosts.filter(host => host.tagName.toLowerCase() === 'swc-app' || host.getAttribute('is')?.startsWith('swc-app-')) as SwcAppInterface[];
+    // const hosts = getHosts(el);
+    // return hosts.filter(host => host.tagName.toLowerCase() === 'swc-app' || host.getAttribute('is')?.startsWith('swc-app-')) as SwcAppInterface[];
+    const hosts = SwcUtils.findAllParentAppHostsDirect(el);
+    return hosts;
   };
 
   export const getAppHost = (el: HTMLElement): SwcAppInterface | undefined => {
@@ -277,7 +296,15 @@ export namespace SwcUtils {
    */
   export const findAllParentAppHostsDirect = (el: HTMLElement): SwcAppInterface[] => {
     const appHosts: SwcAppInterface[] = [];
-    
+
+    const w = el.ownerDocument?.defaultView || ((typeof window !== 'undefined' ? window : undefined) as any);
+
+    // Guard against SSR environment where window might be undefined
+    if (!w) {
+      return appHosts;
+    }
+
+    // console.log('------?',w.ShadowRoot);
     // el 자체부터 시작 (el이 app host일 수도 있음)
     let current: HTMLElement | null = el;
 
@@ -296,9 +323,9 @@ export namespace SwcUtils {
       } else {
         // parentElement가 없음 = Shadow root의 직접 자식일 수 있음
         const root = current.getRootNode();
-        if (root instanceof ShadowRoot) {
+        if (w.ShadowRoot && root instanceof w.ShadowRoot) {
           // Shadow host로 올라가기
-          current = root.host as HTMLElement;
+          current = (root as ShadowRoot).host as HTMLElement;
         } else {
           // Document root 도달
           break;
@@ -338,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,