@dooboostore/simple-web-component 1.0.49 → 1.0.51

package/src/decorators/query.ts

@@ -39,7 +39,7 @@ export const resolveQueryElements = (
   options: QueryOptions,
   win: Window
 ): HTMLElement[] => {
-  const hostSet = SwcUtils.getHelperAndHostSet(win, inst);
+  const hostSet = SwcUtils.getHelperAndHostSet(inst);
   let all: HTMLElement[] = [];
 
   if (typeof selector === 'function') {
@@ -95,10 +95,11 @@ export const pickElements = (
   return all.length ? all[0] : null;
 };
 
-export function query(target: Object, propertyKey: string | symbol, descriptor?: PropertyDescriptor): PropertyDescriptor | void;
 export function query(selector: string, options?: QueryOptions): PropertyDecorator;
 export function query(selector: QueryFnSelector, options?: QueryNonQueryOptions): PropertyDecorator;
-export function query(options?: QueryOptions): PropertyDecorator;
+export function query(options: QueryOptions): PropertyDecorator;
+// bare(@query) 시그니처는 맨 뒤 — @attribute 와 같은 이유 (TS1240/TS1271)
+export function query(target: Object, propertyKey: string | symbol): void;
 /**
  * @query decorator — 클래스 필드에 요소를 주입한다.
  *
@@ -111,6 +112,10 @@ export function query(selectorOrTarget?: string | ((currentThis: any, helper: He
   if (descriptor !== undefined && (typeof optionsOrPropertyKey === 'string' || typeof optionsOrPropertyKey === 'symbol')) {
     throw new Error(`@query decorator cannot be used on methods. (Method: ${String(optionsOrPropertyKey)})`);
   }
+  // bare: @query — 자기 자신($this). 빈 괄호 @query() 는 타입에서 막는다 (인자가 없으면 괄호도 없다)
+  if (selectorOrTarget && (typeof optionsOrPropertyKey === 'string' || typeof optionsOrPropertyKey === 'symbol')) {
+    return query('$this')(selectorOrTarget, optionsOrPropertyKey);
+  }
   // With selector
   if (typeof selectorOrTarget === 'string' || typeof selectorOrTarget === 'function') {
     return (targetObj: Object, propertyKey: string | symbol, descriptor?: never): void => {
@@ -119,7 +124,7 @@ export function query(selectorOrTarget?: string | ((currentThis: any, helper: He
       }
 
       const constructor = targetObj.constructor;
-      let queries = ReflectUtils.getMetadata<QueryMetadata[]>(QUERY_METADATA_KEY, constructor);
+      let queries = ReflectUtils.getOwnMetadata(QUERY_METADATA_KEY, constructor) as QueryMetadata[] | undefined;
       if (!queries) {
         queries = [];
         ReflectUtils.defineMetadata(QUERY_METADATA_KEY, queries, constructor);
@@ -157,26 +162,29 @@ export function query(selectorOrTarget?: string | ((currentThis: any, helper: He
       });
     };
   }
-  // Without selector (defaults to $this)
+  // 옵션만: $this
   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) ?? [];
+  const constructor = typeof target === 'function' ? target : target.constructor;
+  return ReflectUtils.findAllMetadata<any[]>(QUERY_METADATA_KEY, constructor).flat();
 };
 
 // ─── 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(options: Omit<QueryOptions, 'pick'>): PropertyDecorator;
+export function queryAll(target: Object, propertyKey: string | symbol): void;
 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);
+    throw new Error(`@queryAll decorator cannot be used on methods. (Method: ${String(optionsOrPropertyKey)})`);
+  }
+  // bare: @queryAll — [$this]. 빈 괄호 @queryAll() 는 타입에서 막는다
+  if (selectorOrTarget && (typeof optionsOrPropertyKey === 'string' || typeof optionsOrPropertyKey === 'symbol')) {
+    return query('$this', { pick: 'all' })(selectorOrTarget, optionsOrPropertyKey);
   }
   if (typeof selectorOrTarget === 'string' || typeof selectorOrTarget === 'function') {
     return query(selectorOrTarget, {...(optionsOrPropertyKey ?? {}), pick: 'all'});
@@ -235,9 +243,9 @@ export function queryAllAll(selector: string | QueryFnSelector, options?: QueryB
  * 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
+ * @(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 =>

package/src/decorators/requestAnimationFrame.ts

@@ -0,0 +1,149 @@
+import { ReflectUtils } from '@dooboostore/core';
+import { ensureInit } from './elementDefine';
+import { SwcUtils } from '../utils/Utils';
+import { ElementDefineLifeCycler, HelperHostSet } from '../types';
+
+export const REQUEST_ANIMATION_FRAME_METADATA_KEY = Symbol.for('simple-web-component:request-animation-frame');
+
+export type RequestAnimationFrameType = 'onConnected' | 'returnValue';
+
+export interface RequestAnimationFrameOptions {
+  /**
+   * 'onConnected' - connect 시 자동으로 루프 시작 (매 프레임 데코레이트된 메서드를 직접 호출), disconnect 시 자동 정리.
+   * 'returnValue'(기본값) - 자동 시작 없음. 개발자가 이 메서드를 직접 호출해야 시작되고,
+   *   그 호출의 리턴값(또는 valueKey로 뽑은 값)이 실제로 매 프레임 호출될 함수가 된다.
+   */
+  type?: RequestAnimationFrameType;
+  /** 루프 시작 직후 1회 호출 (디버깅/로깅용). id는 첫 requestAnimationFrame 반환값 - cleanup은 자동으로 처리되므로 직접 취소할 필요 없음. */
+  created?: (set: HelperHostSet, id: number) => void;
+  /**
+   * type:'returnValue' 전용 - 리턴값이 함수면 그 자체를, 객체면 이 키의 값이 함수일 때 그 값을
+   * "매 프레임 호출될 함수"로 사용한다. 안 주면 REQUEST_ANIMATION_FRAME_METADATA_KEY로 폴백한다 -
+   * applyAttribute.ts/applyNode.ts의 valueKey와 동일한 컨벤션.
+   */
+  valueKey?: symbol | string;
+}
+
+export interface RequestAnimationFrameMetadata {
+  propertyKey: string | symbol;
+  options: RequestAnimationFrameOptions;
+}
+
+/**
+ * 프레임 콜백 시그니처.
+ * - timestamp: 이번 프레임의 시각 (requestAnimationFrame이 넘겨주는 값)
+ * - prevValue: 직전 호출이 리턴한 값 (첫 호출에서는 undefined)
+ * 리턴값이 undefined/null이면 다음 프레임을 예약하지 않고 루프가 멈춘다 (개발자가 종료를 제어).
+ * undefined/null이 아닌 값을 리턴하면 그 값 그대로 다음 호출의 prevValue로 전달된다.
+ */
+export type FrameCallback = (timestamp: number, prevValue?: any) => any;
+
+const getActiveEntries = (inst: any): number[] => (inst.__swc_requestAnimationFrameIds ??= []);
+
+const startFrameLoop = (win: Window, entries: number[], frameFn: FrameCallback): number => {
+  let currentId = 0;
+  const step = (timestamp: number, prevValue?: any) => {
+    const idx = entries.indexOf(currentId);
+    if (idx >= 0) entries.splice(idx, 1);
+    let result: any;
+    try {
+      result = frameFn(timestamp, prevValue);
+    } catch (e) {
+      console.error('[SWC] requestAnimationFrame callback error:', e);
+      return;
+    }
+    if (result === undefined || result === null) return; // 개발자가 종료를 신호함 - 다음 프레임 예약 안 함
+    currentId = win.requestAnimationFrame(ts => step(ts, result));
+    entries.push(currentId);
+  };
+  currentId = win.requestAnimationFrame(ts => step(ts, undefined));
+  entries.push(currentId);
+  return currentId;
+};
+
+const applyRequestAnimationFrame = (options: RequestAnimationFrameOptions, target: Object, propertyKey: string | symbol, descriptor?: PropertyDescriptor): PropertyDescriptor | void => {
+  const constructor = target.constructor;
+  const normalizedOptions: RequestAnimationFrameOptions = { ...options, type: options.type ?? 'returnValue' };
+
+  let metaList = ReflectUtils.getOwnMetadata(REQUEST_ANIMATION_FRAME_METADATA_KEY, constructor) as RequestAnimationFrameMetadata[];
+  if (!metaList) {
+    metaList = [];
+    ReflectUtils.defineMetadata(REQUEST_ANIMATION_FRAME_METADATA_KEY, metaList, constructor);
+  }
+  metaList.push({ propertyKey, options: normalizedOptions });
+
+  if (normalizedOptions.type === 'onConnected' || !descriptor) {
+    return; // LifeCycler가 connect/disconnect를 전담 - wrapping 불필요
+  }
+
+  const original = descriptor.value;
+  descriptor.value = function (this: any, ...args: any[]) {
+    const res = original.apply(this, args);
+    // valueKey를 안 주면 이 데코레이터 전용 METADATA_KEY로 폴백 (applyAttribute.ts/applyNode.ts와 동일한 컨벤션)
+    const vk = normalizedOptions.valueKey ?? REQUEST_ANIMATION_FRAME_METADATA_KEY;
+    const frameFn: FrameCallback | undefined =
+      typeof res === 'function' ? res : res && typeof res === 'object' && typeof res[vk] === 'function' ? res[vk] : undefined;
+
+    if (frameFn) {
+      ensureInit(this);
+      const win = SwcUtils.resolveWindow(this);
+      const id = startFrameLoop(win, getActiveEntries(this), frameFn);
+      normalizedOptions.created?.(SwcUtils.getHelperAndHostSet(this), id);
+    }
+    return res;
+  };
+  return descriptor;
+};
+
+/**
+ * type:'onConnected' - connect 시 자동으로 매 프레임 루프를 시작하고, disconnect 시 자동으로 cancelAnimationFrame 한다.
+ * type:'returnValue'(기본값) - 메서드를 감싸지 않는 대신, 호출될 때마다(개발자가 직접 호출) 원본 로직을
+ *   그대로 실행하고 리턴값(또는 valueKey로 뽑은 값)이 함수면 그 함수를 매 프레임 호출되는 루프로 등록한다.
+ *   원본 리턴값은 그대로 통과시키므로 다른 데코레이터와 같은 메서드에 스택해도 순서에 상관없이 안전하다.
+ *
+ * 옵션 없이 `@requestAnimationFrame` 그대로 붙여도 되고, `@requestAnimationFrame({...})`처럼 옵션을 줄 수도 있다.
+ */
+export function requestAnimationFrame(options: RequestAnimationFrameOptions): MethodDecorator;
+export function requestAnimationFrame(target: Object, propertyKey: string | symbol, descriptor: PropertyDescriptor): void;
+export function requestAnimationFrame(optionsOrTarget?: RequestAnimationFrameOptions | Object, propertyKey?: string | symbol, descriptor?: PropertyDescriptor): MethodDecorator | void {
+  if (propertyKey !== undefined) {
+    // 옵션 없이: @requestAnimationFrame
+    applyRequestAnimationFrame({}, optionsOrTarget as Object, propertyKey, descriptor);
+    return;
+  }
+  // 옵션과 함께: @requestAnimationFrame({...})
+  return (target: Object, propertyKey: string | symbol, descriptor?: PropertyDescriptor) => {
+    return applyRequestAnimationFrame((optionsOrTarget as RequestAnimationFrameOptions) ?? {}, target, propertyKey, descriptor);
+  };
+}
+
+export const findAllRequestAnimationFrameMetadata = (target: any): RequestAnimationFrameMetadata[] => {
+  const constructor = typeof target === 'function' ? target : target.constructor;
+  return (ReflectUtils.findAllMetadata<RequestAnimationFrameMetadata[]>(REQUEST_ANIMATION_FRAME_METADATA_KEY, constructor) || []).flat();
+};
+
+export class RequestAnimationFrameLifeCycler implements ElementDefineLifeCycler {
+  onConnected(helperHostSet: HelperHostSet): void {
+    const inst = helperHostSet.$this;
+    inst.__swc_requestAnimationFrameIds = []; // 재연결 대비 리셋
+    const entries = getActiveEntries(inst);
+    for (const meta of findAllRequestAnimationFrameMetadata(inst)) {
+      if (meta.options.type !== 'onConnected') continue; // returnValue 타입은 수동 호출을 기다림
+      const frameFn: FrameCallback = (timestamp, prevValue) => inst[meta.propertyKey](timestamp, prevValue);
+      const id = startFrameLoop(helperHostSet.$w, entries, frameFn);
+      meta.options.created?.(helperHostSet, id);
+    }
+  }
+
+  onDisconnected(helperHostSet: HelperHostSet): void {
+    const inst = helperHostSet.$this;
+    for (const id of inst.__swc_requestAnimationFrameIds ?? []) {
+      try {
+        helperHostSet.$w.cancelAnimationFrame(id);
+      } catch (e) {
+        console.error('[SWC] cancelAnimationFrame error:', e);
+      }
+    }
+    inst.__swc_requestAnimationFrameIds = [];
+  }
+}

package/src/decorators/resizeObserver.ts

@@ -1,10 +1,16 @@
 import { ReflectUtils } from '@dooboostore/core';
 import { SpecialSelector, SwcQueryOptions, SwcFnSelector, SwcSelector, HelperHostSet } from '../types';
+import { buildSwcParameterArgs } from './parameter';
 
 // 공통 옵션 — root·delegate 없음
 export interface ResizeObserverBaseOptions {
   box?: 'content-box' | 'border-box' | 'device-pixel-content-box';
-  filter?: (matchedEls: HTMLElement[], meta: { currentThis: any, helper: HelperHostSet }) => boolean;
+  /** 매칭 시 핸들러 실행 여부 게이트. Promise<boolean>도 되어 async 판정 가능. false면 스킵. */
+  filter?: (matchedEls: HTMLElement[], meta: { currentThis: any, helper: HelperHostSet }) => boolean | Promise<boolean>;
+  /** filter 통과 후 핸들러 직전 훅. await되고, 리턴값은 @resizeObserverBeforeReturn 으로 핸들러에 주입된다. */
+  before?: (matchedEls: HTMLElement[], meta: { currentThis: any, helper: HelperHostSet }) => any | Promise<any>;
+  /** 핸들러가 성공/실패해도 항상 실행되는 정리 훅. ctx로 인자/결과/에러를 받는다. 에러는 로깅됨. */
+  finally?: (matchedEls: HTMLElement[], meta: { currentThis: any, helper: HelperHostSet }, ctx: { args: any[]; result?: any; error?: any }) => any | Promise<any>;
   removeObserver?: (target: Element, optionValue: ResizeObserverOptions) => void;
 }
 
@@ -26,112 +32,123 @@ export interface ResizeObserverMetadata {
 
 export const RESIZE_OBSERVER_METADATA_KEY = Symbol.for('simple-web-component:resize-observer');
 
+const applyResizeObserver = (selector: SwcSelector, options: ResizeObserverOptions, targetObj: Object, propertyKey: string | symbol): void => {
+  const constructor = targetObj.constructor;
+  let observers = ReflectUtils.getOwnMetadata(RESIZE_OBSERVER_METADATA_KEY, constructor) as ResizeObserverMetadata[] | undefined;
+  if (!observers) {
+    observers = [];
+    ReflectUtils.defineMetadata(RESIZE_OBSERVER_METADATA_KEY, observers, constructor);
+  }
+  observers.push({ propertyKey, selector, options });
+};
+
+const resolveResizeObserverArgs = (
+  selectorOrOptions: SwcSelector | ResizeObserverOptions | undefined,
+  maybeOptions: ResizeObserverOptions | undefined,
+  extra: Partial<ResizeObserverOptions>
+): { selector: SwcSelector; options: ResizeObserverOptions } => {
+  if (typeof selectorOrOptions === 'string' || typeof selectorOrOptions === 'function') {
+    return { selector: selectorOrOptions, options: { ...(maybeOptions ?? {}), ...extra } };
+  }
+  return { selector: '$this', options: { ...(selectorOrOptions ?? {}), ...extra } };
+};
+
+/**
+ * bare(@decorator)와 factory(@decorator(...), 빈 괄호는 타입에서 막음) 호출을 모두 처리하는 공통 디스패처.
+ * extra는 Light/Shadow/All/Delegate 변형이 강제로 덧씌우는 옵션(root, delegate 등)이다.
+ */
+const dispatchResizeObserver = (
+  selectorOrOptionsOrTarget: SwcSelector | ResizeObserverOptions | Object | undefined,
+  maybeOptionsOrPropertyKey: ResizeObserverOptions | string | symbol | undefined,
+  descriptor: PropertyDescriptor | undefined,
+  extra: Partial<ResizeObserverOptions>
+): MethodDecorator | void => {
+  if ((typeof maybeOptionsOrPropertyKey === 'string' || typeof maybeOptionsOrPropertyKey === 'symbol') && descriptor !== undefined) {
+    // 옵션 없이: @decorator
+    applyResizeObserver('$this', { ...extra }, selectorOrOptionsOrTarget as Object, maybeOptionsOrPropertyKey);
+    return;
+  }
+  // 옵션과 함께: @decorator(selector, options) / @decorator(options)
+  const { selector, options } = resolveResizeObserverArgs(
+    selectorOrOptionsOrTarget as SwcSelector | ResizeObserverOptions | undefined,
+    maybeOptionsOrPropertyKey as ResizeObserverOptions | undefined,
+    extra
+  );
+  return (targetObj: Object, propertyKey: string | symbol) => {
+    applyResizeObserver(selector, options, targetObj, propertyKey);
+  };
+};
+
 export function resizeObserver(target: SpecialSelector, options?: ResizeObserverQueryOptions): MethodDecorator;
 export function resizeObserver(selector: string, options?: ResizeObserverQueryOptions): MethodDecorator;
 export function resizeObserver(selector: SwcFnSelector, options?: ResizeObserverNonQueryOptions): MethodDecorator;
-export function resizeObserver(options?: ResizeObserverQueryOptions): MethodDecorator;
+export function resizeObserver(options: ResizeObserverQueryOptions): MethodDecorator;
+export function resizeObserver(target: Object, propertyKey: string | symbol, descriptor: PropertyDescriptor): void;
 /**
  * @resizeObserver decorator to observe element size changes.
+ * 옵션 없이 `@resizeObserver` 그대로 붙여도 되고, `@resizeObserver(...)`처럼 셀렉터/옵션을 줄 수도 있다.
  */
-export function resizeObserver(selectorOrOptions?: SwcSelector | ResizeObserverOptions, maybeOptions?: ResizeObserverOptions): MethodDecorator {
-  return (targetObj: Object, propertyKey: string | symbol, descriptor: PropertyDescriptor) => {
-    let selector: SwcSelector = '$this';
-    let options: ResizeObserverOptions = {};
-
-    if (typeof selectorOrOptions === 'string' || typeof selectorOrOptions === 'function') {
-      selector = selectorOrOptions;
-      options = maybeOptions ?? {};
-    } else {
-      selector = '$this';
-      options = selectorOrOptions ?? {};
-    }
-
-    const constructor = targetObj.constructor;
-
-    let observers = ReflectUtils.getMetadata<ResizeObserverMetadata[]>(RESIZE_OBSERVER_METADATA_KEY, constructor);
-    if (!observers) {
-      observers = [];
-      ReflectUtils.defineMetadata(RESIZE_OBSERVER_METADATA_KEY, observers, constructor);
-    }
-
-    observers.push({ propertyKey, selector, options });
-  };
+export function resizeObserver(selectorOrOptionsOrTarget?: SwcSelector | ResizeObserverOptions | Object, maybeOptionsOrPropertyKey?: ResizeObserverOptions | string | symbol, descriptor?: PropertyDescriptor): MethodDecorator | void {
+  return dispatchResizeObserver(selectorOrOptionsOrTarget, maybeOptionsOrPropertyKey, descriptor, {});
 }
 
-export function resizeObserverThis(options?: ResizeObserverQueryOptions): MethodDecorator {
-  return resizeObserver('$this', options);
-}
 
 // ─── root별 delegate 헬퍼 (root 주입 → 문자열 셀렉터 전용) ───
 
 export function resizeObserverDelegateLight(selector: string, options?: Omit<ResizeObserverQueryOptions, 'delegate'>): MethodDecorator;
-export function resizeObserverDelegateLight(options?: Omit<ResizeObserverQueryOptions, 'delegate'>): MethodDecorator;
-export function resizeObserverDelegateLight(selectorOrOptions?: string | Omit<ResizeObserverQueryOptions, 'delegate'>, maybeOptions?: Omit<ResizeObserverQueryOptions, 'delegate'>): MethodDecorator {
-  if (typeof selectorOrOptions === 'string' || typeof selectorOrOptions === 'function') {
-    return resizeObserver(selectorOrOptions as any, {...maybeOptions ?? {}, root: 'light', delegate: true});
-  }
-  return resizeObserver({...selectorOrOptions ?? {}, root: 'light', delegate: true});
+export function resizeObserverDelegateLight(options: Omit<ResizeObserverQueryOptions, 'delegate'>): MethodDecorator;
+export function resizeObserverDelegateLight(target: Object, propertyKey: string | symbol, descriptor: PropertyDescriptor): void;
+export function resizeObserverDelegateLight(selectorOrOptionsOrTarget?: string | Omit<ResizeObserverQueryOptions, 'delegate'> | Object, maybeOptionsOrPropertyKey?: Omit<ResizeObserverQueryOptions, 'delegate'> | string | symbol, descriptor?: PropertyDescriptor): MethodDecorator | void {
+  return dispatchResizeObserver(selectorOrOptionsOrTarget as any, maybeOptionsOrPropertyKey as any, descriptor, { root: 'light', delegate: true });
 }
 
 export function resizeObserverDelegateShadow(selector: string, options?: Omit<ResizeObserverQueryOptions, 'delegate'>): MethodDecorator;
-export function resizeObserverDelegateShadow(options?: Omit<ResizeObserverQueryOptions, 'delegate'>): MethodDecorator;
-export function resizeObserverDelegateShadow(selectorOrOptions?: string | Omit<ResizeObserverQueryOptions, 'delegate'>, maybeOptions?: Omit<ResizeObserverQueryOptions, 'delegate'>): MethodDecorator {
-  if (typeof selectorOrOptions === 'string' || typeof selectorOrOptions === 'function') {
-    return resizeObserver(selectorOrOptions as any, {...maybeOptions ?? {}, root: 'shadow', delegate: true});
-  }
-  return resizeObserver({...selectorOrOptions ?? {}, root: 'shadow', delegate: true});
+export function resizeObserverDelegateShadow(options: Omit<ResizeObserverQueryOptions, 'delegate'>): MethodDecorator;
+export function resizeObserverDelegateShadow(target: Object, propertyKey: string | symbol, descriptor: PropertyDescriptor): void;
+export function resizeObserverDelegateShadow(selectorOrOptionsOrTarget?: string | Omit<ResizeObserverQueryOptions, 'delegate'> | Object, maybeOptionsOrPropertyKey?: Omit<ResizeObserverQueryOptions, 'delegate'> | string | symbol, descriptor?: PropertyDescriptor): MethodDecorator | void {
+  return dispatchResizeObserver(selectorOrOptionsOrTarget as any, maybeOptionsOrPropertyKey as any, descriptor, { root: 'shadow', delegate: true });
 }
 
 export function resizeObserverDelegateAll(selector: string, options?: Omit<ResizeObserverQueryOptions, 'delegate'>): MethodDecorator;
-export function resizeObserverDelegateAll(options?: Omit<ResizeObserverQueryOptions, 'delegate'>): MethodDecorator;
-export function resizeObserverDelegateAll(selectorOrOptions?: string | Omit<ResizeObserverQueryOptions, 'delegate'>, maybeOptions?: Omit<ResizeObserverQueryOptions, 'delegate'>): MethodDecorator {
-  if (typeof selectorOrOptions === 'string' || typeof selectorOrOptions === 'function') {
-    return resizeObserver(selectorOrOptions as any, {...maybeOptions ?? {}, root: 'all', delegate: true});
-  }
-  return resizeObserver({...selectorOrOptions ?? {}, root: 'all', delegate: true});
+export function resizeObserverDelegateAll(options: Omit<ResizeObserverQueryOptions, 'delegate'>): MethodDecorator;
+export function resizeObserverDelegateAll(target: Object, propertyKey: string | symbol, descriptor: PropertyDescriptor): void;
+export function resizeObserverDelegateAll(selectorOrOptionsOrTarget?: string | Omit<ResizeObserverQueryOptions, 'delegate'> | Object, maybeOptionsOrPropertyKey?: Omit<ResizeObserverQueryOptions, 'delegate'> | string | symbol, descriptor?: PropertyDescriptor): MethodDecorator | void {
+  return dispatchResizeObserver(selectorOrOptionsOrTarget as any, maybeOptionsOrPropertyKey as any, descriptor, { root: 'all', delegate: true });
 }
 
 export function resizeObserverDelegate(selector: string, options?: Omit<ResizeObserverQueryOptions, 'delegate'>): MethodDecorator;
-export function resizeObserverDelegate(options?: Omit<ResizeObserverQueryOptions, 'delegate'>): MethodDecorator;
-export function resizeObserverDelegate(selectorOrOptions?: string | Omit<ResizeObserverQueryOptions, 'delegate'>, maybeOptions?: Omit<ResizeObserverQueryOptions, 'delegate'>): MethodDecorator {
-  if (typeof selectorOrOptions === 'string' || typeof selectorOrOptions === 'function') {
-    return resizeObserver(selectorOrOptions as any, {...maybeOptions ?? {}, root: 'auto', delegate: true});
-  }
-  return resizeObserver({...selectorOrOptions ?? {}, root: 'auto', delegate: true});
+export function resizeObserverDelegate(options: Omit<ResizeObserverQueryOptions, 'delegate'>): MethodDecorator;
+export function resizeObserverDelegate(target: Object, propertyKey: string | symbol, descriptor: PropertyDescriptor): void;
+export function resizeObserverDelegate(selectorOrOptionsOrTarget?: string | Omit<ResizeObserverQueryOptions, 'delegate'> | Object, maybeOptionsOrPropertyKey?: Omit<ResizeObserverQueryOptions, 'delegate'> | string | symbol, descriptor?: PropertyDescriptor): MethodDecorator | void {
+  return dispatchResizeObserver(selectorOrOptionsOrTarget as any, maybeOptionsOrPropertyKey as any, descriptor, { root: 'auto', delegate: true });
 }
 
 // ─── root별 일반 헬퍼 (delegate 없이, 셀렉터 생략 시 $this) ───
 
 export function resizeObserverLight(selector: string, options?: ResizeObserverQueryOptions): MethodDecorator;
-export function resizeObserverLight(options?: ResizeObserverQueryOptions): MethodDecorator;
-export function resizeObserverLight(selectorOrOptions?: string | ResizeObserverQueryOptions, maybeOptions?: ResizeObserverQueryOptions): MethodDecorator {
-  if (typeof selectorOrOptions === 'string' || typeof selectorOrOptions === 'function') {
-    return resizeObserver(selectorOrOptions as any, {...maybeOptions ?? {}, root: 'light'});
-  }
-  return resizeObserver({...selectorOrOptions ?? {}, root: 'light'});
+export function resizeObserverLight(options: ResizeObserverQueryOptions): MethodDecorator;
+export function resizeObserverLight(target: Object, propertyKey: string | symbol, descriptor: PropertyDescriptor): void;
+export function resizeObserverLight(selectorOrOptionsOrTarget?: string | ResizeObserverQueryOptions | Object, maybeOptionsOrPropertyKey?: ResizeObserverQueryOptions | string | symbol, descriptor?: PropertyDescriptor): MethodDecorator | void {
+  return dispatchResizeObserver(selectorOrOptionsOrTarget as any, maybeOptionsOrPropertyKey as any, descriptor, { root: 'light' });
 }
 
 export function resizeObserverShadow(selector: string, options?: ResizeObserverQueryOptions): MethodDecorator;
-export function resizeObserverShadow(options?: ResizeObserverQueryOptions): MethodDecorator;
-export function resizeObserverShadow(selectorOrOptions?: string | ResizeObserverQueryOptions, maybeOptions?: ResizeObserverQueryOptions): MethodDecorator {
-  if (typeof selectorOrOptions === 'string' || typeof selectorOrOptions === 'function') {
-    return resizeObserver(selectorOrOptions as any, {...maybeOptions ?? {}, root: 'shadow'});
-  }
-  return resizeObserver({...selectorOrOptions ?? {}, root: 'shadow'});
+export function resizeObserverShadow(options: ResizeObserverQueryOptions): MethodDecorator;
+export function resizeObserverShadow(target: Object, propertyKey: string | symbol, descriptor: PropertyDescriptor): void;
+export function resizeObserverShadow(selectorOrOptionsOrTarget?: string | ResizeObserverQueryOptions | Object, maybeOptionsOrPropertyKey?: ResizeObserverQueryOptions | string | symbol, descriptor?: PropertyDescriptor): MethodDecorator | void {
+  return dispatchResizeObserver(selectorOrOptionsOrTarget as any, maybeOptionsOrPropertyKey as any, descriptor, { root: 'shadow' });
 }
 
 export function resizeObserverAll(selector: string, options?: ResizeObserverQueryOptions): MethodDecorator;
-export function resizeObserverAll(options?: ResizeObserverQueryOptions): MethodDecorator;
-export function resizeObserverAll(selectorOrOptions?: string | ResizeObserverQueryOptions, maybeOptions?: ResizeObserverQueryOptions): MethodDecorator {
-  if (typeof selectorOrOptions === 'string' || typeof selectorOrOptions === 'function') {
-    return resizeObserver(selectorOrOptions as any, {...maybeOptions ?? {}, root: 'all'});
-  }
-  return resizeObserver({...selectorOrOptions ?? {}, root: 'all'});
+export function resizeObserverAll(options: ResizeObserverQueryOptions): MethodDecorator;
+export function resizeObserverAll(target: Object, propertyKey: string | symbol, descriptor: PropertyDescriptor): void;
+export function resizeObserverAll(selectorOrOptionsOrTarget?: string | ResizeObserverQueryOptions | Object, maybeOptionsOrPropertyKey?: ResizeObserverQueryOptions | string | symbol, descriptor?: PropertyDescriptor): MethodDecorator | void {
+  return dispatchResizeObserver(selectorOrOptionsOrTarget as any, maybeOptionsOrPropertyKey as any, descriptor, { root: 'all' });
 }
 
 export function getResizeObserverMetadata(target: any): ResizeObserverMetadata[] | undefined {
-  const constructor = target instanceof Function ? target : target.constructor;
-  return ReflectUtils.getMetadata(RESIZE_OBSERVER_METADATA_KEY, constructor);
+  const constructor = typeof target === 'function' ? target : target.constructor;
+  return ReflectUtils.findAllMetadata<any[]>(RESIZE_OBSERVER_METADATA_KEY, constructor).flat();
 }
 
 // ─────────────────────────────────────────────────────────────────────────────
@@ -140,20 +157,21 @@ export function getResizeObserverMetadata(target: any): ResizeObserverMetadata[]
 // elementDefine 이 수집된 ResizeObserverSet 으로 observer 를 생성하고,
 // observe/unobserve 함수를 주입해 MutationObserver delegate 추적이 사용할 수 있게 한다.
 // ─────────────────────────────────────────────────────────────────────────────
-import { ElementDefineLifeCycler, OnConnectedResult, ResizeObserverSet, ResizeObserverSetEntry } from '../types';
+import { ElementDefineLifeCycler, inObserverScope, ObserverScope, OnConnectedResult, ResizeObserverSet, ResizeObserverSetEntry } from '../types';
 import { SwcUtils } from '../utils/Utils';
 
 export class ResizeObserverLifeCycler implements ElementDefineLifeCycler {
   private readonly removeObserverCallbacksMap = new WeakMap<Element, Array<{ fn: (target: Element, opts: unknown) => void; target: any; opts: unknown }>>();
 
-  onConnected(helperHostSet: HelperHostSet): OnConnectedResult | void {
+  onConnected(helperHostSet: HelperHostSet, _set?: ResizeObserverSet, scope?: ObserverScope): OnConnectedResult | void {
     const inst = helperHostSet.$this;
     const currentWin = helperHostSet.$w;
 
-    const removeObserverCallbacks: Array<{ fn: (target: Element, opts: unknown) => void; target: any; opts: unknown }> = [];
+    // 'rest' 는 같은 connect 의 'self' 뒤에 오므로 이어 붙이고, 그 외(새 connect)는 새로 시작한다.
+    const removeObserverCallbacks = (scope === 'rest' && this.removeObserverCallbacksMap.get(inst)) || [];
     this.removeObserverCallbacksMap.set(inst, removeObserverCallbacks);
 
-    const allMeta = getResizeObserverMetadata(inst) ?? [];
+    const allMeta = (getResizeObserverMetadata(inst) ?? []).filter(m => inObserverScope(m, scope));
     if (allMeta.length === 0) return;
 
     const root: HTMLElement | ShadowRoot = inst.shadowRoot || inst;
@@ -163,6 +181,9 @@ export class ResizeObserverLifeCycler implements ElementDefineLifeCycler {
       if (m.options.removeObserver) removeObserverCallbacks.push({ fn: m.options.removeObserver, target: root, opts: m.options });
     }
 
+    // non-delegate 메타별 observe 대상 — 콜백은 모든 메타가 공유하므로, 엔트리를 자기 대상에만 배달한다.
+    const metaTargets = new Map<typeof allMeta[number], WeakSet<Element>>();
+
     // ── ResizeObserver 콜백 ──
     const callback: ResizeObserverSetEntry['callback'] = (entries, obs) => {
       for (const m of allMeta) {
@@ -175,14 +196,29 @@ export class ResizeObserverLifeCycler implements ElementDefineLifeCycler {
             return el.matches?.(m.selector as string) || !!el.closest?.(m.selector as string);
           });
         } else {
-          matchedEls = entries.map(e => e.target as HTMLElement).filter(t => t && t.nodeType === 1);
+          const set = metaTargets.get(m);
+          matchedEls = entries.map(e => e.target as HTMLElement).filter(t => t && t.nodeType === 1 && !!set?.has(t));
         }
         if (matchedEls.length === 0) continue;
-        if (m.options.filter) {
-          if (!m.options.filter(matchedEls, { currentThis: inst, helper: helperHostSet })) continue;
-        }
-        const hostSet = SwcUtils.getHostSet(inst);
-        inst[m.propertyKey](matchedEls, entries, obs, { ...hostSet, $root: root });
+        const opts = m.options;
+        void (async () => {
+          const helper = SwcUtils.getHelperAndHostSet(inst);
+          if (opts.filter && !(await opts.filter(matchedEls, { currentThis: inst, helper }))) return;
+          const hostSet = SwcUtils.getHostSet(inst);
+          const helperSet = SwcUtils.getHelperSet(helperHostSet.$w);
+          // entries 도 이 메서드 대상 것만 (옵저버는 공유라 배치에 다른 대상 엔트리가 섞인다)
+          const legacyArgs = [matchedEls, entries.filter(e => matchedEls.includes(e.target as HTMLElement)), obs, { ...hostSet, $root: root }];
+          const buildArgs = (beforeReturn: any) => buildSwcParameterArgs(inst, m.propertyKey, {
+            hostSet, helperHostSet: helper, helperSet, resizeObserverBeforeReturn: beforeReturn
+          }, [...legacyArgs, beforeReturn]);
+          let args = buildArgs(undefined);
+          if (opts.before) { const br = await opts.before(matchedEls, { currentThis: inst, helper }); args = buildArgs(br); }
+          let result: any, error: any;
+          try { result = await inst[m.propertyKey](...args); }
+          catch (e) { error = e; }
+          finally { if (opts.finally) await opts.finally(matchedEls, { currentThis: inst, helper }, { args, result, error }); }
+          if (error) throw error;
+        })().catch(e => console.error('[SWC] resizeObserver handler error:', e));
       }
     };
 
@@ -219,6 +255,7 @@ export class ResizeObserverLifeCycler implements ElementDefineLifeCycler {
           }
         }
       }
+      metaTargets.set(m, new WeakSet(targets));
       for (const el of targets) resizeObserverSet.push({ target: el, options: m.options.box ? { box: m.options.box } : undefined, callback });
     }