@dooboostore/simple-web-component 1.0.47 → 1.0.49

package/src/decorators/mutationObserver.ts

@@ -0,0 +1,304 @@
+import { ReflectUtils } from '@dooboostore/core';
+import { SpecialSelector, SwcQueryOptions, SwcSelector, SwcFnSelector, HelperHostSet } from '../types';
+
+// 공통 옵션 — root·delegate 없음 (MutationObserverInit + filter/removeObserver)
+export interface MutationObserverBaseOptions extends MutationObserverInit {
+  filter?: (matchedEls: HTMLElement[], meta: { currentThis: any, helper: HelperHostSet }) => boolean;
+  // observer 해제(disconnected) 시 호출되는 콜백. 첫 번째 인자는 observe된 target element, 두 번째는 사용자 옵션 객체.
+  removeObserver?: (target: Element, optionValue: MutationObserverQueryOptions) => void;
+}
+
+// 문자열 셀렉터 전용 — root·delegate 허용 (셀렉터로 탐색/델리게이션)
+export type MutationObserverQueryOptions = MutationObserverBaseOptions & SwcQueryOptions & { delegate?: boolean };
+// 함수 셀렉터 전용 — root·delegate 금지 (이미 요소를 직접 반환)
+export type MutationObserverNonQueryOptions = MutationObserverBaseOptions;
+
+// 셀렉터 종류에 따라 옵션 타입 분기
+export type MutationObserverOptionsOf<S extends SwcSelector> = S extends string ? MutationObserverQueryOptions : MutationObserverNonQueryOptions;
+
+export interface MutationObserverMetadata {
+  propertyKey: string | symbol;
+  selector: SwcSelector;
+  options: MutationObserverQueryOptions;
+}
+
+export const MUTATION_OBSERVER_METADATA_KEY = Symbol.for('simple-web-component:mutation-observer');
+
+export function mutationObserver(target: SpecialSelector, options?: MutationObserverQueryOptions): MethodDecorator;
+export function mutationObserver(selector: string, options?: MutationObserverQueryOptions): MethodDecorator;
+export function mutationObserver(selector: SwcFnSelector, options?: MutationObserverNonQueryOptions): MethodDecorator;
+export function mutationObserver(options?: MutationObserverQueryOptions): MethodDecorator;
+/**
+ * @mutationObserver decorator to observe DOM mutations.
+ */
+export function mutationObserver(selectorOrOptions?: SwcSelector | MutationObserverQueryOptions, maybeOptions?: MutationObserverQueryOptions): MethodDecorator {
+  return (targetObj: Object, propertyKey: string | symbol, descriptor: PropertyDescriptor) => {
+    let selector: SwcSelector = '$this';
+    let options: MutationObserverQueryOptions = {};
+
+    if (typeof selectorOrOptions === 'string' || typeof selectorOrOptions === 'function') {
+      selector = selectorOrOptions;
+      options = maybeOptions ?? {};
+    } else {
+      selector = '$this';
+      options = selectorOrOptions ?? {};
+    }
+
+    const constructor = targetObj.constructor;
+
+    let observers = ReflectUtils.getMetadata<MutationObserverMetadata[]>(MUTATION_OBSERVER_METADATA_KEY, constructor);
+    if (!observers) {
+      observers = [];
+      ReflectUtils.defineMetadata(MUTATION_OBSERVER_METADATA_KEY, observers, constructor);
+    }
+
+    observers.push({ propertyKey, selector, options });
+  };
+}
+
+export function mutationObserverThis<TEvent extends Event = Event>(options?: MutationObserverQueryOptions): MethodDecorator {
+  return mutationObserver('$this', options);
+}
+
+// ─── root별 delegate 헬퍼 (addEventListener와 동일 패턴) ───
+
+export function mutationObserverDelegateLight(selector: string, options?: MutationObserverBaseOptions): MethodDecorator;
+export function mutationObserverDelegateLight(options?: MutationObserverBaseOptions): MethodDecorator;
+export function mutationObserverDelegateLight(selectorOrOptions?: string | Omit<MutationObserverQueryOptions, 'root'>, maybeOptions?: Omit<MutationObserverQueryOptions, 'root'>): MethodDecorator {
+  if (typeof selectorOrOptions === 'string' || typeof selectorOrOptions === 'function') {
+    return mutationObserver(selectorOrOptions, {...maybeOptions ?? {}, root: 'light', delegate: true});
+  }
+  return mutationObserver({...selectorOrOptions ?? {}, root: 'light', delegate: true});
+}
+
+export function mutationObserverDelegateShadow(selector: string, options?: MutationObserverBaseOptions): MethodDecorator;
+export function mutationObserverDelegateShadow(options?: MutationObserverBaseOptions): MethodDecorator;
+export function mutationObserverDelegateShadow(selectorOrOptions?: string | Omit<MutationObserverQueryOptions, 'root'>, maybeOptions?: Omit<MutationObserverQueryOptions, 'root'>): MethodDecorator {
+  if (typeof selectorOrOptions === 'string' || typeof selectorOrOptions === 'function') {
+    return mutationObserver(selectorOrOptions, {...maybeOptions ?? {}, root: 'shadow', delegate: true});
+  }
+  return mutationObserver({...selectorOrOptions ?? {}, root: 'shadow', delegate: true});
+}
+
+export function mutationObserverDelegateAll(selector: string, options?: MutationObserverBaseOptions): MethodDecorator;
+export function mutationObserverDelegateAll(options?: MutationObserverBaseOptions): MethodDecorator;
+export function mutationObserverDelegateAll(selectorOrOptions?: string | Omit<MutationObserverQueryOptions, 'root'>, maybeOptions?: Omit<MutationObserverQueryOptions, 'root'>): MethodDecorator {
+  if (typeof selectorOrOptions === 'string' || typeof selectorOrOptions === 'function') {
+    return mutationObserver(selectorOrOptions, {...maybeOptions ?? {}, root: 'all', delegate: true});
+  }
+  return mutationObserver({...selectorOrOptions ?? {}, root: 'all', delegate: true});
+}
+
+export function mutationObserverDelegate(selector: string, options?: MutationObserverBaseOptions): MethodDecorator;
+export function mutationObserverDelegate(options?: MutationObserverBaseOptions): MethodDecorator;
+export function mutationObserverDelegate(selectorOrOptions?: string | Omit<MutationObserverQueryOptions, 'root'>, maybeOptions?: Omit<MutationObserverQueryOptions, 'root'>): MethodDecorator {
+  if (typeof selectorOrOptions === 'string' || typeof selectorOrOptions === 'function') {
+    return mutationObserver(selectorOrOptions, {...maybeOptions ?? {}, root: 'auto', delegate: true});
+  }
+  return mutationObserver({...selectorOrOptions ?? {}, root: 'auto', delegate: true});
+}
+
+// ─── root별 일반 헬퍼 (delegate 없이, 셀렉터 생략 시 $this) ───
+
+export function mutationObserverLight(selector: string, options?: Omit<MutationObserverQueryOptions, 'root'>): MethodDecorator;
+export function mutationObserverLight(options?: Omit<MutationObserverQueryOptions, 'root'>): MethodDecorator;
+export function mutationObserverLight(selectorOrOptions?: string | Omit<MutationObserverQueryOptions, 'root'>, maybeOptions?: Omit<MutationObserverQueryOptions, 'root'>): MethodDecorator {
+  if (typeof selectorOrOptions === 'string' || typeof selectorOrOptions === 'function') {
+    return mutationObserver(selectorOrOptions, {...maybeOptions ?? {}, root: 'light'});
+  }
+  return mutationObserver({...selectorOrOptions ?? {}, root: 'light'});
+}
+
+export function mutationObserverShadow(selector: string, options?: Omit<MutationObserverQueryOptions, 'root'>): MethodDecorator;
+export function mutationObserverShadow(options?: Omit<MutationObserverQueryOptions, 'root'>): MethodDecorator;
+export function mutationObserverShadow(selectorOrOptions?: string | Omit<MutationObserverQueryOptions, 'root'>, maybeOptions?: Omit<MutationObserverQueryOptions, 'root'>): MethodDecorator {
+  if (typeof selectorOrOptions === 'string' || typeof selectorOrOptions === 'function') {
+    return mutationObserver(selectorOrOptions, {...maybeOptions ?? {}, root: 'shadow'});
+  }
+  return mutationObserver({...selectorOrOptions ?? {}, root: 'shadow'});
+}
+
+export function mutationObserverAll(selector: string, options?: Omit<MutationObserverQueryOptions, 'root'>): MethodDecorator;
+export function mutationObserverAll(options?: Omit<MutationObserverQueryOptions, 'root'>): MethodDecorator;
+export function mutationObserverAll(selectorOrOptions?: string | Omit<MutationObserverQueryOptions, 'root'>, maybeOptions?: Omit<MutationObserverQueryOptions, 'root'>): MethodDecorator {
+  if (typeof selectorOrOptions === 'string' || typeof selectorOrOptions === 'function') {
+    return mutationObserver(selectorOrOptions, {...maybeOptions ?? {}, root: 'all'});
+  }
+  return mutationObserver({...selectorOrOptions ?? {}, root: 'all'});
+}
+
+export function getMutationObserverMetadata(target: any): MutationObserverMetadata[] | undefined {
+  const constructor = target instanceof Function ? target : target.constructor;
+  return ReflectUtils.getMetadata(MUTATION_OBSERVER_METADATA_KEY, constructor);
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// MutationObserverLifeCycler
+// observer 를 직접 생성하지 않고 OnConnectedResult 를 반환한다.
+// elementDefine 이 수집된 MutationObserverSet 으로 observer 를 생성한다.
+// ─────────────────────────────────────────────────────────────────────────────
+import { ElementDefineLifeCycler, MutationObserverSet, MutationObserverSetEntry, ObserverObserveTarget, OnConnectedResult } from '../types';
+import { SwcUtils } from '../utils/Utils';
+
+export class MutationObserverLifeCycler implements ElementDefineLifeCycler {
+  private readonly removeObserverCallbacksMap = new WeakMap<Element, Array<{ fn: (target: Element, opts: unknown) => void; target: any; opts: unknown }>>();
+
+  onConnected(helperHostSet: HelperHostSet): OnConnectedResult | void {
+    const inst = helperHostSet.$this;
+    const currentWin = helperHostSet.$w;
+
+    const removeObserverCallbacks: Array<{ fn: (target: Element, opts: unknown) => void; target: any; opts: unknown }> = [];
+    this.removeObserverCallbacksMap.set(inst, removeObserverCallbacks);
+
+    const allMeta = getMutationObserverMetadata(inst) ?? [];
+    // 처리할 메타가 없으면 observer 불필요
+    if (allMeta.length === 0) return;
+
+    // ── shadow / light 루트별 분류 ──
+    const shadowMetas = allMeta.filter(m => {
+      const r = m.options.root || 'auto';
+      return inst.shadowRoot && (r === 'shadow' || r === 'all' || r === 'auto');
+    });
+    const lightMetas = allMeta.filter(m => {
+      const r = m.options.root || 'auto';
+      return r === 'light' || r === 'all' || (!inst.shadowRoot && r === 'auto');
+    });
+    // ── MutationObserverSet 생성 헬퍼 (루트별) ──
+    const buildSet = (
+      root: HTMLElement | ShadowRoot,
+      metas: MutationObserverMetadata[],
+    ): { callback: MutationObserverSetEntry['callback']; observeTargets: ObserverObserveTarget<MutationObserverInit>[] } | null => {
+      if (metas.length === 0) return null;
+
+      const initFrom = (o: MutationObserverBaseOptions): MutationObserverInit => {
+        const init: MutationObserverInit = {
+          childList: o.childList, attributes: o.attributes, characterData: o.characterData,
+          subtree: o.subtree, attributeFilter: o.attributeFilter,
+          attributeOldValue: o.attributeOldValue, characterDataOldValue: o.characterDataOldValue,
+        };
+        if (!init.childList && !init.attributes && !init.characterData) init.childList = true;
+        return init;
+      };
+
+      const fnObservedSets = new Map<MutationObserverMetadata, WeakSet<Element>>();
+
+      const callback = (mutations: MutationRecord[], obs: MutationObserver) => {
+        // ── MutationObserver 메타 콜백 ──
+        for (const meta of metas) {
+          const { selector, options } = meta;
+          let matchedEls: HTMLElement[] = [];
+
+          const typeMatches = (m: MutationRecord): boolean => {
+            const has = !!(options.childList || options.attributes || options.characterData);
+            if (m.type === 'childList')     return has ? !!options.childList : true;
+            if (m.type === 'attributes')    return !!options.attributes;
+            if (m.type === 'characterData') return !!options.characterData;
+            return true;
+          };
+
+          const collect = (matchesSel: (n: any) => boolean) =>
+            mutations.flatMap(m => {
+              if (!typeMatches(m)) return [];
+              const els: HTMLElement[] = [];
+              if (matchesSel(m.target)) els.push(m.target as HTMLElement);
+              Array.from(m.addedNodes   || []).filter(matchesSel).forEach(n => els.push(n as HTMLElement));
+              Array.from(m.removedNodes || []).filter(matchesSel).forEach(n => els.push(n as HTMLElement));
+              return els;
+            });
+
+          if (options.delegate && typeof selector === 'string') {
+            const isThis = selector === '$this' || selector === '';
+            matchedEls = collect(n => {
+              if (!n || n.nodeType !== 1) return false;
+              if (isThis) return true;
+              const el = n as HTMLElement;
+              return el.matches?.(selector) || !!el.closest?.(selector);
+            });
+          } else if (typeof selector === 'string') {
+            const isThis = selector === '$this' || selector === '';
+            matchedEls = collect(n => {
+              if (!n || n.nodeType !== 1) return false;
+              if (isThis) return true;
+              return (n as HTMLElement).matches?.(selector);
+            });
+          } else if (typeof selector === 'function') {
+            const set = fnObservedSets.get(meta);
+            matchedEls = mutations.filter(m => typeMatches(m))
+              .map(m => m.target as HTMLElement)
+              .filter(t => t && t.nodeType === 1 && (set ? set.has(t) : false));
+          } else {
+            matchedEls = mutations.filter(m => typeMatches(m))
+              .map(m => m.target as HTMLElement)
+              .filter(t => t && t.nodeType === 1);
+          }
+
+          if (matchedEls.length === 0) continue;
+          if (options.filter) {
+            if (!options.filter(matchedEls, { currentThis: inst, helper: helperHostSet })) continue;
+          }
+          const hostSet = SwcUtils.getHostSet(inst);
+          inst[meta.propertyKey](matchedEls, mutations, obs, { ...hostSet, $root: root });
+        }
+
+      };
+
+      // ── observe 대상 목록 구성 ──
+      const observeTargets: ObserverObserveTarget<MutationObserverInit>[] = [];
+
+      // delegate 있으면 루트 전체 subtree observe
+      if (metas.some(m => m.options.delegate)) {
+        observeTargets.push({ target: root, options: { childList: true, subtree: true } });
+      }
+
+      // non-delegate: 셀렉터 매칭 요소 직접 observe
+      for (const m of metas.filter(m => !m.options.delegate)) {
+        const { selector, options } = m;
+        const mInit = initFrom(options);
+        if (typeof selector === 'string') {
+          if (selector === '$this' || selector === '') {
+            observeTargets.push({ target: root, options: mInit });
+          } else {
+            root.querySelectorAll(selector).forEach(el => observeTargets.push({ target: el as Element, options: mInit }));
+          }
+        } else if (typeof selector === 'function') {
+          const res = (selector as any)(inst, helperHostSet);
+          let targets: HTMLElement[] = [];
+          if (res instanceof currentWin.HTMLElement) targets = [res as HTMLElement];
+          else if (res instanceof currentWin.NodeList) targets = Array.from(res as NodeList).filter((e: any) => e instanceof currentWin.HTMLElement) as HTMLElement[];
+          else if (Array.isArray(res)) targets = res.filter((e: any) => e instanceof currentWin.HTMLElement) as HTMLElement[];
+          const set = new WeakSet<Element>();
+          for (const el of targets) { set.add(el); observeTargets.push({ target: el, options: mInit }); }
+          fnObservedSets.set(m, set);
+        }
+      }
+
+      // removeObserver 콜백 수집
+      for (const m of metas) {
+        if (m.options.removeObserver) removeObserverCallbacks.push({ fn: m.options.removeObserver, target: root, opts: m.options });
+      }
+
+      return { callback, observeTargets };
+    };
+
+    const shadowSet = inst.shadowRoot ? buildSet(inst.shadowRoot, shadowMetas) : null;
+    const lightSet  = buildSet(inst as any, lightMetas);
+
+    // 두 루트의 observe 대상 + 콜백을 엔트리 배열(MutationObserverSet)로 병합
+    // 같은 루트의 여러 대상은 같은 callback 을 공유한다.
+    const mutationObserverSet: MutationObserverSet = [
+      ...(shadowSet?.observeTargets ?? []).map(t => ({ ...t, callback: shadowSet!.callback })),
+      ...(lightSet?.observeTargets  ?? []).map(t => ({ ...t, callback: lightSet!.callback })),
+    ];
+    if (mutationObserverSet.length === 0) return;
+
+    return { mutationObserverSet };
+  }
+
+  onDisconnected(helperHostSet: HelperHostSet): void {
+    const inst = helperHostSet.$this;
+    for (const cb of this.removeObserverCallbacksMap.get(inst) ?? []) {
+      try { cb.fn(cb.target, cb.opts); } catch (e) { console.error('[SWC] removeObserver error:', e); }
+    }
+    this.removeObserverCallbacksMap.delete(inst);
+  }
+}

package/src/decorators/query.ts

@@ -1,36 +1,110 @@
 import { ReflectUtils } from '@dooboostore/core';
 import { getElementConfig, ensureInit } from './elementDefine';
 import { SwcUtils } from '../utils/Utils';
-import { SwcQueryOptions, HelperHostSet } from '../types';
+import { SwcQueryOptions, SwcRootType, SwcFnSelector, SwcSelector, HelperHostSet } from '../types';
 
-export interface QueryOptions extends SwcQueryOptions {
-  /**
-   * Filter function to determine whether to include the element.
-   * If it returns false, the element is skipped.
-   */
+export type QueryPick = 'first' | 'last' | 'all' | 'even' | 'odd' | number;
+
+export interface QueryBaseOptions {
+  // 어떤 요소를 고를지 — 기본 'first'(단일). 'all'/'even'/'odd'는 배열, number는 인덱스(단일)
+  pick?: QueryPick;
   filter?: (target: HTMLElement, meta: { currentThis: any, helper: HelperHostSet }) => boolean;
 }
+// 문자열 셀렉터 전용 — root 허용
+export type QueryOptions = QueryBaseOptions & SwcQueryOptions;
+// 함수 셀렉터 전용 — root 금지
+export type QueryNonQueryOptions = QueryBaseOptions;
+
+export type QueryFnSelector = SwcFnSelector;
+export type QuerySelector = SwcSelector;
+
+// 셀렉터 종류에 따라 옵션 타입 분기
+export type QueryOptionsOf<S extends QuerySelector> = S extends string ? QueryOptions : QueryNonQueryOptions;
 
 export interface QueryMetadata {
   propertyKey: string | symbol;
-  selector: string | ((currentThis: any, helper: HelperHostSet) => Node | NodeList | Element | Element[] | null);
-  options: QueryOptions ;
+  selector: QuerySelector;
+  options: QueryOptions;
 }
 
 export const QUERY_METADATA_KEY = Symbol.for('simple-web-component:query');
 
+/**
+ * 셀렉터를 해석해 매칭된 모든 요소를 배열로 반환한다 (query/queryAll 공용).
+ * $window/$document는 요소가 아니므로 여기서 처리하지 않는다.
+ */
+export const resolveQueryElements = (
+  inst: any,
+  selector: QuerySelector,
+  options: QueryOptions,
+  win: Window
+): HTMLElement[] => {
+  const hostSet = SwcUtils.getHelperAndHostSet(win, inst);
+  let all: HTMLElement[] = [];
+
+  if (typeof selector === 'function') {
+    const result = (selector as any)(inst, hostSet);
+    if (result instanceof win.NodeList) all = Array.from(result as NodeList).filter(e => e instanceof win.HTMLElement) as HTMLElement[];
+    else if (Array.isArray(result)) all = (result as any[]).filter(e => e instanceof win.HTMLElement) as HTMLElement[];
+    else if (result instanceof win.HTMLElement) all = [result as HTMLElement];
+  } else if (typeof selector === 'string') {
+    const r = (options as any)?.root || 'auto';
+    if (selector === '$this') all = [inst as HTMLElement];
+    else if (selector === '$host') all = hostSet.$host ? [hostSet.$host] : [];
+    else if (selector === '$parentHost') all = hostSet.$parentHost ? [hostSet.$parentHost] : [];
+    else if (selector === '$appHost') all = hostSet.$appHost ? [hostSet.$appHost as any] : [];
+    else if (selector === '$firstHost') all = hostSet.$firstHost ? [hostSet.$firstHost] : [];
+    else if (selector === '$lastHost') all = hostSet.$lastHost ? [hostSet.$lastHost] : [];
+    else if (selector === '$firstAppHost') all = hostSet.$firstAppHost ? [hostSet.$firstAppHost as any] : [];
+    else if (selector === '$lastAppHost') all = hostSet.$lastAppHost ? [hostSet.$lastAppHost as any] : [];
+    else if (selector === '$hosts') all = hostSet.$hosts.filter(Boolean);
+    else if (selector === '$appHosts') all = hostSet.$appHosts.filter(Boolean) as any[];
+    else {
+      const scopes: any[] = [];
+      if (r === 'auto') scopes.push(inst.shadowRoot || inst);
+      else if (r === 'light') scopes.push(inst);
+      else if (r === 'shadow' && inst.shadowRoot) scopes.push(inst.shadowRoot);
+      else if (r === 'all') { scopes.push(inst); if (inst.shadowRoot) scopes.push(inst.shadowRoot); }
+      for (const scope of scopes) {
+        const found = scope?.querySelectorAll?.(selector) as NodeListOf<HTMLElement> | undefined;
+        if (found?.length) all.push(...Array.from(found).filter(e => e instanceof win.HTMLElement));
+      }
+    }
+  }
+
+  if ((options as any)?.filter) {
+    all = all.filter(el => (options as any).filter(el, { currentThis: inst, helper: hostSet }));
+  }
+  return all;
+};
+
+/**
+ * 매칭된 요소 배열에서 pick 옵션에 따라 요소를 고른다.
+ * - 'first'(기본) / 'last' / number(인덱스) → 단일 요소
+ * - 'all' / 'even'(0,2,4...) / 'odd'(1,3,5...) → 배열
+ */
+export const pickElements = (
+  all: HTMLElement[],
+  pick: QueryPick
+): HTMLElement | HTMLElement[] | null => {
+  if (pick === 'all') return all;
+  if (pick === 'even') return all.filter((_, i) => i % 2 === 0);
+  if (pick === 'odd') return all.filter((_, i) => i % 2 === 1);
+  if (typeof pick === 'number') return all[pick] ?? null;
+  if (pick === 'last') return all.length ? all[all.length - 1] : null;
+  return all.length ? all[0] : null;
+};
+
 export function query(target: Object, propertyKey: string | symbol, descriptor?: PropertyDescriptor): PropertyDescriptor | void;
-export function query(selector: string | ((currentThis: any, helper: HelperHostSet) => Node | NodeList | Element | Element[] | null), options?: QueryOptions): PropertyDecorator;
+export function query(selector: string, options?: QueryOptions): PropertyDecorator;
+export function query(selector: QueryFnSelector, options?: QueryNonQueryOptions): PropertyDecorator;
 export function query(options?: QueryOptions): PropertyDecorator;
 /**
- * @query decorator to inject a single element into a class property.
- * 
- * Supports both string selectors and function-based selectors:
- * - String selector: @query('#my-element')
- * - Function selector: @query((currentThis, helper) => currentThis.shadowRoot?.querySelector('.item'))
- * 
- * Supports filtering:
- * - @query('#my-element', { filter: (target, meta) => target.hasAttribute('active') })
+ * @query decorator — 클래스 필드에 요소를 주입한다.
+ *
+ * - 문자열 셀렉터: CSS / 특수 셀렉터($this,$host,$window,...), root 옵션으로 탐색 영역 지정
+ * - 함수 셀렉터: (currentThis, helper) => Node | NodeList | Element | Element[] | null (root 금지)
+ * - options.pick: 'first'(기본) | 'last' | 'all' | 'even' | 'odd' | number
  */
 export function query(selectorOrTarget?: string | ((currentThis: any, helper: HelperHostSet) => Node | NodeList | Element | Element[] | null) | Object, optionsOrPropertyKey?: QueryOptions | string | symbol, descriptor?: PropertyDescriptor): any {
   // Bare decorator: @query
@@ -50,118 +124,32 @@ export function query(selectorOrTarget?: string | ((currentThis: any, helper: He
         queries = [];
         ReflectUtils.defineMetadata(QUERY_METADATA_KEY, queries, constructor);
       }
-      queries.push({ propertyKey, selector: selectorOrTarget as any, options: optionsOrPropertyKey as QueryOptions || {} });
+      queries.push({ propertyKey, selector: selectorOrTarget as any, options: (optionsOrPropertyKey as QueryOptions) || {} });
 
       Object.defineProperty(targetObj, propertyKey, {
         get(this: HTMLElement) {
           ensureInit(this);
           const config = getElementConfig(this);
           const win = config?.window || window;
-          const hostSet = SwcUtils.getHelperAndHostSet(win, this);
-          
-          // Resolve selector - can be string or function
-          let resolvedSelector: string;
-          let resolvedElement: HTMLElement | null = null;
-          
-          if (typeof selectorOrTarget === 'function') {
-            const result = (selectorOrTarget as any)(this, hostSet);
-            // If function returns a Node/Element, return it directly
-            if (result instanceof win.Node || result instanceof win.Element) {
-              resolvedElement = result instanceof win.HTMLElement ? (result as HTMLElement) : null;
-            }
-            // If function returns NodeList or Element[], return first element
-            else if (result instanceof win.NodeList || Array.isArray(result)) {
-              resolvedElement = result.length > 0 && result[0] instanceof win.HTMLElement ? (result[0] as HTMLElement) : null;
-            }
-          } else {
-            resolvedSelector = selectorOrTarget;
-
-            const r = (optionsOrPropertyKey as QueryOptions)?.root || 'auto';
-            const applyRoot = (t: any) => {
-              if (!t || !(t instanceof HTMLElement)) 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;
-            };
-
-            // --- Special Selectors: HostSet ---
-            if (resolvedSelector === '$this') resolvedElement = applyRoot(this);
-            else if (resolvedSelector === '$host') resolvedElement = applyRoot(hostSet.$host);
-            else if (resolvedSelector === '$parentHost') resolvedElement = applyRoot(hostSet.$parentHost);
-            else if (resolvedSelector === '$appHost') resolvedElement = applyRoot(hostSet.$appHost);
-            else if (resolvedSelector === '$firstHost') resolvedElement = applyRoot(hostSet.$firstHost);
-            else if (resolvedSelector === '$lastHost') resolvedElement = applyRoot(hostSet.$lastHost);
-            else if (resolvedSelector === '$firstAppHost') resolvedElement = applyRoot(hostSet.$firstAppHost);
-            else if (resolvedSelector === '$lastAppHost') resolvedElement = applyRoot(hostSet.$lastAppHost);
-            // --- Special Selectors: Env ---
-            else if (resolvedSelector === '$window') return win;
-            else if (resolvedSelector === '$document') return win.document;
-            // --- Standard Selectors ---
-            else {
-              if (r === 'shadow') resolvedElement = this.shadowRoot ? (this.shadowRoot.querySelector(resolvedSelector) as HTMLElement | null) : null;
-              else if (r === 'light') resolvedElement = this.querySelector(resolvedSelector) as HTMLElement | null;
-              else if (r === 'all') {
-                const shadowMatch = this.shadowRoot ? (this.shadowRoot.querySelector(resolvedSelector) as HTMLElement | null) : null;
-                resolvedElement = shadowMatch || (this.querySelector(resolvedSelector) as HTMLElement | null);
-              }
-              else resolvedElement = ((this.shadowRoot || this).querySelector(resolvedSelector) as HTMLElement | null);
-            }
-          }
+          const options = (optionsOrPropertyKey as QueryOptions) || {};
 
-          // Apply filter if provided
-          if (resolvedElement instanceof win.HTMLElement && (optionsOrPropertyKey as QueryOptions)?.filter) {
-            const shouldInclude = (optionsOrPropertyKey as QueryOptions).filter!(resolvedElement, { currentThis: this, helper: hostSet });
-            if (!shouldInclude) {
-              return null;
-            }
-          }
+          // $window/$document는 요소가 아니므로 항상 단일 반환
+          if (typeof selectorOrTarget === 'string' && selectorOrTarget === '$window') return win;
+          if (typeof selectorOrTarget === 'string' && selectorOrTarget === '$document') return win.document;
 
-          return resolvedElement;
+          const all = resolveQueryElements(this, selectorOrTarget as QuerySelector, options, win);
+          return pickElements(all, options.pick ?? 'first');
         },
         set(this: HTMLElement, nv: any) {
           ensureInit(this);
-          if (nv === null || nv === undefined) {
+          if (nv === null || nv === undefined || (Array.isArray(nv) && nv.length === 0)) {
             const config = getElementConfig(this);
             const win = config?.window || window;
-            const hostSet = SwcUtils.getHelperAndHostSet(win, this);
-            
-            // Resolve selector - can be string or function
-            if (typeof selectorOrTarget === 'function') {
-              // Get the element from function and remove it
-              const result = (selectorOrTarget as any)(this, hostSet);
-              if (result instanceof win.Element) {
-                (result as Element).remove();
-              } else if (result instanceof win.NodeList || Array.isArray(result)) {
-                const el = result.length > 0 ? result[0] : null;
-                if (el instanceof win.Element) {
-                  (el as Element).remove();
-                }
-              }
-              return;
-            }
-            
-            const resolvedSelector = selectorOrTarget;
-            
-            if (resolvedSelector.startsWith('$') && resolvedSelector !== '$this') return;
-
-            const r = (optionsOrPropertyKey as QueryOptions)?.root || 'auto';
-            const targets: Element[] = [];
-
-            if (r === 'shadow') {
-              if (this.shadowRoot?.querySelector(resolvedSelector)) targets.push(this.shadowRoot.querySelector(resolvedSelector)!);
-            } else if (r === 'light') {
-              if (this.querySelector(resolvedSelector)) targets.push(this.querySelector(resolvedSelector)!);
-            } else if (r === 'all') {
-              if (this.shadowRoot?.querySelector(resolvedSelector)) targets.push(this.shadowRoot.querySelector(resolvedSelector)!);
-              if (this.querySelector(resolvedSelector)) targets.push(this.querySelector(resolvedSelector)!);
-            } else {
-              const el = (this.shadowRoot || this).querySelector(resolvedSelector);
-              if (el) targets.push(el);
-            }
-
-            targets.forEach(t => t.remove());
+            const options = (optionsOrPropertyKey as QueryOptions) || {};
+            const all = resolveQueryElements(this, selectorOrTarget as QuerySelector, options, win);
+            const picked = pickElements(all, options.pick ?? 'first');
+            if (Array.isArray(picked)) picked.forEach(t => t.remove());
+            else if (picked) picked.remove();
           }
         },
         enumerable: true,
@@ -170,10 +158,87 @@ export function query(selectorOrTarget?: string | ((currentThis: any, helper: He
     };
   }
   // Without selector (defaults to $this)
-  return query('$this', selectorOrTarget as SwcQueryOptions);
+  return query('$this', selectorOrTarget as QueryOptions);
 }
 
 export const getQueryMetadata = (target: any): QueryMetadata[]  => {
   const constructor = target instanceof Function ? target : target.constructor;
   return ReflectUtils.getMetadata(QUERY_METADATA_KEY, constructor) ?? [];
 };
+
+// ─── queryAll (query의 pick:'all' 편의 래퍼 — 호환용) ───
+export const QUERY_ALL_METADATA_KEY = QUERY_METADATA_KEY;
+
+export function queryAll(target: Object, propertyKey: string | symbol, descriptor?: PropertyDescriptor): PropertyDescriptor | void;
+export function queryAll(selector: string, options?: Omit<QueryOptions, 'pick'>): PropertyDecorator;
+export function queryAll(selector: QueryFnSelector, options?: Omit<QueryNonQueryOptions, 'pick'>): PropertyDecorator;
+export function queryAll(options?: Omit<QueryOptions, 'pick'>): PropertyDecorator;
+export function queryAll(selectorOrTarget?: any, optionsOrPropertyKey?: any, descriptor?: PropertyDescriptor): any {
+  // bare(필드 직접 적용)는 query로 위임
+  if (descriptor !== undefined && (typeof optionsOrPropertyKey === 'string' || typeof optionsOrPropertyKey === 'symbol')) {
+    return query(selectorOrTarget, optionsOrPropertyKey, descriptor);
+  }
+  if (typeof selectorOrTarget === 'string' || typeof selectorOrTarget === 'function') {
+    return query(selectorOrTarget, {...(optionsOrPropertyKey ?? {}), pick: 'all'});
+  }
+  return query({...(selectorOrTarget ?? {}), pick: 'all'});
+}
+
+export const getQueryAllMetadata = getQueryMetadata;
+
+// ─── root별 편의 데코레이터 ───
+
+/**
+ * @queryShadow(selector, options?) — shadow DOM에서 요소를 쿼리
+ */
+export function queryShadow(selector: string | QueryFnSelector, options?: QueryBaseOptions): PropertyDecorator {
+  return query(selector as any, {...options ?? {}, root: 'shadow'});
+}
+
+/**
+ * @queryLight(selector, options?) — light DOM에서 요소를 쿼리
+ */
+export function queryLight(selector: string | QueryFnSelector, options?: QueryBaseOptions): PropertyDecorator {
+  return query(selector as any, {...options ?? {}, root: 'light'});
+}
+
+/**
+ * @queryAllRoots(selector, options?) — shadow+light 모두에서 요소를 쿼리 (pick 기본 first)
+ */
+export function queryAllRoots(selector: string | QueryFnSelector, options?: QueryBaseOptions): PropertyDecorator {
+  return query(selector as any, {...options ?? {}, root: 'all'});
+}
+
+/**
+ * @queryAllShadow(selector, options?) — shadow DOM에서 모든 매칭 요소를 배열로 쿼리
+ */
+export function queryAllShadow(selector: string | QueryFnSelector, options?: QueryBaseOptions): PropertyDecorator {
+  return query(selector as any, {...options ?? {}, root: 'shadow', pick: 'all'});
+}
+
+/**
+ * @queryAllLight(selector, options?) — light DOM에서 모든 매칭 요소를 배열로 쿼리
+ */
+export function queryAllLight(selector: string | QueryFnSelector, options?: QueryBaseOptions): PropertyDecorator {
+  return query(selector as any, {...options ?? {}, root: 'light', pick: 'all'});
+}
+
+/**
+ * @queryAllAll(selector, options?) — shadow+light 모두에서 모든 매칭 요소를 배열로 쿼리
+ */
+export function queryAllAll(selector: string | QueryFnSelector, options?: QueryBaseOptions): PropertyDecorator {
+  return query(selector as any, {...options ?? {}, root: 'all', pick: 'all'});
+}
+
+/**
+ * @queryIn(root, pick?) — root + pick 조합 팩토리.
+ * first/last/even/odd/all/number를 모두 지원하는 데코레이터를 생성한다.
+ *
+ * @example
+ * @queryIn('shadow', 'even')('.item')   // shadow DOM 짝수 인덱스들
+ * @queryIn('light', 2)('.item')         // light DOM 3번째 요소
+ * @queryIn('all')('.item')              // root all, pick 기본 first
+ */
+export const queryIn = (root: SwcRootType, pick?: QueryPick) =>
+  (selector: string | QueryFnSelector, options?: QueryBaseOptions): PropertyDecorator =>
+    query(selector as any, {...options ?? {}, root, ...(pick !== undefined ? {pick} : {})});