@dooboostore/simple-web-component 1.0.34 → 1.0.36

package/dist/esm/decorators/elementDefine.js

@@ -2,9 +2,9 @@ import { ReflectUtils, FunctionUtils, ActionExpression } from "@dooboostore/core
 import { getAddEventListenerMetadata } from "./addEventListener.js";
 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.js";
 import { getEmitCustomEventMetadataList } from "./emitCustomEvent.js";
-import { findAllAttributeChangedMetadata, convertAttributeValue } from "./changedAttributeHost.js";
+import { findAllAttributeChangedMetadata, convertAttributeValue } from "./changedAttributeThis.js";
 import { findAllAttributeApplyMetadata } from "./applyAttribute.js";
-import { findAllAttributeMetadata } from "./attribute.js";
+import { findAllAttributeMetadata, getAttributeValue } from "./attribute.js";
 import { getQueryMetadata } from "./query.js";
 import { getQueryAllMetadata } from "./queryAll.js";
 import { SwcUtils } from "../utils/Utils.js";
@@ -41,7 +41,7 @@ const ensureInit = (inst) => {
       });
     }
     const hostSet = SwcUtils.getHostSet(inst);
-    const appHosts = SwcUtils.findAllParentAppHostsDirect(inst);
+    const appHosts = SwcUtils.findAllAppHostsIncludingSelfDirect(inst);
     inst._executeSwcScript?.("swc-on-constructor", hostSet);
     const cMethods = findAllLifecycleMetadata(inst, ON_INITIALIZE_METADATA_KEY);
     if (cMethods) {
@@ -59,7 +59,7 @@ const handleGlobalSwcEvent = async (event) => {
     if (!(node instanceof HTMLElement)) continue;
     const script = node.getAttribute?.(attrName);
     if (script && !getElementConfig(node)) {
-      const host = SwcUtils.findNearestSwcHost(node);
+      const host = SwcUtils.findNearestSwcHostIncludingSelf(node);
       if (host && host.isConnected && typeof host.__swc_executeAttributeEvent === "function") {
         await host.__swc_executeAttributeEvent(node, attrName, script, event);
         event.__swc_handled = true;
@@ -103,7 +103,7 @@ const setupPrototype = (proto) => {
   proto._resolveWindow = function(localConfig) {
     ensureInit(this);
     if (localConfig?.window) return localConfig.window;
-    const ancestors = SwcUtils.findAllSwcHosts(this);
+    const ancestors = SwcUtils.findAllSwcHostsIncludingSelf(this);
     for (let i = ancestors.length - 1; i >= 0; i--) {
       const aConf = getElementConfig(ancestors[i]);
       if (aConf?.window) return aConf.window;
@@ -117,7 +117,13 @@ const setupPrototype = (proto) => {
     const app = useHostSet?.$appHost?.simpleApplication;
     if (app) {
       const otherStorage = /* @__PURE__ */ new Map();
-      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(
         {
@@ -201,7 +207,7 @@ const elementDefine = (name, config = {}) => (constructor) => {
     metadata.extends = extendsTagName;
   }
   const emitCustomEventList = getEmitCustomEventMetadataList(constructor) || [];
-  const emitHostCustomEventList = emitCustomEventList.filter((meta) => meta.selector === ":host" || meta.selector === "");
+  const emitHostCustomEventList = emitCustomEventList.filter((meta) => meta.selector === "$this" || meta.selector === "");
   const addEventListenerList = getAddEventListenerMetadata(constructor) || [];
   const attrChangeMap = findAllAttributeChangedMetadata(constructor);
   const attributeList = findAllAttributeMetadata(constructor);
@@ -209,204 +215,245 @@ const elementDefine = (name, config = {}) => (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);
-  const hostAttributes = attributeList.filter((it) => it.selector === ":host").map((it) => it.options.name || String(it.propertyKey));
-  const proto = constructor.prototype;
+  const hostAttributes = attributeList.filter((it) => it.selector === "$this").map((it) => it.options.name || String(it.propertyKey));
   const originalStaticObservedAttributes = constructor.observedAttributes ?? [];
-  const mergedObservedAttributes = [.../* @__PURE__ */ new Set([
-    ...metadata.observedAttributes ?? [],
-    ...originalStaticObservedAttributes,
-    ...attrChangeMap.keys(),
-    ...attributeApplyNames,
-    ...hostAttributes,
-    ...emitHostCustomEventList.map((it) => it.options.attributeName).filter(Boolean),
-    ...swcLifecycleAttributes,
-    ...swcOnEvents
-  ])];
+  const mergedObservedAttributes = [.../* @__PURE__ */ new Set([...metadata.observedAttributes ?? [], ...originalStaticObservedAttributes, ...attrChangeMap.keys(), ...attributeApplyNames, ...hostAttributes, ...emitHostCustomEventList.map((it) => it.options.attributeName).filter(Boolean), ...swcLifecycleAttributes, ...swcOnEvents])];
   const connectedInnerHtmlList = getOnConnectedInnerHtmlMetadata(constructor) || [];
+  const proto = constructor.prototype;
   setupPrototype(proto);
+  let helperHostSet = null;
   const originalConnected = proto.connectedCallback;
-  proto.connectedCallback = function() {
+  proto.connectedCallback = async function() {
     ensureInit(this);
-    const hostSet = SwcUtils.getHostSet(this);
-    const appHost = hostSet.$appHost;
-    const conf = getElementConfig(this);
-    const currentWin = this._resolveWindow(conf);
-    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 });
-    }
-    this._executeSwcScript("swc-on-before-connected", hostSet);
-    const bMethods = findAllLifecycleMetadata(this, ON_BEFORE_CONNECTED_METADATA_KEY);
-    if (bMethods) {
-      for (const m of bMethods) this._invokeLifecycleMethod(m, hostSet);
-    }
-    if (connectedInnerHtmlList.length > 0) {
-      let sContent = "", lContent = "";
-      for (const meta of connectedInnerHtmlList) {
-        const res = this._invokeLifecycleMethod(meta.propertyKey, hostSet);
-        if (res !== void 0) {
-          if (meta.options.useShadow || conf?.useShadow) sContent += res;
-          else lContent += res;
-        }
+    helperHostSet = SwcUtils.getHelperAndHostSet(win, this);
+    const appHost = helperHostSet.$appHost;
+    try {
+      if (appHost && typeof appHost._connected === "function") {
+        await appHost._connected(this);
+      } else if (appHost && typeof appHost) {
+        appHost._connected_safari ?? (appHost._connected_safari = []);
+        appHost._connected_safari.push(this);
       }
-      try {
-        if (this.shadowRoot) this.shadowRoot.innerHTML = sContent;
-        if (lContent) this.innerHTML = lContent;
-      } catch (e) {
-        console.error("[ElementDefine] innerHTML setting error:", e);
-      }
-    }
-    const root = this.getRootNode();
-    if (!globalDelegatedRoots.has(root)) {
-      DOM_EVENT_NAMES.forEach((type) => {
-        root.addEventListener(type, handleGlobalSwcEvent);
-      });
-      globalDelegatedRoots.add(root);
-    }
-    const delegateListeners = [];
-    const nonDelegateListeners = [];
-    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 conf = getElementConfig(this);
+      const currentWin = this._resolveWindow(conf);
+      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 });
       }
-    });
-    const delegatesByTypeAndRoot = /* @__PURE__ */ new Map();
-    delegateListeners.forEach((meta) => {
-      const r = meta.options.root || "auto";
-      const rootKey = `${meta.type}:${r}`;
-      if (!delegatesByTypeAndRoot.has(rootKey)) {
-        delegatesByTypeAndRoot.set(rootKey, []);
+      const bMethods = findAllLifecycleMetadata(this, ON_BEFORE_CONNECTED_METADATA_KEY);
+      if (bMethods) {
+        for (const m of bMethods) await this._invokeLifecycleMethod(m, helperHostSet);
       }
-      delegatesByTypeAndRoot.get(rootKey).push(meta);
-    });
-    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 = [];
-      if (r === "auto") bindRoots.push(this.shadowRoot || this);
-      else if (r === "light") bindRoots.push(this);
-      else if (r === "shadow" && this.shadowRoot) bindRoots.push(this.shadowRoot);
-      else if (r === "all") {
-        bindRoots.push(this);
-        if (this.shadowRoot) bindRoots.push(this.shadowRoot);
+      this._executeSwcScript("swc-on-before-connected", helperHostSet);
+      if (connectedInnerHtmlList.length > 0) {
+        let sContent = "", lContent = "";
+        for (const meta of connectedInnerHtmlList) {
+          let res = await this._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 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();
+          if (res !== void 0) {
+            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);
+        }
       }
-      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 root = this.getRootNode();
+      if (!globalDelegatedRoots.has(root)) {
+        DOM_EVENT_NAMES.forEach((type) => {
+          root.addEventListener(type, handleGlobalSwcEvent);
         });
-        const unifiedHandler = async (event) => {
-          for (const meta of sortedMetaList) {
-            const { selector, options } = meta;
-            const matchedEl = event.target.closest(selector);
-            if (matchedEl && br.contains(matchedEl)) {
-              if (options.filter) {
-                const helper = SwcUtils.getHelperAndHostSet(currentWin, matchedEl);
-                if (!options.filter(event, helper)) {
-                  continue;
+        globalDelegatedRoots.add(root);
+      }
+      const delegateListeners = [];
+      const nonDelegateListeners = [];
+      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);
+        }
+      });
+      const delegatesByTypeAndRoot = /* @__PURE__ */ new Map();
+      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);
+      });
+      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 = [];
+        if (r === "auto") bindRoots.push(this.shadowRoot || this);
+        else if (r === "light") bindRoots.push(this);
+        else if (r === "shadow" && this.shadowRoot) bindRoots.push(this.shadowRoot);
+        else if (r === "all") {
+          bindRoots.push(this);
+          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) => {
+            for (const meta of sortedMetaList) {
+              const { selector, options } = meta;
+              const matchedEl = event.target.closest(selector);
+              if (matchedEl && br.contains(matchedEl)) {
+                if (options.filter) {
+                  const helper = SwcUtils.getHelperAndHostSet(currentWin, matchedEl);
+                  if (!options.filter(event, helper)) {
+                    continue;
+                  }
                 }
+                if (options.stopPropagation) event.stopPropagation();
+                if (options.stopImmediatePropagation) event.stopImmediatePropagation();
+                if (options.preventDefault) event.preventDefault();
+                const currentHostSet = SwcUtils.getHostSet(this);
+                const args = { event, ...currentHostSet, $el: matchedEl, $root: br };
+                await this[meta.propertyKey](event, { ...currentHostSet, $matchedElement: matchedEl }, args);
+                if (event.cancelBubble) break;
               }
-              if (options.stopPropagation) event.stopPropagation();
-              if (options.stopImmediatePropagation) event.stopImmediatePropagation();
-              if (options.preventDefault) event.preventDefault();
-              const currentHostSet = SwcUtils.getHostSet(this);
-              const args = { event, ...currentHostSet, $el: matchedEl, $root: br };
-              await this[meta.propertyKey](event, currentHostSet, matchedEl, args);
-              if (event.cancelBubble) break;
             }
+          };
+          br.addEventListener(type, unifiedHandler, opts);
+          this._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 = [];
+        const r = options.root || "auto";
+        const applyRootOption = (target) => {
+          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);
           }
         };
-        br.addEventListener(type, unifiedHandler, opts);
-        this._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 = [];
-      const r = options.root || "auto";
-      const applyRootOption = (target) => {
-        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 = [];
-        if (r === "auto") searchRoots.push(this.shadowRoot || this);
-        else if (r === "light") searchRoots.push(this);
-        else if (r === "shadow" && this.shadowRoot) searchRoots.push(this.shadowRoot);
-        else if (r === "all") {
-          searchRoots.push(this);
-          if (this.shadowRoot) searchRoots.push(this.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 = [];
+          if (r === "auto") searchRoots.push(this.shadowRoot || this);
+          else if (r === "light") searchRoots.push(this);
+          else if (r === "shadow" && this.shadowRoot) searchRoots.push(this.shadowRoot);
+          else if (r === "all") {
+            searchRoots.push(this);
+            if (this.shadowRoot) searchRoots.push(this.shadowRoot);
+          }
+          searchRoots.forEach((sr) => {
+            sr.querySelectorAll(selector).forEach((el) => bindTargets.push(el));
+          });
         }
-        searchRoots.forEach((sr) => {
-          sr.querySelectorAll(selector).forEach((el) => bindTargets.push(el));
+        bindTargets.forEach((t) => {
+          const handler = async (event) => {
+            if (options.filter) {
+              const helper = SwcUtils.getHelperAndHostSet(currentWin, t);
+              if (!options.filter(event, { currentThis: this, helper })) {
+                return;
+              }
+            }
+            if (options.stopPropagation) event.stopPropagation();
+            if (options.stopImmediatePropagation) event.stopImmediatePropagation();
+            if (options.preventDefault) event.preventDefault();
+            const currentHostSet = SwcUtils.getHostSet(this);
+            const args = { event, ...currentHostSet, $el: t, $root: t };
+            await this[meta.propertyKey](event, { currentHostSet, $$matchedElement: event.currentTarget }, args);
+          };
+          t.addEventListener(type, handler, opts);
+          if (options.removeOnDisconnected === true || t === currentWin || t === currentWin.document) {
+            this._boundListeners.push({ target: t, type, handler, options: opts });
+          }
         });
+      });
+      if (originalConnected) await originalConnected.apply(this);
+      const aMethods = findAllLifecycleMetadata(this, ON_AFTER_CONNECTED_METADATA_KEY);
+      if (aMethods) {
+        for (const m of aMethods) await this._invokeLifecycleMethod(m, helperHostSet);
       }
-      bindTargets.forEach((t) => {
-        const handler = async (event) => {
-          if (options.filter) {
-            const helper = SwcUtils.getHelperAndHostSet(currentWin, t);
-            if (!options.filter(event, { currentThis: this, helper })) {
-              return;
+      this._executeSwcScript("swc-on-connected", helperHostSet);
+      this._executeSwcScript("swc-on-after-connected", helperHostSet);
+      this.__swc_connected = true;
+      for (let [name2, metaList] of Array.from(attrChangeMap)) {
+        for (const meta of metaList) {
+          if (meta.options.while === "connected") {
+            const val = getAttributeValue(this, name2, { type: meta.options.type });
+            if (val !== null) {
+              await this[meta.propertyKey](val, null, name2, helperHostSet);
             }
           }
-          if (options.stopPropagation) event.stopPropagation();
-          if (options.stopImmediatePropagation) event.stopImmediatePropagation();
-          if (options.preventDefault) event.preventDefault();
-          const currentHostSet = SwcUtils.getHostSet(this);
-          const args = { event, ...currentHostSet, $el: t, $root: t };
-          await this[meta.propertyKey](event, currentHostSet, args);
-        };
-        t.addEventListener(type, handler, opts);
-        if (options.removeOnDisconnected === true || t === currentWin || t === currentWin.document) {
-          this._boundListeners.push({ target: t, type, handler, options: opts });
         }
-      });
-    });
-    if (originalConnected) originalConnected.apply(this);
-    const aMethods = findAllLifecycleMetadata(this, ON_AFTER_CONNECTED_METADATA_KEY);
-    if (aMethods) {
-      for (const m of aMethods) this._invokeLifecycleMethod(m, hostSet);
-    }
-    this._executeSwcScript("swc-on-connected", hostSet);
-    this._executeSwcScript("swc-on-after-connected", hostSet);
-    this.__swc_connected = true;
-    const appHostss = SwcUtils.findAllParentAppHostsDirect(this);
-    if (appHost && typeof appHost._connected === "function") {
-      appHost._connected(this);
-    } else if (appHost && typeof appHost) {
-      appHost._connected_safari ?? (appHost._connected_safari = []);
-      appHost._connected_safari.push(this);
+      }
+    } finally {
+      if (appHost && typeof appHost._connectedDone === "function") {
+        await appHost._connectedDone(this);
+      }
     }
   };
   const originalDisconnected = proto.disconnectedCallback;
   proto.disconnectedCallback = function() {
-    const hostSet = SwcUtils.getHostSet(this);
-    this._executeSwcScript("swc-on-before-disconnected", hostSet);
+    console.log("disconnnnnnnnnnnnnnnnnnn", helperHostSet, this);
+    const appHost = helperHostSet.$appHost;
+    if (appHost && typeof appHost._disconnected === "function") {
+      appHost._disconnected(this);
+    }
+    this._executeSwcScript("swc-on-before-disconnected", helperHostSet);
     const bMethods = findAllLifecycleMetadata(this, ON_BEFORE_DISCONNECTED_METADATA_KEY);
     if (bMethods) {
-      for (const m of bMethods) this._invokeLifecycleMethod(m, hostSet);
+      for (const m of bMethods) this._invokeLifecycleMethod(m, helperHostSet);
     }
     if (this._boundListeners) {
       this._boundListeners.forEach((l) => l.target.removeEventListener(l.type, l.handler, l.options));
@@ -415,15 +462,11 @@ const elementDefine = (name, config = {}) => (constructor) => {
     if (originalDisconnected) originalDisconnected.apply(this);
     const aMethods = findAllLifecycleMetadata(this, ON_AFTER_DISCONNECTED_METADATA_KEY);
     if (aMethods) {
-      for (const m of aMethods) this._invokeLifecycleMethod(m, hostSet);
+      for (const m of aMethods) this._invokeLifecycleMethod(m, helperHostSet);
     }
-    this._executeSwcScript("swc-on-disconnected", hostSet);
-    this._executeSwcScript("swc-on-after-disconnected", hostSet);
+    this._executeSwcScript("swc-on-disconnected", helperHostSet);
+    this._executeSwcScript("swc-on-after-disconnected", helperHostSet);
     this.__swc_connected = false;
-    const appHost = hostSet.$appHost;
-    if (appHost && typeof appHost._disconnected === "function") {
-      appHost._disconnected(this);
-    }
   };
   const originalAdopted = proto.adoptedCallback;
   proto.adoptedCallback = function() {
@@ -448,12 +491,12 @@ const elementDefine = (name, config = {}) => (constructor) => {
     let processedVal = newVal;
     if (newVal !== null) {
       const ae = new ActionExpression(newVal);
-      const expr = ae.getFirstExpression("call-return");
+      const expr = ae.getFirstExpression("callReturn");
       if (expr) {
         const win2 = this._resolveWindow?.() || (typeof window !== "undefined" ? window : void 0);
         const helperAndHostSet = SwcUtils.getHelperAndHostSet(win2, this);
+        const script = ConvertUtils.decodeHtmlEntity(expr.script, win2.document);
         try {
-          const script = ConvertUtils.decodeHtmlEntity(expr.script, win2.document);
           const result = FunctionUtils.executeReturn({
             script,
             context: this,
@@ -479,6 +522,9 @@ const elementDefine = (name, config = {}) => (constructor) => {
     const metaList = attrChangeMap.get(name2);
     if (metaList && Array.isArray(metaList)) {
       for (const meta of metaList) {
+        if (meta.options.while === "connected" && !this.__swc_connected) {
+          continue;
+        }
         const convertedVal = convertAttributeValue(processedVal, meta.options.type);
         this[meta.propertyKey](convertedVal, old, name2, hSet);
       }