@dooboostore/simple-web-component 1.0.37 → 1.0.39

package/src/decorators/lifecycles.ts

@@ -8,7 +8,7 @@ export const ON_AFTER_DISCONNECTED_METADATA_KEY = Symbol.for('simple-web-compone
 export const ON_BEFORE_ADOPTED_METADATA_KEY = Symbol.for('simple-web-component:on-before-adopted');
 export const ON_AFTER_ADOPTED_METADATA_KEY = Symbol.for('simple-web-component:on-after-adopted');
 export const ON_ADD_EVENT_LISTENER_METADATA_KEY = Symbol.for('simple-web-component:on-add-event-listener');
-export const ON_CONNECTED_INNER_HTML_METADATA_KEY = Symbol.for('simple-web-component:inner-html');
+export const ON_CONNECTED_METADATA_KEY = Symbol.for('simple-web-component');
 export const ON_CONNECTED_SWC_APP_METADATA_KEY = Symbol.for('simple-web-component:on-connected-swc-app');
 export const ON_CONNECTED_COMPLETED_METADATA_KEY = Symbol.for('simple-web-component:on-completed');
 
@@ -16,7 +16,7 @@ export const ATTRIBUTE_CHANGED_WILDCARD = '*';
 
 export interface InnerHtmlOptions {
   ssrFirst?: boolean;
-  replaceWrap?:{ start: string, end:string},
+  // replaceWrap?:{ start: string, end:string},
   useShadow?: boolean;
 }
 export interface InnerHtmlMetadata {
@@ -93,7 +93,7 @@ function createLifecycleDecorator(metadataKey: symbol): MethodDecorator {
 export const onInitialize = createLifecycleDecorator(ON_INITIALIZE_METADATA_KEY);
 // export const onConnectedBefore = createLifecycleDecorator(ON_BEFORE_CONNECTED_METADATA_KEY);
 // export const onConnectedAfter = createLifecycleDecorator(ON_AFTER_CONNECTED_METADATA_KEY);
-export const onConnected = onConnectedAfter;
+// export const onConnected = onConnectedAfter;
 
 export const onDisconnectedBefore = createLifecycleDecorator(ON_BEFORE_DISCONNECTED_METADATA_KEY);
 export const onDisconnectedAfter = createLifecycleDecorator(ON_AFTER_DISCONNECTED_METADATA_KEY);
@@ -108,28 +108,52 @@ export const onAddEventListener = createLifecycleDecorator(ON_ADD_EVENT_LISTENER
 export const onConnectedSwcApp = createLifecycleDecorator(ON_CONNECTED_SWC_APP_METADATA_KEY);
 export const onConnectedCompleted = createLifecycleDecorator(ON_CONNECTED_COMPLETED_METADATA_KEY);
 
-/**
- * @onConnectedInnerHtml decorator to define the initial HTML content when connected.
- */
-export function onConnectedInnerHtml(options: InnerHtmlOptions): MethodDecorator;
-export function onConnectedInnerHtml(target: Object, propertyKey: string | symbol, descriptor: PropertyDescriptor): void;
-export function onConnectedInnerHtml(arg1?: InnerHtmlOptions | Object, arg2?: string | symbol, arg3?: PropertyDescriptor): MethodDecorator | void {
-  const decorator = (options: InnerHtmlOptions, target: Object, propertyKey: string | symbol) => {
-    const constructor = target.constructor;
-    let list = ReflectUtils.getMetadata<InnerHtmlMetadata[]>(ON_CONNECTED_INNER_HTML_METADATA_KEY, constructor);
-    if (!list) {
-      list = [];
-      ReflectUtils.defineMetadata(ON_CONNECTED_INNER_HTML_METADATA_KEY, list, constructor);
-    }
-    list.push({ propertyKey, options });
-  };
 
-  if (arg2) {
-    return decorator({}, arg1!, arg2);
+
+
+
+const decorator = (options: InnerHtmlOptions, target: Object, propertyKey: string | symbol) => {
+  const constructor = target.constructor;
+  let list = ReflectUtils.getMetadata<InnerHtmlMetadata[]>(ON_CONNECTED_METADATA_KEY, constructor);
+  if (!list) {
+    list = [];
+    ReflectUtils.defineMetadata(ON_CONNECTED_METADATA_KEY, list, constructor);
+  }
+  list.push({ propertyKey, options });
+};
+
+export function onConnectedShadowDom(options: Omit<InnerHtmlOptions, 'useShadow'>): MethodDecorator; // 파라미터있음
+export function onConnectedShadowDom(target: Object, propertyKey: string | symbol, descriptor: PropertyDescriptor): void; // 파라미터없음
+export function onConnectedShadowDom(optionOrTarget: Omit<InnerHtmlOptions, 'useShadow'> | Object, propertyKey?: string | symbol, arg3?: PropertyDescriptor): MethodDecorator | void {
+  if (propertyKey) { // no parameter option  @decorator
+    return decorator({useShadow: true}, optionOrTarget!, propertyKey);
   }
+  // parameter option @decorator()
+  return (target: Object, propertyKey: string | symbol) => {
+    decorator({...optionOrTarget??{}, useShadow: true}, target, propertyKey);
+  };
+}
 
+export function onConnectedLightDom(options: Omit<InnerHtmlOptions, 'useShadow'>): MethodDecorator; // 파라미터있음
+export function onConnectedLightDom(target: Object, propertyKey: string | symbol, descriptor: PropertyDescriptor): void; // 파라미터없음
+export function onConnectedLightDom(optionOrTarget: Omit<InnerHtmlOptions, 'useShadow'> | Object, propertyKey?: string | symbol, arg3?: PropertyDescriptor): MethodDecorator | void {
+  if (propertyKey) { // no parameter option  @decorator
+    return decorator({useShadow: false}, optionOrTarget!, propertyKey);
+  }
+  // parameter option @decorator()
+  return (target: Object, propertyKey: string | symbol) => {
+    decorator({...optionOrTarget??{}, useShadow: false}, target, propertyKey);
+  };
+}
+export function onConnected(options: InnerHtmlOptions): MethodDecorator;
+export function onConnected(target: Object, propertyKey: string | symbol, descriptor: PropertyDescriptor): void;
+export function onConnected(optionOrTarget: InnerHtmlOptions | Object, propertyKey?: string | symbol, arg3?: PropertyDescriptor): MethodDecorator | void {
+  if (propertyKey) { // no parameter option  @decorator
+    return decorator({}, optionOrTarget!, propertyKey);
+  }
+  // parameter option @decorator()
   return (target: Object, propertyKey: string | symbol) => {
-    decorator((arg1 as InnerHtmlOptions) || {}, target, propertyKey);
+    decorator((optionOrTarget as InnerHtmlOptions) || {}, target, propertyKey);
   };
 }
 
@@ -138,19 +162,19 @@ export function onConnectedInnerHtml(arg1?: InnerHtmlOptions | Object, arg2?: st
  */
 // export const findAllLifecycleMetadata = <T = (string | symbol)[]>(target: any, metadataKey: symbol): T | undefined => {
 export const findAllLifecycleMetadata = (target: any, metadataKey: symbol): (string | symbol)[] => {
-  const results = ReflectUtils.findAllMetadataFlatten(metadataKey, target);
+  const results = ReflectUtils.findAllMetadataFlatten(metadataKey, target)??[];
   return results;
 };
 
-export const getOnConnectedInnerHtmlMetadata = (target: any): InnerHtmlMetadata[] => {
+export const findAllOnConnectedMetadata = (target: any): InnerHtmlMetadata[] => {
   const constructor = target instanceof Function ? target : target.constructor;
-  return ReflectUtils.getMetadata(ON_CONNECTED_INNER_HTML_METADATA_KEY, constructor) ?? [];
+  return ReflectUtils.getMetadata(ON_CONNECTED_METADATA_KEY, constructor) ?? [];
 };
-export const getOnConnectedBeforeMetadata = (target: any): OnConnectedMetadata[] => {
+export const findAllOnConnectedBeforeMetadata = (target: any): OnConnectedMetadata[] => {
   const constructor = target instanceof Function ? target : target.constructor;
   return ReflectUtils.getMetadata(ON_BEFORE_CONNECTED_METADATA_KEY, constructor) ?? [];
 };
-export const getOnConnectedAfterMetadata = (target: any): OnConnectedMetadata[] => {
+export const findAllOnConnectedAfterMetadata = (target: any): OnConnectedMetadata[] => {
   const constructor = target instanceof Function ? target : target.constructor;
   return ReflectUtils.getMetadata(ON_AFTER_CONNECTED_METADATA_KEY, constructor) ?? [];
 };

package/src/decorators/publishSwcAppMessage.ts

@@ -1,6 +1,5 @@
-import { ReflectUtils } from '@dooboostore/core';
-import { SwcAppMessage } from '../types';
-import { SwcUtils } from '../utils/Utils';
+import {ReflectUtils} from '@dooboostore/core';
+import {SwcUtils} from '../utils/Utils';
 
 export const PUBLISH_SWC_APP_MESSAGE_METADATA_KEY = Symbol.for('simple-web-component:publish-swc-app-message');
 

package/src/decorators/query.ts

@@ -1,12 +1,12 @@
 import { ReflectUtils } from '@dooboostore/core';
 import { getElementConfig, ensureInit } from './elementDefine';
 import { SwcUtils } from '../utils/Utils';
-import { SpecialSelector, SwcQueryOptions } from '../types';
+import { SpecialSelector, SwcQueryOptions, HelperHostSet } from '../types';
 
 export interface QueryMetadata {
   propertyKey: string | symbol;
   selector: string;
-  options: SwcQueryOptions;
+  options: SwcQueryOptions ;
 }
 
 export const QUERY_METADATA_KEY = Symbol.for('simple-web-component:query');
@@ -180,7 +180,7 @@ export function queryAppHost(targetOrOptions?: any, propertyKey?: string | symbo
   }
 }
 
-export const getQueryMetadata = (target: any): QueryMetadata[] | undefined => {
+export const getQueryMetadata = (target: any): QueryMetadata[]  => {
   const constructor = target instanceof Function ? target : target.constructor;
-  return ReflectUtils.getMetadata(QUERY_METADATA_KEY, constructor);
+  return ReflectUtils.getMetadata(QUERY_METADATA_KEY, constructor) ?? [];
 };

package/src/decorators/queryAll.ts

@@ -1,7 +1,7 @@
 import { ReflectUtils } from '@dooboostore/core';
 import { getElementConfig, ensureInit } from './elementDefine';
 import { SwcUtils } from '../utils/Utils';
-import { SpecialSelector, SwcQueryOptions } from '../types';
+import { SpecialSelector, SwcQueryOptions, HelperHostSet } from '../types';
 
 export interface QueryAllMetadata {
   propertyKey: string | symbol;

package/src/decorators/setProperty.ts

@@ -1,7 +1,7 @@
 import { ReflectUtils } from '@dooboostore/core';
 import { ensureInit } from './elementDefine';
 import { SwcUtils } from '../utils/Utils';
-import { HelperHostSet, SwcQueryOptions } from '../types';
+import { SpecialSelector, SwcQueryOptions, HelperHostSet } from '../types';
 
 export interface PropertySetOptions extends SwcQueryOptions {
   name?: string;

package/src/decorators/state.ts

@@ -0,0 +1,83 @@
+import {ReflectUtils} from '@dooboostore/core';
+import {ElementApply} from "@dooboostore/core-web";
+import {SwcUtils} from "../utils/Utils";
+import {getElementConfig} from "./elementDefine";
+
+export interface StateMetadata {
+  propertyKey: string | symbol;
+  name: string;
+}
+
+export const STATE_METADATA_KEY = Symbol.for('simple-web-component:state');
+
+// export function state(target: SpecialSelector): PropertyDecorator;
+// export function state(): PropertyDecorator;
+export function state(target: Object, propertyKey: string | symbol): void;
+export function state(name: string): PropertyDecorator;
+/**
+ * Supports both forms:
+ * - @state
+ * - @state()
+ * - @state('selector')
+ */
+export function state(nameOrTarget?: string | Object, propertyKey?: string | symbol): any {
+
+  const stateDefine = (targetObj: any, stateMetadata: StateMetadata) => {
+
+    let storage = targetObj[stateMetadata.propertyKey];
+    // console.log('ssssssssssssssss', storage, stateMetadata.propertyKey)
+    Object.defineProperty(targetObj, stateMetadata.propertyKey, {
+      set(this: any, nv: string) {
+        storage = nv;
+        const config = getElementConfig(this)
+        const ea = new ElementApply(this, {id: this._swcId});
+        const helperHostSet = SwcUtils.getHelperAndHostSet(config.window, this);
+        const stateContext: any = {...helperHostSet};
+        findAllStateMetadata(this).forEach(it => {
+          stateContext[it.name] = this[it.propertyKey]
+        })
+        ea.apply({context:stateContext, targetVariableName: stateMetadata.name, bind: this});
+      },
+      get(this: any) {
+        return storage;
+      },
+      enumerable: true,
+      configurable: true
+    });
+  }
+
+  // If used as @state (no parentheses), TypeScript will call this function with (target, propertyKey)
+  if (typeof nameOrTarget === 'object' && propertyKey) {
+    const targetObj = nameOrTarget as Object;
+    const name = String(propertyKey);
+    const constructor = (targetObj as any).constructor;
+    let states = ReflectUtils.getMetadata<StateMetadata[]>(STATE_METADATA_KEY, constructor);
+    if (!states) {
+      states = [];
+      ReflectUtils.defineMetadata(STATE_METADATA_KEY, states, constructor);
+    }
+    const stateMetadata = {propertyKey, name};
+    states.push(stateMetadata);
+    stateDefine(targetObj, stateMetadata);
+    return;
+  }
+
+  // Otherwise return a decorator factory
+  return (targetObj: Object, propertyKey: string | symbol): void => {
+    const name = String(nameOrTarget);
+    const constructor = targetObj.constructor;
+    let states = ReflectUtils.getMetadata<StateMetadata[]>(STATE_METADATA_KEY, constructor);
+    if (!states) {
+      states = [];
+      ReflectUtils.defineMetadata(STATE_METADATA_KEY, states, constructor);
+    }
+    const stateMetadata = {propertyKey, name};
+    states.push(stateMetadata);
+    stateDefine(targetObj, stateMetadata);
+  };
+}
+
+export const findAllStateMetadata = (target: any): StateMetadata[] => {
+  const constructor = target instanceof Function ? target : target.constructor;
+  return ReflectUtils.getMetadata(STATE_METADATA_KEY, constructor) ?? [];
+};

package/src/decorators/subscribeSwcAppMessageWhileConnected.ts

@@ -1,5 +1,5 @@
 import { ReflectUtils } from '@dooboostore/core';
-import { SwcAppMessage } from '../types';
+import { SwcAppMessage, SpecialSelector, SwcQueryOptions, HelperHostSet } from '../types';
 
 export const SUBSCRIBE_SWC_APP_MESSAGE_WHILE_CONNECTED_METADATA_KEY = Symbol.for('simple-web-component:subscribe-swc-app-message-while-connected');
 

package/src/decorators/subscribeSwcAppRouteChangeWhileConnected.ts

@@ -1,5 +1,6 @@
-import { ReflectUtils } from '@dooboostore/core';
-import { Router } from '@dooboostore/core-web';
+import {ReflectUtils} from '@dooboostore/core';
+import {Router} from '@dooboostore/core-web';
+import {HelperHostSet} from '../types';
 
 export const SUBSCRIBE_SWC_APP_ROUTE_CHANGE_WHILE_CONNECTED_METADATA_KEY = Symbol.for('simple-web-component:subscribe-swc-app-route-change-while-connected');
 
@@ -12,7 +13,7 @@ export interface SwcAppRouteChangeSubscriberMetadata {
 
 export interface SwcAppRouteChangeOptions {
   path?: RoutePathType;
-  filter?: (router: Router, currentThis: any) => boolean;
+  filter?: (router: Router, meta: {currentThis: any, helper: HelperHostSet}) => boolean;
 }
 
 function createSubscribeSwcAppRouteChangeWhileConnected(options?: SwcAppRouteChangeOptions): MethodDecorator {