@dooboostore/simple-web-component 1.0.15 → 1.0.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dooboostore/simple-web-component",
-  "version": "1.0.15",
+  "version": "1.0.17",
   "license": "MIT",
   "type": "module",
   "main": "./dist/cjs/index.js",
@@ -14,6 +14,13 @@
     }
   },
   "description": "Simple Web Component library based on dom-render philosophy",
+  "sideEffects": [
+    "./dist/esm/elements/*.js",
+    "./dist/esm/elements/is/*.js",
+    "./dist/cjs/elements/*.js",
+    "./dist/cjs/elements/is/*.js",
+    "*.ts"
+  ],
   "repository": {
     "type": "git",
     "url": "git+https://github.com/dooboostore-develop/packages.git",
@@ -82,8 +89,8 @@
     "webpack-dev-server": "^5.2.0",
     "@dooboostore/core": "1.0.28",
     "@dooboostore/core-node": "1.0.10",
-    "@dooboostore/simple-boot": "1.0.53",
-    "@dooboostore/core-web": "1.0.9"
+    "@dooboostore/core-web": "1.0.9",
+    "@dooboostore/simple-boot": "1.0.53"
   },
   "scripts": {
     "clean": "rm -rf dist",

package/src/decorators/addEventListener.ts

@@ -1,8 +1,6 @@
 import { ReflectUtils } from '@dooboostore/core/reflect/ReflectUtils';
 
 export interface AddEventListenerOptions extends EventListenerOptions {
-  query?: string;
-  type: string;
   root?: 'light' | 'shadow' | 'all' | 'auto';
   capture?: boolean;
   once?: boolean;
@@ -10,28 +8,34 @@ export interface AddEventListenerOptions extends EventListenerOptions {
   stopPropagation?: boolean;
   stopImmediatePropagation?: boolean;
   preventDefault?: boolean;
+  delegate?: boolean;
+  removeOnDisconnected?: boolean;
 }
 
 export interface AddEventListenerMetadata {
+  selector: string;
+  type: string;
   options: AddEventListenerOptions;
   propertyKey: string | symbol;
 }
 
 export const ADD_EVENT_LISTENER_METADATA_KEY = Symbol('simple-web-component:add-event-listener');
 
-export function addEventListener(type: string, query?: string): MethodDecorator;
-export function addEventListener(options: AddEventListenerOptions): MethodDecorator;
-export function addEventListener(arg1: string | AddEventListenerOptions, arg2?: string): MethodDecorator {
+/**
+ * @addEventListener decorator to bind events to elements.
+ * Usage: @addEventListener('.btn', 'click') onClick() { ... }
+ * Usage: @addEventListener('', 'scroll', { passive: true }) onScroll() { ... }
+ */
+export function addEventListener(selector: string, type: string, options: AddEventListenerOptions = {}): MethodDecorator {
   return (target: Object, propertyKey: string | symbol, descriptor: PropertyDescriptor) => {
     const constructor = target.constructor;
-    const options: AddEventListenerOptions = typeof arg1 === 'string' ? { type: arg1, query: arg2 } : arg1;
 
     let listeners = ReflectUtils.getMetadata<AddEventListenerMetadata[]>(ADD_EVENT_LISTENER_METADATA_KEY, constructor);
     if (!listeners) {
       listeners = [];
       ReflectUtils.defineMetadata(ADD_EVENT_LISTENER_METADATA_KEY, listeners, constructor);
     }
-    listeners.push({ options, propertyKey });
+    listeners.push({ selector, type, options, propertyKey });
   };
 }
 

package/src/decorators/elementDefine.ts

@@ -1,4 +1,5 @@
 import { ReflectUtils } from '@dooboostore/core/reflect/ReflectUtils';
+import { FunctionUtils } from '@dooboostore/core/function/FunctionUtils';
 import { getInnerHtmlMetadataList } from './innerHtml';
 import { getQueryMetadata } from './query';
 import { getQueryAllMetadata } from './queryAll';
@@ -11,9 +12,11 @@ import { SwcUtils } from '../utils/Utils';
 import { HTML_TAG_ENTRIES, DOM_EVENT_NAMES } from '../config/config';
 import { SituationType, SituationTypeContainer, SituationTypeContainers } from '@dooboostore/simple-boot/decorators/inject/Inject';
 import { ConstructorType } from '@dooboostore/core/types';
+import { SimpleApplication } from '@dooboostore/simple-boot/SimpleApplication';
+import { Router } from '@dooboostore/core-web/routers/Router';
 import { InjectSituationType, HostSet, SwcAppInterface } from '../types';
 
-// --- Core Interfaces & Types (Integrated) ---
+// --- Core Interfaces & Types ---
 
 export interface ElementConfig {
   name: string;
@@ -25,6 +28,9 @@ export interface ElementConfig {
 
 export const ELEMENT_CONFIG_KEY = Symbol('simple-web-component:element-config');
 
+// Shared state for global delegation to prevent multiple listeners on the same root
+const globalDelegatedRoots = new WeakSet<Node>();
+
 // --- Environment Initialization Helper ---
 
 function buildEnv(configWindow?: Window) {
@@ -36,14 +42,7 @@ function buildEnv(configWindow?: Window) {
     if (win?.[cls]) builtInTagMap.set(win[cls], tag);
   }
 
-  const domHelpers = {
-    $d: doc,
-    $w: win,
-    $q: (sel: string, root?: Element | Document | ShadowRoot) => (root ?? doc).querySelector(sel),
-    $qa: (sel: string, root?: Element | Document | ShadowRoot) => Array.from((root ?? doc).querySelectorAll(sel)),
-    $qi: (id: string, root?: Document | ShadowRoot) => (root ?? doc).getElementById(id)
-  } as const;
-
+  const domHelpers = SwcUtils.getHelperSet(win);
   return { win, doc, builtInTagMap, domHelpers };
 }
 
@@ -58,8 +57,6 @@ export const elementDefine =
     const config: ElementConfig = typeof inConfig === 'string' ? { name: inConfig } : inConfig;
     const { win, doc, builtInTagMap: BUILT_IN_TAG_MAP, domHelpers: SWC_DOM_HELPERS } = buildEnv(config.window);
     config.window = win;
-    const SWC_DOM_HELPER_KEYS = Object.keys(SWC_DOM_HELPERS) as (keyof typeof SWC_DOM_HELPERS)[];
-    const SWC_DOM_HELPER_VALS = () => SWC_DOM_HELPER_KEYS.map(k => (SWC_DOM_HELPERS as any)[k]);
 
     let extendsTagName = config.extends;
     if (!extendsTagName) {
@@ -86,15 +83,14 @@ export const elementDefine =
     const NewClass = class extends (constructor as any) {
       private _swcId = Math.random().toString(36).substring(2, 11);
       private _emitHandlers = new Map<string, EventListener>();
+      private _boundListeners: Array<{ target: EventTarget; type: string; handler: EventListener; options?: any }> = [];
 
       private _executeSwcScript(attrName: string, hostSet: HostSet, extraArgs: Record<string, any> = {}) {
         const script = this.getAttribute(attrName);
         if (script) {
           try {
             const args = { ...hostSet, ...SWC_DOM_HELPERS, ...extraArgs };
-            const argNames = Object.keys(args);
-            const argValues = Object.values(args);
-            new Function(...argNames, script).apply(this, argValues);
+            FunctionUtils.execute({ script, context: this, args });
           } catch (e) {
             console.error(`[SWC] Failed to execute ${attrName}:`, e);
           }
@@ -123,9 +119,11 @@ export const elementDefine =
         }
       }
 
-      private _bindAttributeEvent(el: HTMLElement, attrName: string, script: string) {
-        if (!attrName.startsWith('swc-on-')) return;
-        const eventName = attrName.substring(7);
+      private _bindAttributeEvent(el: HTMLElement, attrName: string, script: string, eventName?: string) {
+        if (!eventName) {
+          if (!attrName.startsWith('swc-on-')) return;
+          eventName = attrName.substring(7);
+        }
         if (swcLifecycleAttributes.includes(attrName)) return;
 
         const elHandlers = getHandlers(this);
@@ -140,9 +138,13 @@ export const elementDefine =
 
         const handler = (event: any) => {
           const hostSet = SwcUtils.getHostSet(el);
-          const argNames = Object.keys(hostSet);
-          const argValues = Object.values(hostSet);
-          new Function('event', '$data', ...argNames, ...SWC_DOM_HELPER_KEYS, script).call(el, event, (event as CustomEvent).detail, ...argValues, ...SWC_DOM_HELPER_VALS());
+          const args = {
+            event,
+            $data: (event as CustomEvent).detail,
+            ...hostSet,
+            ...SWC_DOM_HELPERS
+          };
+          FunctionUtils.execute({ script, context: el, args });
         };
 
         el.addEventListener(eventName, handler);
@@ -164,6 +166,10 @@ export const elementDefine =
       }
 
       async connectedCallback() {
+        const conf = getElementConfig(this);
+        const currentWin = conf?.window || window;
+        const currentDoc = currentWin.document;
+
         const hostSet = SwcUtils.getHostSet(this as any);
 
         this._executeSwcScript('swc-on-before-connected', hostSet);
@@ -188,21 +194,117 @@ export const elementDefine =
           if (lContent) this.innerHTML = lContent;
         }
 
-        // --- @addEventListener binding ---
+        // --- Optimized Host Delegation ---
+        const createDelegationHandler = (delegateHost: any) => (event: Event) => {
+          if ((event as any).__swc_handled) return;
+
+          const path = event.composedPath();
+          const type = event.type;
+          const attrName = `swc-on-${type}`;
+
+          for (const node of path) {
+            if (node === delegateHost) break;
+            if (!(node instanceof HTMLElement)) continue;
+
+            const script = node.getAttribute?.(attrName);
+            if (script && !getElementConfig(node)) {
+              const host = SwcUtils.findNearestSwcHost(node);
+              if (host) {
+                const childHostSet = SwcUtils.getHostSet(node);
+                const args = {
+                  event,
+                  $data: (event as CustomEvent).detail,
+                  ...childHostSet,
+                  ...SWC_DOM_HELPERS
+                };
+                FunctionUtils.execute({ script, context: node, args });
+                (event as any).__swc_handled = true;
+                break;
+              }
+            }
+          }
+        };
+
+        // 1. Local Delegation (To itself)
+        DOM_EVENT_NAMES.forEach(type => {
+          this.addEventListener(type, createDelegationHandler(this));
+          this._boundListeners.push({ target: this as any, type, handler: createDelegationHandler(this) });
+        });
+
+        // 2. Structural/Global Delegation (If no parent host exists)
+        const hasParentHost = SwcUtils.findAllSwcHosts(this as any).length > 0;
+        if (!hasParentHost) {
+          const root = this.getRootNode();
+          if (!globalDelegatedRoots.has(root)) {
+            DOM_EVENT_NAMES.forEach(type => {
+              const handler = createDelegationHandler(root);
+              root.addEventListener(type, handler);
+            });
+            globalDelegatedRoots.add(root);
+          }
+        }
+
+        // --- @addEventListener binding (Direct/Delegate/Global) ---
         addEventListenerList.forEach(meta => {
-          const { type, query, root, capture, once, passive, stopPropagation, stopImmediatePropagation, preventDefault } = meta.options;
-          const targetEls: (HTMLElement | Element | Document | ShadowRoot | Window)[] = [];
+          const { selector, type, options } = meta;
+          const { root, capture, once, passive, stopPropagation, stopImmediatePropagation, preventDefault, delegate, removeOnDisconnected } = options;
+          const opts = { capture, once, passive };
+
+          const bindTargets: EventTarget[] = [];
+
+          if (selector === ':window') {
+            bindTargets.push(currentWin);
+          } else if (selector === ':document') {
+            bindTargets.push(currentDoc);
+          } else if (selector === ':parentHost') {
+            if (hostSet.$parentHost) bindTargets.push(hostSet.$parentHost);
+          } else if (selector === ':appHost') {
+            if (hostSet.$appHost) bindTargets.push(hostSet.$appHost);
+          } else if (selector === ':firstHost') {
+            if (hostSet.$firstHost) bindTargets.push(hostSet.$firstHost);
+          } else if (selector === ':lastHost') {
+            if (hostSet.$lastHost) bindTargets.push(hostSet.$lastHost);
+          } else if (selector === ':firstAppHost') {
+            if (hostSet.$firstAppHost) bindTargets.push(hostSet.$firstAppHost);
+          } else if (selector === ':lastAppHost') {
+            if (hostSet.$lastAppHost) bindTargets.push(hostSet.$lastAppHost);
+          } else if (!selector || selector === ':host') {
+            bindTargets.push(this as any);
+          } else if (delegate) {
+            const bindRoots: (HTMLElement | ShadowRoot)[] = [];
+            const r = root || 'auto';
+            if (r === 'auto') bindRoots.push(this.shadowRoot || (this as any));
+            else if (r === 'light') bindRoots.push(this as any);
+            else if (r === 'shadow') {
+              if (this.shadowRoot) bindRoots.push(this.shadowRoot as any);
+            } else if (r === 'all') {
+              bindRoots.push(this as any);
+              if (this.shadowRoot) bindRoots.push(this.shadowRoot as any);
+            }
 
-          if (!query) {
-            targetEls.push(this as any);
+            bindRoots.forEach(br => {
+              const handler = (event: Event) => {
+                const matchedEl = (event.target as HTMLElement).closest(selector);
+                if (matchedEl && (br as any).contains(matchedEl)) {
+                  if (stopPropagation) event.stopPropagation();
+                  if (stopImmediatePropagation) event.stopImmediatePropagation();
+                  if (preventDefault) event.preventDefault();
+                  const currentHostSet = SwcUtils.getHostSet(this as any);
+                  this._invokeLifecycleMethod(meta.propertyKey, currentHostSet, [event, currentHostSet, matchedEl]);
+                }
+              };
+              br.addEventListener(type, handler, opts);
+              const self: any = this;
+              if (removeOnDisconnected === true || (br !== self && br !== self.shadowRoot)) {
+                this._boundListeners.push({ target: br, type, handler, options: opts });
+              }
+            });
           } else {
             const searchRoots: (HTMLElement | ShadowRoot)[] = [];
             const r = root || 'auto';
-            if (r === 'auto') {
-              searchRoots.push((this.shadowRoot || (this as any)) as any);
-            } else if (r === 'light') {
-              searchRoots.push(this as any);
-            } else if (r === 'shadow') {
+            if (r === 'auto') searchRoots.push((this.shadowRoot || (this as any)) as any);
+            else if (r === 'light') searchRoots.push(this as any);
+            else if (r === 'shadow') {
               if (this.shadowRoot) searchRoots.push(this.shadowRoot as any);
             } else if (r === 'all') {
               searchRoots.push(this as any);
@@ -210,22 +312,22 @@ export const elementDefine =
             }
 
             searchRoots.forEach(sr => {
-              const found = sr.querySelectorAll(query);
-              found.forEach(el => targetEls.push(el as any));
+              sr.querySelectorAll(selector).forEach(el => bindTargets.push(el));
             });
           }
 
-          targetEls.forEach(el => {
+          bindTargets.forEach(target => {
             const handler = (event: Event) => {
               if (stopPropagation) event.stopPropagation();
               if (stopImmediatePropagation) event.stopImmediatePropagation();
               if (preventDefault) event.preventDefault();
-
-              const hostSet = SwcUtils.getHostSet(this as any);
-              this._invokeLifecycleMethod(meta.propertyKey, hostSet, [event, hostSet]);
+              const currentHostSet = SwcUtils.getHostSet(this as any);
+              this._invokeLifecycleMethod(meta.propertyKey, currentHostSet, [event, currentHostSet]);
             };
-            const options = { capture, once, passive };
-            el.addEventListener(type, handler, options);
+            target.addEventListener(type, handler, opts);
+            if (removeOnDisconnected === true || target === currentWin || target === currentDoc) {
+              this._boundListeners.push({ target, type, handler, options: opts });
+            }
           });
         });
 
@@ -245,6 +347,9 @@ export const elementDefine =
         const bMethods = findAllLifecycleMetadata(this, ON_BEFORE_DISCONNECTED_METADATA_KEY);
         if (bMethods) bMethods.forEach(m => this._invokeLifecycleMethod(m, hostSet));
 
+        this._boundListeners.forEach(l => l.target.removeEventListener(l.type, l.handler, l.options));
+        this._boundListeners = [];
+
         if (super.disconnectedCallback) super.disconnectedCallback();
 
         const aMethods = findAllLifecycleMetadata(this, ON_AFTER_DISCONNECTED_METADATA_KEY);
@@ -272,7 +377,9 @@ export const elementDefine =
 
         if (name.startsWith('swc-on-') && !swcLifecycleAttributes.includes(name)) {
           if (newVal !== null) {
-            this._bindAttributeEvent(this as any, name, newVal);
+            const customEventMeta = emitCustomEventList.find(it => it.options.attributeName === name);
+            const eventName = customEventMeta ? customEventMeta.options.type : name.substring(7);
+            this._bindAttributeEvent(this as any, name, newVal, eventName);
           }
         }
 
@@ -299,6 +406,25 @@ export const elementDefine =
       }
     });
 
+    // --- @emitCustomEvent wrapping logic ---
+    emitCustomEventList.forEach(meta => {
+      const { propertyKey, options } = meta;
+      const original = NewClass.prototype[propertyKey as any];
+      if (typeof original === 'function') {
+        NewClass.prototype[propertyKey as any] = function (...args: any[]) {
+          const detail = original.apply(this, args);
+          const event = new CustomEvent(options.type, {
+            detail,
+            bubbles: options.bubbles,
+            composed: options.composed,
+            cancelable: options.cancelable
+          });
+          this.dispatchEvent(event);
+          return detail;
+        };
+      }
+    });
+
     const originalProto = constructor.prototype;
     const newProto = NewClass.prototype;
     Object.getOwnPropertyNames(originalProto).forEach(name => {

package/src/decorators/emitCustomEvent.ts

@@ -2,9 +2,9 @@ import { ReflectUtils } from '@dooboostore/core/reflect/ReflectUtils';
 
 export interface EmitCustomEventOptions {
   type: string;
-  attributeName?: string; // Default: on + type
-  bubbles?: boolean; // Default: true
-  composed?: boolean; // Default: true
+  attributeName?: string;
+  bubbles?: boolean;
+  composed?: boolean;
   cancelable?: boolean;
 }
 
@@ -16,12 +16,12 @@ export interface EmitCustomEventMetadata {
 export const EMIT_CUSTOM_EVENT_METADATA_KEY = Symbol('simple-web-component:emit-custom-event');
 
 export function emitCustomEvent(typeOrOptions: string | EmitCustomEventOptions): MethodDecorator {
-  return (target: Object, propertyKey: string | symbol, descriptor: PropertyDescriptor) => {
+  return (target: Object, propertyKey: string | symbol) => {
     const constructor = target.constructor;
     const options: EmitCustomEventOptions = typeof typeOrOptions === 'string' ? { type: typeOrOptions } : typeOrOptions;
 
     if (!options.attributeName) {
-      options.attributeName = `on${options.type}`;
+      options.attributeName = `swc-on-${options.type}`;
     }
     if (options.bubbles === undefined) options.bubbles = true;
     if (options.composed === undefined) options.composed = true;
@@ -32,22 +32,6 @@ export function emitCustomEvent(typeOrOptions: string | EmitCustomEventOptions):
       ReflectUtils.defineMetadata(EMIT_CUSTOM_EVENT_METADATA_KEY, list, constructor);
     }
     list.push({ propertyKey, options });
-
-    // Wrap the original method to dispatch event after execution
-    const originalMethod = descriptor.value;
-    descriptor.value = function (this: HTMLElement, ...args: any[]) {
-      const detail = originalMethod.apply(this, args);
-
-      const event = new CustomEvent(options.type, {
-        detail,
-        bubbles: options.bubbles,
-        composed: options.composed,
-        cancelable: options.cancelable
-      });
-
-      this.dispatchEvent(event);
-      return detail;
-    };
   };
 }
 

package/src/decorators/query.ts

@@ -1,7 +1,8 @@
 import { ReflectUtils } from '@dooboostore/core/reflect/ReflectUtils';
+import { getElementConfig } from './elementDefine';
+import { SwcUtils } from '../utils/Utils';
 
 export interface QueryOptions {
-  selector?: string;
   root?: 'light' | 'shadow' | 'all' | 'auto';
 }
 
@@ -9,61 +10,65 @@ export interface QueryMetadata {
   selector: string;
   options: QueryOptions;
   propertyKey: string | symbol;
-  isMethod: boolean;
 }
 
 export const QUERY_METADATA_KEY = Symbol('simple-web-component:query');
 
-export function query(selector: string): any;
-export function query(options: QueryOptions): any;
-export function query(target: Object, propertyKey: string | symbol): void;
-export function query(arg1?: string | QueryOptions | Object, arg2?: string | symbol): any {
-  const decorator = (selector: string, options: QueryOptions, target: Object, propertyKey: string | symbol, descriptor?: PropertyDescriptor) => {
-    const isMethod = !!descriptor;
-    const constructor = target.constructor;
+/**
+ * @query decorator to inject a single element into a class property.
+ */
+export function query(selector: string, options: QueryOptions = {}): PropertyDecorator {
+  return (target: Object, propertyKey: string | symbol, descriptor?: never): void => {
+    if (descriptor !== undefined) {
+      throw new Error(`@query decorator cannot be used on methods. (Method: ${String(propertyKey)})`);
+    }
 
+    const constructor = target.constructor;
     let queries = ReflectUtils.getMetadata<QueryMetadata[]>(QUERY_METADATA_KEY, constructor);
     if (!queries) {
       queries = [];
       ReflectUtils.defineMetadata(QUERY_METADATA_KEY, queries, constructor);
     }
-    queries.push({ selector, options, propertyKey, isMethod });
+    queries.push({ selector, options, propertyKey });
 
-    if (!isMethod) {
-      Object.defineProperty(target, propertyKey, {
-        get(this: HTMLElement) {
-          if (!selector) return this;
-          let searchRoot: Node = this;
-          if (options.root === 'shadow') searchRoot = this.shadowRoot || this;
-          else if (options.root === 'light') searchRoot = this;
-          else searchRoot = this.shadowRoot || this; // Default: Auto (Shadow-First)
+    Object.defineProperty(target, propertyKey, {
+      get(this: HTMLElement) {
+        // --- Special Selectors: HostSet ---
+        const hostSet = SwcUtils.getHostSet(this);
+        if (selector === ':parentHost') return hostSet.$parentHost;
+        if (selector === ':appHost') return hostSet.$appHost;
+        if (selector === ':firstHost') return hostSet.$firstHost;
+        if (selector === ':lastHost') return hostSet.$lastHost;
+        if (selector === ':firstAppHost') return hostSet.$firstAppHost;
+        if (selector === ':lastAppHost') return hostSet.$lastAppHost;
 
-          return (searchRoot as HTMLElement).querySelector(selector);
-        },
-        enumerable: true,
-        configurable: true
-      });
-    }
-  };
-
-  // Case: @query (parameterless decorator)
-  if (arg1 && typeof arg2 === 'string') {
-    return decorator('', {}, arg1 as Object, arg2 as string | symbol);
-  }
+        // --- Special Selectors: Env ---
+        const config = getElementConfig(this);
+        const win = config?.window || window;
+        const doc = win.document;
 
-  // Case: @query('selector') or @query({ selector: '...', ... })
-  return (target: Object, propertyKey: string | symbol, descriptor?: PropertyDescriptor) => {
-    let selector = '';
-    let options: QueryOptions = {};
+        if (selector === ':window') return win;
+        if (selector === ':document') return doc;
+        if (!selector || selector === ':host') return this;
 
-    if (typeof arg1 === 'string') {
-      selector = arg1;
-    } else if (typeof arg1 === 'object') {
-      options = arg1 as QueryOptions;
-      selector = options.selector || '';
-    }
+        // --- Standard Selectors ---
+        const r = options.root || 'auto';
 
-    decorator(selector, options, target, propertyKey, descriptor);
+        if (r === 'shadow') {
+          return this.shadowRoot ? this.shadowRoot.querySelector(selector) : null;
+        }
+        if (r === 'light') {
+          return this.querySelector(selector);
+        }
+        if (r === 'all') {
+          return this.shadowRoot?.querySelector(selector) || this.querySelector(selector);
+        }
+        // auto
+        return (this.shadowRoot || this).querySelector(selector);
+      },
+      enumerable: true,
+      configurable: true
+    });
   };
 }