@dooboostore/simple-web-component 1.0.28 → 1.0.30

package/src/elements/register.ts

@@ -4,7 +4,9 @@ import { SwcUtils } from '../utils/Utils';
 import { FunctionUtils } from '@dooboostore/core';
 import { changedAttributeHost } from '../decorators/changedAttributeHost';
 
-export const registerAllElements = (w: any) => {
+type Constructor<T> = new (...args: any[]) => T;
+
+export const registerAllElements = (w: any): Record<string, Constructor<HTMLElement>> => {
   const {
     HTMLElement: _HTMLElement,
     HTMLTemplateElement: _HTMLTemplateElement,
@@ -374,6 +376,7 @@ export const registerAllElements = (w: any) => {
   class SwcChoose extends HTMLTemplateElement {
   private _nodes: Node[] = [];
   private _value: any = null;
+  private _previousTemplate: HTMLTemplateElement | null = null;
 
   get value(): any {
     return this._value;
@@ -383,76 +386,114 @@ export const registerAllElements = (w: any) => {
     this.render();
   }
 
-  private _resolvePortal(): Element | null {
-    const portalScript = this.getAttribute('on-get-portal');
-    if (!portalScript) return this.parentElement;
-
-    const win = this.ownerDocument?.defaultView || window;
-    const res = FunctionUtils.executeReturn({
-      script: portalScript,
-      context: this,
-      args: SwcUtils.getHelperAndHostSet(win, this)
-    });
-
-    if (res instanceof HTMLElement) return res;
-    if (typeof res === 'string') return win.document.querySelector(res);
-    return this.parentElement;
-  }
-
   private _executeCloneCallback(attr: string, args: any) {
     const script = this.getAttribute(attr);
     if (!script) return;
     FunctionUtils.execute({ script, context: this, args });
   }
 
-  @changedAttributeHost('on-get-value')
-  private refresh() {
-    const script = this.getAttribute('on-get-value');
-    if (!script) {
+  @changedAttributeHost('value')
+  private refresh(valueAttr?: string | null) {
+    valueAttr ??= this.getAttribute('value');
+    if (valueAttr === null) {
       this.value = null;
       return;
     }
-    const win = this.ownerDocument?.defaultView || window;
-    const result = FunctionUtils.executeReturn({ script, context: this, args: SwcUtils.getHelperAndHostSet(win, this) });
-    this.value = result;
+
+    // {{ }} 브레이스로 감싸진 값은 스크립트 실행
+    if (valueAttr.startsWith('{{') && valueAttr.endsWith('}}')) {
+      const script = valueAttr.slice(2, -2).trim();
+      const win = this.ownerDocument?.defaultView || window;
+      const result = FunctionUtils.executeReturn({ script, context: this, args: SwcUtils.getHelperAndHostSet(win, this) });
+      this.value = result;
+    } else {
+      // 일반 문자열 값
+      this.value = valueAttr;
+    }
   }
 
   private render() {
-    this.cleanup();
-    const portal = this._resolvePortal();
-    if (!portal) return;
-
     const win = this.ownerDocument?.defaultView || window;
     const helperSet = SwcUtils.getHelperAndHostSet(win, this);
-
     const templates = Array.from(this.content.querySelectorAll('template'));
     let selected: HTMLTemplateElement | null = null;
+
     for (const t of templates) {
-      if (t.getAttribute('is') === 'swc-when' && String(t.getAttribute('value')) === String(this._value)) {
-        selected = t;
-        break;
+      if (t.getAttribute('is') === 'swc-when') {
+        let matches = false;
+        const value = t.getAttribute('value') || '';
+
+        // {{ }} 브레이스로 감싸진 값은 스크립트 실행
+        if (value.startsWith('{{') && value.endsWith('}}')) {
+          const script = value.slice(2, -2).trim();
+          const result = FunctionUtils.executeReturn({
+            script,
+            context: t,
+            args: { ...helperSet, $value: this._value }
+          });
+          // console.log('rrrrrrrrrrrrrr', result);
+          matches = result === true;
+        } else {
+          // 일반 문자열 비교 (기존 방식)
+          matches = String(value) === String(this._value);
+        }
+
+        if (matches) {
+          selected = t;
+          break;
+        }
       }
     }
+
     const target = selected || (this.content.querySelector('template[is="swc-otherwise"]') as HTMLTemplateElement);
 
+    // skip-if-same attribute가 있고 이전과 같은 template이면 렌더링 스킵
+    // 최상위 skip-if-same 또는 각 when/otherwise의 skip-if-same 체크
+    const targetHasSkipIfSame = target?.hasAttribute('skip-if-same');
+    const shouldSkip = (this.hasAttribute('skip-if-same') || targetHasSkipIfSame) && this._previousTemplate === target;
+    if (shouldSkip) {
+      return;
+    }
+
+    this.cleanup();
+    this._previousTemplate = target;
+
     if (target) {
       const clone = target.content.cloneNode(true) as DocumentFragment;
       this._nodes = Array.from(clone.childNodes);
       const elements = this._nodes.filter(n => n.nodeType === 1) as HTMLElement[];
       const groupArgs = { ...helperSet, $value: this._value, $nodes: this._nodes, $elements: elements, $firstElement: elements[0] };
 
+      // 복제된 최상위 요소들은 SwcChoose의 직접 자식이 될 것이므로 __swc_host 설정 안 함
       this._nodes.forEach((n, nodeIdx) => {
-        if (n instanceof HTMLElement) (n as any).__swc_host = this;
+        // if (n instanceof HTMLElement) (n as any).__swc_host = this;  // 제거: 부모 체인 유지
         this._executeCloneCallback('on-clone-node', { ...groupArgs, $node: n, $nodeIndex: nodeIdx, $isElement: n.nodeType === 1 });
+
+        // Attribute {{ }} 치환 - HTML string 차원에서 동적 치환
+        if (n instanceof HTMLElement) {
+          Array.from(n.attributes).forEach(attr => {
+            const value = attr.value || '';
+            if (value.startsWith('{{') && value.endsWith('}}')) {
+              const script = value.slice(2, -2).trim();
+              const result = FunctionUtils.executeReturn({
+                script,
+                context: n,
+                args: { ...groupArgs, $value: this._value }
+              });
+              n.setAttribute(attr.name, String(result));
+            }
+          });
+        }
       });
 
       this._executeCloneCallback('on-clone-nodes', groupArgs);
 
-      if (portal === this.parentElement) {
-        portal.insertBefore(clone, this.nextSibling);
-      } else {
-        portal.appendChild(clone);
-      }
+      this.parentElement?.insertBefore(clone, this.nextSibling);
+      // if (portal === this.parentElement) {
+      //   portal.insertBefore(clone, this.nextSibling);
+      // } else {
+      //   portal.appendChild(clone);
+      // }
     }
   }
 
@@ -499,7 +540,10 @@ export const registerAllElements = (w: any) => {
   @changedAttributeHost('on-get-value')
   private refresh() {
     const script = this.getAttribute('on-get-value');
-    if (!script) return;
+    if (!script) {
+      this.render('default');
+      return;
+    }
     const win = this.ownerDocument?.defaultView || window;
     const result = FunctionUtils.executeReturn({ script, context: this, args: SwcUtils.getHelperAndHostSet(win, this) });
 
@@ -553,6 +597,7 @@ export const registerAllElements = (w: any) => {
   }
 
   connectedCallback() {
+    console.log('[SwcAsync] connectedCallback called');
     this.refresh();
   }
   disconnectedCallback() {
@@ -732,4 +777,78 @@ export const registerAllElements = (w: any) => {
   @elementDefine('swc-app-body', { extends: 'body', window: w })
   class SwcAppBody extends SwcAppMixin(HTMLBodyElement) {}
 
+
+  return {
+    // Sub Templates
+    SwcLoading,
+    SwcError,
+    SwcSuccess,
+    SwcWhen,
+    SwcOtherwise,
+    SwcDefault,
+    // Core Elements
+    SwcApp,
+    SwcIf,
+    SwcLoop,
+    SwcChoose,
+    SwcAsync,
+    // App Elements
+    SwcAppAnchor,
+    SwcAppArea,
+    SwcAppAudio,
+    SwcAppBase,
+    SwcAppButton,
+    SwcAppCanvas,
+    SwcAppData,
+    SwcAppDataList,
+    SwcAppDetails,
+    SwcAppDialog,
+    SwcAppDiv,
+    SwcAppDList,
+    SwcAppEmbed,
+    SwcAppFieldSet,
+    SwcAppForm,
+    SwcAppHR,
+    SwcAppIFrame,
+    SwcAppImage,
+    SwcAppInput,
+    SwcAppLabel,
+    SwcAppLegend,
+    SwcAppLI,
+    SwcAppLink,
+    SwcAppMap,
+    SwcAppMeta,
+    SwcAppMeter,
+    SwcAppMod,
+    SwcAppObject,
+    SwcAppOList,
+    SwcAppOptGroup,
+    SwcAppOption,
+    SwcAppOutput,
+    SwcAppParagraph,
+    SwcAppParam,
+    SwcAppPicture,
+    SwcAppPre,
+    SwcAppProgress,
+    SwcAppQuote,
+    SwcAppScript,
+    SwcAppSelect,
+    SwcAppSlot,
+    SwcAppSource,
+    SwcAppSpan,
+    SwcAppStyle,
+    SwcAppTable,
+    SwcAppTableSection,
+    SwcAppTableCell,
+    SwcAppTemplate,
+    SwcAppTextArea,
+    SwcAppTime,
+    SwcAppTitle,
+    SwcAppTableRow,
+    SwcAppTrack,
+    SwcAppUList,
+    SwcAppVideo,
+    SwcAppHeading,
+    SwcAppBody,
+  };
 };

package/src/index.ts

@@ -16,12 +16,14 @@ export * from './config/config';
 
 // Registration Factory
 export default (w: Window, other?: (((w: Window) => ConstructorType<any>) | any) []) => {
-  registerAllElements(w);
+  const cr = registerAllElements(w);
   const r = other?.map(fn => {
     if (typeof fn === 'function') {
       const a = fn(w);
     } else {
     }
   });
+
+  return cr;
   // return r??[];
 };

package/src/types.ts

@@ -48,4 +48,7 @@ export interface SwcAppInterface extends HTMLElement {
   router?: Router;
   connect(config?: SwcAttributeConfigType): Promise<void>;
   routing(path: string): Promise<void>;
+  reload(): void;
+  back(): void;
+  forward(): void;
 }

package/src/utils/Utils.ts

@@ -236,6 +236,59 @@ export namespace SwcUtils {
     return appHostsWithoutSelf.length > 0 ? appHostsWithoutSelf[appHostsWithoutSelf.length - 1] : undefined;
   };
 
+  /**
+   * Find parent app host by traversing DOM tree directly.
+   * Only checks tagName and is attribute - no SWC host discovery.
+   * Useful for Safari polyfill compatibility where is="" elements upgrade in child-first order.
+   */
+  export const findParentAppHostDirect = (el: HTMLElement): SwcAppInterface | null => {
+    const appHosts = findAllParentAppHostsDirect(el);
+    return appHosts.length > 0 ? appHosts[appHosts.length - 1] : null;
+  };
+
+  /**
+   * Find all parent app hosts by traversing DOM tree directly.
+   * Returns array of all parent app hosts in [closest-parent, ..., root] order.
+   * Only checks tagName and is attribute - no SWC host discovery.
+   * Useful for Safari polyfill compatibility where is="" elements upgrade in child-first order.
+   */
+  export const findAllParentAppHostsDirect = (el: HTMLElement): SwcAppInterface[] => {
+    const appHosts: SwcAppInterface[] = [];
+    
+    // Shadow DOM 내부의 depth를 정상적으로 탐색하기 위해
+    // el.parentElement부터 시작하고, shadow root 경계를 만날 때만 host로 이동
+    let current: HTMLElement | null = el.parentElement;
+    
+    while (current) {
+      // console.log('vvvvvvv');
+      // alert(1)
+      // debugger;
+      const isAppHost =
+        current.tagName.toLowerCase() === 'swc-app' || 
+        current.getAttribute('is')?.startsWith('swc-app-');
+      if (isAppHost) {
+        appHosts.push(current as SwcAppInterface);
+      }
+      // Handle shadow DOM
+      if (current.shadowRoot) {
+        current = ((current.shadowRoot as any).host as HTMLElement).parentElement;
+      } else {
+        // 부모가 없으면 shadow root 경계일 수 있음
+        if (!current.parentElement) {
+          const parentNode = current.parentNode;
+          if (parentNode instanceof ShadowRoot) {
+            current = (parentNode as any).host as HTMLElement;
+          } else {
+            break;
+          }
+        } else {
+          current = current.parentElement;
+        }
+      }
+    }
+    return appHosts.reverse(); // [root, ..., closest-parent]
+  };
+
   export const getHostSet = (el: HTMLElement): HostSet => {
     const isSwc = !!getElementConfig(el);
     const ancestors = findAllSwcHosts(el); // [root, ..., parent]
@@ -265,7 +318,8 @@ export namespace SwcUtils {
       curr = curr.parentElement || (curr.getRootNode() as any).host;
     }
 
-    const $appHosts = $hosts.filter(h => h.tagName.toLowerCase() === 'swc-app' || h.getAttribute('is')?.startsWith('swc-app-')) as SwcAppInterface[];
+    const $appHosts = SwcUtils.findAllParentAppHostsDirect(el); //$hosts.filter(h => h.tagName.toLowerCase() === 'swc-app' || h.getAttribute('is')?.startsWith('swc-app-')) as SwcAppInterface[];
+    // console.log('apphosts00000000', $appHosts)
     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;