@dooboostore/simple-web-component 1.0.36 → 1.0.38

package/src/decorators/applySlot.ts

@@ -0,0 +1,188 @@
+import {ReflectUtils} from '@dooboostore/core';
+import {ensureInit, getElementConfig} from './elementDefine';
+import {SwcUtils} from "../utils/Utils";
+import {NodeSlot} from "@dooboostore/core-web";
+/*
+<!-- beforebegin -->
+<p> <-- it's me
+  <!-- afterbegin -->
+  foo
+  <!-- beforeend -->
+</p>
+<!-- afterend -->
+ */
+export type ApplySlotPosition = 'prependHtml' | 'prependText' | 'appendHtml' | 'appendText' | 'replaceChildrenHtml' | 'replaceChildrenText' | 'clear';
+
+export interface ApplySlotOptions {
+  position?: ApplySlotPosition;
+  // root?: SwcRootType;
+  /**
+   * Filter function to determine whether to perform DOM operation.
+   * If it returns false, the operation is skipped.
+   */
+  // filter?: (target: HTMLElement | ShadowRoot, newValue: any, meta:{currentThis: any,helper: HelperHostSet}) => boolean;
+  /**
+   * Optional loading content to display while an async method is executing.
+   */
+  // loading?: (helper: HelperHostSet) => any;
+}
+
+export interface ApplySlotMetadata {
+  propertyKey: string | symbol;
+  id: string;
+  type: 'method' | 'property';
+  options: ApplySlotOptions;
+}
+
+export const APPLY_SLOT_METADATA_KEY = Symbol.for('simple-web-component:apply-slot');
+
+// const normalizeNodes = (res: any, doc: Document): Node[] => {
+//   const items = Array.isArray(res) ? res : [res];
+//   return items.map(it => {
+//     if (it instanceof Node) return it;
+//     return doc.createTextNode(it !== undefined && it !== null ? String(it) : '');
+//   });
+// };
+
+// const applyToDom = (targetEl: any, res: any, pos: ApplyNodePosition, win: Window) => {
+//     if (!targetEl) return;
+//
+//     const doc = win.document;
+//
+//     if (pos === 'innerHtml') {
+//         targetEl.innerHTML = res !== undefined && res !== null ? String(res) : '';
+//         return;
+//     }
+//
+//     if (pos === 'innerText') {
+//         if (targetEl.innerText !== undefined) {
+//             targetEl.innerText = res !== undefined && res !== null ? String(res) : '';
+//         }
+//         return;
+//     }
+//
+//     const isShadowRoot = targetEl instanceof win.ShadowRoot;
+//     const nodes = normalizeNodes(res, doc);
+//     if (pos === 'replace') {
+//       if (!isShadowRoot) targetEl.replaceWith(...nodes);
+//     } else if (pos === 'replaceChildren') {
+//       targetEl.replaceChildren(...nodes);
+//     } else {
+//       if (pos === 'beforeEnd') targetEl.append(...nodes);
+//       else if (pos === 'afterBegin') targetEl.prepend(...nodes);
+//       else if (pos === 'beforeBegin' && !isShadowRoot) targetEl.before(...nodes);
+//       else if (pos === 'afterEnd' && !isShadowRoot) targetEl.after(...nodes);
+//     }
+// };
+
+/**
+ * @applyNode decorator to surgically add/replace nodes to a target element.
+ */
+export function applySlot(id: string, options: ApplySlotOptions = { position: 'replaceChildrenHtml' }): MethodDecorator & PropertyDecorator {
+  return (targetObj: Object, propertyKey: string | symbol, descriptor?: PropertyDescriptor) => {
+    const type = descriptor === undefined ? 'property' : 'method';
+
+    if (type === 'property') {
+            Object.defineProperty(targetObj, propertyKey, {
+              get(this: any) {
+                const nodeSlot = new NodeSlot(this, `${this._swcId}-${id}`);
+                return nodeSlot;
+              },
+              set(this: any, nv: any) {
+                if(nv) {
+                  // 있을때 아무일도안함
+                } else {
+                  const nodeSlot = new NodeSlot(this, `${this._swcId}-${id}`);
+                  nodeSlot.clear();
+                }
+              },
+              configurable: true,
+              enumerable: true,
+            })
+     // return nodeSlot;
+     //  return;
+    }
+
+    const constructor = targetObj.constructor;
+    let metaList = ReflectUtils.getOwnMetadata(APPLY_SLOT_METADATA_KEY, constructor) as ApplySlotMetadata[];
+    if (!metaList) {
+      metaList = []
+      ReflectUtils.defineMetadata(APPLY_SLOT_METADATA_KEY, metaList, constructor);
+    }
+    metaList.push({ propertyKey, id, type, options });
+
+
+
+    if (type === 'method') {
+      const original = descriptor.value;
+      descriptor.value = function (...args: any[]) {
+        ensureInit(this);
+
+        const conf = getElementConfig(this);
+        const currentWin = (this as any)._resolveWindow?.(conf) || ((typeof window !== 'undefined' ? window : undefined) as Window);
+        const currentDoc = currentWin.document;
+        const hostSet = SwcUtils.getHelperAndHostSet(currentWin, this);
+        let res = original.apply(this, args);
+        if (res) {
+          // res = SwcUtils.projectProcessHtml(this, res)
+          const nodeSlot = new NodeSlot(this, this._swcId);
+          const pos = options.position || 'replaceChildrenHtml';
+          const doc = currentWin.document;
+          if (pos === 'replaceChildrenHtml') {
+            nodeSlot.replaceChildrenHtml(id, res);
+          } else if (pos === 'replaceChildrenText') {
+            nodeSlot.replaceChildrenText(id, res);
+          } else if (pos === 'appendHtml') {
+            nodeSlot.appendHtml(id, res);
+          } else if (pos === 'appendText') {
+            nodeSlot.appendText(id, res);
+          } else if (pos === 'prependHtml') {
+            nodeSlot.prependHtml(id, res);
+          } else if (pos === 'prependText') {
+            nodeSlot.prependText(id, res);
+          } else if (pos === 'clear') {
+            nodeSlot.clear(id);
+          }
+
+          // const stateContext: any = {...hostSet};
+          // getStateMetadata(this).forEach(it => {
+          //   stateContext[it.name] = this[it.propertyKey]
+          // })
+          // new ElementApply(this, {id: this._swcId}).apply({target:'noInitialized', context: stateContext, bind: this});
+        }
+        return res;
+      };
+    }
+  };
+}
+
+// export const findAllApplySlotMetadata = (target: any): Map<string | symbol, ApplySlotMetadata> => {
+export const findAllApplySlotMetadata = (target: any): ApplySlotMetadata[] => {
+  const constructor = target instanceof Function ? target : target.constructor;
+  return ReflectUtils.getMetadata(APPLY_SLOT_METADATA_KEY, constructor);
+};
+
+export function applySlotClear(id: string): MethodDecorator {
+  return applySlot(id, { position: 'clear' });
+}
+export function applySlotPrependHtml(id: string): MethodDecorator {
+  return applySlot(id, { position: 'prependHtml' });
+}
+export const applySlotPrepend = applySlotPrependHtml;
+export function applySlotPrependText(id: string): MethodDecorator {
+  return applySlot(id, { position: 'prependText' });
+}
+export function applySlotAppendHtml(id: string): MethodDecorator {
+  return applySlot(id, { position: 'appendHtml' });
+}
+export function applySlotAppendText(id: string): MethodDecorator {
+  return applySlot(id, { position: 'appendText' });
+}
+export const applySlotAppend = applySlotAppendHtml;
+export function applySlotReplaceChildrenHtml(id: string): MethodDecorator {
+  return applySlot(id, { position: 'replaceChildrenHtml' });
+}
+export const applySlotReplaceChildren = applySlotReplaceChildrenHtml;
+export function applySlotReplaceChildrenText(id: string): MethodDecorator {
+  return applySlot(id, { position: 'replaceChildrenText' });
+}

package/src/decorators/applyStyle.ts

@@ -1,7 +1,7 @@
-import { ReflectUtils } from '@dooboostore/core';
-import { ensureInit } from './elementDefine';
-import { SwcUtils } from '../utils/Utils';
-import { SwcQueryOptions, HelperHostSet } from '../types';
+import {ReflectUtils} from '@dooboostore/core';
+import {ensureInit} from './elementDefine';
+import {SwcUtils} from '../utils/Utils';
+import { SpecialSelector, SwcQueryOptions, HelperHostSet } from '../types';
 
 export type StyleAction = 'set' | 'update' | 'remove';
 

package/src/decorators/attribute.ts

@@ -1,7 +1,7 @@
 import { ReflectUtils, FunctionUtils, ActionExpression } from '@dooboostore/core';
 import { ensureInit, getElementConfig } from './elementDefine';
 import { SwcUtils } from '../utils/Utils';
-import { SpecialSelector, SwcQueryOptions } from '../types';
+import { SpecialSelector, SwcQueryOptions, HelperHostSet } from '../types';
 import { ConvertUtils } from '@dooboostore/core-web';
 export interface AttributeFieldOptions extends SwcQueryOptions {
   name?: string;

package/src/decorators/elementDefine.ts

@@ -1,17 +1,20 @@
-import {ReflectUtils, FunctionUtils, ActionExpression} from '@dooboostore/core';
+import {ActionExpression, FunctionUtils, ReflectUtils} 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 {findAllLifecycleMetadata, findAllOnConnectedAfterMetadata, findAllOnConnectedBeforeMetadata, findAllOnConnectedMetadata, ON_AFTER_ADOPTED_METADATA_KEY, ON_AFTER_DISCONNECTED_METADATA_KEY, ON_BEFORE_ADOPTED_METADATA_KEY, ON_BEFORE_DISCONNECTED_METADATA_KEY, ON_CONNECTED_COMPLETED_METADATA_KEY, ON_INITIALIZE_METADATA_KEY} from './lifecycles';
 import {getEmitCustomEventMetadataList} from './emitCustomEvent';
-import {findAllAttributeChangedMetadata, convertAttributeValue} from './changedAttributeThis';
+import {convertAttributeValue, findAllAttributeChangedMetadata} 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 {DOM_EVENT_NAMES, HTML_TAG_ENTRIES} 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';
+import {HelperHostSet, HostSet, InjectSituationType} from '../types';
+import {ConvertUtils, ElementApply, NodeSlot} from '@dooboostore/core-web';
+import {isSSR} from "../elements/SwcAppMixin";
+import {findAllApplySlotMetadata} from "./applySlot";
+import {findAllStateMetadata} from "./state";
 
 // --- Core Interfaces & Types ---
 
@@ -35,13 +38,12 @@ export const getElementConfig = (target: any): ElementMetadata | undefined => {
   return ReflectUtils.getMetadata(ELEMENT_CONFIG_KEY, constructor);
 };
 
-export const ensureInit = (inst: any) => {
+export const ensureInit = (inst: any) => { // HTMLElement
   if (!inst.__swc_initialized) {
-    inst._swcId = Math.random().toString(36).substring(2, 11);
+    inst._swcId = inst?.getAttribute?.('swc-use-ssr') ?? 's' + Math.random().toString(36).substring(2, 11).toLowerCase();
     inst._emitHandlers = new Map();
     inst._boundListeners = [];
     inst.__swc_initialized = true;
-
     // const attributeList = findAllQ(inst);
     // attributeList.forEach(meta => {
     //   delete (inst as any)[meta.propertyKey];
@@ -52,7 +54,7 @@ export const ensureInit = (inst: any) => {
     // ╔════════════════════════════════════════════════════════════════════════════════╗
     // ║ decorator 필드의 own property 삭제                                              ║
     // ║                                                                                ║
-    // ║ 이유:                                                                          ║
+    // ║ 이유: own property가 있으면 prototype의 getter/setter는 절대 안 탄다                  ║
     // ║ 1. TypeScript는 초기값이 있는 필드를 constructor에서 own property로 생성       ║
     // ║    @attributeThis('id') myId: string = "default"  →  this.myId = "default"    ║
     // ║                                                                                ║
@@ -71,7 +73,11 @@ export const ensureInit = (inst: any) => {
     // @attribute 필드의 own property 삭제 → getter/setter 작동
     const attributeList = findAllAttributeMetadata(target);
     attributeList.forEach(meta => {
+      const initUserData = (inst as any)[meta.propertyKey];
       delete (inst as any)[meta.propertyKey];
+      // undefined 이면은 외부 attribute string html을 리스팩한다
+      if (initUserData !== undefined)
+      (inst as any)[meta.propertyKey] = initUserData;
     });
 
     // @query 필드의 own property 삭제 → getter 작동
@@ -89,6 +95,20 @@ export const ensureInit = (inst: any) => {
         delete (inst as any)[meta.propertyKey];
       });
     }
+    const slotAllList = findAllApplySlotMetadata(target);
+    if (slotAllList) {
+      slotAllList.filter(it => it.type === 'property').forEach(meta => {
+        delete (inst as any)[meta.propertyKey];
+      });
+    }
+    const stateAllList = findAllStateMetadata(target);
+    if (stateAllList) {
+      stateAllList.forEach(meta => {
+        const initUserData = (inst as any)[meta.propertyKey];
+        delete (inst as any)[meta.propertyKey];
+        (inst as any)[meta.propertyKey] = initUserData;
+      });
+    }
 
     // Call constructor script if present
     const hostSet = SwcUtils.getHostSet(inst);
@@ -103,9 +123,11 @@ export const ensureInit = (inst: any) => {
   }
 };
 
+
+// 훔 이게맞나?? global로 관리하는게..훔... 왜이렇게 했을까..
 // --- Global Event Handling ---
 const globalDelegatedRoots = new WeakSet<Node>();
-
+// 여기에서 중복 호출안되게 잘막아준다 ..
 const handleGlobalSwcEvent = async (event: Event) => {
   if ((event as any).__swc_handled) return;
   const path = event.composedPath();
@@ -143,10 +165,32 @@ const getHandlers = (inst: any) => {
   return inst.__swc_attributeEventHandlers;
 };
 
-const setupPrototype = (proto: any) => {
+const setupPrototype = (proto: any, win: Window) => {
   if (proto.__swc_proto_setup) return;
   proto.__swc_proto_setup = true;
 
+
+  proto.createSlotString = function (id: string) {
+    return NodeSlot.slot(`${this._swcId}-${id}`);
+  }
+  proto.createEaHtml = function (id: string, script: string) {
+    return ElementApply.html(id, script);
+  }
+  proto.createEaText = function (id: string, script: string) {
+    return ElementApply.text(id, script);
+  }
+  proto.createEaAttribute = function (id: string, name: string, script: string) {
+    return ElementApply.attribute(id, name, script);
+  }
+  proto.createEaEvent = function (id: string, name: string, script: string) {
+    return ElementApply.event(id, name, script);
+  }
+  proto.createEaProperty = function (id: string, name: string, script: string) {
+    return ElementApply.property(id, name, script);
+  }
+
+  // swc-id-asdasdasdasd-click="  :value=""    {: value fsdfsdafsad :}       {html: aaa :}   {text: asdas :}
+
   proto._executeSwcScript = function (attrName: string, hostSet: HostSet, extraArgs: Record<string, any> = {}) {
     ensureInit(this);
     const script = this.getAttribute(attrName);
@@ -177,7 +221,7 @@ const setupPrototype = (proto: any) => {
   proto._invokeLifecycleMethod = function (methodName: string | symbol, hostSet?: HostSet, extraArgs: any[] = []) {
     ensureInit(this);
     if (typeof (this as any)[methodName] !== 'function') return;
-    const useHostSet = hostSet ?? SwcUtils.getHostSet(this);
+    const useHostSet = hostSet ?? SwcUtils.getHelperAndHostSet(win, this);
     const app = useHostSet?.$appHost?.simpleApplication;
     // console.log('---->hh',app, this, methodName);
     if (app) {
@@ -301,10 +345,10 @@ export const elementDefine =
       // 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 connectedInnerHtmlList = getOnConnectedInnerHtmlMetadata(constructor) || [];
 
       const proto = constructor.prototype;
-      setupPrototype(proto);
+      setupPrototype(proto, win);
 
       // 값을 기대하지않는다.
       let helperHostSet: HelperHostSet | null = null;
@@ -314,82 +358,93 @@ export const elementDefine =
         // connected 됐을시 최신화
         helperHostSet = SwcUtils.getHelperAndHostSet(win, this as any);
         const appHost = helperHostSet.$appHost;
+        const useSsr = isSSR(this);
+        // console.log('isSsr', useSsr, this);
+        // console.log('----helperHostSet--->', this, helperHostSet, useSsr)
+        // let connectedApp: SwcAppInterface |undefined;
         try {
           if (appHost && typeof (appHost as any)._connected === 'function') {
-           await (appHost as any)._connected(this);
+            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);
+            (appHost as any)._connected_safari_and_standby ??= [];
+            (appHost as any)._connected_safari_and_standby.push(this);
           }
 
           // const hostSet = SwcUtils.getHostSet(this as any);
           const conf = getElementConfig(this);
           const currentWin = (this as any)._resolveWindow(conf);
 
-          const shadowMode = conf?.useShadow || connectedInnerHtmlList.find(it => it.options.useShadow)?.options.useShadow;
+          const bMethods = findAllOnConnectedBeforeMetadata(this).filter(it => useSsr ? !it.options.ssrFirst : true);
+          // console.log('beforeConnected', bMethods)
+          if (bMethods) {
+            for (const m of bMethods) await (this as any)._invokeLifecycleMethod(m.propertyKey, helperHostSet);
+          }
+          (this as any)._executeSwcScript('swc-on-before-connected', helperHostSet);
+
+          // console.log('vvvvvvvvvvvvvvvu-seSsr-vvvvvvvvvv>', useSsr, this.tagName, this.getAttribute('seq'))
+          //   // ssr 처리라서 이미 내려준거그대로 상요하면된다 따라서 호출안한다
+          const targetConnectedList = findAllOnConnectedMetadata(constructor).filter(it => useSsr ? !it.options.ssrFirst : true);
+          const shadowMode = conf?.useShadow || targetConnectedList.find(it => it.options.useShadow)?.options.useShadow;
+          // console.log('--------->', this.tagName, shadowMode && !this.shadowRoot)
           if (shadowMode && !this.shadowRoot) {
             const mode = shadowMode === true ? 'open' : shadowMode;
-            this.attachShadow({mode: mode as ShadowRootMode});
+            console.log('tagName=', this.tagName, 'mode', mode, this.shadowRoot);
+            // if (this.tagName!=='INDEX-ROUTER') {
+              this.attachShadow({mode: mode as ShadowRootMode});
+            // }
           }
 
-          const bMethods = findAllLifecycleMetadata(this, ON_BEFORE_CONNECTED_METADATA_KEY);
-          if (bMethods) {
-            for (const m of bMethods) await (this as any)._invokeLifecycleMethod(m, helperHostSet);
-          }
-          (this as any)._executeSwcScript('swc-on-before-connected', helperHostSet);
+          const stateContext: any = {...helperHostSet};
+          findAllStateMetadata(this).forEach(it => {
+            stateContext[it.name] = this[it.propertyKey]
+          })
+
+          const shadowChildren: Node[] = [];
+          const lightChildren: Node[] = [];
 
-          if (connectedInnerHtmlList.length > 0) {
-            let sContent = '',
-              lContent = '';
-            for (const meta of connectedInnerHtmlList) {
+          console.log('targetConnectList', this.tagName, targetConnectedList.length)
+          if (targetConnectedList.length > 0) {
+            // let sContent = '',
+            //   lContent = '';
+            for (const meta of targetConnectedList) {
               // 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 || '}%}'
-                  }
-                }
-              });
+              // res = SwcUtils.projectProcessHtml(this, res);
+              if (typeof res === 'string') {
+                const htmlTemplateElement = doc.createElement('template');
+                htmlTemplateElement.innerHTML = res;//SwcUtils.projectProcessHtml(this._swcId, res, doc);
+                res = htmlTemplateElement.content;
+              }
 
-              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);
+              if (res) {
+                const nodes = Array.isArray(res) ? res : [res];
+                if (meta.options.useShadow || conf?.useShadow) {
+                  shadowChildren.push(...nodes);
+                }else {
+                  lightChildren.push(...nodes);
                 }
-              });
-              res = actionExpression.getUnprocessedTemplate();
-
-              if (res !== undefined) {
-                if (meta.options.useShadow || conf?.useShadow) sContent += res;
-                else lContent += res;
               }
             }
             try {
               if (this.shadowRoot) {
-                this.shadowRoot.innerHTML = sContent;
+                const applyShadowChildren = SwcUtils.projectProcessHtml(this._swcId, shadowChildren, doc);
+                this.shadowRoot.replaceChildren(...applyShadowChildren)
               }
-              if (lContent) {
-                this.innerHTML = lContent;
+              if (lightChildren.length) {
+                const applyLightChildren = SwcUtils.projectProcessHtml(this._swcId, lightChildren, doc);
+                this.replaceChildren(...applyLightChildren)
               }
+
             } catch (e) {
               console.error('[ElementDefine] innerHTML setting error:', e);
             }
+            new ElementApply(this, {id: this._swcId}).apply({context: stateContext, bind: this});
+          } else {
+            new ElementApply(this, {id: this._swcId}).apply({exclude: {html: true, text: true, attribute: true}, context: stateContext, bind: this});
           }
 
-          const root = this.getRootNode();
+          // global delegate event
+          const root = this.getRootNode()
           if (!globalDelegatedRoots.has(root)) {
             DOM_EVENT_NAMES.forEach(type => {
               root.addEventListener(type, handleGlobalSwcEvent);
@@ -397,6 +452,7 @@ export const elementDefine =
             globalDelegatedRoots.add(root);
           }
 
+
           // Separate delegate and non-delegate listeners
           const delegateListeners: typeof addEventListenerList = [];
           const nonDelegateListeners: typeof addEventListenerList = [];
@@ -526,17 +582,18 @@ export const elementDefine =
                 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});
-              }
+              (this as any)._boundListeners.push({target: t, type, handler, options: opts});
             });
           });
 
           if (originalConnected) await (originalConnected.apply(this));
 
-          const aMethods = findAllLifecycleMetadata(this, ON_AFTER_CONNECTED_METADATA_KEY);
+          const aMethods = findAllOnConnectedAfterMetadata(this).filter(it => {
+            return useSsr ? !it.options.ssrFirst : true;
+          });
+          // console.log('afterConnected', this.tagName, aMethods,  getOnConnectedAfterMetadata(this))
           if (aMethods) {
-            for (const m of aMethods) await (this as any)._invokeLifecycleMethod(m, helperHostSet);
+            for (const m of aMethods) await (this as any)._invokeLifecycleMethod(m.propertyKey, helperHostSet);
           }
           (this as any)._executeSwcScript('swc-on-connected', helperHostSet);
           (this as any)._executeSwcScript('swc-on-after-connected', helperHostSet);
@@ -554,6 +611,9 @@ export const elementDefine =
             }
           }
         } finally {
+          for (let mPropertyKey of findAllLifecycleMetadata(this, ON_CONNECTED_COMPLETED_METADATA_KEY)) {
+            await (this as any)._invokeLifecycleMethod(mPropertyKey, helperHostSet);
+          }
           if (appHost && typeof (appHost as any)._connectedDone === 'function') {
             await (appHost as any)._connectedDone(this);
           }
@@ -564,7 +624,7 @@ export const elementDefine =
       proto.disconnectedCallback = function () {
         // const helperHostSet = SwcUtils.getHelperAndHostSet(win, this as any);
         // Remove from appHost LAST when disconnected
-        console.log('disconnnnnnnnnnnnnnnnnnn', helperHostSet, this)
+        // console.log('disconnnnnnnnnnnnnnnnnnn', helperHostSet, this)
         const appHost = helperHostSet.$appHost;
         if (appHost && typeof (appHost as any)._disconnected === 'function') {
           (appHost as any)._disconnected(this);
@@ -581,6 +641,20 @@ export const elementDefine =
           (this as any)._boundListeners = [];
         }
 
+        new ElementApply(this, {id: this._swcId}).removeAllEventListener();
+
+        // globalDelegatedRoots remove
+        // const roots = [this, this.getRootNode()];
+        // if (this.shadowRoot) {
+        //   roots.push(this.shadowRoot);
+        // }
+        // roots.forEach(root => {
+        //     DOM_EVENT_NAMES.forEach(type => {
+        //       root.removeEventListener(type, handleGlobalSwcEvent);
+        //     });
+        //   }
+        // )
+
         if (originalDisconnected) originalDisconnected.apply(this);
 
         const aMethods = findAllLifecycleMetadata(this, ON_AFTER_DISCONNECTED_METADATA_KEY);

package/src/decorators/emitCustomEvent.ts

@@ -1,5 +1,5 @@
 import {ReflectUtils} from '@dooboostore/core';
-import {SpecialSelector, SwcQueryOptions, HelperHostSet} from '../types';
+import { SpecialSelector, SwcQueryOptions, HelperHostSet } from '../types';
 import {ensureInit, getElementConfig} from './elementDefine';
 import {SwcUtils} from '../utils/Utils';
 

package/src/decorators/index.ts

@@ -14,3 +14,6 @@ export * from './setProperty';
 export * from './subscribeSwcAppRouteChangeWhileConnected';
 export * from './subscribeSwcAppMessageWhileConnected';
 export * from './publishSwcAppMessage';
+export * from './applySlot';
+export * from './state';
+