@dooboostore/simple-web-component 1.0.33 → 1.0.34

package/dist/cjs/decorators/applyStyle.js

@@ -44,67 +44,77 @@ function createStyleDecorator(action) {
       }
       metaList.set(propertyKey, { propertyKey, selector, action, options });
       const original = descriptor.value;
-      descriptor.value = async function(...args) {
+      descriptor.value = function(...args) {
         (0, import_elementDefine.ensureInit)(this);
-        const res = await original.apply(this, args);
-        if (res !== void 0) {
-          const win = this.ownerDocument?.defaultView || window;
-          const host = this;
-          const hostSet = import_Utils.SwcUtils.getHelperAndHostSet(win, host);
-          const r = options.root || "auto";
-          const targetEls = [];
-          const applyRoot = (t) => {
-            if (!t || !(t instanceof win.HTMLElement)) return;
-            targetEls.push(t);
-          };
-          if (selector === ":parentHost") applyRoot(hostSet.$parentHost);
-          else if (selector === ":appHost") applyRoot(hostSet.$appHost);
-          else if (selector === ":firstHost") applyRoot(hostSet.$firstHost);
-          else if (selector === ":lastHost") applyRoot(hostSet.$lastHost);
-          else if (selector === ":firstAppHost") applyRoot(hostSet.$firstAppHost);
-          else if (selector === ":lastAppHost") applyRoot(hostSet.$lastAppHost);
-          else if (selector === ":hosts") hostSet.$hosts.forEach(applyRoot);
-          else if (selector === ":appHosts") hostSet.$appHosts.forEach(applyRoot);
-          else if (selector === ":host" || !selector) applyRoot(host);
-          else {
-            const targetRoot = r === "auto" ? host.shadowRoot || host : r === "shadow" ? host.shadowRoot : host;
-            if (targetRoot) {
-              const found = targetRoot.querySelectorAll(selector);
-              if (found) targetEls.push(...Array.from(found));
+        const res = original.apply(this, args);
+        const handleResult = (resolvedValue) => {
+          if (resolvedValue !== void 0) {
+            const win = this.ownerDocument?.defaultView || window;
+            const host = this;
+            const hostSet = import_Utils.SwcUtils.getHelperAndHostSet(win, host);
+            const r = options.root || "auto";
+            const targetEls = [];
+            const applyRoot = (t) => {
+              if (!t || !(t instanceof win.HTMLElement)) return;
+              targetEls.push(t);
+            };
+            if (selector === ":parentHost") applyRoot(hostSet.$parentHost);
+            else if (selector === ":appHost") applyRoot(hostSet.$appHost);
+            else if (selector === ":firstHost") applyRoot(hostSet.$firstHost);
+            else if (selector === ":lastHost") applyRoot(hostSet.$lastHost);
+            else if (selector === ":firstAppHost") applyRoot(hostSet.$firstAppHost);
+            else if (selector === ":lastAppHost") applyRoot(hostSet.$lastAppHost);
+            else if (selector === ":hosts") hostSet.$hosts.forEach(applyRoot);
+            else if (selector === ":appHosts") hostSet.$appHosts.forEach(applyRoot);
+            else if (selector === ":host" || !selector) applyRoot(host);
+            else {
+              const targetRoot = r === "auto" ? host.shadowRoot || host : r === "shadow" ? host.shadowRoot : host;
+              if (targetRoot) {
+                const found = targetRoot.querySelectorAll(selector);
+                if (found) targetEls.push(...Array.from(found));
+              }
             }
-          }
-          targetEls.forEach((targetEl) => {
-            const resolvedRes = typeof res === "function" ? res(targetEl, hostSet) : res;
-            if (action === "set" || action === "update") {
-              if (action === "set") targetEl.style.cssText = "";
-              if (typeof resolvedRes === "object" && resolvedRes !== null && !Array.isArray(resolvedRes)) {
-                Object.entries(resolvedRes).forEach(([prop, val]) => {
-                  const finalVal = typeof val === "function" ? val(targetEl, hostSet) : val;
-                  if (finalVal === null || finalVal === void 0) {
-                    targetEl.style.removeProperty(prop);
-                  } else {
-                    targetEl.style[prop] = String(finalVal);
-                  }
-                });
-              } else if (typeof resolvedRes === "string") {
-                targetEl.style.cssText = resolvedRes;
+            targetEls.forEach((targetEl) => {
+              if (options.filter && !options.filter(targetEl, resolvedValue, { currentThis: this, helper: hostSet })) {
+                return;
               }
-            } else if (action === "remove") {
-              if (typeof resolvedRes === "object" && resolvedRes !== null && !Array.isArray(resolvedRes)) {
-                Object.entries(resolvedRes).forEach(([prop, val]) => {
-                  const shouldRemove = typeof val === "function" ? val(targetEl, hostSet) : !!val;
-                  if (shouldRemove) {
-                    targetEl.style.removeProperty(prop);
-                  }
-                });
-              } else {
-                const props = Array.isArray(resolvedRes) ? resolvedRes : [resolvedRes];
-                props.forEach((p) => targetEl.style.removeProperty(String(p)));
+              const resolvedRes = typeof resolvedValue === "function" ? resolvedValue(targetEl, hostSet) : resolvedValue;
+              if (action === "set" || action === "update") {
+                if (action === "set") targetEl.style.cssText = "";
+                if (typeof resolvedRes === "object" && resolvedRes !== null && !Array.isArray(resolvedRes)) {
+                  Object.entries(resolvedRes).forEach(([prop, val]) => {
+                    const finalVal = typeof val === "function" ? val(targetEl, hostSet) : val;
+                    if (finalVal === null || finalVal === void 0) {
+                      targetEl.style.removeProperty(prop);
+                    } else {
+                      targetEl.style[prop] = String(finalVal);
+                    }
+                  });
+                } else if (typeof resolvedRes === "string") {
+                  targetEl.style.cssText = resolvedRes;
+                }
+              } else if (action === "remove") {
+                if (typeof resolvedRes === "object" && resolvedRes !== null && !Array.isArray(resolvedRes)) {
+                  Object.entries(resolvedRes).forEach(([prop, val]) => {
+                    const shouldRemove = typeof val === "function" ? val(targetEl, hostSet) : !!val;
+                    if (shouldRemove) {
+                      targetEl.style.removeProperty(prop);
+                    }
+                  });
+                } else {
+                  const props = Array.isArray(resolvedRes) ? resolvedRes : [resolvedRes];
+                  props.forEach((p) => targetEl.style.removeProperty(String(p)));
+                }
               }
-            }
-          });
+            });
+          }
+          return resolvedValue;
+        };
+        if (res instanceof Promise) {
+          return res.then(handleResult);
+        } else {
+          return handleResult(res);
         }
-        return res;
       };
       return descriptor;
     };

package/dist/cjs/decorators/applyStyle.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/decorators/applyStyle.ts"],
-  "sourcesContent": ["import { ReflectUtils } from '@dooboostore/core';\nimport { ensureInit } from './elementDefine';\nimport { SwcUtils } from '../utils/Utils';\nimport { SwcQueryOptions, HelperHostSet } from '../types';\n\nexport type StyleAction = 'set' | 'update' | 'remove';\n\nexport interface StyleApplyOptions extends SwcQueryOptions {}\n\nexport interface StyleApplyMetadata {\n  propertyKey: string | symbol;\n  selector: string;\n  action: StyleAction;\n  options: StyleApplyOptions;\n}\n\nexport const STYLE_METADATA_KEY = Symbol.for('simple-web-component:style');\n\nfunction createStyleDecorator(action: StyleAction) {\n  return (selector: string, options: StyleApplyOptions = {}): MethodDecorator => {\n    return (target: Object, propertyKey: string | symbol, descriptor: PropertyDescriptor) => {\n      const constructor = target.constructor;\n      let metaList = ReflectUtils.getOwnMetadata(STYLE_METADATA_KEY, constructor) as Map<string | symbol, StyleApplyMetadata>;\n      if (!metaList) {\n        metaList = new Map<string | symbol, StyleApplyMetadata>();\n        ReflectUtils.defineMetadata(STYLE_METADATA_KEY, metaList, constructor);\n      }\n      metaList.set(propertyKey, { propertyKey, selector, action, options });\n\n      const original = descriptor.value;\n      descriptor.value = async function (...args: any[]) {\n        ensureInit(this);\n        const res = await (original as any).apply(this, args);\n        if (res !== undefined) {\n          const win = (this as any).ownerDocument?.defaultView || window;\n          const host = this as unknown as HTMLElement;\n          const hostSet = SwcUtils.getHelperAndHostSet(win, host);\n          const r = options.root || 'auto';\n          const targetEls: HTMLElement[] = [];\n\n          const applyRoot = (t: any) => {\n            if (!t || !(t instanceof win.HTMLElement)) return;\n            targetEls.push(t);\n          };\n\n          if (selector === ':parentHost') applyRoot(hostSet.$parentHost);\n          else if (selector === ':appHost') applyRoot(hostSet.$appHost);\n          else if (selector === ':firstHost') applyRoot(hostSet.$firstHost);\n          else if (selector === ':lastHost') applyRoot(hostSet.$lastHost);\n          else if (selector === ':firstAppHost') applyRoot(hostSet.$firstAppHost);\n          else if (selector === ':lastAppHost') applyRoot(hostSet.$lastAppHost);\n          else if (selector === ':hosts') hostSet.$hosts.forEach(applyRoot);\n          else if (selector === ':appHosts') hostSet.$appHosts.forEach(applyRoot);\n          else if (selector === ':host' || !selector) applyRoot(host);\n          else {\n            const targetRoot = r === 'auto' ? (host.shadowRoot || host) : (r === 'shadow' ? host.shadowRoot : host);\n            if (targetRoot) {\n                const found = targetRoot.querySelectorAll(selector);\n                if (found) targetEls.push(...(Array.from(found) as HTMLElement[]));\n            }\n          }\n\n          targetEls.forEach(targetEl => {\n            const resolvedRes = typeof res === 'function' ? (res as any)(targetEl, hostSet) : res;\n\n            if (action === 'set' || action === 'update') {\n              if (action === 'set') targetEl.style.cssText = '';\n              \n              if (typeof resolvedRes === 'object' && resolvedRes !== null && !Array.isArray(resolvedRes)) {\n                Object.entries(resolvedRes as any).forEach(([prop, val]) => {\n                  const finalVal = typeof val === 'function' ? val(targetEl, hostSet) : val;\n                  if (finalVal === null || finalVal === undefined) {\n                    targetEl.style.removeProperty(prop);\n                  } else {\n                    targetEl.style[prop as any] = String(finalVal);\n                  }\n                });\n              } else if (typeof resolvedRes === 'string') {\n                targetEl.style.cssText = resolvedRes;\n              }\n            } else if (action === 'remove') {\n              if (typeof resolvedRes === 'object' && resolvedRes !== null && !Array.isArray(resolvedRes)) {\n                Object.entries(resolvedRes as any).forEach(([prop, val]) => {\n                  const shouldRemove = typeof val === 'function' ? val(targetEl, hostSet) : !!val;\n                  if (shouldRemove) {\n                    targetEl.style.removeProperty(prop);\n                  }\n                });\n              } else {\n                const props = Array.isArray(resolvedRes) ? resolvedRes : [resolvedRes];\n                props.forEach(p => targetEl.style.removeProperty(String(p)));\n              }\n            }\n          });\n        }\n        return res;\n      };\n      return descriptor;\n    };\n  };\n}\n\nexport function applyStyle(selector: string, action: StyleAction = 'update', options: StyleApplyOptions = {}): MethodDecorator {\n  return createStyleDecorator(action)(selector, options);\n}\n\nexport const setStyle = (selector: string, options: StyleApplyOptions = {}) => createStyleDecorator('set')(selector, options);\nexport const updateStyle = (selector: string, options: StyleApplyOptions = {}) => createStyleDecorator('update')(selector, options);\nexport const removeStyle = (selector: string, options: StyleApplyOptions = {}) => createStyleDecorator('remove')(selector, options);\n\n// Host versions\nexport function applyStyleHost(action: StyleAction = 'update', options: StyleApplyOptions = {}): MethodDecorator {\n  return createStyleDecorator(action)(':host', options);\n}\nexport const setStyleHost = (options: StyleApplyOptions = {}) => createStyleDecorator('set')(':host', options);\nexport const updateStyleHost = (options: StyleApplyOptions = {}) => createStyleDecorator('update')(':host', options);\nexport const removeStyleHost = (options: StyleApplyOptions = {}) => createStyleDecorator('remove')(':host', options);\n\nexport const findAllStyleMetadata = (target: any): Map<string | symbol, StyleApplyMetadata> => {\n  const result = new Map<string | symbol, StyleApplyMetadata>();\n  const maps = ReflectUtils.findAllMetadata<Map<string | symbol, StyleApplyMetadata>>(STYLE_METADATA_KEY, target);\n  maps.forEach(map => {\n    if (map instanceof Map) {\n      map.forEach((v, k) => result.set(k, v));\n    }\n  });\n  return result;\n};\n"],
-  "mappings": "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",
+  "sourcesContent": ["import { ReflectUtils } from '@dooboostore/core';\nimport { ensureInit } from './elementDefine';\nimport { SwcUtils } from '../utils/Utils';\nimport { SwcQueryOptions, HelperHostSet } from '../types';\n\nexport type StyleAction = 'set' | 'update' | 'remove';\n\nexport interface StyleApplyOptions extends SwcQueryOptions {\n  filter?: (target: HTMLElement, value: any, meta: {currentThis: any, helper: HelperHostSet}) => boolean;\n}\n\nexport interface StyleApplyMetadata {\n  propertyKey: string | symbol;\n  selector: string;\n  action: StyleAction;\n  options: StyleApplyOptions;\n}\n\nexport const STYLE_METADATA_KEY = Symbol.for('simple-web-component:style');\n\nfunction createStyleDecorator(action: StyleAction) {\n  return (selector: string, options: StyleApplyOptions = {}): MethodDecorator => {\n    return (target: Object, propertyKey: string | symbol, descriptor: PropertyDescriptor) => {\n      const constructor = target.constructor;\n      let metaList = ReflectUtils.getOwnMetadata(STYLE_METADATA_KEY, constructor) as Map<string | symbol, StyleApplyMetadata>;\n      if (!metaList) {\n        metaList = new Map<string | symbol, StyleApplyMetadata>();\n        ReflectUtils.defineMetadata(STYLE_METADATA_KEY, metaList, constructor);\n      }\n      metaList.set(propertyKey, { propertyKey, selector, action, options });\n\n      const original = descriptor.value;\n      descriptor.value = function (...args: any[]) {\n        ensureInit(this);\n        const res = (original as any).apply(this, args);\n\n        const handleResult = (resolvedValue: any) => {\n          if (resolvedValue !== undefined) {\n            const win = (this as any).ownerDocument?.defaultView || window;\n            const host = this as unknown as HTMLElement;\n            const hostSet = SwcUtils.getHelperAndHostSet(win, host);\n            const r = options.root || 'auto';\n            const targetEls: HTMLElement[] = [];\n\n            const applyRoot = (t: any) => {\n              if (!t || !(t instanceof win.HTMLElement)) return;\n              targetEls.push(t);\n            };\n\n            if (selector === ':parentHost') applyRoot(hostSet.$parentHost);\n            else if (selector === ':appHost') applyRoot(hostSet.$appHost);\n            else if (selector === ':firstHost') applyRoot(hostSet.$firstHost);\n            else if (selector === ':lastHost') applyRoot(hostSet.$lastHost);\n            else if (selector === ':firstAppHost') applyRoot(hostSet.$firstAppHost);\n            else if (selector === ':lastAppHost') applyRoot(hostSet.$lastAppHost);\n            else if (selector === ':hosts') hostSet.$hosts.forEach(applyRoot);\n            else if (selector === ':appHosts') hostSet.$appHosts.forEach(applyRoot);\n            else if (selector === ':host' || !selector) applyRoot(host);\n            else {\n              const targetRoot = r === 'auto' ? (host.shadowRoot || host) : (r === 'shadow' ? host.shadowRoot : host);\n              if (targetRoot) {\n                  const found = targetRoot.querySelectorAll(selector);\n                  if (found) targetEls.push(...(Array.from(found) as HTMLElement[]));\n              }\n            }\n\n            targetEls.forEach(targetEl => {\n              if (options.filter && !options.filter(targetEl, resolvedValue, {currentThis: this, helper: hostSet})) {\n                return;\n              }\n              const resolvedRes = typeof resolvedValue === 'function' ? (resolvedValue as any)(targetEl, hostSet) : resolvedValue;\n\n              if (action === 'set' || action === 'update') {\n                if (action === 'set') targetEl.style.cssText = '';\n                \n                if (typeof resolvedRes === 'object' && resolvedRes !== null && !Array.isArray(resolvedRes)) {\n                  Object.entries(resolvedRes as any).forEach(([prop, val]) => {\n                    const finalVal = typeof val === 'function' ? val(targetEl, hostSet) : val;\n                    if (finalVal === null || finalVal === undefined) {\n                      targetEl.style.removeProperty(prop);\n                    } else {\n                      targetEl.style[prop as any] = String(finalVal);\n                    }\n                  });\n                } else if (typeof resolvedRes === 'string') {\n                  targetEl.style.cssText = resolvedRes;\n                }\n              } else if (action === 'remove') {\n                if (typeof resolvedRes === 'object' && resolvedRes !== null && !Array.isArray(resolvedRes)) {\n                  Object.entries(resolvedRes as any).forEach(([prop, val]) => {\n                    const shouldRemove = typeof val === 'function' ? val(targetEl, hostSet) : !!val;\n                    if (shouldRemove) {\n                      targetEl.style.removeProperty(prop);\n                    }\n                  });\n                } else {\n                  const props = Array.isArray(resolvedRes) ? resolvedRes : [resolvedRes];\n                  props.forEach(p => targetEl.style.removeProperty(String(p)));\n                }\n              }\n            });\n          }\n          return resolvedValue;\n        };\n\n        if (res instanceof Promise) {\n          return res.then(handleResult);\n        } else {\n          return handleResult(res);\n        }\n      };\n      return descriptor;\n    };\n  };\n}\n\nexport function applyStyle(selector: string, action: StyleAction = 'update', options: StyleApplyOptions = {}): MethodDecorator {\n  return createStyleDecorator(action)(selector, options);\n}\n\nexport const setStyle = (selector: string, options: StyleApplyOptions = {}) => createStyleDecorator('set')(selector, options);\nexport const updateStyle = (selector: string, options: StyleApplyOptions = {}) => createStyleDecorator('update')(selector, options);\nexport const removeStyle = (selector: string, options: StyleApplyOptions = {}) => createStyleDecorator('remove')(selector, options);\n\n// Host versions\nexport function applyStyleHost(action: StyleAction = 'update', options: StyleApplyOptions = {}): MethodDecorator {\n  return createStyleDecorator(action)(':host', options);\n}\nexport const setStyleHost = (options: StyleApplyOptions = {}) => createStyleDecorator('set')(':host', options);\nexport const updateStyleHost = (options: StyleApplyOptions = {}) => createStyleDecorator('update')(':host', options);\nexport const removeStyleHost = (options: StyleApplyOptions = {}) => createStyleDecorator('remove')(':host', options);\n\nexport const findAllStyleMetadata = (target: any): Map<string | symbol, StyleApplyMetadata> => {\n  const result = new Map<string | symbol, StyleApplyMetadata>();\n  const maps = ReflectUtils.findAllMetadata<Map<string | symbol, StyleApplyMetadata>>(STYLE_METADATA_KEY, target);\n  maps.forEach(map => {\n    if (map instanceof Map) {\n      map.forEach((v, k) => result.set(k, v));\n    }\n  });\n  return result;\n};\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/cjs/decorators/attribute.js

@@ -20,7 +20,9 @@ __export(attribute_exports, {
   ATTRIBUTE_FIELD_METADATA_KEY: () => ATTRIBUTE_FIELD_METADATA_KEY,
   attribute: () => attribute,
   attributeHost: () => attributeHost,
+  convertValue: () => convertValue,
   findAllAttributeMetadata: () => findAllAttributeMetadata,
+  getAttributeValue: () => getAttributeValue,
   resolveTargetEls: () => resolveTargetEls
 });
 module.exports = __toCommonJS(attribute_exports);
@@ -35,6 +37,32 @@ const convertValue = (val, type) => {
   if (type === Boolean) return val === "false" || val === "0" ? false : true;
   return val;
 };
+const getAttributeValue = (inst, attrName, options) => {
+  const conf = (0, import_elementDefine.getElementConfig)(inst);
+  const currentWin = inst._resolveWindow?.(conf) || (typeof window !== "undefined" ? window : void 0);
+  const targets = options?.selector ? resolveTargetEls(inst, options.selector, options, currentWin) : [inst];
+  const primaryTarget = targets[0];
+  if (primaryTarget && typeof primaryTarget.hasAttribute === "function" && primaryTarget.hasAttribute(attrName)) {
+    let domVal = primaryTarget.getAttribute(attrName);
+    const ae = new import_core.ActionExpression(domVal);
+    const expr = ae.getFirstExpression("call-return");
+    if (expr) {
+      try {
+        const result = import_core.FunctionUtils.executeReturn({
+          script: import_core_web.ConvertUtils.decodeHtmlEntity(expr.script, currentWin.document),
+          context: inst,
+          args: import_Utils.SwcUtils.getHelperAndHostSet(currentWin, inst)
+        });
+        return convertValue(result, options?.type);
+      } catch (e) {
+        console.error(`[SWC] Failed to execute directive {{= ${expr.script} }}:`, e);
+        return convertValue(domVal, options?.type);
+      }
+    }
+    return convertValue(domVal, options?.type);
+  }
+  return null;
+};
 const resolveTargetEls = (inst, selector, options, currentWin) => {
   const r = options.root || "auto";
   const results = [];
@@ -109,35 +137,13 @@ function attribute(selector, options = {}) {
       Object.defineProperty(target, propertyKey, {
         get() {
           const attrName = options.name || String(propertyKey);
-          const conf = (0, import_elementDefine.getElementConfig)(this);
-          const currentWin = this._resolveWindow?.(conf) || (typeof window !== "undefined" ? window : void 0);
-          const targetType = options.type || designType;
-          const targets = resolveTargetEls(this, selector, options, currentWin);
-          const primaryTarget = targets[0];
-          if (primaryTarget && typeof primaryTarget.hasAttribute === "function") {
-            if (primaryTarget.hasAttribute(attrName)) {
-              let domVal = primaryTarget.getAttribute(attrName);
-              const ae = new import_core.ActionExpression(domVal);
-              const expr = ae.getFirstExpression("call-return");
-              if (expr) {
-                try {
-                  const result = import_core.FunctionUtils.executeReturn({
-                    script: import_core_web.ConvertUtils.decodeHtmlEntity(expr.script, currentWin.document),
-                    context: this,
-                    args: import_Utils.SwcUtils.getHelperAndHostSet(currentWin, this)
-                  });
-                  return convertValue(result, targetType);
-                } catch (e) {
-                  console.error(`[SWC] Failed to execute directive {{= ${expr.script} }}:`, e);
-                  return convertValue(domVal, targetType);
-                }
-              }
-              return convertValue(domVal, targetType);
-            }
-            return null;
-          }
-          const data = convertValue(this[privateKey], targetType);
-          return data;
+          const mergedOptions = {
+            ...options,
+            selector,
+            type: options.type || designType
+          };
+          const result = getAttributeValue(this, attrName, mergedOptions);
+          return result !== null ? result : this[privateKey];
         },
         set(nv) {
           const attrName = options.name || String(propertyKey);

package/dist/cjs/decorators/attribute.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/decorators/attribute.ts"],
-  "sourcesContent": ["import {ReflectUtils, FunctionUtils, ActionExpression} from '@dooboostore/core';\nimport {ensureInit, getElementConfig} from './elementDefine';\nimport {SwcUtils} from '../utils/Utils';\nimport {SpecialSelector, SwcQueryOptions} from '../types';\nimport { ConvertUtils } from '@dooboostore/core-web';\nexport interface AttributeFieldOptions extends SwcQueryOptions {\n  name?: string;\n  // connectedInitialize?: boolean;\n  type?: typeof Number | typeof Boolean | typeof String;\n}\n\nexport interface AttributeFieldMetadata {\n  propertyKey: string | symbol;\n  selector: string;\n  options: AttributeFieldOptions;\n  privateKey: symbol;\n}\n\nexport const ATTRIBUTE_FIELD_METADATA_KEY = Symbol.for('simple-web-component:attribute-field');\n\nconst convertValue = (val: string | null, type: any): any => {\n  if (val === null || val === undefined) return val;\n  if (type === Number) return Number(val);\n  if (type === Boolean) return val === 'false' || val === '0' ? false : true;\n  return val;\n};\n\nexport const resolveTargetEls = (inst: any, selector: string, options: AttributeFieldOptions, currentWin: any): HTMLElement[] => {\n  const r = options.root || 'auto';\n  const results: HTMLElement[] = [];\n\n  const applyRoot = (target: any) => {\n    if (!target) return;\n    if (r === 'auto') {\n      results.push(target);\n    } else {\n      if (r === 'light' || r === 'all') results.push(target);\n      if ((r === 'shadow' || r === 'all') && target.shadowRoot) results.push(target.shadowRoot);\n    }\n  };\n\n  if (selector === ':host' || !selector) {\n    applyRoot(inst);\n  } else if (selector === ':window') {\n    results.push(currentWin);\n  } else if (selector === ':document') {\n    results.push(currentWin.document);\n  } else {\n    const hostSet = SwcUtils.getHostSet(inst);\n    if (selector === ':parentHost') applyRoot(hostSet.$parentHost);\n    else if (selector === ':appHost') applyRoot(hostSet.$appHost as any);\n    else if (selector === ':firstHost') applyRoot(hostSet.$firstHost);\n    else if (selector === ':lastHost') applyRoot(hostSet.$lastHost);\n    else if (selector === ':firstAppHost') applyRoot(hostSet.$firstAppHost as any);\n    else if (selector === ':lastAppHost') applyRoot(hostSet.$lastAppHost as any);\n    else {\n      if (r === 'shadow') {\n        const found = inst.shadowRoot?.querySelectorAll(selector);\n        if (found) results.push(...found);\n      } else if (r === 'light') {\n        const found = inst.querySelectorAll(selector);\n        if (found) results.push(...found);\n      } else if (r === 'all') {\n        const sMatch = inst.shadowRoot?.querySelectorAll(selector);\n        const lMatch = inst.querySelectorAll(selector);\n        if (sMatch) results.push(...sMatch);\n        if (lMatch) results.push(...lMatch);\n      } else {\n        const found = (inst.shadowRoot || inst).querySelectorAll(selector);\n        if (found) results.push(...found);\n      }\n    }\n  }\n  return results;\n};\n\n/**\n * @attribute decorator to sync a field value with an element's attribute.\n */\nexport function attribute(selector: string, options: AttributeFieldOptions = {}): PropertyDecorator {\n  return (target: Object, propertyKey: string | symbol) => {\n    const constructor = target.constructor;\n    const privateKey = Symbol(String(propertyKey));\n    //\n    const designType = (Reflect as any).getMetadata('design:type', target, propertyKey);\n    //\n    let metaList = ReflectUtils.getOwnMetadata(ATTRIBUTE_FIELD_METADATA_KEY, constructor) as AttributeFieldMetadata[];\n    if (!metaList) {\n      metaList = [];\n      ReflectUtils.defineMetadata(ATTRIBUTE_FIELD_METADATA_KEY, metaList, constructor);\n    }\n    metaList.push({propertyKey, selector, options, privateKey});\n\n    const applySetAttribute = (inst: any, targets: HTMLElement[], attrName: string, nv: any) => {\n      targets.forEach(it => {\n        // console.log('sssssssssssss', it, attrName, nv);\n        if (it && typeof (it as any).setAttribute === 'function') {\n          if (nv === null) {\n            (it as any).removeAttribute(attrName);\n          } else {\n            (it as any).setAttribute(attrName, String(nv));\n          }\n        } else {\n          inst[privateKey] = nv;\n        }\n      });\n    };\n\n    try {\n      // Own property\uB97C \uC0AD\uC81C\uD558\uC5EC getter\uAC00 \uC791\uB3D9\uD558\uB3C4\uB85D \uD568\n      // delete target[propertyKey];\n\n      // const defineTarget = target instanceof Function ? target : (target as any).constructor;\n      \n      Object.defineProperty(target, propertyKey, {\n        get(this: any) {\n          const attrName = options.name || String(propertyKey);\n          const conf = getElementConfig(this);\n          const currentWin = this._resolveWindow?.(conf) || ((typeof window !== 'undefined' ? window : undefined) as any);\n          const targetType = options.type || designType;\n\n          const targets = resolveTargetEls(this, selector, options, currentWin);\n          const primaryTarget = targets[0];\n\n          if (primaryTarget && typeof (primaryTarget as any).hasAttribute === 'function') {\n            if ((primaryTarget as any).hasAttribute(attrName)) {\n              let domVal = (primaryTarget as any).getAttribute(attrName);\n              \n              // \uD45C\uD604\uC2DD \uCCB4\uD06C\n              const ae = new ActionExpression(domVal);\n              const expr = ae.getFirstExpression('call-return');\n              if (expr) {\n                try {\n                  const result = FunctionUtils.executeReturn({\n                    script: ConvertUtils.decodeHtmlEntity(expr.script, currentWin.document),\n                    context: this,\n                    args: SwcUtils.getHelperAndHostSet(currentWin, this)\n                  });\n                  return convertValue(result, targetType);\n                } catch (e) {\n                  console.error(`[SWC] Failed to execute directive {{= ${expr.script} }}:`, e);\n                  return convertValue(domVal, targetType);\n                }\n              }\n              \n              return convertValue(domVal, targetType);\n            }\n            return null;\n          }\n\n          const data = convertValue(this[privateKey], targetType);\n          return data;\n        },\n        set(this: any, nv: any) {\n          // this[propertyKey] = nv;\n          // console.log('------>??settttt', this, nv, propertyKey);\n          const attrName = options.name || String(propertyKey);\n          const conf = getElementConfig(this);\n          const currentWin = this._resolveWindow?.(conf) || ((typeof window !== 'undefined' ? window : undefined) as any);\n\n\n          // if (!this.__swc_connected) {\n          //   this[privateKey] = nv;\n          //   return;\n          // }\n\n          const targets = resolveTargetEls(this, selector, options, currentWin);\n          applySetAttribute(this, targets, attrName, nv);\n        },\n        enumerable: true,\n        configurable: true\n      });\n  } catch (err) {\n    console.error('[SWC] defineProperty error:', err);\n  }\n  };\n}\n\n/**\n * @attributeHost decorator to sync a field value with the :host element's attribute.\n */\nexport function attributeHost(target: Object, propertyKey: string | symbol): void;\nexport function attributeHost(options: AttributeFieldOptions): PropertyDecorator;\nexport function attributeHost(attrName: string): PropertyDecorator;\nexport function attributeHost(attrName: string, options: AttributeFieldOptions): PropertyDecorator;\nexport function attributeHost(targetOrAttrOrOptions?: any, propertyKeyOrOptions?: any): any {\n  if (propertyKeyOrOptions !== undefined && (typeof propertyKeyOrOptions === 'string' || typeof propertyKeyOrOptions === 'symbol')) {\n    return attribute(':host', { name: String(propertyKeyOrOptions) })(targetOrAttrOrOptions, propertyKeyOrOptions);\n  }\n\n  if (typeof targetOrAttrOrOptions === 'string') {\n    const attrName = targetOrAttrOrOptions;\n    const options = (typeof propertyKeyOrOptions === 'object' ? propertyKeyOrOptions : {}) as AttributeFieldOptions;\n    return attribute(':host', { ...options, name: attrName });\n  } else if (typeof targetOrAttrOrOptions === 'object') {\n    const options = targetOrAttrOrOptions as AttributeFieldOptions;\n    return (target: Object, propertyKey: string | symbol) => {\n      return attribute(':host', { ...options, name: String(propertyKey) })(target, propertyKey);\n    };\n  } else {\n    return (target: Object, propertyKey: string | symbol) => {\n      return attribute(':host', { name: String(propertyKey) })(target, propertyKey);\n    };\n  }\n}\n\nexport const findAllAttributeMetadata = (target: any): AttributeFieldMetadata[] => {\n  const actualTarget = target instanceof Function ? target : target.constructor;\n  return ReflectUtils.findAllMetadata<AttributeFieldMetadata[]>(ATTRIBUTE_FIELD_METADATA_KEY, actualTarget).flat();\n};\n"],
-  "mappings": "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",
+  "sourcesContent": ["import { ReflectUtils, FunctionUtils, ActionExpression } from '@dooboostore/core';\nimport { ensureInit, getElementConfig } from './elementDefine';\nimport { SwcUtils } from '../utils/Utils';\nimport { SpecialSelector, SwcQueryOptions } from '../types';\nimport { ConvertUtils } from '@dooboostore/core-web';\nexport interface AttributeFieldOptions extends SwcQueryOptions {\n  name?: string;\n  // connectedInitialize?: boolean;\n  type?: typeof Number | typeof Boolean | typeof String;\n}\n\nexport interface AttributeFieldMetadata {\n  propertyKey: string | symbol;\n  selector: string;\n  options: AttributeFieldOptions;\n  privateKey: symbol;\n}\n\nexport const ATTRIBUTE_FIELD_METADATA_KEY = Symbol.for('simple-web-component:attribute-field');\n\nconst convertValue = (val: string | null, type: any): any => {\n  if (val === null || val === undefined) return val;\n  if (type === Number) return Number(val);\n  if (type === Boolean) return val === 'false' || val === '0' ? false : true;\n  return val;\n};\n\nexport { convertValue };\n\nexport const getAttributeValue = (inst: any, attrName: string, options?: AttributeFieldOptions & { selector?: string }): any => {\n  const conf = getElementConfig(inst);\n  const currentWin = inst._resolveWindow?.(conf) || ((typeof window !== 'undefined' ? window : undefined) as any);\n\n  // If selector is not provided, use inst itself\n  const targets = options?.selector ? resolveTargetEls(inst, options.selector, options, currentWin) : [inst];\n\n  const primaryTarget = targets[0];\n\n  if (primaryTarget && typeof (primaryTarget as any).hasAttribute === 'function' && (primaryTarget as any).hasAttribute(attrName)) {\n    let domVal = (primaryTarget as any).getAttribute(attrName);\n\n    // \uD45C\uD604\uC2DD \uCCB4\uD06C\n    const ae = new ActionExpression(domVal);\n    const expr = ae.getFirstExpression('call-return');\n    if (expr) {\n      try {\n        const result = FunctionUtils.executeReturn({\n          script: ConvertUtils.decodeHtmlEntity(expr.script, currentWin.document),\n          context: inst,\n          args: SwcUtils.getHelperAndHostSet(currentWin, inst)\n        });\n        return convertValue(result, options?.type);\n      } catch (e) {\n        console.error(`[SWC] Failed to execute directive {{= ${expr.script} }}:`, e);\n        return convertValue(domVal, options?.type);\n      }\n    }\n\n    return convertValue(domVal, options?.type);\n  }\n\n  // If no target found, return null\n  return null;\n};\n\nexport const resolveTargetEls = (inst: any, selector: string, options: AttributeFieldOptions, currentWin: any): HTMLElement[] => {\n  const r = options.root || 'auto';\n  const results: HTMLElement[] = [];\n\n  const applyRoot = (target: any) => {\n    if (!target) return;\n    if (r === 'auto') {\n      results.push(target);\n    } else {\n      if (r === 'light' || r === 'all') results.push(target);\n      if ((r === 'shadow' || r === 'all') && target.shadowRoot) results.push(target.shadowRoot);\n    }\n  };\n\n  if (selector === ':host' || !selector) {\n    applyRoot(inst);\n  } else if (selector === ':window') {\n    results.push(currentWin);\n  } else if (selector === ':document') {\n    results.push(currentWin.document);\n  } else {\n    const hostSet = SwcUtils.getHostSet(inst);\n    if (selector === ':parentHost') applyRoot(hostSet.$parentHost);\n    else if (selector === ':appHost') applyRoot(hostSet.$appHost as any);\n    else if (selector === ':firstHost') applyRoot(hostSet.$firstHost);\n    else if (selector === ':lastHost') applyRoot(hostSet.$lastHost);\n    else if (selector === ':firstAppHost') applyRoot(hostSet.$firstAppHost as any);\n    else if (selector === ':lastAppHost') applyRoot(hostSet.$lastAppHost as any);\n    else {\n      if (r === 'shadow') {\n        const found = inst.shadowRoot?.querySelectorAll(selector);\n        if (found) results.push(...found);\n      } else if (r === 'light') {\n        const found = inst.querySelectorAll(selector);\n        if (found) results.push(...found);\n      } else if (r === 'all') {\n        const sMatch = inst.shadowRoot?.querySelectorAll(selector);\n        const lMatch = inst.querySelectorAll(selector);\n        if (sMatch) results.push(...sMatch);\n        if (lMatch) results.push(...lMatch);\n      } else {\n        const found = (inst.shadowRoot || inst).querySelectorAll(selector);\n        if (found) results.push(...found);\n      }\n    }\n  }\n  return results;\n};\n\n/**\n * @attribute decorator to sync a field value with an element's attribute.\n */\nexport function attribute(selector: string, options: AttributeFieldOptions = {}): PropertyDecorator {\n  return (target: Object, propertyKey: string | symbol) => {\n    const constructor = target.constructor;\n    const privateKey = Symbol(String(propertyKey));\n    //\n    const designType = (Reflect as any).getMetadata('design:type', target, propertyKey);\n    //\n    let metaList = ReflectUtils.getOwnMetadata(ATTRIBUTE_FIELD_METADATA_KEY, constructor) as AttributeFieldMetadata[];\n    if (!metaList) {\n      metaList = [];\n      ReflectUtils.defineMetadata(ATTRIBUTE_FIELD_METADATA_KEY, metaList, constructor);\n    }\n    metaList.push({ propertyKey, selector, options, privateKey });\n\n    const applySetAttribute = (inst: any, targets: HTMLElement[], attrName: string, nv: any) => {\n      targets.forEach(it => {\n        // console.log('sssssssssssss', it, attrName, nv);\n        if (it && typeof (it as any).setAttribute === 'function') {\n          if (nv === null) {\n            (it as any).removeAttribute(attrName);\n          } else {\n            (it as any).setAttribute(attrName, String(nv));\n          }\n        } else {\n          inst[privateKey] = nv;\n        }\n      });\n    };\n\n    try {\n      // Own property\uB97C \uC0AD\uC81C\uD558\uC5EC getter\uAC00 \uC791\uB3D9\uD558\uB3C4\uB85D \uD568\n      // delete target[propertyKey];\n\n      // const defineTarget = target instanceof Function ? target : (target as any).constructor;\n\n      Object.defineProperty(target, propertyKey, {\n        get(this: any) {\n          const attrName = options.name || String(propertyKey);\n\n          // Merge designType fallback into options once\n          const mergedOptions = {\n            ...options,\n            selector,\n            type: options.type || designType\n          };\n\n          const result = getAttributeValue(this, attrName, mergedOptions);\n          return result !== null ? result : this[privateKey];\n        },\n        set(this: any, nv: any) {\n          // this[propertyKey] = nv;\n          // console.log('------>??settttt', this, nv, propertyKey);\n          const attrName = options.name || String(propertyKey);\n          const conf = getElementConfig(this);\n          const currentWin = this._resolveWindow?.(conf) || ((typeof window !== 'undefined' ? window : undefined) as any);\n\n          // if (!this.__swc_connected) {\n          //   this[privateKey] = nv;\n          //   return;\n          // }\n\n          const targets = resolveTargetEls(this, selector, options, currentWin);\n          applySetAttribute(this, targets, attrName, nv);\n        },\n        enumerable: true,\n        configurable: true\n      });\n    } catch (err) {\n      console.error('[SWC] defineProperty error:', err);\n    }\n  };\n}\n\n/**\n * @attributeHost decorator to sync a field value with the :host element's attribute.\n */\nexport function attributeHost(target: Object, propertyKey: string | symbol): void;\nexport function attributeHost(options: AttributeFieldOptions): PropertyDecorator;\nexport function attributeHost(attrName: string): PropertyDecorator;\nexport function attributeHost(attrName: string, options: AttributeFieldOptions): PropertyDecorator;\nexport function attributeHost(targetOrAttrOrOptions?: any, propertyKeyOrOptions?: any): any {\n  if (propertyKeyOrOptions !== undefined && (typeof propertyKeyOrOptions === 'string' || typeof propertyKeyOrOptions === 'symbol')) {\n    return attribute(':host', { name: String(propertyKeyOrOptions) })(targetOrAttrOrOptions, propertyKeyOrOptions);\n  }\n\n  if (typeof targetOrAttrOrOptions === 'string') {\n    const attrName = targetOrAttrOrOptions;\n    const options = (typeof propertyKeyOrOptions === 'object' ? propertyKeyOrOptions : {}) as AttributeFieldOptions;\n    return attribute(':host', { ...options, name: attrName });\n  } else if (typeof targetOrAttrOrOptions === 'object') {\n    const options = targetOrAttrOrOptions as AttributeFieldOptions;\n    return (target: Object, propertyKey: string | symbol) => {\n      return attribute(':host', { ...options, name: String(propertyKey) })(target, propertyKey);\n    };\n  } else {\n    return (target: Object, propertyKey: string | symbol) => {\n      return attribute(':host', { name: String(propertyKey) })(target, propertyKey);\n    };\n  }\n}\n\nexport const findAllAttributeMetadata = (target: any): AttributeFieldMetadata[] => {\n  const actualTarget = target instanceof Function ? target : target.constructor;\n  return ReflectUtils.findAllMetadata<AttributeFieldMetadata[]>(ATTRIBUTE_FIELD_METADATA_KEY, actualTarget).flat();\n};\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/cjs/decorators/changedAttributeHost.js

@@ -19,27 +19,33 @@ var changedAttributeHost_exports = {};
 __export(changedAttributeHost_exports, {
   ON_ATTRIBUTE_CHANGED_METADATA_KEY: () => ON_ATTRIBUTE_CHANGED_METADATA_KEY,
   changedAttributeHost: () => changedAttributeHost,
+  convertAttributeValue: () => convertAttributeValue,
   findAllAttributeChangedMetadata: () => findAllAttributeChangedMetadata,
   getChangedAttributeMetadata: () => getChangedAttributeMetadata
 });
 module.exports = __toCommonJS(changedAttributeHost_exports);
 var import_core = require("@dooboostore/core");
 const ON_ATTRIBUTE_CHANGED_METADATA_KEY = Symbol.for("simple-web-component:on-attribute-changed");
-function changedAttributeHost(attributeName) {
+const convertValue = (val, type) => {
+  if (val === null || val === void 0) return val;
+  if (type === Number) return Number(val);
+  if (type === Boolean) return val === "false" || val === "0" ? false : true;
+  return val;
+};
+function changedAttributeHost(attributeName, options = {}) {
   return (target, propertyKey) => {
     const constructor = target.constructor;
-    let meta = import_core.ReflectUtils.getOwnMetadata(ON_ATTRIBUTE_CHANGED_METADATA_KEY, constructor);
-    if (!meta) {
-      meta = /* @__PURE__ */ new Map();
-      import_core.ReflectUtils.defineMetadata(ON_ATTRIBUTE_CHANGED_METADATA_KEY, meta, constructor);
+    let metaList = import_core.ReflectUtils.getOwnMetadata(ON_ATTRIBUTE_CHANGED_METADATA_KEY, constructor);
+    if (!metaList) {
+      metaList = [];
+      import_core.ReflectUtils.defineMetadata(ON_ATTRIBUTE_CHANGED_METADATA_KEY, metaList, constructor);
     }
     const name = attributeName || String(propertyKey);
-    let methods = meta.get(name);
-    if (!methods) {
-      methods = [];
-      meta.set(name, methods);
-    }
-    if (!methods.includes(propertyKey)) methods.push(propertyKey);
+    metaList.push({
+      attributeName: name,
+      propertyKey,
+      options
+    });
   };
 }
 const getChangedAttributeMetadata = (target) => {
@@ -47,6 +53,20 @@ const getChangedAttributeMetadata = (target) => {
   return import_core.ReflectUtils.getMetadata(ON_ATTRIBUTE_CHANGED_METADATA_KEY, constructor);
 };
 const findAllAttributeChangedMetadata = (target) => {
-  return import_core.ReflectUtils.findAllMapMetadata(ON_ATTRIBUTE_CHANGED_METADATA_KEY, target);
+  const constructor = target instanceof Function ? target : target.constructor;
+  const metaList = import_core.ReflectUtils.findAllMetadata(ON_ATTRIBUTE_CHANGED_METADATA_KEY, constructor) || [];
+  const result = /* @__PURE__ */ new Map();
+  metaList.forEach((meta) => {
+    meta.forEach((item) => {
+      if (!result.has(item.attributeName)) {
+        result.set(item.attributeName, []);
+      }
+      result.get(item.attributeName).push(item);
+    });
+  });
+  return result;
+};
+const convertAttributeValue = (val, type) => {
+  return convertValue(val, type);
 };
 //# sourceMappingURL=changedAttributeHost.js.map

package/dist/cjs/decorators/changedAttributeHost.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/decorators/changedAttributeHost.ts"],
-  "sourcesContent": ["import {ReflectUtils} from '@dooboostore/core';\n\nexport const ON_ATTRIBUTE_CHANGED_METADATA_KEY = Symbol.for('simple-web-component:on-attribute-changed');\n\n/**\n * @changedAttributeHost decorator - fires when any attribute on :host changes\n * Usage: @changedAttributeHost('data-product-id')\n */\nexport function changedAttributeHost(attributeName?: string): MethodDecorator {\n  return (target: Object, propertyKey: string | symbol) => {\n    const constructor = target.constructor;\n    let meta = ReflectUtils.getOwnMetadata(ON_ATTRIBUTE_CHANGED_METADATA_KEY, constructor) as Map<string, (string | symbol)[]>;\n    if (!meta) {\n      meta = new Map<string, (string | symbol)[]>();\n      ReflectUtils.defineMetadata(ON_ATTRIBUTE_CHANGED_METADATA_KEY, meta, constructor);\n    }\n\n    const name = attributeName || String(propertyKey);\n    let methods = meta.get(name);\n    if (!methods) {\n      methods = [];\n      meta.set(name, methods);\n    }\n    if (!methods.includes(propertyKey)) methods.push(propertyKey);\n  };\n}\n\nexport const getChangedAttributeMetadata = (target: any): Map<string, (string | symbol)[]> | undefined => {\n  const constructor = target instanceof Function ? target : target.constructor;\n  return ReflectUtils.getMetadata(ON_ATTRIBUTE_CHANGED_METADATA_KEY, constructor);\n};\n\nexport const findAllAttributeChangedMetadata = (target: any): Map<string, (string | symbol)[]> => {\n  return ReflectUtils.findAllMapMetadata<string, string | symbol>(ON_ATTRIBUTE_CHANGED_METADATA_KEY, target);\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAA2B;AAEpB,MAAM,oCAAoC,OAAO,IAAI,2CAA2C;AAMhG,SAAS,qBAAqB,eAAyC;AAC5E,SAAO,CAAC,QAAgB,gBAAiC;AACvD,UAAM,cAAc,OAAO;AAC3B,QAAI,OAAO,yBAAa,eAAe,mCAAmC,WAAW;AACrF,QAAI,CAAC,MAAM;AACT,aAAO,oBAAI,IAAiC;AAC5C,+BAAa,eAAe,mCAAmC,MAAM,WAAW;AAAA,IAClF;AAEA,UAAM,OAAO,iBAAiB,OAAO,WAAW;AAChD,QAAI,UAAU,KAAK,IAAI,IAAI;AAC3B,QAAI,CAAC,SAAS;AACZ,gBAAU,CAAC;AACX,WAAK,IAAI,MAAM,OAAO;AAAA,IACxB;AACA,QAAI,CAAC,QAAQ,SAAS,WAAW,EAAG,SAAQ,KAAK,WAAW;AAAA,EAC9D;AACF;AAEO,MAAM,8BAA8B,CAAC,WAA8D;AACxG,QAAM,cAAc,kBAAkB,WAAW,SAAS,OAAO;AACjE,SAAO,yBAAa,YAAY,mCAAmC,WAAW;AAChF;AAEO,MAAM,kCAAkC,CAAC,WAAkD;AAChG,SAAO,yBAAa,mBAA4C,mCAAmC,MAAM;AAC3G;",
+  "sourcesContent": ["import {ReflectUtils} from '@dooboostore/core';\n\nexport const ON_ATTRIBUTE_CHANGED_METADATA_KEY = Symbol.for('simple-web-component:on-attribute-changed');\n\nexport interface ChangedAttributeHostOptions {\n  type?: typeof Number | typeof Boolean | typeof String;\n}\n\nexport interface ChangedAttributeHostMetadata {\n  attributeName: string;\n  propertyKey: string | symbol;\n  options: ChangedAttributeHostOptions;\n}\n\nconst convertValue = (val: any, type: any): any => {\n  if (val === null || val === undefined) return val;\n  if (type === Number) return Number(val);\n  if (type === Boolean) return val === 'false' || val === '0' ? false : true;\n  return val;\n};\n\n/**\n * @changedAttributeHost decorator - fires when any attribute on :host changes\n * Usage: @changedAttributeHost('data-product-id')\n *        @changedAttributeHost('count', { type: Number })\n */\nexport function changedAttributeHost(attributeName?: string, options: ChangedAttributeHostOptions = {}): MethodDecorator {\n  return (target: Object, propertyKey: string | symbol) => {\n    const constructor = target.constructor;\n    let metaList = ReflectUtils.getOwnMetadata(ON_ATTRIBUTE_CHANGED_METADATA_KEY, constructor) as ChangedAttributeHostMetadata[];\n    if (!metaList) {\n      metaList = [];\n      ReflectUtils.defineMetadata(ON_ATTRIBUTE_CHANGED_METADATA_KEY, metaList, constructor);\n    }\n\n    const name = attributeName || String(propertyKey);\n    metaList.push({\n      attributeName: name,\n      propertyKey,\n      options\n    });\n  };\n}\n\nexport const getChangedAttributeMetadata = (target: any): ChangedAttributeHostMetadata[] | undefined => {\n  const constructor = target instanceof Function ? target : target.constructor;\n  return ReflectUtils.getMetadata(ON_ATTRIBUTE_CHANGED_METADATA_KEY, constructor);\n};\n\nexport const findAllAttributeChangedMetadata = (target: any): Map<string, ChangedAttributeHostMetadata[]> => {\n  const constructor = target instanceof Function ? target : target.constructor;\n  const metaList = ReflectUtils.findAllMetadata<ChangedAttributeHostMetadata[]>(ON_ATTRIBUTE_CHANGED_METADATA_KEY, constructor) || [];\n  \n  const result = new Map<string, ChangedAttributeHostMetadata[]>();\n  metaList.forEach(meta => {\n    meta.forEach(item => {\n      if (!result.has(item.attributeName)) {\n        result.set(item.attributeName, []);\n      }\n      result.get(item.attributeName)!.push(item);\n    });\n  });\n  return result;\n};\n\nexport const convertAttributeValue = (val: any, type?: typeof Number | typeof Boolean | typeof String): any => {\n  return convertValue(val, type);\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAA2B;AAEpB,MAAM,oCAAoC,OAAO,IAAI,2CAA2C;AAYvG,MAAM,eAAe,CAAC,KAAU,SAAmB;AACjD,MAAI,QAAQ,QAAQ,QAAQ,OAAW,QAAO;AAC9C,MAAI,SAAS,OAAQ,QAAO,OAAO,GAAG;AACtC,MAAI,SAAS,QAAS,QAAO,QAAQ,WAAW,QAAQ,MAAM,QAAQ;AACtE,SAAO;AACT;AAOO,SAAS,qBAAqB,eAAwB,UAAuC,CAAC,GAAoB;AACvH,SAAO,CAAC,QAAgB,gBAAiC;AACvD,UAAM,cAAc,OAAO;AAC3B,QAAI,WAAW,yBAAa,eAAe,mCAAmC,WAAW;AACzF,QAAI,CAAC,UAAU;AACb,iBAAW,CAAC;AACZ,+BAAa,eAAe,mCAAmC,UAAU,WAAW;AAAA,IACtF;AAEA,UAAM,OAAO,iBAAiB,OAAO,WAAW;AAChD,aAAS,KAAK;AAAA,MACZ,eAAe;AAAA,MACf;AAAA,MACA;AAAA,IACF,CAAC;AAAA,EACH;AACF;AAEO,MAAM,8BAA8B,CAAC,WAA4D;AACtG,QAAM,cAAc,kBAAkB,WAAW,SAAS,OAAO;AACjE,SAAO,yBAAa,YAAY,mCAAmC,WAAW;AAChF;AAEO,MAAM,kCAAkC,CAAC,WAA6D;AAC3G,QAAM,cAAc,kBAAkB,WAAW,SAAS,OAAO;AACjE,QAAM,WAAW,yBAAa,gBAAgD,mCAAmC,WAAW,KAAK,CAAC;AAElI,QAAM,SAAS,oBAAI,IAA4C;AAC/D,WAAS,QAAQ,UAAQ;AACvB,SAAK,QAAQ,UAAQ;AACnB,UAAI,CAAC,OAAO,IAAI,KAAK,aAAa,GAAG;AACnC,eAAO,IAAI,KAAK,eAAe,CAAC,CAAC;AAAA,MACnC;AACA,aAAO,IAAI,KAAK,aAAa,EAAG,KAAK,IAAI;AAAA,IAC3C,CAAC;AAAA,EACH,CAAC;AACD,SAAO;AACT;AAEO,MAAM,wBAAwB,CAAC,KAAU,SAA+D;AAC7G,SAAO,aAAa,KAAK,IAAI;AAC/B;",
   "names": []
 }

package/dist/cjs/decorators/elementDefine.js

@@ -94,7 +94,7 @@ const handleGlobalSwcEvent = async (event) => {
   }
 };
 function buildEnv(configWindow) {
-  const win = configWindow || (typeof window !== "undefined" ? window : void 0);
+  const win = configWindow;
   const doc = win?.document;
   const builtInTagMap = /* @__PURE__ */ new Map();
   for (const [cls, tag] of import_config.HTML_TAG_ENTRIES) {
@@ -133,7 +133,7 @@ const setupPrototype = (proto) => {
       const aConf = getElementConfig(ancestors[i]);
       if (aConf?.window) return aConf.window;
     }
-    return typeof window !== "undefined" ? window : void 0;
+    return getElementConfig(this).window ?? (typeof window !== "undefined" ? window : void 0);
   };
   proto._invokeLifecycleMethod = function(methodName, hostSet, extraArgs = []) {
     ensureInit(this);
@@ -235,8 +235,11 @@ const elementDefine = (name, config = {}) => (constructor) => {
   const swcOnEvents = import_config.DOM_EVENT_NAMES.map((e) => `swc-on-${e}`);
   const attributeApplyNames = Array.from(applyAttributeMap.values()).map((it) => it.options.name).filter(Boolean);
   const hostAttributes = attributeList.filter((it) => it.selector === ":host").map((it) => it.options.name || String(it.propertyKey));
+  const proto = constructor.prototype;
+  const originalStaticObservedAttributes = constructor.observedAttributes ?? [];
   const mergedObservedAttributes = [.../* @__PURE__ */ new Set([
     ...metadata.observedAttributes ?? [],
+    ...originalStaticObservedAttributes,
     ...attrChangeMap.keys(),
     ...attributeApplyNames,
     ...hostAttributes,
@@ -245,7 +248,6 @@ const elementDefine = (name, config = {}) => (constructor) => {
     ...swcOnEvents
   ])];
   const connectedInnerHtmlList = (0, import_lifecycles.getOnConnectedInnerHtmlMetadata)(constructor) || [];
-  const proto = constructor.prototype;
   setupPrototype(proto);
   const originalConnected = proto.connectedCallback;
   proto.connectedCallback = function() {
@@ -254,8 +256,10 @@ const elementDefine = (name, config = {}) => (constructor) => {
     const appHost = hostSet.$appHost;
     const conf = getElementConfig(this);
     const currentWin = this._resolveWindow(conf);
-    if ((connectedInnerHtmlList.some((it) => it.options.useShadow === true) || conf?.useShadow === true) && !this.shadowRoot) {
-      this.attachShadow({ mode: "open" });
+    const shadowMode = conf?.useShadow || connectedInnerHtmlList.find((it) => it.options.useShadow)?.options.useShadow;
+    if (shadowMode && !this.shadowRoot) {
+      const mode = shadowMode === true ? "open" : shadowMode;
+      this.attachShadow({ mode });
     }
     this._executeSwcScript("swc-on-before-connected", hostSet);
     const bMethods = (0, import_lifecycles.findAllLifecycleMetadata)(this, import_lifecycles.ON_BEFORE_CONNECTED_METADATA_KEY);
@@ -267,12 +271,16 @@ const elementDefine = (name, config = {}) => (constructor) => {
       for (const meta of connectedInnerHtmlList) {
         const res = this._invokeLifecycleMethod(meta.propertyKey, hostSet);
         if (res !== void 0) {
-          if (meta.options.useShadow) sContent += res;
+          if (meta.options.useShadow || conf?.useShadow) sContent += res;
           else lContent += res;
         }
       }
-      if (this.shadowRoot) this.shadowRoot.innerHTML = sContent;
-      if (lContent) this.innerHTML = lContent;
+      try {
+        if (this.shadowRoot) this.shadowRoot.innerHTML = sContent;
+        if (lContent) this.innerHTML = lContent;
+      } catch (e) {
+        console.error("[ElementDefine] innerHTML setting error:", e);
+      }
     }
     const root = this.getRootNode();
     if (!globalDelegatedRoots.has(root)) {
@@ -384,7 +392,7 @@ const elementDefine = (name, config = {}) => (constructor) => {
         const handler = async (event) => {
           if (options.filter) {
             const helper = import_Utils.SwcUtils.getHelperAndHostSet(currentWin, t);
-            if (!options.filter(event, helper)) {
+            if (!options.filter(event, { currentThis: this, helper })) {
               return;
             }
           }
@@ -468,15 +476,17 @@ const elementDefine = (name, config = {}) => (constructor) => {
       const expr = ae.getFirstExpression("call-return");
       if (expr) {
         const win2 = this._resolveWindow?.() || (typeof window !== "undefined" ? window : void 0);
+        const helperAndHostSet = import_Utils.SwcUtils.getHelperAndHostSet(win2, this);
         try {
+          const script = import_core_web.ConvertUtils.decodeHtmlEntity(expr.script, win2.document);
           const result = import_core.FunctionUtils.executeReturn({
-            script: import_core_web.ConvertUtils.decodeHtmlEntity(expr.script, win2.document),
+            script,
             context: this,
-            args: import_Utils.SwcUtils.getHelperAndHostSet(win2, this)
+            args: helperAndHostSet
           });
-          processedVal = String(result);
+          processedVal = result;
         } catch (e) {
-          console.error(`[SWC] Failed to execute directive {{= ${expr.script} }} on attribute ${name2}:`, e);
+          console.error(`[SWC] Failed to execute directive {{= ${expr.script} }} on attribute ${name2}: ${helperAndHostSet}`, e);
           processedVal = newVal;
         }
       }
@@ -491,9 +501,12 @@ const elementDefine = (name, config = {}) => (constructor) => {
     if (hostCustomEventMeta && newVal !== null) {
       this._bindAttributeEvent(this, name2, newVal, hostCustomEventMeta.type);
     }
-    const mKeys = attrChangeMap.get(name2);
-    if (mKeys && Array.isArray(mKeys)) {
-      for (const key of mKeys) this[key](processedVal, old, name2, hSet);
+    const metaList = attrChangeMap.get(name2);
+    if (metaList && Array.isArray(metaList)) {
+      for (const meta of metaList) {
+        const convertedVal = (0, import_changedAttributeHost.convertAttributeValue)(processedVal, meta.options.type);
+        this[meta.propertyKey](convertedVal, old, name2, hSet);
+      }
     }
   };
   Object.defineProperty(constructor, "observedAttributes", {