@dooboostore/simple-web-component 1.0.15 → 1.0.16

package/src/utils/Utils.ts

@@ -1,4 +1,5 @@
-import {HostSet, SwcAppInterface} from '../types';
+import { SwcAppInterface, HostSet } from '../types';
+import { getElementConfig } from '../decorators/elementDefine';
 
 export const SWC_NOT_FOUND = Symbol('SWC_NOT_FOUND');
 
@@ -7,177 +8,45 @@ export class SwcUtils {
     if (!obj || !path) return SWC_NOT_FOUND;
 
     const parts = path.split('.');
+    let current = obj;
 
-    // 1. If the path starts with the rootName (alias), strip it and resolve within obj
-    if (parts[0] === rootName && parts.length > 1) {
-      const subParts = parts.slice(1);
-      let subResult = obj;
-      for (const part of subParts) {
-        if (subResult === null || typeof subResult !== 'object' || !(part in subResult)) return SWC_NOT_FOUND;
-        subResult = subResult[part];
-      }
-      return subResult;
-    }
-
-    // 2. Fallback: resolve directly on obj (standard behavior)
-    let result = obj;
     for (const part of parts) {
-      if (result === null || typeof result !== 'object' || !(part in result)) {
-        return SWC_NOT_FOUND;
-      }
-      result = result[part];
-    }
-
-    // Safety: don't return the instance itself or a DOM element as a template value
-    if (result !== obj && !(result instanceof HTMLElement)) {
-      return result;
+      if (current === null || current === undefined) return SWC_NOT_FOUND;
+      current = current[part];
     }
-
-    return SWC_NOT_FOUND;
+    return current;
   }
 
-  static evalExpression(expr: string, context: Record<string, any>): any {
-    try {
-      const keys = Object.keys(context);
-      const values = Object.values(context);
-      // eslint-disable-next-line no-new-func
-      return new Function(...keys, `return (${expr})`).apply(null, values);
-    } catch {
-      return SWC_NOT_FOUND;
-    }
-  }
+  static findNearestSwcHost(el: HTMLElement | Node): HTMLElement | undefined {
+    let current: any = el instanceof Node && !(el instanceof HTMLElement) ? (el as any).host : el;
+    current = current?.parentElement || (current?.getRootNode() as any)?.host;
 
-  static applyData(
-    node: Node,
-    data: any,
-    options: {
-      asKey: string;
-      asIndexKey: string;
-      index?: number;
-      hostContext?: Record<string, any>;
-    }
-  ) {
-    const { asKey, asIndexKey, index, hostContext } = options;
-    const context: Record<string, any> = {};
-    if (index !== undefined) {
-      context[asIndexKey] = index;
+    while (current) {
+      if (getElementConfig(current)) return current as HTMLElement;
+      current = current.parentElement || (current?.getRootNode() as any)?.host;
     }
-    if (data !== null && data !== undefined) {
-      context[asKey] = data;
-      context['value'] = data; // Always provide 'value' as well
-    }
-    const fullContext: Record<string, any> = { ...(hostContext || {}), ...context };
-
-    const resolveExpr = (expr: string, match: string): string => {
-      expr = expr.trim();
-      // 1. Local path resolve
-      const simpleVal = SwcUtils.getValueByPath(data, expr, asKey);
-      if (simpleVal !== SWC_NOT_FOUND && typeof simpleVal !== 'symbol') {
-        return simpleVal === null || simpleVal === undefined ? '' : String(simpleVal);
-      }
-      // 2. Full context eval (alias, host states, etc.)
-      const exprVal = SwcUtils.evalExpression(expr, fullContext);
-      if (exprVal !== SWC_NOT_FOUND && typeof exprVal !== 'symbol') {
-        return exprVal === null || exprVal === undefined ? '' : String(exprVal);
-      }
-      return match;
-    };
-
-    const walk = (n: Node) => {
-      if (n.nodeType === Node.TEXT_NODE) {
-        if (!(n as any)._original) (n as any)._original = n.textContent;
-        let text = (n as any)._original;
-        text = text.replace(/{{(.*?)}}/g, (match: string, path: string) => {
-          return resolveExpr(path, match);
-        });
-        if (n.textContent !== text) n.textContent = text;
-      } else if (n.nodeType === Node.ELEMENT_NODE) {
-        const el = n as HTMLElement;
-        Array.from(el.attributes).forEach(a => {
-          if (!(a as any)._original) (a as any)._original = a.value;
-          let val = (a as any)._original;
-          val = val.replace(/{{(.*?)}}/g, (match: string, path: string) => {
-            return resolveExpr(path, match);
-          });
-          if (a.value !== val) a.value = val;
-        });
-        el.childNodes.forEach(walk);
-      }
-    };
-    walk(node);
-  }
-
-  static createReactiveProxy(target: any, onChange: () => void, onIndexChange?: (index: number, val: any) => void) {
-    const makeRecursiveProxy = (obj: any): any => {
-      if (typeof obj !== 'object' || obj === null || obj instanceof Node) return obj;
-      if ((obj as any).__swc_is_proxy) return obj;
-
-      const IS_PROXY_KEY = '__swc_is_proxy';
-
-      const proxy = new Proxy(obj, {
-        get: (t, prop) => {
-          if (prop === IS_PROXY_KEY) return true;
-          if (typeof prop === 'symbol') return t[prop];
-          return t[prop];
-        },
-        set: (t, prop, val) => {
-          if (prop === IS_PROXY_KEY) return true;
-          if (typeof prop === 'symbol') {
-            t[prop] = val;
-            return true;
-          }
-          const oldVal = t[prop];
-          if (oldVal === val) return true;
-          t[prop] = makeRecursiveProxy(val);
-          const isIndex = !isNaN(Number(prop)) && Array.isArray(t);
-          if (isIndex && onIndexChange) {
-            onIndexChange(Number(prop), val);
-          } else {
-            onChange();
-          }
-          return true;
-        },
-        deleteProperty: (t, prop) => {
-          delete t[prop];
-          onChange();
-          return true;
-        }
-      });
-      return proxy;
-    };
-
-    return makeRecursiveProxy(target);
-  }
-
-  static findNearestSwcHost(el: HTMLElement | Node): any {
-    const hosts = this.findAllSwcHosts(el);
-    return hosts.length > 0 ? hosts[hosts.length - 1] : null;
+    return undefined;
   }
 
-  static findAllSwcHosts(el: HTMLElement | Node): any[] {
-    const hosts: any[] = [];
-    let curr: any = el instanceof Node && !(el instanceof HTMLElement) ? (el as any).host : el;
-    curr = curr?.parentElement || (curr?.getRootNode() as any)?.host;
-
-    while (curr) {
-      if (curr._swcId) hosts.push(curr);
-      curr = curr.parentElement || (curr?.getRootNode() as any)?.host;
+  /**
+   * Returns all SWC ancestors (excluding self) in [root, ..., parent] order.
+   */
+  static findAllSwcHosts(el: HTMLElement | Node): HTMLElement[] {
+    const hosts: HTMLElement[] = [];
+    let current = this.findNearestSwcHost(el);
+    while (current) {
+      hosts.push(current);
+      current = this.findNearestSwcHost(current);
     }
     return hosts.reverse();
   }
 
   static getHosts(el: HTMLElement): HTMLElement[] {
-    return this.findAllSwcHosts(el);
+    return [...this.findAllSwcHosts(el), el];
   }
 
   static getHost(el: HTMLElement): HTMLElement | undefined {
-    const hosts = this.getHosts(el);
-    return hosts.length > 0 ? hosts[hosts.length - 1] : undefined;
-  }
-
-  static getFirstHost(el: HTMLElement): HTMLElement | undefined {
-    const hosts = this.getHosts(el);
-    return hosts.length > 0 ? hosts[0] : undefined;
+    return el;
   }
 
   static getAppHosts(el: HTMLElement): SwcAppInterface[] {
@@ -187,37 +56,32 @@ export class SwcUtils {
 
   static getAppHost(el: HTMLElement): SwcAppInterface | undefined {
     const appHosts = this.getAppHosts(el);
-    return appHosts.length > 0 ? appHosts[appHosts.length - 1] : undefined;
-  }
-
-  static getFirstAppHost(el: HTMLElement): SwcAppInterface | undefined {
-    const appHosts = this.getAppHosts(el);
-    return appHosts.length > 0 ? appHosts[0] : undefined;
-  }
-
-  static getLastAppHost(el: HTMLElement): SwcAppInterface | undefined {
-    return this.getAppHost(el);
+    const appHostsWithoutSelf = appHosts.filter(h => h !== el);
+    // Nearest app host is the last one in [root, ..., parent]
+    return appHostsWithoutSelf.length > 0 ? appHostsWithoutSelf[appHostsWithoutSelf.length - 1] : undefined;
   }
 
   static getHostSet(el: HTMLElement): HostSet {
-    const $hosts = this.getHosts(el);
-    const $appHosts = this.getAppHosts(el);
-
-    const $firstHost = $hosts[0] || null;
-    const $lastHost = $hosts[$hosts.length - 1] || null;
+    const ancestors = this.findAllSwcHosts(el); // [root, ..., parent]
+    const $host = el;
+    const $hosts = [...ancestors, $host]; // [root, ..., parent, self]
+    const $parentHost = ancestors.length > 0 ? ancestors[ancestors.length - 1] : null;
+    const $firstHost = ancestors.length > 0 ? ancestors[0] : null;
 
-    const $firstAppHost = $appHosts[0] || null;
-    const $lastAppHost = $appHosts[$appHosts.length - 1] || null;
+    const $appHosts = $hosts.filter(h => h.tagName.toLowerCase() === 'swc-app' || h.getAttribute('is')?.startsWith('swc-app-')) as SwcAppInterface[];
+    const $appHost = $appHosts.length > 0 ? ($appHosts[$appHosts.length - 1] === el ? ($appHosts.length > 1 ? $appHosts[$appHosts.length - 2] : null) : $appHosts[$appHosts.length - 1]) : null;
+    const $firstAppHost = $appHosts.length > 0 ? $appHosts[0] : null;
 
     return {
-      $host: $lastHost,
+      $host,
+      $parentHost,
       $hosts,
       $firstHost,
-      $lastHost,
-      $appHost: $lastAppHost,
+      $lastHost: $parentHost,
+      $appHost,
       $appHosts,
       $firstAppHost,
-      $lastAppHost
+      $lastAppHost: $appHost
     };
   }
 }