@dooboostore/simple-web-component 1.0.37 → 1.0.39

package/src/decorators/applySlot.ts

@@ -1,8 +1,8 @@
-import { ReflectUtils } from '@dooboostore/core';
-import { ensureInit, getElementConfig } from './elementDefine';
-import { HelperHostSet, SwcRootType } from '../types';
-import { SwcUtils } from "../utils/Utils";
+import {OptionalType, ReflectUtils} from '@dooboostore/core';
+import {ensureInit, getElementConfig} from './elementDefine';
+import {SwcUtils} from "../utils/Utils";
 import {NodeSlot} from "@dooboostore/core-web";
+import {HelperHostSet} from "../types";
 /*
 <!-- beforebegin -->
 <p> <-- it's me
@@ -12,10 +12,11 @@ import {NodeSlot} from "@dooboostore/core-web";
 </p>
 <!-- afterend -->
  */
-export type ApplySlotPosition = 'prependHtml' | 'prependText' | 'appendHtml' | 'appendText' | 'replaceChildrenHtml' | 'replaceChildrenText' | 'clear';
+export type ApplySlotPosition = 'prepend' | 'prependHtml' | 'prependText' | 'append' | 'appendHtml' | 'appendText' | 'replaceChildren' | 'replaceChildrenHtml' | 'replaceChildrenText' | 'clear';
 
 export interface ApplySlotOptions {
-  position?: ApplySlotPosition;
+  position: ApplySlotPosition;
+  fallback?: (helper: HelperHostSet) => string | Node;
   // root?: SwcRootType;
   /**
    * Filter function to determine whether to perform DOM operation.
@@ -30,8 +31,8 @@ export interface ApplySlotOptions {
 
 export interface ApplySlotMetadata {
   propertyKey: string | symbol;
-  id: string;
-  type: 'method' | 'property';
+  targetId: string;
+  // type: 'method' | 'property';
   options: ApplySlotOptions;
 }
 
@@ -76,25 +77,27 @@ export const APPLY_SLOT_METADATA_KEY = Symbol.for('simple-web-component:apply-sl
 //     }
 // };
 
+const applyToDom = (swcId: string, id: string, pos: ApplySlotPosition, nodes: Node[]) => {
+  const nodeSlot = new NodeSlot(this, swcId);
+  if (pos === 'replaceChildrenText' || pos === 'replaceChildren' || pos === 'replaceChildrenHtml') {
+    nodeSlot.replaceChildren(id, ...nodes);
+  } else if (pos === 'appendHtml' || pos === 'append' || pos === 'appendText') {
+    nodeSlot.append(id, ...nodes);
+  } else if (pos === 'prependHtml' || pos === 'prepend' || pos === 'prependText') {
+    nodeSlot.prepend(id, ...nodes);
+  } else if (pos === 'clear') {
+    nodeSlot.clear(id);
+  }
+}
 /**
  * @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;
-              },
-              configurable: true,
-              enumerable: true,
-            })
-     // return nodeSlot;
-     //  return;
-    }
+export function applySlot(targetId: string, opt: OptionalType<ApplySlotOptions, 'position'>): MethodDecorator {
+  return (targetObj: Object, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<any>) => {
+
+
+    const options: ApplySlotOptions = {position: 'replaceChildrenHtml', ...opt};
+
 
     const constructor = targetObj.constructor;
     let metaList = ReflectUtils.getOwnMetadata(APPLY_SLOT_METADATA_KEY, constructor) as ApplySlotMetadata[];
@@ -102,97 +105,56 @@ export function applySlot(id: string, options: ApplySlotOptions = { position: 'r
       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);
-
-
-        // const getTarget = () => {
-        //   const r = options.root || 'auto';
-        //   const applyRoot = (t: any) => {
-        //     if (!t) return t;
-        //     if (r === 'auto') return t.shadowRoot || t;
-        //     if (r === 'shadow') return t.shadowRoot;
-        //     if (r === 'light') return t;
-        //     if (r === 'all') return t.shadowRoot || t;
-        //     return t;
-        //   };
-        //
-        //   if (selector === '$this') return applyRoot(this);
-        //   if (selector === '$host') return applyRoot(hostSet.$host);
-        //   if (selector === '$parentHost') return applyRoot(hostSet.$parentHost);
-        //   if (selector === '$appHost') return applyRoot(hostSet.$appHost);
-        //   if (selector === '$firstHost') return applyRoot(hostSet.$firstHost);
-        //   if (selector === '$lastHost') return applyRoot(hostSet.$lastHost);
-        //
-        //   const targetRoot = applyRoot(this);
-        //   return targetRoot ? targetRoot.querySelector(selector) : null;
-        // };
-
-        // const targetEl = getTarget();
-        const res = original.apply(this, args);
-
-        // const runApply = (target: any, val: any) => {
-        //   const pos = options.position || 'beforeEnd';
-        //
-        //   // 사용자가 filter를 명시하면 그 조건으로, 아니면 항상 적용
-        //   if (!options.filter || options.filter(target, val, {currentThis: this, helper: hostSet})) {
-        //       applyToDom(target, val, pos, currentWin);
-        //   }
-        // };
-
-        // if (res instanceof Promise) {
-        //     // 비동기일 때만 로딩 표시
-        //     if (targetEl && options.loading) {
-        //         const loadingRes = options.loading.call(this, hostSet);
-        //         applyToDom(targetEl, loadingRes, options.position || 'beforeEnd', currentDoc);
-        //     }
-        //
-        //     return res.then(finalRes => {
-        //         if (finalRes !== undefined && targetEl) runApply(targetEl, finalRes);
-        //         return finalRes;
-        //     });
-        // } else {
-        //     if (res !== undefined && targetEl) runApply(targetEl, res);
-        //     return res;
-        // }
-        if (res) {
-          const nodeSlot = new NodeSlot(this, `${this._swcId}-${id}`);
-          const pos = options.position || 'replaceChildrenHtml';
-          const doc = currentWin.document;
-
-
-          // const isShadowRoot = targetEl instanceof win.ShadowRoot;
-          // const nodes = normalizeNodes(res, doc);
-          if (pos === 'replaceChildrenHtml') {
-            nodeSlot.replaceChildrenHtml(res);
-          } else if (pos === 'replaceChildrenText') {
-            nodeSlot.replaceChildrenText(res);
-          } else if (pos === 'appendHtml') {
-            nodeSlot.appendHtml(res);
-          } else if (pos === 'appendText') {
-            nodeSlot.appendText(res);
-          } else if (pos === 'prependHtml') {
-            nodeSlot.prependHtml(res);
-          } else if (pos === 'prependText') {
-            nodeSlot.prependText(res);
-          } else if (pos === 'clear') {
-            nodeSlot.clear();
-          }
+    metaList.push({propertyKey, targetId, options});
+
+
+    const original = descriptor.value;
+    descriptor.value = function (...args: any[]) {
+      ensureInit(this);
+
+      const conf = getElementConfig(this);
+      const currentWin = conf.window;
+      const swcId = this._swcId;
+      const currentDoc = currentWin.document;
+      const hostSet = SwcUtils.getHelperAndHostSet(currentWin, this);
+      const pos = options.position;
+
+      const resToNodes = (res: string | Node) => {
+        const nodes: Node[] = [];
+
+        if (typeof res === 'string' && (pos === 'replaceChildrenHtml' || pos === 'appendHtml' || pos === 'prependHtml')) {
+          const t = currentWin.document.createElement('template');
+          t.innerHTML = res;
+          nodes.push(...Array.from(t.content.childNodes));
+        } else if (typeof res === 'string' && (pos === 'replaceChildrenText' || pos === 'prependText' || pos === 'appendText')) {
+          nodes.push(currentWin.document.createTextNode(res));
+        } else if (typeof res === 'object') {
+          nodes.push(res);
         }
-        return res;
-      };
-    }
+        SwcUtils.projectProcessHtml(swcId, nodes, currentDoc);
+        return nodes;
+      }
+
+      const fallbackNodes: Node[] = [];
+      if (options.fallback) {
+        const res: string | Node = options.fallback.call(this, hostSet);
+        const nodes: Node[] = resToNodes(res);
+        fallbackNodes.push(...nodes);
+        applyToDom(swcId, targetId, options.position, nodes);
+      }
+
+      let res = original.apply(this, args);
+      if (res instanceof Promise) {
+        return res.then(asyncRes => {
+          const nodes = resToNodes(asyncRes)
+          fallbackNodes.forEach((it: any)=>it.remove());
+          applyToDom(swcId, targetId, options.position, nodes);
+        })
+      } else {
+        const nodes: Node[] = resToNodes(res);
+        applyToDom(swcId, targetId, options.position, nodes);
+      }
+    };
   };
 }
 
@@ -202,27 +164,36 @@ export const findAllApplySlotMetadata = (target: any): ApplySlotMetadata[] => {
   return ReflectUtils.getMetadata(APPLY_SLOT_METADATA_KEY, constructor);
 };
 
-export function applySlotClear(id: string): MethodDecorator {
-  return applySlot(id, { position: 'clear' });
+export function applySlotClear(targetId: string): MethodDecorator {
+  return applySlot(targetId, {position: 'clear'});
 }
-export function applySlotPrependHtml(id: string): MethodDecorator {
-  return applySlot(id, { position: 'prependHtml' });
+
+export function applySlotPrependHtml(targetId: string): MethodDecorator {
+  return applySlot(targetId, {position: 'prependHtml'});
 }
+
 export const applySlotPrepend = applySlotPrependHtml;
-export function applySlotPrependText(id: string): MethodDecorator {
-  return applySlot(id, { position: 'prependText' });
+
+export function applySlotPrependText(targetId: string): MethodDecorator {
+  return applySlot(targetId, {position: 'prependText'});
 }
-export function applySlotAppendHtml(id: string): MethodDecorator {
-  return applySlot(id, { position: 'appendHtml' });
+
+export function applySlotAppendHtml(targetId: string): MethodDecorator {
+  return applySlot(targetId, {position: 'appendHtml'});
 }
-export function applySlotAppendText(id: string): MethodDecorator {
-  return applySlot(id, { position: 'appendText' });
+
+export function applySlotAppendText(targetId: string): MethodDecorator {
+  return applySlot(targetId, {position: 'appendText'});
 }
+
 export const applySlotAppend = applySlotAppendHtml;
-export function applySlotReplaceChildrenHtml(id: string): MethodDecorator {
-  return applySlot(id, { position: 'replaceChildrenHtml' });
+
+export function applySlotReplaceChildrenHtml(targetId: string): MethodDecorator {
+  return applySlot(targetId, {position: 'replaceChildrenHtml'});
 }
+
 export const applySlotReplaceChildren = applySlotReplaceChildrenHtml;
-export function applySlotReplaceChildrenText(id: string): MethodDecorator {
-  return applySlot(id, { position: 'replaceChildrenText' });
+
+export function applySlotReplaceChildrenText(targetId: string): MethodDecorator {
+  return applySlot(targetId, {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,19 +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, getOnConnectedBeforeMetadata, getOnConnectedAfterMetadata, ON_CONNECTED_COMPLETED_METADATA_KEY} 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, SwcAppInterface} from '../types';
-import {ConvertUtils, NodeSlot} from '@dooboostore/core-web';
-import {isSSR} from "../elements/SwcApp";
+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 ---
 
@@ -39,11 +40,10 @@ export const getElementConfig = (target: any): ElementMetadata | undefined => {
 
 export const ensureInit = (inst: any) => { // HTMLElement
   if (!inst.__swc_initialized) {
-    inst._swcId = inst?.getAttribute?.('swc-use-ssr') ?? 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];
@@ -54,7 +54,7 @@ export const ensureInit = (inst: any) => { // HTMLElement
     // ╔════════════════════════════════════════════════════════════════════════════════╗
     // ║ decorator 필드의 own property 삭제                                              ║
     // ║                                                                                ║
-    // ║ 이유:                                                                          ║
+    // ║ 이유: own property가 있으면 prototype의 getter/setter는 절대 안 탄다                  ║
     // ║ 1. TypeScript는 초기값이 있는 필드를 constructor에서 own property로 생성       ║
     // ║    @attributeThis('id') myId: string = "default"  →  this.myId = "default"    ║
     // ║                                                                                ║
@@ -73,7 +73,11 @@ export const ensureInit = (inst: any) => { // HTMLElement
     // @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 작동
@@ -91,10 +95,18 @@ export const ensureInit = (inst: any) => { // HTMLElement
         delete (inst as any)[meta.propertyKey];
       });
     }
-    const slotAllList = findAllApplySlotMetadata(target);
-    if (slotAllList) {
-      slotAllList.filter(it=>it.type === 'property').forEach(meta => {
+    // 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;
       });
     }
 
@@ -111,9 +123,11 @@ export const ensureInit = (inst: any) => { // HTMLElement
   }
 };
 
+
+// 훔 이게맞나?? 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();
@@ -155,6 +169,28 @@ 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);
@@ -338,7 +374,7 @@ export const elementDefine =
           const conf = getElementConfig(this);
           const currentWin = (this as any)._resolveWindow(conf);
 
-          const bMethods = getOnConnectedBeforeMetadata(this).filter(it => useSsr ? !it.options.ssrFirst : true);
+          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);
@@ -347,65 +383,68 @@ export const elementDefine =
 
           // console.log('vvvvvvvvvvvvvvvu-seSsr-vvvvvvvvvv>', useSsr, this.tagName, this.getAttribute('seq'))
           //   // ssr 처리라서 이미 내려준거그대로 상요하면된다 따라서 호출안한다
-          const targetConnectedInnerHtmlList = getOnConnectedInnerHtmlMetadata(constructor).filter(it => useSsr ? !it.options.ssrFirst : true);
-          const shadowMode = conf?.useShadow || targetConnectedInnerHtmlList.find(it => it.options.useShadow)?.options.useShadow;
+          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});
+            // }
           }
 
-          if (targetConnectedInnerHtmlList.length > 0) {
-            let sContent = '',
-              lContent = '';
-            for (const meta of targetConnectedInnerHtmlList) {
+          const stateContext: any = {...helperHostSet};
+          findAllStateMetadata(this).forEach(it => {
+            stateContext[it.name] = this[it.propertyKey]
+          })
+
+          const shadowChildren: Node[] = [];
+          const lightChildren: Node[] = [];
+
+          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 || ']]'
-                  }
-                }
-              });
-
-              actionExpression.getExpressions().filter(it => it.type === 'replace').forEach(it => {
-                actionExpression.replace(it, NodeSlot.slot(`${this._swcId}-${it.script}`));
-                // 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();
+              // 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;
+              }
 
-              if (res !== undefined) {
-                if (meta.options.useShadow || conf?.useShadow) sContent += res;
-                else lContent += res;
+              if (res) {
+                const nodes = Array.isArray(res) ? res : [res];
+                if (meta.options.useShadow || conf?.useShadow) {
+                  shadowChildren.push(...nodes);
+                }else {
+                  lightChildren.push(...nodes);
+                }
               }
             }
             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);
@@ -413,6 +452,7 @@ export const elementDefine =
             globalDelegatedRoots.add(root);
           }
 
+
           // Separate delegate and non-delegate listeners
           const delegateListeners: typeof addEventListenerList = [];
           const nonDelegateListeners: typeof addEventListenerList = [];
@@ -542,15 +582,13 @@ 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 = getOnConnectedAfterMetadata(this).filter(it => {
+          const aMethods = findAllOnConnectedAfterMetadata(this).filter(it => {
             return useSsr ? !it.options.ssrFirst : true;
           });
           // console.log('afterConnected', this.tagName, aMethods,  getOnConnectedAfterMetadata(this))
@@ -603,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

@@ -15,3 +15,5 @@ export * from './subscribeSwcAppRouteChangeWhileConnected';
 export * from './subscribeSwcAppMessageWhileConnected';
 export * from './publishSwcAppMessage';
 export * from './applySlot';
+export * from './state';
+