@dooboostore/simple-web-component 1.0.34 → 1.0.36

package/src/decorators/elementDefine.ts

@@ -1,17 +1,17 @@
-import { ReflectUtils, FunctionUtils, ActionExpression } from '@dooboostore/core';
-import { getAddEventListenerMetadata } from './addEventListener';
-import { ON_INITIALIZE_METADATA_KEY, ON_BEFORE_CONNECTED_METADATA_KEY, ON_AFTER_CONNECTED_METADATA_KEY, ON_BEFORE_DISCONNECTED_METADATA_KEY, ON_AFTER_DISCONNECTED_METADATA_KEY, ON_BEFORE_ADOPTED_METADATA_KEY, ON_AFTER_ADOPTED_METADATA_KEY, findAllLifecycleMetadata, getOnConnectedInnerHtmlMetadata } from './lifecycles';
-import { getEmitCustomEventMetadataList } from './emitCustomEvent';
-import { findAllAttributeChangedMetadata, convertAttributeValue } from './changedAttributeHost';
-import { findAllAttributeApplyMetadata } from './applyAttribute';
-import { findAllAttributeMetadata } from './attribute';
-import { getQueryMetadata } from './query';
-import { getQueryAllMetadata } from './queryAll';
-import { SwcUtils } from '../utils/Utils';
-import { HTML_TAG_ENTRIES, DOM_EVENT_NAMES } from '../config/config';
-import { SituationTypeContainer, SituationTypeContainers } from '@dooboostore/simple-boot/decorators/inject/Inject';
-import { InjectSituationType, HostSet } from '../types';
-import { ConvertUtils } from '@dooboostore/core-web';
+import {ReflectUtils, FunctionUtils, ActionExpression} from '@dooboostore/core';
+import {getAddEventListenerMetadata} from './addEventListener';
+import {ON_INITIALIZE_METADATA_KEY, ON_BEFORE_CONNECTED_METADATA_KEY, ON_AFTER_CONNECTED_METADATA_KEY, ON_BEFORE_DISCONNECTED_METADATA_KEY, ON_AFTER_DISCONNECTED_METADATA_KEY, ON_BEFORE_ADOPTED_METADATA_KEY, ON_AFTER_ADOPTED_METADATA_KEY, findAllLifecycleMetadata, getOnConnectedInnerHtmlMetadata} from './lifecycles';
+import {getEmitCustomEventMetadataList} from './emitCustomEvent';
+import {findAllAttributeChangedMetadata, convertAttributeValue} from './changedAttributeThis';
+import {findAllAttributeApplyMetadata} from './applyAttribute';
+import {findAllAttributeMetadata, getAttributeValue} from './attribute';
+import {getQueryMetadata} from './query';
+import {getQueryAllMetadata} from './queryAll';
+import {SwcUtils} from '../utils/Utils';
+import {HTML_TAG_ENTRIES, DOM_EVENT_NAMES} from '../config/config';
+import {SituationTypeContainer, SituationTypeContainers} from '@dooboostore/simple-boot/decorators/inject/Inject';
+import {InjectSituationType, HostSet, HelperHostSet} from '../types';
+import {ConvertUtils} from '@dooboostore/core-web';
 
 // --- Core Interfaces & Types ---
 
@@ -48,13 +48,13 @@ export const ensureInit = (inst: any) => {
     // });
 
     const target = inst instanceof Function ? inst : inst.constructor;
-    
+
     // ╔════════════════════════════════════════════════════════════════════════════════╗
     // ║ decorator 필드의 own property 삭제                                              ║
     // ║                                                                                ║
     // ║ 이유:                                                                          ║
     // ║ 1. TypeScript는 초기값이 있는 필드를 constructor에서 own property로 생성       ║
-    // ║    @attributeHost('id') myId: string = "default"  →  this.myId = "default"    ║
+    // ║    @attributeThis('id') myId: string = "default"  →  this.myId = "default"    ║
     // ║                                                                                ║
     // ║ 2. JavaScript의 property lookup은 own property를 먼저 찾음                      ║
     // ║    - this.myId 접근                                                           ║
@@ -67,13 +67,13 @@ export const ensureInit = (inst: any) => {
     // ║ 4. own property를 삭제하면 JavaScript가 prototype의 getter를 찾게 됨          ║
     // ║    → getter 호출됨 → DOM 속성 값 동기화됨                                     ║
     // ╚════════════════════════════════════════════════════════════════════════════════╝
-    
+
     // @attribute 필드의 own property 삭제 → getter/setter 작동
     const attributeList = findAllAttributeMetadata(target);
     attributeList.forEach(meta => {
       delete (inst as any)[meta.propertyKey];
     });
-    
+
     // @query 필드의 own property 삭제 → getter 작동
     const queryList = getQueryMetadata(target);
     if (queryList) {
@@ -81,7 +81,7 @@ export const ensureInit = (inst: any) => {
         delete (inst as any)[meta.propertyKey];
       });
     }
-    
+
     // @queryAll 필드의 own property 삭제 → getter 작동
     const queryAllList = getQueryAllMetadata(target);
     if (queryAllList) {
@@ -92,13 +92,13 @@ export const ensureInit = (inst: any) => {
 
     // Call constructor script if present
     const hostSet = SwcUtils.getHostSet(inst);
-    const appHosts = SwcUtils.findAllParentAppHostsDirect(inst);
+    const appHosts = SwcUtils.findAllAppHostsIncludingSelfDirect(inst);
     inst._executeSwcScript?.('swc-on-constructor', hostSet);
 
     // Call @onInitialize lifecycle methods
     const cMethods = findAllLifecycleMetadata(inst, ON_INITIALIZE_METADATA_KEY);
     if (cMethods) {
-      for (const m of cMethods) (inst)._invokeLifecycleMethod(m, hostSet);
+      for (const m of cMethods) inst._invokeLifecycleMethod(m, hostSet);
     }
   }
 };
@@ -116,7 +116,7 @@ const handleGlobalSwcEvent = async (event: Event) => {
     if (!(node instanceof HTMLElement)) continue;
     const script = node.getAttribute?.(attrName);
     if (script && !getElementConfig(node)) {
-      const host: any = SwcUtils.findNearestSwcHost(node);
+      const host: any = SwcUtils.findNearestSwcHostIncludingSelf(node);
       if (host && host.isConnected && typeof host.__swc_executeAttributeEvent === 'function') {
         await host.__swc_executeAttributeEvent(node, attrName, script, event);
         (event as any).__swc_handled = true;
@@ -134,8 +134,8 @@ function buildEnv(configWindow: Window) {
     if ((win as any)?.[cls]) builtInTagMap.set((win as any)[cls], tag);
   }
   const domHelpers = SwcUtils.getHelperSet(win);
-  
-  return { win, doc, builtInTagMap, domHelpers };
+
+  return {win, doc, builtInTagMap, domHelpers};
 }
 
 const getHandlers = (inst: any) => {
@@ -155,8 +155,8 @@ const setupPrototype = (proto: any) => {
         const conf = getElementConfig(this);
         const currentWin = (this as any)._resolveWindow(conf);
         const helpers = SwcUtils.getHelperSet(currentWin);
-        const args = { ...hostSet, ...helpers, ...extraArgs, $el: this, $root: this.getRootNode() };
-        FunctionUtils.execute({ script, context: this, args });
+        const args = {...hostSet, ...helpers, ...extraArgs, $el: this, $root: this.getRootNode()};
+        FunctionUtils.execute({script, context: this, args});
       } catch (e) {
         console.error(`[SWC] Failed to execute ${attrName}:`, e);
       }
@@ -166,12 +166,12 @@ const setupPrototype = (proto: any) => {
   proto._resolveWindow = function (localConfig?: ElementConfig): Window {
     ensureInit(this);
     if (localConfig?.window) return localConfig.window;
-    const ancestors = SwcUtils.findAllSwcHosts(this as any);
+    const ancestors = SwcUtils.findAllSwcHostsIncludingSelf(this as any);
     for (let i = ancestors.length - 1; i >= 0; i--) {
       const aConf = getElementConfig(ancestors[i]);
       if (aConf?.window) return aConf.window;
     }
-    return getElementConfig(this).window ?? (typeof window !== 'undefined' ? window : undefined) as Window;
+    return getElementConfig(this).window ?? ((typeof window !== 'undefined' ? window : undefined) as Window);
   };
 
   proto._invokeLifecycleMethod = function (methodName: string | symbol, hostSet?: HostSet, extraArgs: any[] = []) {
@@ -182,7 +182,13 @@ const setupPrototype = (proto: any) => {
     // console.log('---->hh',app, this, methodName);
     if (app) {
       const otherStorage = new Map<any, any>();
-      const situations = new SituationTypeContainers([new SituationTypeContainer({ situationType: InjectSituationType.HOST_SET, data: useHostSet }), new SituationTypeContainer({ situationType: InjectSituationType.APP_HOST, data: useHostSet.$appHost }), new SituationTypeContainer({ situationType: InjectSituationType.APP_HOSTS, data: useHostSet.$appHosts }), new SituationTypeContainer({ situationType: InjectSituationType.HOST, data: useHostSet.$host }), new SituationTypeContainer({ situationType: InjectSituationType.HOSTS, data: useHostSet.$hosts }), new SituationTypeContainer({ situationType: InjectSituationType.FIRST_HOST, data: useHostSet.$firstHost }), new SituationTypeContainer({ situationType: InjectSituationType.LAST_HOST, data: useHostSet.$lastHost }), new SituationTypeContainer({ situationType: InjectSituationType.FIRST_APP_HOST, data: useHostSet.$firstAppHost }), new SituationTypeContainer({ situationType: InjectSituationType.LAST_APP_HOST, data: useHostSet.$lastAppHost })]);
+      const situations = new SituationTypeContainers([new SituationTypeContainer({situationType: InjectSituationType.HOST_SET, data: useHostSet}), new SituationTypeContainer({situationType: InjectSituationType.APP_HOST, data: useHostSet.$appHost}), new SituationTypeContainer({situationType: InjectSituationType.APP_HOSTS, data: useHostSet.$appHosts}), new SituationTypeContainer({
+        situationType: InjectSituationType.HOST,
+        data: useHostSet.$host
+      }), new SituationTypeContainer({situationType: InjectSituationType.HOSTS, data: useHostSet.$hosts}), new SituationTypeContainer({situationType: InjectSituationType.FIRST_HOST, data: useHostSet.$firstHost}), new SituationTypeContainer({situationType: InjectSituationType.LAST_HOST, data: useHostSet.$lastHost}), new SituationTypeContainer({
+        situationType: InjectSituationType.FIRST_APP_HOST,
+        data: useHostSet.$firstAppHost
+      }), new SituationTypeContainer({situationType: InjectSituationType.LAST_APP_HOST, data: useHostSet.$lastAppHost})]);
       otherStorage.set(SituationTypeContainers, situations);
 
       return app.simstanceManager.executeBindParameterSim(
@@ -227,7 +233,7 @@ const setupPrototype = (proto: any) => {
         $el: el,
         $root: this.getRootNode()
       };
-      await FunctionUtils.execute({ script, context: el, args });
+      await FunctionUtils.execute({script, context: el, args});
     };
 
     el.addEventListener(eventName, handler);
@@ -252,384 +258,422 @@ const setupPrototype = (proto: any) => {
       $el: el,
       $root: this.getRootNode()
     };
-    await FunctionUtils.execute({ script, context: el, args });
+    await FunctionUtils.execute({script, context: el, args});
   };
 };
 
 export const elementDefine =
   (name: string, config: Partial<ElementConfig> = {}): ClassDecorator =>
-  (constructor: any) => {
-    const { win, doc, builtInTagMap: BUILT_IN_TAG_MAP, domHelpers: SWC_DOM_HELPERS } = buildEnv(config.window);
-    const metadata: ElementMetadata = { ...config, name, window: win };
+    (constructor: any) => {
+      const {win, doc, builtInTagMap: BUILT_IN_TAG_MAP, domHelpers: SWC_DOM_HELPERS} = buildEnv(config.window);
+      const metadata: ElementMetadata = {...config, name, window: win};
 
-    if (!metadata.window) {
-      throw new Error('window is required');
-    }
+      if (!metadata.window) {
+        throw new Error('window is required');
+      }
 
-    let extendsTagName = metadata.extends;
-    if (!extendsTagName) {
-      let proto = constructor;
-      const BaseHTMLElement = (win as any).HTMLElement;
-      while (proto && proto !== BaseHTMLElement && proto !== Function.prototype) {
-        extendsTagName = BUILT_IN_TAG_MAP.get(proto);
-        if (extendsTagName) break;
-        proto = Object.getPrototypeOf(proto);
+      let extendsTagName = metadata.extends;
+      if (!extendsTagName) {
+        let proto = constructor;
+        const BaseHTMLElement = (win as any).HTMLElement;
+        while (proto && proto !== BaseHTMLElement && proto !== Function.prototype) {
+          extendsTagName = BUILT_IN_TAG_MAP.get(proto);
+          if (extendsTagName) break;
+          proto = Object.getPrototypeOf(proto);
+        }
+        metadata.extends = extendsTagName;
       }
-      metadata.extends = extendsTagName;
-    }
 
-    const emitCustomEventList = getEmitCustomEventMetadataList(constructor) || [];
-    const emitHostCustomEventList = emitCustomEventList.filter(meta => meta.selector === ':host' || meta.selector === '');
-    const addEventListenerList = getAddEventListenerMetadata(constructor) || [];
-    const attrChangeMap = findAllAttributeChangedMetadata(constructor);
-    const attributeList = findAllAttributeMetadata(constructor);
-    const applyAttributeMap = findAllAttributeApplyMetadata(constructor);
-
-    const swcLifecycleAttributes = ['swc-on-constructor', 'swc-on-connected', 'swc-on-disconnected', 'swc-on-before-connected', 'swc-on-after-connected', 'swc-on-before-disconnected', 'swc-on-after-disconnected', 'swc-on-before-adopted', 'swc-on-after-adopted', 'swc-on-attribute-changed'];
-    const swcOnEvents = DOM_EVENT_NAMES.map(e => `swc-on-${e}`);
-
-    // Collect all observed attributes from all decorators
-    const attributeApplyNames = Array.from(applyAttributeMap.values()).map(it => it.options.name).filter(Boolean) as string[];
-    // const attributeListNames = attributeList.map(it => it.options.name || String(it.propertyKey));
-    const hostAttributes = attributeList.filter(it => it.selector === ':host').map(it=>it.options.name || String(it.propertyKey));
-
-    const proto = constructor.prototype;
-    
-    // Get original static observedAttributes before they're overwritten by Object.defineProperty
-    const originalStaticObservedAttributes = (constructor.observedAttributes ?? []) as string[];
-    
-    // proto.observedAttributes??[];
-    const mergedObservedAttributes = [...new Set([
-      ...(metadata.observedAttributes ?? []),
-      ...originalStaticObservedAttributes,
-      ...attrChangeMap.keys(),
-      ...attributeApplyNames,
-      ...hostAttributes,
-      ...emitHostCustomEventList.map(it => (it.options as any).attributeName).filter(Boolean),
-      ...swcLifecycleAttributes,
-      ...swcOnEvents
-    ])];
-
-    const connectedInnerHtmlList = getOnConnectedInnerHtmlMetadata(constructor) || [];
-
-    setupPrototype(proto);
-
-    const originalConnected = proto.connectedCallback;
-    proto.connectedCallback = function () {
-      ensureInit(this);
-
-      const hostSet = SwcUtils.getHostSet(this as any);
-      const appHost = hostSet.$appHost;
-      const conf = getElementConfig(this);
-      const currentWin = (this as any)._resolveWindow(conf);
+      const emitCustomEventList = getEmitCustomEventMetadataList(constructor) || [];
+      const emitHostCustomEventList = emitCustomEventList.filter(meta => meta.selector === '$this' || meta.selector === '');
+      const addEventListenerList = getAddEventListenerMetadata(constructor) || [];
+      const attrChangeMap = findAllAttributeChangedMetadata(constructor);
+      const attributeList = findAllAttributeMetadata(constructor);
+      const applyAttributeMap = findAllAttributeApplyMetadata(constructor);
+
+      const swcLifecycleAttributes = ['swc-on-constructor', 'swc-on-connected', 'swc-on-disconnected', 'swc-on-before-connected', 'swc-on-after-connected', 'swc-on-before-disconnected', 'swc-on-after-disconnected', 'swc-on-before-adopted', 'swc-on-after-adopted', 'swc-on-attribute-changed'];
+      const swcOnEvents = DOM_EVENT_NAMES.map(e => `swc-on-${e}`);
+
+      const attributeApplyNames = Array.from(applyAttributeMap.values())
+        .map(it => it.options.name)
+        .filter(Boolean) as string[];
+      const hostAttributes = attributeList.filter(it => it.selector === '$this').map(it => it.options.name || String(it.propertyKey));
+      // Get original static observedAttributes before they're overwritten by Object.defineProperty
+      const originalStaticObservedAttributes = (constructor.observedAttributes ?? []) as string[];
+      const mergedObservedAttributes = [...new Set([...(metadata.observedAttributes ?? []), ...originalStaticObservedAttributes, ...attrChangeMap.keys(), ...attributeApplyNames, ...hostAttributes, ...emitHostCustomEventList.map(it => (it.options as any).attributeName).filter(Boolean), ...swcLifecycleAttributes, ...swcOnEvents])];
+      const connectedInnerHtmlList = getOnConnectedInnerHtmlMetadata(constructor) || [];
+
+      const proto = constructor.prototype;
+      setupPrototype(proto);
+
+      // 값을 기대하지않는다.
+      let helperHostSet: HelperHostSet | null = null;
+      const originalConnected = proto.connectedCallback;
+      proto.connectedCallback = async function () {
+        ensureInit(this);
+        // connected 됐을시 최신화
+        helperHostSet = SwcUtils.getHelperAndHostSet(win, this as any);
+        const appHost = helperHostSet.$appHost;
+        try {
+          if (appHost && typeof (appHost as any)._connected === 'function') {
+           await (appHost as any)._connected(this);
+          } else if (appHost && typeof (appHost as any)) {
+            (appHost as any)._connected_safari ??= [];
+            (appHost as any)._connected_safari.push(this);
+          }
 
-      const shadowMode = conf?.useShadow || connectedInnerHtmlList.find(it => it.options.useShadow)?.options.useShadow;
-      if (shadowMode && !this.shadowRoot) {
-        const mode = shadowMode === true ? 'open' : shadowMode;
-        this.attachShadow({ mode: mode as ShadowRootMode });
-      }
+          // const hostSet = SwcUtils.getHostSet(this as any);
+          const conf = getElementConfig(this);
+          const currentWin = (this as any)._resolveWindow(conf);
 
-      (this as any)._executeSwcScript('swc-on-before-connected', hostSet);
-      const bMethods = findAllLifecycleMetadata(this, ON_BEFORE_CONNECTED_METADATA_KEY);
-      if (bMethods) {
-        for (const m of bMethods) (this as any)._invokeLifecycleMethod(m, hostSet);
-      }
+          const shadowMode = conf?.useShadow || connectedInnerHtmlList.find(it => it.options.useShadow)?.options.useShadow;
+          if (shadowMode && !this.shadowRoot) {
+            const mode = shadowMode === true ? 'open' : shadowMode;
+            this.attachShadow({mode: mode as ShadowRootMode});
+          }
 
-      if (connectedInnerHtmlList.length > 0) {
-        let sContent = '',
-          lContent = '';
-        for (const meta of connectedInnerHtmlList) {
-          // const res = (this as any)[meta.propertyKey]();
-          const res = (this as any)._invokeLifecycleMethod(meta.propertyKey, hostSet);
-          // console.log('------res0', res);
-          // console.log('------res1', res1);
-          if (res !== undefined) {
-            if (meta.options.useShadow || conf?.useShadow) sContent += res;
-            else lContent += res;
+          const bMethods = findAllLifecycleMetadata(this, ON_BEFORE_CONNECTED_METADATA_KEY);
+          if (bMethods) {
+            for (const m of bMethods) await (this as any)._invokeLifecycleMethod(m, helperHostSet);
           }
-        }
-        try {
-          if (this.shadowRoot) this.shadowRoot.innerHTML = sContent;
-          if (lContent) this.innerHTML = lContent;
-        } catch (e) {
-          console.error('[ElementDefine] innerHTML setting error:', e);
-        }
-      }
+          (this as any)._executeSwcScript('swc-on-before-connected', helperHostSet);
+
+          if (connectedInnerHtmlList.length > 0) {
+            let sContent = '',
+              lContent = '';
+            for (const meta of connectedInnerHtmlList) {
+              // const res = (this as any)[meta.propertyKey]();
+              let res = await (this as any)._invokeLifecycleMethod(meta.propertyKey, helperHostSet);
+              const actionExpression = new ActionExpression(res, {
+                expression: {
+                  replace: {
+                    start: meta.options.replaceWrap?.start || '{%{',
+                    end: meta.options.replaceWrap?.end || '}%}'
+                  },
+                  callReturn: {
+                    start: meta.options.replaceWrap?.start || '{%{=',
+                    end: meta.options.replaceWrap?.end || '}%}'
+                  },
+                  call: {
+                    start: meta.options.replaceWrap?.start || '{%{@',
+                    end: meta.options.replaceWrap?.end || '}%}'
+                  }
+                }
+              });
+
+              actionExpression.getExpressions().filter(it => it.type === 'replace').forEach(it => {
+                try {
+                  // const helperHostSet22 = SwcUtils.getHelperAndHostSet(win, this as any);
+                  const sr = FunctionUtils.executeReturn({script: it.script, context: this, args: helperHostSet});
+                  actionExpression.replace(it, sr);
+                } catch (e) {
+                  console.error(`[SWC] Failed to execute connectedInnerHTML:`, e);
+                }
+              });
+              res = actionExpression.getUnprocessedTemplate();
 
-      const root = this.getRootNode();
-      if (!globalDelegatedRoots.has(root)) {
-        DOM_EVENT_NAMES.forEach(type => {
-          root.addEventListener(type, handleGlobalSwcEvent);
-        });
-        globalDelegatedRoots.add(root);
-      }
+              if (res !== undefined) {
+                if (meta.options.useShadow || conf?.useShadow) sContent += res;
+                else lContent += res;
+              }
+            }
+            try {
+              if (this.shadowRoot) {
+                this.shadowRoot.innerHTML = sContent;
+              }
+              if (lContent) {
+                this.innerHTML = lContent;
+              }
+            } catch (e) {
+              console.error('[ElementDefine] innerHTML setting error:', e);
+            }
+          }
 
-      // Separate delegate and non-delegate listeners
-      const delegateListeners: typeof addEventListenerList = [];
-      const nonDelegateListeners: typeof addEventListenerList = [];
-      
-      addEventListenerList.forEach(meta => {
-        if (meta.options.delegate && meta.selector !== ':window' && meta.selector !== ':document' && meta.selector !== ':parentHost' && meta.selector !== ':appHost' && meta.selector !== ':firstHost' && meta.selector !== ':lastHost' && meta.selector !== ':firstAppHost' && meta.selector !== ':lastAppHost' && meta.selector !== ':hosts' && meta.selector !== ':appHosts' && meta.selector !== ':host' && meta.selector !== '') {
-          delegateListeners.push(meta);
-        } else {
-          nonDelegateListeners.push(meta);
-        }
-      });
+          const root = this.getRootNode();
+          if (!globalDelegatedRoots.has(root)) {
+            DOM_EVENT_NAMES.forEach(type => {
+              root.addEventListener(type, handleGlobalSwcEvent);
+            });
+            globalDelegatedRoots.add(root);
+          }
 
-      const delegatesByTypeAndRoot = new Map<string, any[]>();
-      delegateListeners.forEach(meta => {
-        const r = meta.options.root || 'auto';
-        const rootKey = `${meta.type}:${r}`;
-        if (!delegatesByTypeAndRoot.has(rootKey)) {
-          delegatesByTypeAndRoot.set(rootKey, []);
-        }
-        delegatesByTypeAndRoot.get(rootKey)!.push(meta);
-      });
+          // Separate delegate and non-delegate listeners
+          const delegateListeners: typeof addEventListenerList = [];
+          const nonDelegateListeners: typeof addEventListenerList = [];
 
-      delegatesByTypeAndRoot.forEach((metaList, typeRootKey) => {
-        const [type, rStr] = typeRootKey.split(':');
-        const r = rStr === 'auto' ? 'auto' : rStr;
-        const opts = { capture: metaList[0].options.capture, once: metaList[0].options.once, passive: metaList[0].options.passive };
-        
-        const bindRoots: (HTMLElement | ShadowRoot)[] = [];
-        if (r === 'auto') bindRoots.push(this.shadowRoot || (this as any));
-        else if (r === 'light') bindRoots.push(this as any);
-        else if (r === 'shadow' && this.shadowRoot) bindRoots.push(this.shadowRoot);
-        else if (r === 'all') {
-          bindRoots.push(this as any);
-          if (this.shadowRoot) bindRoots.push(this.shadowRoot);
-        }
+          addEventListenerList.forEach(meta => {
+            if (meta.options.delegate && meta.selector !== '$window' && meta.selector !== '$document' && meta.selector !== '$host' && meta.selector !== '$appHost' && meta.selector !== '$firstHost' && meta.selector !== '$lastHost' && meta.selector !== '$firstAppHost' && meta.selector !== '$lastAppHost' && meta.selector !== '$hosts' && meta.selector !== '$appHosts' && meta.selector !== '$this' && meta.selector !== '') {
+              delegateListeners.push(meta);
+            } else {
+              nonDelegateListeners.push(meta);
+            }
+          });
 
-        bindRoots.forEach(br => {
-          const sortedMetaList = [...metaList].sort((a, b) => {
-            const aStop = a.options.stopPropagation ? 1 : 0;
-            const bStop = b.options.stopPropagation ? 1 : 0;
-            return bStop - aStop;
+          const delegatesByTypeAndRoot = new Map<string, any[]>();
+          delegateListeners.forEach(meta => {
+            const r = meta.options.root || 'auto';
+            const rootKey = `${meta.type}:${r}`;
+            if (!delegatesByTypeAndRoot.has(rootKey)) {
+              delegatesByTypeAndRoot.set(rootKey, []);
+            }
+            delegatesByTypeAndRoot.get(rootKey)!.push(meta);
           });
-          
-          const unifiedHandler = async (event: Event) => {
-            for (const meta of sortedMetaList) {
-              const { selector, options } = meta;
-              const matchedEl = (event.target as HTMLElement).closest(selector);
-              if (matchedEl && (br as any).contains(matchedEl)) {
+
+          delegatesByTypeAndRoot.forEach((metaList, typeRootKey) => {
+            const [type, rStr] = typeRootKey.split(':');
+            const r = rStr === 'auto' ? 'auto' : rStr;
+            const opts = {capture: metaList[0].options.capture, once: metaList[0].options.once, passive: metaList[0].options.passive};
+
+            const bindRoots: (HTMLElement | ShadowRoot)[] = [];
+            if (r === 'auto') bindRoots.push(this.shadowRoot || (this as any));
+            else if (r === 'light') bindRoots.push(this as any);
+            else if (r === 'shadow' && this.shadowRoot) bindRoots.push(this.shadowRoot);
+            else if (r === 'all') {
+              bindRoots.push(this as any);
+              if (this.shadowRoot) bindRoots.push(this.shadowRoot);
+            }
+
+            bindRoots.forEach(br => {
+              const sortedMetaList = [...metaList].sort((a, b) => {
+                const aStop = a.options.stopPropagation ? 1 : 0;
+                const bStop = b.options.stopPropagation ? 1 : 0;
+                return bStop - aStop;
+              });
+
+              const unifiedHandler = async (event: Event) => {
+                for (const meta of sortedMetaList) {
+                  const {selector, options} = meta;
+                  const matchedEl = (event.target as HTMLElement).closest(selector);
+                  if (matchedEl && (br as any).contains(matchedEl)) {
+                    // Apply filter if specified
+                    if (options.filter) {
+                      const helper = SwcUtils.getHelperAndHostSet(currentWin, matchedEl);
+                      if (!options.filter(event, helper)) {
+                        continue; // Skip this listener if filter returns false
+                      }
+                    }
+                    if (options.stopPropagation) event.stopPropagation();
+                    if (options.stopImmediatePropagation) event.stopImmediatePropagation();
+                    if (options.preventDefault) event.preventDefault();
+                    const currentHostSet = SwcUtils.getHostSet(this as any);
+                    const args = {event, ...currentHostSet, $el: matchedEl, $root: br};
+                    await (this as any)[meta.propertyKey](event, {...currentHostSet, $matchedElement: matchedEl}, args);
+                    if ((event as any).cancelBubble) break;
+                  }
+                }
+              };
+              br.addEventListener(type, unifiedHandler, opts);
+              (this as any)._boundListeners.push({target: br, type, handler: unifiedHandler, options: opts});
+            });
+          });
+
+          nonDelegateListeners.forEach(meta => {
+            const {selector, type, options} = meta;
+            const opts = {capture: options.capture, once: options.once, passive: options.passive};
+            const bindTargets: EventTarget[] = [];
+            const r = options.root || 'auto';
+            const applyRootOption = (target: any) => {
+              if (!target) return;
+              if (r === 'auto') {
+                bindTargets.push(target.shadowRoot || target);
+              } else {
+                if (r === 'light' || r === 'all') bindTargets.push(target);
+                if ((r === 'shadow' || r === 'all') && target.shadowRoot) bindTargets.push(target.shadowRoot);
+              }
+            };
+
+            if (selector === '$window') bindTargets.push(currentWin);
+            else if (selector === '$document') bindTargets.push(currentWin.document);
+            else if (selector === '$host') applyRootOption(helperHostSet.$host);
+            else if (selector === '$parentHost') applyRootOption(helperHostSet.$parentHost);
+            else if (selector === '$appHost') applyRootOption(helperHostSet.$appHost);
+            else if (selector === '$firstHost') applyRootOption(helperHostSet.$firstHost);
+            else if (selector === '$lastHost') applyRootOption(helperHostSet.$lastHost);
+            else if (selector === '$firstAppHost') applyRootOption(helperHostSet.$firstAppHost);
+            else if (selector === '$lastAppHost') applyRootOption(helperHostSet.$lastAppHost);
+            else if (selector === '$hosts') helperHostSet.$hosts.forEach(applyRootOption);
+            else if (selector === '$appHosts') helperHostSet.$appHosts.forEach(applyRootOption);
+            else if (selector === '$this' || !selector) applyRootOption(this);
+            else {
+              const searchRoots: (HTMLElement | ShadowRoot)[] = [];
+              if (r === 'auto') searchRoots.push(this.shadowRoot || (this as any));
+              else if (r === 'light') searchRoots.push(this as any);
+              else if (r === 'shadow' && this.shadowRoot) searchRoots.push(this.shadowRoot);
+              else if (r === 'all') {
+                searchRoots.push(this as any);
+                if (this.shadowRoot) searchRoots.push(this.shadowRoot);
+              }
+
+              searchRoots.forEach(sr => {
+                sr.querySelectorAll(selector).forEach(el => bindTargets.push(el));
+              });
+            }
+
+            bindTargets.forEach(t => {
+              const handler = async (event: Event) => {
                 // Apply filter if specified
                 if (options.filter) {
-                  const helper = SwcUtils.getHelperAndHostSet(currentWin, matchedEl);
-                  if (!options.filter(event, helper)) {
-                    continue;  // Skip this listener if filter returns false
+                  const helper = SwcUtils.getHelperAndHostSet(currentWin, t as HTMLElement);
+                  if (!options.filter(event, {currentThis: this, helper})) {
+                    return; // Skip if filter returns false
                   }
                 }
                 if (options.stopPropagation) event.stopPropagation();
                 if (options.stopImmediatePropagation) event.stopImmediatePropagation();
                 if (options.preventDefault) event.preventDefault();
                 const currentHostSet = SwcUtils.getHostSet(this as any);
-                const args = { event, ...currentHostSet, $el: matchedEl, $root: br };
-                await (this as any)[meta.propertyKey](event, currentHostSet, matchedEl, args);
-                if ((event as any).cancelBubble) break;
+                const args = {event, ...currentHostSet, $el: t, $root: t};
+                await (this as any)[meta.propertyKey](event, {currentHostSet, $$matchedElement: event.currentTarget}, args);
+              };
+              t.addEventListener(type, handler, opts);
+              if (options.removeOnDisconnected === true || t === currentWin || t === currentWin.document) {
+                (this as any)._boundListeners.push({target: t, type, handler, options: opts});
               }
-            }
-          };
-          br.addEventListener(type, unifiedHandler, opts);
-          (this as any)._boundListeners.push({ target: br, type, handler: unifiedHandler, options: opts });
-        });
-      });
-
-      nonDelegateListeners.forEach(meta => {
-        const { selector, type, options } = meta;
-        const opts = { capture: options.capture, once: options.once, passive: options.passive };
-        const bindTargets: EventTarget[] = [];
-        const r = options.root || 'auto';
-        const applyRootOption = (target: any) => {
-          if (!target) return;
-          if (r === 'auto') {
-            bindTargets.push(target.shadowRoot || target);
-          } else {
-            if (r === 'light' || r === 'all') bindTargets.push(target);
-            if ((r === 'shadow' || r === 'all') && target.shadowRoot) bindTargets.push(target.shadowRoot);
-          }
-        };
-
-        if (selector === ':window') bindTargets.push(currentWin);
-        else if (selector === ':document') bindTargets.push(currentWin.document);
-        else if (selector === ':parentHost') applyRootOption(hostSet.$parentHost);
-        else if (selector === ':appHost') applyRootOption(hostSet.$appHost);
-        else if (selector === ':firstHost') applyRootOption(hostSet.$firstHost);
-        else if (selector === ':lastHost') applyRootOption(hostSet.$lastHost);
-        else if (selector === ':firstAppHost') applyRootOption(hostSet.$firstAppHost);
-        else if (selector === ':lastAppHost') applyRootOption(hostSet.$lastAppHost);
-        else if (selector === ':hosts') hostSet.$hosts.forEach(applyRootOption);
-        else if (selector === ':appHosts') hostSet.$appHosts.forEach(applyRootOption);
-        else if (selector === ':host' || !selector) applyRootOption(this);
-        else {
-          const searchRoots: (HTMLElement | ShadowRoot)[] = [];
-          if (r === 'auto') searchRoots.push(this.shadowRoot || (this as any));
-          else if (r === 'light') searchRoots.push(this as any);
-          else if (r === 'shadow' && this.shadowRoot) searchRoots.push(this.shadowRoot);
-          else if (r === 'all') {
-            searchRoots.push(this as any);
-            if (this.shadowRoot) searchRoots.push(this.shadowRoot);
-          }
-
-          searchRoots.forEach(sr => {
-            sr.querySelectorAll(selector).forEach(el => bindTargets.push(el));
+            });
           });
-        }
 
-        bindTargets.forEach(t => {
-          const handler = async (event: Event) => {
-            // Apply filter if specified
-            if (options.filter) {
-              const helper = SwcUtils.getHelperAndHostSet(currentWin, t as HTMLElement);
-              if (!options.filter(event, {currentThis: this,helper})) {
-                return;  // Skip if filter returns false
+          if (originalConnected) await (originalConnected.apply(this));
+
+          const aMethods = findAllLifecycleMetadata(this, ON_AFTER_CONNECTED_METADATA_KEY);
+          if (aMethods) {
+            for (const m of aMethods) await (this as any)._invokeLifecycleMethod(m, helperHostSet);
+          }
+          (this as any)._executeSwcScript('swc-on-connected', helperHostSet);
+          (this as any)._executeSwcScript('swc-on-after-connected', helperHostSet);
+          (this as any).__swc_connected = true;
+
+          // Trigger @changedAttributeThis with while: 'connected'
+          for (let [name, metaList] of Array.from(attrChangeMap)) {
+            for (const meta of metaList) {
+              if (meta.options.while === 'connected') {
+                const val = getAttributeValue(this, name, {type: meta.options.type});
+                if (val !== null) {
+                  await ((this as any)[meta.propertyKey](val, null, name, helperHostSet));
+                }
               }
             }
-            if (options.stopPropagation) event.stopPropagation();
-            if (options.stopImmediatePropagation) event.stopImmediatePropagation();
-            if (options.preventDefault) event.preventDefault();
-            const currentHostSet = SwcUtils.getHostSet(this as any);
-            const args = { event, ...currentHostSet, $el: t, $root: t };
-            await (this as any)[meta.propertyKey](event, currentHostSet, args);
-          };
-          t.addEventListener(type, handler, opts);
-          if (options.removeOnDisconnected === true || t === currentWin || t === currentWin.document) {
-            (this as any)._boundListeners.push({ target: t, type, handler, options: opts });
           }
-        });
-      });
+        } finally {
+          if (appHost && typeof (appHost as any)._connectedDone === 'function') {
+            await (appHost as any)._connectedDone(this);
+          }
+        }
+      };
 
-      if (originalConnected) originalConnected.apply(this);
+      const originalDisconnected = proto.disconnectedCallback;
+      proto.disconnectedCallback = function () {
+        // const helperHostSet = SwcUtils.getHelperAndHostSet(win, this as any);
+        // Remove from appHost LAST when disconnected
+        console.log('disconnnnnnnnnnnnnnnnnnn', helperHostSet, this)
+        const appHost = helperHostSet.$appHost;
+        if (appHost && typeof (appHost as any)._disconnected === 'function') {
+          (appHost as any)._disconnected(this);
+        }
 
-      const aMethods = findAllLifecycleMetadata(this, ON_AFTER_CONNECTED_METADATA_KEY);
-      if (aMethods) {
-        for (const m of aMethods) (this as any)._invokeLifecycleMethod(m, hostSet);
-      }
-      (this as any)._executeSwcScript('swc-on-connected', hostSet);
-      (this as any)._executeSwcScript('swc-on-after-connected', hostSet);
-      (this as any).__swc_connected = true;
-
-      // Register to appHost LAST when all lifecycle completed
-      // console.log('!!!!!!!!!!!!!!', this, appHost)
-      const appHostss = SwcUtils.findAllParentAppHostsDirect(this)
-      // const nAppHostSet = SwcUtils.getHostSet(this as any);
-      if (appHost && typeof (appHost as any)._connected === 'function') {
-        (appHost as any)._connected(this);
-      } else if (appHost && typeof (appHost as any)) {
-        (appHost as any)._connected_safari ??= [];
-        (appHost as any)._connected_safari.push(this);
-      }
-    };
+        (this as any)._executeSwcScript('swc-on-before-disconnected', helperHostSet);
+        const bMethods = findAllLifecycleMetadata(this, ON_BEFORE_DISCONNECTED_METADATA_KEY);
+        if (bMethods) {
+          for (const m of bMethods) (this as any)._invokeLifecycleMethod(m, helperHostSet);
+        }
 
-    const originalDisconnected = proto.disconnectedCallback;
-    proto.disconnectedCallback = function () {
-      const hostSet = SwcUtils.getHostSet(this as any);
-      (this as any)._executeSwcScript('swc-on-before-disconnected', hostSet);
-      const bMethods = findAllLifecycleMetadata(this, ON_BEFORE_DISCONNECTED_METADATA_KEY);
-      if (bMethods) {
-        for (const m of bMethods) (this as any)._invokeLifecycleMethod(m, hostSet);
-      }
+        if ((this as any)._boundListeners) {
+          (this as any)._boundListeners.forEach((l: any) => l.target.removeEventListener(l.type, l.handler, l.options));
+          (this as any)._boundListeners = [];
+        }
 
-      if ((this as any)._boundListeners) {
-        (this as any)._boundListeners.forEach((l: any) => l.target.removeEventListener(l.type, l.handler, l.options));
-        (this as any)._boundListeners = [];
-      }
+        if (originalDisconnected) originalDisconnected.apply(this);
 
-      if (originalDisconnected) originalDisconnected.apply(this);
+        const aMethods = findAllLifecycleMetadata(this, ON_AFTER_DISCONNECTED_METADATA_KEY);
+        if (aMethods) {
+          for (const m of aMethods) (this as any)._invokeLifecycleMethod(m, helperHostSet);
+        }
+        (this as any)._executeSwcScript('swc-on-disconnected', helperHostSet);
+        (this as any)._executeSwcScript('swc-on-after-disconnected', helperHostSet);
+        (this as any).__swc_connected = false;
+      };
 
-      const aMethods = findAllLifecycleMetadata(this, ON_AFTER_DISCONNECTED_METADATA_KEY);
-      if (aMethods) {
-        for (const m of aMethods) (this as any)._invokeLifecycleMethod(m, hostSet);
-      }
-      (this as any)._executeSwcScript('swc-on-disconnected', hostSet);
-      (this as any)._executeSwcScript('swc-on-after-disconnected', hostSet);
-      (this as any).__swc_connected = false;
-      
-      // Remove from appHost LAST when disconnected
-      const appHost = hostSet.$appHost;
-      if (appHost && typeof (appHost as any)._disconnected === 'function') {
-        (appHost as any)._disconnected(this);
-      }
-    };
+      const originalAdopted = proto.adoptedCallback;
+      proto.adoptedCallback = function () {
+        const hostSet = SwcUtils.getHostSet(this as any);
+        (this as any)._executeSwcScript('swc-on-before-adopted', hostSet);
+        const bMethods = findAllLifecycleMetadata(this, ON_BEFORE_ADOPTED_METADATA_KEY);
+        if (bMethods) {
+          for (const m of bMethods) (this as any)._invokeLifecycleMethod(m, hostSet);
+        }
 
-    const originalAdopted = proto.adoptedCallback;
-    proto.adoptedCallback = function () {
-      const hostSet = SwcUtils.getHostSet(this as any);
-      (this as any)._executeSwcScript('swc-on-before-adopted', hostSet);
-      const bMethods = findAllLifecycleMetadata(this, ON_BEFORE_ADOPTED_METADATA_KEY);
-      if (bMethods) {
-        for (const m of bMethods) (this as any)._invokeLifecycleMethod(m, hostSet);
-      }
+        if (originalAdopted) originalAdopted.apply(this);
 
-      if (originalAdopted) originalAdopted.apply(this);
+        const aMethods = findAllLifecycleMetadata(this, ON_AFTER_ADOPTED_METADATA_KEY);
+        if (aMethods) {
+          for (const m of aMethods) (this as any)._invokeLifecycleMethod(m, hostSet);
+        }
+        (this as any)._executeSwcScript('swc-on-adopted', hostSet);
+        (this as any)._executeSwcScript('swc-on-after-adopted', hostSet);
+      };
 
-      const aMethods = findAllLifecycleMetadata(this, ON_AFTER_ADOPTED_METADATA_KEY);
-      if (aMethods) {
-        for (const m of aMethods) (this as any)._invokeLifecycleMethod(m, hostSet);
-      }
-      (this as any)._executeSwcScript('swc-on-adopted', hostSet);
-      (this as any)._executeSwcScript('swc-on-after-adopted', hostSet);
-    };
+      const originalAttributeChanged = proto.attributeChangedCallback;
+      proto.attributeChangedCallback = function (name: string, old: string | null, newVal: string | null) {
+        if (originalAttributeChanged) originalAttributeChanged.apply(this, [name, old, newVal]);
+
+        const hSet = SwcUtils.getHostSet(this as any);
 
-    const originalAttributeChanged = proto.attributeChangedCallback;
-    proto.attributeChangedCallback = function (name: string, old: string | null, newVal: string | null) {
-      if (originalAttributeChanged) originalAttributeChanged.apply(this, [name, old, newVal]);
-
-      const hSet = SwcUtils.getHostSet(this as any);
-
-      // Process expression directive before passing to handlers
-      let processedVal: any = newVal;
-      if (newVal !== null) {
-        const ae = new ActionExpression(newVal);
-        const expr = ae.getFirstExpression('call-return');
-        if (expr) {
-          const win = (this as any)._resolveWindow?.() || ((typeof window !== 'undefined' ? window : undefined) as any);
-          const helperAndHostSet = SwcUtils.getHelperAndHostSet(win,this as any);
-          try {
+        // Process expression directive before passing to handlers
+        let processedVal: any = newVal;
+        if (newVal !== null) {
+          const ae = new ActionExpression(newVal);
+          const expr = ae.getFirstExpression('callReturn');
+          if (expr) {
+            const win = (this as any)._resolveWindow?.() || ((typeof window !== 'undefined' ? window : undefined) as any);
+            const helperAndHostSet = SwcUtils.getHelperAndHostSet(win, this as any);
             const script = ConvertUtils.decodeHtmlEntity(expr.script, win.document);
-            const result = FunctionUtils.executeReturn({
-              script: script,
-              context: this,
-              args: helperAndHostSet
-            });
-            // Pass the result object directly without serialization
-            processedVal = result;
-          } catch (e) {
-            console.error(`[SWC] Failed to execute directive {{= ${expr.script} }} on attribute ${name}: ${helperAndHostSet}`, e);
-            processedVal = newVal;
+            try {
+              const result = FunctionUtils.executeReturn({
+                script: script,
+                context: this,
+                args: helperAndHostSet
+              });
+              // Pass the result object directly without serialization
+              processedVal = result;
+            } catch (e) {
+              console.error(`[SWC] Failed to execute directive {{= ${expr.script} }} on attribute ${name}: ${helperAndHostSet}`, e);
+              processedVal = newVal;
+            }
           }
         }
-      }
 
-      if (name.startsWith('swc-on-') && !swcLifecycleAttributes.includes(name)) {
-        if (newVal !== null) {
-          const eventName = name.substring(7);
-          (this as any)._bindAttributeEvent(this as any, name, newVal, eventName);
+        if (name.startsWith('swc-on-') && !swcLifecycleAttributes.includes(name)) {
+          if (newVal !== null) {
+            const eventName = name.substring(7);
+            (this as any)._bindAttributeEvent(this as any, name, newVal, eventName);
+          }
         }
-      }
 
-      const hostCustomEventMeta = emitHostCustomEventList.find(it => (it.options as any).attributeName === name);
-      if (hostCustomEventMeta && newVal !== null) {
-        (this as any)._bindAttributeEvent(this as any, name, newVal, hostCustomEventMeta.type);
-      }
+        const hostCustomEventMeta = emitHostCustomEventList.find(it => (it.options as any).attributeName === name);
+        if (hostCustomEventMeta && newVal !== null) {
+          (this as any)._bindAttributeEvent(this as any, name, newVal, hostCustomEventMeta.type);
+        }
 
-      const metaList = attrChangeMap.get(name);
-      if (metaList && Array.isArray(metaList)) {
-        for (const meta of metaList) {
-          const convertedVal = convertAttributeValue(processedVal, meta.options.type);
-          (this as any)[meta.propertyKey](convertedVal, old, name, hSet);
+        const metaList = attrChangeMap.get(name);
+        if (metaList && Array.isArray(metaList)) {
+          for (const meta of metaList) {
+            if (meta.options.while === 'connected' && !(this as any).__swc_connected) {
+              continue;
+            }
+            const convertedVal = convertAttributeValue(processedVal, meta.options.type);
+            (this as any)[meta.propertyKey](convertedVal, old, name, hSet);
+          }
         }
-      }
-    };
+      };
 
-    Object.defineProperty(constructor, 'observedAttributes', {
-      get: () => mergedObservedAttributes,
-      configurable: true
-    });
+      Object.defineProperty(constructor, 'observedAttributes', {
+        get: () => mergedObservedAttributes,
+        configurable: true
+      });
 
-    ReflectUtils.defineMetadata(ELEMENT_CONFIG_KEY, metadata, constructor);
-    const registry = metadata.customElementRegistry || (win as any)?.customElements;
-    if (registry && !registry.get(metadata.name)) {
-      registry.define(metadata.name, constructor as any, metadata.extends ? { extends: metadata.extends } : undefined);
-    }
-    return constructor;
-  };
+      ReflectUtils.defineMetadata(ELEMENT_CONFIG_KEY, metadata, constructor);
+      const registry = metadata.customElementRegistry || (win as any)?.customElements;
+      if (registry && !registry.get(metadata.name)) {
+        registry.define(metadata.name, constructor as any, metadata.extends ? {extends: metadata.extends} : undefined);
+      }
+      return constructor;
+    };