@dooboostore/simple-web-component 1.0.30 → 1.0.32

package/src/router/ElementRouter.ts

@@ -6,18 +6,7 @@ export class ElementRouter extends Router {
   private _currentIndex = -1;
 
   constructor(config: RouterConfig) {
-    // Router 부모 클래스가 생성자에서 go()를 호출하여 초기화되지 않은 필드에 접근하는 것을 방지하기 위해
-    // firstUrl을 제거하고 넘긴 뒤 자식에서 수동 처리합니다.
-    const { firstUrl, ...rest } = config;
-    super(rest);
-
-    const startUrl = firstUrl ?? '/';
-    this._history = [{ url: startUrl, data: null }];
-    this._currentIndex = 0;
-
-    if (firstUrl) {
-      this.replace(firstUrl, { config: { noEventAndPublish: true } });
-    }
+    super(config);
   }
 
   // Override pushState to manage internal history

package/src/types.ts

@@ -41,8 +41,15 @@ export type HostSet = {
   $lastAppHost: SwcAppInterface | null;
 };
 
-export type HelperHostSet = HelperSet & HostSet;
-
+export type HelperHostSet = HelperSet & HostSet & {$this: any};
+export interface SwcChooseInterface extends HTMLTemplateElement {
+  value: any;
+  refresh(): void;
+}
+export interface SwcIfInterface extends HTMLTemplateElement {
+  value: any;
+  refresh(): void;
+}
 export interface SwcAppInterface extends HTMLElement {
   simpleApplication?: SimpleApplication;
   router?: Router;

package/src/utils/Utils.ts

@@ -1,5 +1,6 @@
 import { SwcAppInterface, HostSet, HelperSet, HelperHostSet } from '../types';
 import {getElementConfig} from "../decorators";
+import { getExpression, ExpressionResult, GetExpressionConfig, GetExpressionResult } from '@dooboostore/core';
 
 export const SWC_NOT_FOUND = Symbol.for('simple-web-component:not-found');
 
@@ -148,6 +149,27 @@ export const htmlArticleElement = (options?: { doc?: Document; attrs?: Record<st
 };
 
 export namespace SwcUtils {
+
+
+  export const parsePathPatternsSetAttributeString = (pathPattern: string[], path: string) => {
+    return JSON.stringify(SwcUtils.parsePathPatternsSet(pathPattern, path)).replace(/"/g, "'");
+  }
+
+  export const parsePathPatternsSet = (pathPattern: string[], path: string) => {
+    return {
+      path: path,
+      pathData: SwcUtils.parsePathPatterns(pathPattern, path)
+    };
+  };
+  export const parsePathPatterns = (pathPattern: string[], path: string) => {
+    for (const pattern of pathPattern) {
+      const data = SwcUtils.parsePathPattern(pattern, path || '/');
+      if (data !== null) {
+        return data;
+      }
+    }
+  };
+
   export const getHelperSet = (win: Window): HelperSet => {
     const doc: Document = win.document;
     return {
@@ -164,7 +186,8 @@ export namespace SwcUtils {
     const hostSet = getHostSet(el);
     return {
       ...helperSet,
-      ...hostSet
+      ...hostSet,
+      $this: el,
     };
   };
 
@@ -255,34 +278,30 @@ export namespace SwcUtils {
   export const findAllParentAppHostsDirect = (el: HTMLElement): SwcAppInterface[] => {
     const appHosts: SwcAppInterface[] = [];
     
-    // Shadow DOM 내부의 depth를 정상적으로 탐색하기 위해
-    // el.parentElement부터 시작하고, shadow root 경계를 만날 때만 host로 이동
-    let current: HTMLElement | null = el.parentElement;
-    
+    // el 자체부터 시작 (el이 app host일 수도 있음)
+    let current: HTMLElement | null = el;
+
     while (current) {
-      // console.log('vvvvvvv');
-      // alert(1)
-      // debugger;
       const isAppHost =
-        current.tagName.toLowerCase() === 'swc-app' || 
+        current.tagName.toLowerCase() === 'swc-app' ||
         current.getAttribute('is')?.startsWith('swc-app-');
       if (isAppHost) {
         appHosts.push(current as SwcAppInterface);
       }
-      // Handle shadow DOM
-      if (current.shadowRoot) {
-        current = ((current.shadowRoot as any).host as HTMLElement).parentElement;
+
+      // 다음 부모 찾기
+      if (current.parentElement) {
+        // Light DOM: 정상적인 부모 요소
+        current = current.parentElement;
       } else {
-        // 부모가 없으면 shadow root 경계일 수 있음
-        if (!current.parentElement) {
-          const parentNode = current.parentNode;
-          if (parentNode instanceof ShadowRoot) {
-            current = (parentNode as any).host as HTMLElement;
-          } else {
-            break;
-          }
+        // parentElement가 없음 = Shadow root의 직접 자식일 수 있음
+        const root = current.getRootNode();
+        if (root instanceof ShadowRoot) {
+          // Shadow host로 올라가기
+          current = root.host as HTMLElement;
         } else {
-          current = current.parentElement;
+          // Document root 도달
+          break;
         }
       }
     }
@@ -290,22 +309,12 @@ export namespace SwcUtils {
   };
 
   export const getHostSet = (el: HTMLElement): HostSet => {
-    const isSwc = !!getElementConfig(el);
     const ancestors = findAllSwcHosts(el); // [root, ..., parent]
-
-    let $host: HTMLElement;
-    let $parentHost: HTMLElement | null;
-
-    if (isSwc) {
-      $host = el;
-      $parentHost = ancestors.length > 0 ? ancestors[ancestors.length - 1] : null;
-    } else {
-      $host = ancestors.length > 0 ? ancestors[ancestors.length - 1] : el;
-      $parentHost = ancestors.length > 1 ? ancestors[ancestors.length - 2] : null;
-    }
-
-    const $hosts = isSwc ? [...ancestors, el] : ancestors;
-    const $firstHost = $hosts.length > 0 ? $hosts[0] : null;
+    
+    const $host = ancestors.length > 0 ? ancestors[ancestors.length - 1] : null;
+    const $parentHost = ancestors.length > 1 ? ancestors[ancestors.length - 2] : null;
+    const $hosts = ancestors;
+    const $firstHost = ancestors.length > 0 ? ancestors[0] : null;
 
     // Collect loop contexts
     const loopContext: Record<string, any> = {};
@@ -369,4 +378,6 @@ export namespace SwcUtils {
     
     return result;
   };
-}
+
+
+};